twirp 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ad030c26be19ad5b9f8ed10be469b2f5387989
-  data.tar.gz: be7fbfb03aa836b315a100800da5906e3aed3b66
+  metadata.gz: 83302ec929694b2ac96f016518ad5585de1fa65e
+  data.tar.gz: c79097cde99163118952b003b1402332f83b8c7f
 SHA512:
-  metadata.gz: 0a5f2f6dd28b761a5516c55fc0f0a4d5707d0e5cc01564fd4b0dd7b8e520ff22ed580769e92dc9c65e13a6caaf5c7d2f44a7f1870e0bb1ac07e82dc6e372073a
-  data.tar.gz: f17cf86a2661244cf2833d5d8ddd626046093797cc61eae7a4419eeeb88807d921491a50d2c263120abf7cbb6fa720188cb9b6d141aee9af6a45400e68677782
+  metadata.gz: ba357830275b3b4af11bc6f7319118a17a4405c338592ccb26293a0fed95622612b7f6d167214254eb6b0c05664d91f2ca5c847aeceb171e7c3dd0395f73d7ec
+  data.tar.gz: '05581b8cb43081e0e0103f6e3c50af6dfa0280b67355307418d287086e0c109e335bd0708f84eed4561eca7c288f1aa98884e71524a797ad07fe081a737efa3f'

data/README.md

@@ -2,7 +2,7 @@
 
 [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.
 
-The [cannonical implementation](https://github.com/twitchtv/twirp) is in Golang. The Twirp-Ruby project in this repository is the Ruby implementation.
+The [canonical implementation](https://github.com/twitchtv/twirp) is in Golang. The Twirp-Ruby project in this repository is the Ruby implementation.
 
 
 ## Install
@@ -13,3 +13,8 @@ Add `gem "twirp"` to your Gemfile, or install with `gem install twirp`.
 ## Documentation
 
 [Go to the Wiki](https://github.com/twitchtv/twirp-ruby/wiki).
+
+
+## Contributing
+
+[Go to the CONTRIBUTING file](CONTRIBUTING.md).

data/lib/twirp/service.rb

@@ -127,8 +127,12 @@ module Twirp
       input = nil
       begin
         input = Encoding.decode(rack_request.body.read, env[:input_class], content_type)
-      rescue
-        return bad_route_error("Invalid request body for rpc method #{method_name.inspect} with Content-Type=#{content_type}", rack_request)
+      rescue => e
+        error_msg = "Invalid request body for rpc method #{method_name.inspect} with Content-Type=#{content_type}"
+        if e.is_a?(Google::Protobuf::ParseError)
+          error_msg += ": #{e.message.strip}"
+        end
+        return bad_route_error(error_msg, rack_request)
       end
 
       env[:input] = input

data/lib/twirp/version.rb

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

data/test/service_test.rb

@@ -140,7 +140,8 @@ class ServiceTest < Minitest::Test
     assert_equal 'application/json', headers['Content-Type']
     assert_equal({
       "code" => 'bad_route',
-      "msg"  => 'Invalid request body for rpc method "MakeHat" with Content-Type=application/json',
+      "msg"  => 'Invalid request body for rpc method "MakeHat" with Content-Type=application/json: ' +
+                "Error occurred during parsing: Parse error at 'bad json'",
       "meta" => {"twirp_invalid_route" => "POST /example.Haberdasher/MakeHat"},
     }, JSON.parse(body[0]))
   end
@@ -154,7 +155,8 @@ class ServiceTest < Minitest::Test
     assert_equal 'application/json', headers['Content-Type']
     assert_equal({
       "code" => 'bad_route',
-      "msg"  => 'Invalid request body for rpc method "MakeHat" with Content-Type=application/protobuf',
+      "msg"  => 'Invalid request body for rpc method "MakeHat" with Content-Type=application/protobuf: ' +
+                'Error occurred during parsing: Unexpected EOF inside skipped data',
       "meta" => {"twirp_invalid_route" => "POST /example.Haberdasher/MakeHat"},
     }, JSON.parse(body[0]))
   end

data/twirp.gemspec

@@ -21,5 +21,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9'
   spec.add_runtime_dependency 'google-protobuf', '~> 3.0', '>= 3.0.0'
   spec.add_runtime_dependency 'faraday', '~> 0' # for clients
+
   spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'minitest', '>= 5'
+  spec.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twirp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Cyrus A. Forbes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -59,6 +59,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Twirp is a simple RPC framework with protobuf service definitions. The
   Twirp gem provides native support for Ruby.
 email: