Support Rack 3

Author: ngan

Gemfile.lock

@@ -2,9 +2,10 @@ PATH
   remote: .
   specs:
     grpc-web (1.2.1)
+      base64
       google-protobuf (~> 3.13.0)
       grpc (~> 1.0)
-      rack (>= 1.6.0, < 3.0)
+      rack (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -70,7 +71,7 @@ GEM
       pry (>= 0.13, < 0.15)
     public_suffix (5.1.1)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (3.1.12)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-test (2.2.0)

grpc-web.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['lib/**/*']
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'base64'
   spec.add_dependency 'grpc', '~> 1.0'
   spec.add_dependency 'google-protobuf', '~> 3.13.0'
-  spec.add_dependency 'rack', '>= 1.6.0', '< 3.0'
+  spec.add_dependency 'rack', '~> 3.0'
 
   spec.add_development_dependency 'apparition'
   spec.add_development_dependency 'pry-byebug'

lib/grpc_web/client/client_executor.rb

@@ -32,7 +32,7 @@ def request(uri, rpc_desc, params = {}, metadata = {})
     def request_headers(metadata)
       {
         'Accept' => PROTO_CONTENT_TYPE,
-        'Content-Type' => PROTO_CONTENT_TYPE,
+        'content-type' => PROTO_CONTENT_TYPE,
       }.merge(metadata[:metadata] || {})
     end
 

lib/grpc_web/server/rack_handler.rb

@@ -29,7 +29,7 @@ def call(service, service_method, env)
       request = GRPCWeb::GRPCWebRequest.new(service, service_method, content_type, accept, body)
       response = GRPCWeb::GRPCRequestProcessor.process(request)
 
-      [200, { 'Content-Type' => response.content_type }, [response.body]]
+      [200, { 'content-type' => response.content_type }, [response.body]]
     rescue Google::Protobuf::ParseError => e
       invalid_response(e.message)
     rescue StandardError => e
@@ -51,27 +51,27 @@ def valid_content_types?(rack_request)
     def not_found_response(path)
       [
         NOT_FOUND,
-        { 'Content-Type' => 'text/plain', 'X-Cascade' => 'pass' },
+        { 'content-type' => 'text/plain', 'x-cascade' => 'pass' },
         ["Not Found: #{path}"],
       ]
     end
 
     def unsupported_media_type_response
       [
         UNSUPPORTED_MEDIA_TYPE,
-        { 'Content-Type' => 'text/plain' },
+        { 'content-type' => 'text/plain' },
         ['Unsupported Media Type: Invalid Content-Type or Accept header'],
       ]
     end
 
     def invalid_response(message)
-      [422, { 'Content-Type' => 'text/plain' }, ["Invalid request format: #{message}"]]
+      [422, { 'content-type' => 'text/plain' }, ["Invalid request format: #{message}"]]
     end
 
     def error_response
       [
         INTERNAL_SERVER_ERROR,
-        { 'Content-Type' => 'text/plain' },
+        { 'content-type' => 'text/plain' },
         ['Request failed with an unexpected error.'],
       ]
     end

spec/integration/envoy_server_ruby_client_spec.rb

@@ -97,7 +97,7 @@ def say_hello(_request, _metadata = nil)
   end
 
   context 'with a custom header' do
-    subject { client.say_hello({ name: name }, metadata: { 'Custom-header' => 'Meow meow' }) }
+    subject { client.say_hello({ name: name }, metadata: { 'custom-header' => 'Meow meow' }) }
 
     let(:service) do
       Class.new(TestHelloService) do

spec/unit/grpc_web/client/client_executor_spec.rb

@@ -24,7 +24,7 @@
     let(:expected_headers) do
       {
         'Accept' => GRPCWeb::ContentTypes::PROTO_CONTENT_TYPE,
-        'Content-Type' => GRPCWeb::ContentTypes::PROTO_CONTENT_TYPE,
+        'content-type' => GRPCWeb::ContentTypes::PROTO_CONTENT_TYPE,
       }
     end
 
@@ -68,11 +68,11 @@
       context 'with custom header' do
         subject(:response) { described_class.request(request_uri, rpc_desc, params, custom_header) }
 
-        let(:custom_header) { { metadata: { 'Custom-header' => 'Meow meow' } } }
+        let(:custom_header) { { metadata: { 'custom-header' => 'Meow meow' } } }
         let(:expected_headers) do
           {
             'Accept' => GRPCWeb::ContentTypes::PROTO_CONTENT_TYPE,
-            'Content-Type' => GRPCWeb::ContentTypes::PROTO_CONTENT_TYPE,
+            'content-type' => GRPCWeb::ContentTypes::PROTO_CONTENT_TYPE,
             'Custom-header' => 'Meow meow',
           }
         end

spec/unit/grpc_web/server/rack_handler_spec.rb

@@ -38,7 +38,7 @@
     it 'returns a 200' do
       expect(call).to eq([
         200,
-        { 'Content-Type' => response_content_type },
+        { 'content-type' => response_content_type },
         [response_body],
       ])
     end
@@ -63,7 +63,7 @@
       it 'returns a 404' do
         expect(call).to eq([
           404,
-          { 'Content-Type' => 'text/plain', 'X-Cascade' => 'pass' },
+          { 'content-type' => 'text/plain', 'x-cascade' => 'pass' },
           ["Not Found: #{path_info}"],
         ])
       end
@@ -75,7 +75,7 @@
       it 'returns a 415' do
         expect(call).to eq([
           415,
-          { 'Content-Type' => 'text/plain' },
+          { 'content-type' => 'text/plain' },
           ['Unsupported Media Type: Invalid Content-Type or Accept header'],
         ])
       end
@@ -87,7 +87,7 @@
       it 'returns a 415' do
         expect(call).to eq([
           415,
-          { 'Content-Type' => 'text/plain' },
+          { 'content-type' => 'text/plain' },
           ['Unsupported Media Type: Invalid Content-Type or Accept header'],
         ])
       end
@@ -104,7 +104,7 @@
       it 'returns a 422' do
         expect(call).to eq([
           422,
-          { 'Content-Type' => 'text/plain' },
+          { 'content-type' => 'text/plain' },
           ["Invalid request format: #{error_message}"],
         ])
       end
@@ -120,7 +120,7 @@
     it 'returns a 500' do
       expect(call).to eq([
         500,
-        { 'Content-Type' => 'text/plain' },
+        { 'content-type' => 'text/plain' },
         ['Request failed with an unexpected error.'],
       ])
     end

spec/unit/grpc_web/server/text_coder_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'base64'
 require 'grpc_web/server/text_coder'
 
 RSpec.describe GRPCWeb::TextCoder do