twirp 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2564512dae1e9dcb9345119a0e09ffa0a65bba37c3800a9c6ac6c77c900701cf
-  data.tar.gz: da232ae6c1526bb650fbc32b106191c533e8aa6c11b682d6d28044d612f0def8
+  metadata.gz: 2bd8003fe6ecc7f8636213eaf73a6c8b8455fd4e58adb8fb0a7400fdd5f19492
+  data.tar.gz: ec29ec78920b6451469fa05edcc69f4eec4162d79bbebfdf3d4ef2027a39df33
 SHA512:
-  metadata.gz: 41cbdba9e68278362f8674d6b28336c97a13da955535abbbc5b148f006cee1e1413f76df3daa9e93fb1c80297fcfa7d6c1828591a44680bcd4025ca340f0aacc
-  data.tar.gz: b381e1be9c43e0836bf47f60b98e14dc14cdf5ceb444597abd8cc7587e8162b4f7c8feff4f821e50cafa9a68e5db060359c474d8c2d30a5903a16d6e5db24454
+  metadata.gz: 58571087c354beb83cf23204abae8f64cb6ea4f3f9d75c8cb68fdaf7e9d282d05b09a37dc2458b60c946e3d930dfa64fef10f9391f0233ed5f71d75aa9ba4bf9
+  data.tar.gz: 55f7b4b75c4381a9144127b899c146f9b3841b49009438f123ac66d95db60aa6decf290e1dd30222eb339e062c92291d4008deb580a8798b738c6af27eb1af60

data/README.md

@@ -1,6 +1,8 @@
 # Twirp-Ruby
 
-[Twirp is a protocol](https://twitchtv.github.io/twirp/docs/spec_v5.html) for routing and serialization of services defined in a [.proto file](https://developers.google.com/protocol-buffers/docs/proto3), allowing easy implementation of RPC services with auto-generated clients in different languages.
+[![Run Tests](https://github.com/github/twirp-ruby/actions/workflows/tests.yml/badge.svg)](https://github.com/github/twirp-ruby/actions/workflows/tests.yml)
+
+[Twirp is a protocol](https://github.github.io/twirp/docs/spec_v5.html) for routing and serialization of services defined in a [.proto file](https://developers.google.com/protocol-buffers/docs/proto3), allowing easy implementation of RPC services with auto-generated clients in different languages.
 
 The [canonical implementation](https://github.com/twitchtv/twirp) is in Golang. The Twirp-Ruby project is the official implementation in Ruby for both server and clients.
 
@@ -9,14 +11,18 @@ The [canonical implementation](https://github.com/twitchtv/twirp) is in Golang.
 
 Add `gem "twirp"` to your Gemfile, or install with `gem install twirp`.
 
-To auto-generate Ruby code from a proto file, use the `protoc` plugin and the `--ruby_out` option ([see Wiki page](https://github.com/twitchtv/twirp-ruby/wiki/Code-Generation)).
+To auto-generate Ruby code from a proto file, use the `protoc` plugin and the `--ruby_out` option ([see Wiki page](https://github.com/github/twirp-ruby/wiki/Code-Generation)).
 
 
 ## Documentation
 
-[On the wiki](https://github.com/twitchtv/twirp-ruby/wiki).
+[On the wiki](https://github.com/github/twirp-ruby/wiki).
 
 
 ## Contributing
 
 [On the CONTRIBUTING file](CONTRIBUTING.md).
+
+## Releases and changes
+
+See the [releases](https://github.com/github/twirp-ruby/releases) page for latest information about released versions.

data/lib/twirp/client.rb

@@ -151,7 +151,7 @@ module Twirp
     def rpc(rpc_method, input, req_opts=nil)
       rpcdef = self.class.rpcs[rpc_method.to_s]
       if !rpcdef
-        return ClientResp.new(nil, Twirp::Error.bad_route("rpc not defined on this client"))
+        return ClientResp.new(error: Twirp::Error.bad_route("rpc not defined on this client"))
       end
 
       content_type = (req_opts && req_opts[:headers] && req_opts[:headers]['Content-Type']) || @content_type
@@ -186,15 +186,15 @@ module Twirp
 
     def rpc_response_to_clientresp(resp, content_type, rpcdef)
       if resp.status != 200
-        return ClientResp.new(nil, self.class.error_from_response(resp))
+        return ClientResp.new(error: self.class.error_from_response(resp))
       end
 
       if resp.headers['Content-Type'] != content_type
-        return ClientResp.new(nil, Twirp::Error.internal("Expected response Content-Type #{content_type.inspect} but found #{resp.headers['Content-Type'].inspect}"))
+        return ClientResp.new(error: Twirp::Error.internal("Expected response Content-Type #{content_type.inspect} but found #{resp.headers['Content-Type'].inspect}"))
       end
 
       data = Encoding.decode(resp.body, rpcdef[:output_class], content_type)
-      return ClientResp.new(data, nil)
+      return ClientResp.new(data: data, body: resp.body)
     end
 
   end

data/lib/twirp/client_json.rb

@@ -46,11 +46,11 @@ module Twirp
 
     def rpc_response_to_clientresp(resp)
       if resp.status != 200
-        return ClientResp.new(nil, self.class.error_from_response(resp))
+        return ClientResp.new(error: self.class.error_from_response(resp))
       end
 
       data = Encoding.decode_json(resp.body)
-      return ClientResp.new(data, nil)
+      return ClientResp.new(data: data, body: resp.body)
     end
 
   end

data/lib/twirp/client_resp.rb

@@ -14,11 +14,13 @@
 module Twirp
   class ClientResp
     attr_accessor :data
+    attr_accessor :body
     attr_accessor :error
 
-    def initialize(data, error)
+    def initialize(data: nil, body: nil, error: nil)
       @data = data
       @error = error
+      @body = body
     end
   end
 end

data/lib/twirp/service.rb

@@ -14,6 +14,7 @@
 require_relative 'encoding'
 require_relative 'error'
 require_relative 'service_dsl'
+require 'rack/request'
 
 module Twirp
 
@@ -122,7 +123,7 @@ module Twirp
       end
       env[:content_type] = content_type
 
-      path_parts = rack_request.fullpath.split("/")
+      path_parts = rack_request.path.split("/")
       if path_parts.size < 3 || path_parts[-2] != self.full_name
         return route_err(:bad_route, "Invalid route. Expected format: POST {BaseURL}/#{self.full_name}/{Method}", rack_request)
       end
@@ -137,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/twitchtv/twirp-ruby/issues/50)
+        rack_request.body.rewind # allow other middleware to read again (https://github.com/github/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}"
@@ -153,7 +154,7 @@ module Twirp
     end
 
     def route_err(code, msg, req)
-      Twirp::Error.new code, msg, twirp_invalid_route: "#{req.request_method} #{req.fullpath}"
+      Twirp::Error.new code, msg, twirp_invalid_route: "#{req.request_method} #{req.path}"
     end
 
 

data/lib/twirp/version.rb

@@ -12,5 +12,5 @@
 # permissions and limitations under the License.
 
 module Twirp
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/test/service_test.rb

@@ -188,6 +188,15 @@ class ServiceTest < Minitest::Test
     }, JSON.parse(body[0]))
   end
 
+  def test_route_with_query_string
+    rack_env = json_req "/example.Haberdasher/MakeHat?extra=1", inches: 10
+    status, headers, body = haberdasher_service.call(rack_env)
+
+    assert_equal 200, status
+    assert_equal 'application/json', headers['Content-Type']
+    assert_equal({"inches" => 10, "color" => "white"}, JSON.parse(body[0]))
+  end
+
   def test_json_request_ignores_unknown_fields
     rack_env = json_req "/example.Haberdasher/MakeHat", inches: 10, fake: 3
     status, headers, body = haberdasher_service.call(rack_env)

data/twirp.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["forbescyrus@gmail.com", "tothemario@gmail.com"]
   spec.summary       = %q{Twirp services in Ruby.}
   spec.description   = %q{Twirp is a simple RPC framework with protobuf service definitions. The Twirp gem provides native support for Ruby.}
-  spec.homepage      = "https://github.com/twitchtv/twirp-ruby"
+  spec.homepage      = "https://github.com/github/twirp-ruby"
   spec.license       = "MIT"
 
   spec.files         = Dir['lib/**/*'] + %w(Gemfile LICENSE README.md twirp.gemspec)
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9'
   spec.add_runtime_dependency 'google-protobuf', '~> 3.0', '>= 3.7.0'
-  spec.add_runtime_dependency 'faraday', '< 2' # for clients
+  spec.add_runtime_dependency 'faraday', '< 3' # for clients
 
   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.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Cyrus A. Forbes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ files:
 - test/license_header_test.rb
 - test/service_test.rb
 - twirp.gemspec
-homepage: https://github.com/twitchtv/twirp-ruby
+homepage: https://github.com/github/twirp-ruby
 licenses:
 - MIT
 metadata: {}
@@ -148,14 +148,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Twirp services in Ruby.
 test_files:
+- test/client_json_test.rb
 - test/client_test.rb
 - test/error_test.rb
-- test/license_header_test.rb
 - test/fake_services.rb
+- test/license_header_test.rb
 - test/service_test.rb
-- test/client_json_test.rb