twirp 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ca98464f629eded22f43e5f6be8d5f720287e32056db5535ec71d529745504
-  data.tar.gz: 7f52befd48f263ec529820cdc0a376becee5bff8d83b206d443df288125cf65d
+  metadata.gz: 78baa75e1f8c6d2009bb678de8263824d4bb691c8bb862dd8c3969e93f9a711e
+  data.tar.gz: a6d86c07b49e7ec371cee190942b1286d91208b2d45104a64f67c430207fa3a2
 SHA512:
-  metadata.gz: 1199fe21d97365b929b03e1f2ae347544c13ba69473638c69c7a5f6097bc4de230c41422f1f019700f3b0a8e7a6475cbc24801cee45c755710031a635b4cc359
-  data.tar.gz: fdf6e077944198c4ae9158080f4120c7039a5b2e5bcfd83535a1e2da103638ccf3f2feab429ad22a3fb33c0ed69c504c8b74979a998bd8491d786273f8542733
+  metadata.gz: 4f9f81587e713fd88ab7a2a7fd815b317e271d3a58a76692a4f6828be15076d7ba9682a984001e3fb82aa20dfa74dc14f2f01fc5a53d34e3470b9192793d6005
+  data.tar.gz: 1004bb764ef0e9572aee60b0b84f337cda920ed45d7cd03655c5d47c6299c3864e33737e44010ef2905cebe5095d4a89bd51e9c5517545b0966e9b8854c92055

data/lib/twirp/client.rb

@@ -106,7 +106,7 @@ module Twirp
       end
 
       def is_http_redirect?(status)
-        status >= 300 && status <= 399
+        status && status >= 300 && status <= 399
       end
 
       def make_http_request(conn, service_full_name, rpc_method, content_type, req_opts, body)

data/lib/twirp/service.rb

@@ -32,7 +32,7 @@ module Twirp
       # Rack response with a Twirp::Error
       def error_response(twerr)
         status = Twirp::ERROR_CODES_TO_HTTP_STATUS[twerr.code]
-        headers = {'Content-Type' => Encoding::JSON} # Twirp errors are always JSON, even if the request was protobuf
+        headers = {Rack::CONTENT_TYPE => Encoding::JSON} # Twirp errors are always JSON, even if the request was protobuf
         resp_body = Encoding.encode_json(twerr.to_h)
         [status, headers, [resp_body]]
       end
@@ -100,7 +100,7 @@ module Twirp
       input = env[:input_class].new(input) if input.is_a? Hash
       env[:input] = input
       env[:content_type] ||= Encoding::PROTO
-      env[:http_response_headers] = {}
+      env[:http_response_headers] = defined?(Rack::Headers) ? Rack::Headers.new : {}
       call_handler(env)
     end
 
@@ -138,7 +138,7 @@ module Twirp
       input = nil
       begin
         body_str = rack_request.body.read
-        rack_request.body.rewind # allow other middleware to read again (https://github.com/arthurnn/twirp-ruby/issues/50)
+        rack_request.body.rewind if rack_request.body.respond_to?(:rewind) # allow other middleware to read again (https://github.com/arthurnn/twirp-ruby/issues/50)
         input = Encoding.decode(body_str, env[:input_class], content_type)
       rescue => e
         error_msg = "Invalid request body for rpc method #{method_name.inspect} with Content-Type=#{content_type}"
@@ -149,7 +149,7 @@ module Twirp
       end
 
       env[:input] = input
-      env[:http_response_headers] = {}
+      env[:http_response_headers] = defined?(Rack::Headers) ? Rack::Headers.new : {}
       return
     end
 
@@ -181,7 +181,7 @@ module Twirp
         env[:output] = output
         @on_success.each{|hook| hook.call(env) }
 
-        headers = env[:http_response_headers].merge('Content-Type' => env[:content_type])
+        headers = env[:http_response_headers].merge(Rack::CONTENT_TYPE => env[:content_type])
         resp_body = Encoding.encode(output, env[:output_class], env[:content_type])
         [200, headers, [resp_body]]
 

data/lib/twirp/version.rb

@@ -12,5 +12,5 @@
 # permissions and limitations under the License.
 
 module Twirp
-  VERSION = '1.12.0'
+  VERSION = '1.13.0'
 end

data/test/client_test.rb

@@ -58,6 +58,17 @@ class ClientTest < Minitest::Test
     assert_equal num_mthds + 1, EmptyClient.instance_methods.size # new method added
   end
 
+  def test_is_http_redirect
+    assert Twirp::Client.is_http_redirect? 300
+    assert Twirp::Client.is_http_redirect? 301
+    assert Twirp::Client.is_http_redirect? 302
+    assert Twirp::Client.is_http_redirect? 399
+
+    refute Twirp::Client.is_http_redirect? 200
+    refute Twirp::Client.is_http_redirect? 400
+    refute Twirp::Client.is_http_redirect? nil
+  end
+
 
   # Call .rpc on Protobuf client
   # ----------------------------

data/test/service_test.rb

@@ -17,7 +17,7 @@ class ServiceTest < Minitest::Test
     twerr = Twirp::Error.invalid_argument('foo')
     resp = Twirp::Service.error_response(twerr)
     assert_equal 400, resp[0]
-    assert_equal 'application/json', resp[1]['Content-Type']
+    assert_equal 'application/json', resp[1][Rack::CONTENT_TYPE]
     assert_equal '{"code":"invalid_argument","msg":"foo"}', resp[2][0]
   end
 
@@ -60,7 +60,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 200, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({"inches" => 10, "color" => "white"}, JSON.parse(body[0]))
   end
 
@@ -69,7 +69,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 200, status
-    assert_equal 'application/json; strict=true', headers['Content-Type']
+    assert_equal 'application/json; strict=true', headers[Rack::CONTENT_TYPE]
     assert_equal({"inches" => 0, "color" => "white"}, JSON.parse(body[0]))
   end
 
@@ -78,7 +78,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 200, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({"inches" => 0, "color" => "white"}, JSON.parse(body[0]))
   end
 
@@ -87,7 +87,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 200, status
-    assert_equal 'application/protobuf', headers['Content-Type']
+    assert_equal 'application/protobuf', headers[Rack::CONTENT_TYPE]
     assert_equal Example::Hat.new(inches: 10, color: "white"), Example::Hat.decode(body[0])
   end
 
@@ -96,7 +96,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 404, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'bad_route',
       "msg"  => 'Invalid rpc method "MakeUnicorns"',
@@ -110,7 +110,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 404, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'bad_route',
       "msg"  => 'HTTP request method must be POST',
@@ -124,7 +124,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 404, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'bad_route',
       "msg"  => 'Unexpected Content-Type: "text/plain". Content-Type header must be one of ["application/json", "application/protobuf"]',
@@ -137,7 +137,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 404, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'bad_route',
       "msg"  => 'Invalid route. Expected format: POST {BaseURL}/example.Haberdasher/{Method}',
@@ -150,7 +150,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 404, status
-    assert_equal 'application/json', headers['Content-Type'] # error responses are always JSON, even for Protobuf requests
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE] # error responses are always JSON, even for Protobuf requests
     assert_equal({
       "code" => 'bad_route',
       "msg"  => 'Invalid route. Expected format: POST {BaseURL}/example.Haberdasher/{Method}',
@@ -164,7 +164,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 400, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'malformed',
       "msg"  => 'Invalid request body for rpc method "MakeHat" with Content-Type=application/json: ' +
@@ -179,7 +179,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 400, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'malformed',
       "msg"  => 'Invalid request body for rpc method "MakeHat" with Content-Type=application/protobuf: ' +
@@ -193,7 +193,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 200, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({"inches" => 10, "color" => "white"}, JSON.parse(body[0]))
   end
 
@@ -202,7 +202,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 200, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({"inches" => 10, "color" => "white"}, JSON.parse(body[0]))
   end
 
@@ -211,7 +211,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = haberdasher_service.call(rack_env)
 
     assert_equal 400, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'malformed',
       "msg"  => 'Invalid request body for rpc method "MakeHat" with Content-Type=application/json; strict=true: ' +
@@ -289,7 +289,7 @@ class ServiceTest < Minitest::Test
     rack_env = proto_req "/example.Haberdasher/MakeHat", Example::Size.new(inches: 666)
     status, headers, body = svc.call(rack_env)
     assert_equal 400, status
-    assert_equal 'application/json', headers['Content-Type'] # error responses are always JSON, even for Protobuf requests
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE] # error responses are always JSON, even for Protobuf requests
     assert_equal({
       "code" => 'invalid_argument',
       "msg" => "I don't like that size",
@@ -298,7 +298,7 @@ class ServiceTest < Minitest::Test
 
   def test_handler_method_can_set_response_headers_through_the_env
     svc = Example::Haberdasher.new(HaberdasherHandler.new do |size, env|
-      env[:http_response_headers]["Cache-Control"] = "public, max-age=60"
+      env[:http_response_headers][Rack::CACHE_CONTROL] = "public, max-age=60"
       {}
     end)
 
@@ -306,8 +306,8 @@ class ServiceTest < Minitest::Test
     status, headers, body = svc.call(rack_env)
 
     assert_equal 200, status
-    assert_equal "public, max-age=60", headers["Cache-Control"] # set by the handler
-    assert_equal "application/protobuf", headers["Content-Type"] # set by Twirp::Service
+    assert_equal "public, max-age=60", headers[Rack::CACHE_CONTROL] # set by the handler
+    assert_equal "application/protobuf", headers[Rack::CONTENT_TYPE] # set by Twirp::Service
   end
 
   def test_handler_returns_invalid_type_nil
@@ -533,7 +533,7 @@ class ServiceTest < Minitest::Test
     status, headers, body = svc.call(rack_env)
 
     assert_equal 500, status
-    assert_equal 'application/json', headers['Content-Type']
+    assert_equal 'application/json', headers[Rack::CONTENT_TYPE]
     assert_equal({
       "code" => 'intenal',
       "msg"  => 'hook1 failed',

data/twirp.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9'
   spec.add_runtime_dependency 'google-protobuf', '>= 3.25', '< 5.a'
   spec.add_runtime_dependency 'faraday', '< 3' # for clients
-  spec.add_dependency 'rack', '>= 2.2.3', '< 3' # see https://github.com/arthurnn/twirp-ruby/issues/111
+  spec.add_dependency 'rack', '>= 2.2.3'
 
   spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'minitest', '>= 5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twirp
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Cyrus A. Forbes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -52,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,9 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement