protobuf 2.0.0.rc4 → 2.0.0.rc5

data/lib/protobuf/rpc/service_dispatcher.rb

@@ -48,6 +48,22 @@ module Protobuf
         self.error = error_klass.new(message)
       end
 
+      # Prod the object to see if we can produce a proto object as a response
+      # candidate. Either way, return the candidate for validation.
+      def coerced_response
+        candidate = service.response
+
+        if candidate.is_a?(Hash)
+          candidate = definition.response_type.new(candidate)
+        elsif candidate.respond_to?(:to_hash)
+          candidate = definition.response_type.new(candidate.to_hash)
+        elsif candidate.respond_to?(:to_proto)
+          candidate = candidate.to_proto
+        end
+
+        candidate
+      end
+
       # Get the method for the current request.
       #
       def init_method
@@ -92,19 +108,14 @@ module Protobuf
       # we expect so that deserialization on the client side works.
       #
       def validate_response
+        candidate = coerced_response
         expected = definition.response_type
-
-        candidate = service.response
-        candidate = expected.new(candidate) if candidate.is_a?(Hash)
-
         actual = candidate.class
-        log_debug { sign_message("response (should/actual): #{expected.name}/#{actual.name}") }
 
-        # Determine if the service tried to change response types on us
-        if expected != actual
-          assign_error(BadResponseProto, "Response proto changed from #{expected.name} to #{actual.name}")
-        else
+        if expected == actual
           self.response = candidate
+        else
+          assign_error(BadResponseProto, "Response proto changed from #{expected.name} to #{actual.name}")
         end
       end
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.0.0.rc4'
+  VERSION = '2.0.0.rc5'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/rpc/service_dispatcher_spec.rb

@@ -65,6 +65,28 @@ describe Protobuf::Rpc::ServiceDispatcher do
         its(:response) { should eq Test::Resource.new(:name => 'returned') }
       end
 
+      context 'an object that responds to to_hash but is not a hash' do
+        let(:hashable) do
+          mock('hashable', :to_hash => { :name => 'hashable' })
+        end
+        before { subject.callable_method.should_receive(:call) }
+        before { subject.service.stub(:response).and_return(hashable) }
+        before { subject.invoke! }
+        its(:success?) { should be_true }
+        its(:response) { should eq Test::Resource.new(:name => 'hashable') }
+      end
+
+      context 'an object that responds to to_proto' do
+        let(:protoable) do
+          mock('protoable', :to_proto => Test::Resource.new(:name => 'protoable'))
+        end
+        before { subject.callable_method.should_receive(:call) }
+        before { subject.service.stub(:response).and_return(protoable) }
+        before { subject.invoke! }
+        its(:success?) { should be_true }
+        its(:response) { should eq Test::Resource.new(:name => 'protoable') }
+      end
+
       context 'a type not identified by the rpc definition' do
         before { subject.callable_method.should_receive(:call) }
         before { subject.service.stub(:response).and_return("I'm not a valid response") }

data/spec/lib/protobuf/rpc/service_spec.rb

@@ -129,7 +129,6 @@ describe Protobuf::Rpc::Service do
         Test::Resource.new
       end
 
-
       context 'when calling the rpc method' do
         context 'when response is implied' do
           subject { NewTestService.new(:find_with_implied_response, request.serialize_to_string) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
+  version: 2.0.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152091060 !ruby/object:Gem::Requirement
+  requirement: &2156517120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152091060
+  version_requirements: *2156517120
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2152089400 !ruby/object:Gem::Requirement
+  requirement: &2156516700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152089400
+  version_requirements: *2156516700
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152088440 !ruby/object:Gem::Requirement
+  requirement: &2156516280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152088440
+  version_requirements: *2156516280
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152086720 !ruby/object:Gem::Requirement
+  requirement: &2156515860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152086720
+  version_requirements: *2156515860
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152069860 !ruby/object:Gem::Requirement
+  requirement: &2156515440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152069860
+  version_requirements: *2156515440
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &2152061440 !ruby/object:Gem::Requirement
+  requirement: &2156515020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152061440
+  version_requirements: *2156515020
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2152060500 !ruby/object:Gem::Requirement
+  requirement: &2156514600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152060500
+  version_requirements: *2156514600
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2152059780 !ruby/object:Gem::Requirement
+  requirement: &2156514180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152059780
+  version_requirements: *2156514180
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2152058860 !ruby/object:Gem::Requirement
+  requirement: &2156513760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152058860
+  version_requirements: *2156513760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152058080 !ruby/object:Gem::Requirement
+  requirement: &2156513340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152058080
+  version_requirements: *2156513340
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2152057180 !ruby/object:Gem::Requirement
+  requirement: &2156512920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152057180
+  version_requirements: *2156512920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152056580 !ruby/object:Gem::Requirement
+  requirement: &2153328100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152056580
+  version_requirements: *2153328100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152055760 !ruby/object:Gem::Requirement
+  requirement: &2153327680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152055760
+  version_requirements: *2153327680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152054480 !ruby/object:Gem::Requirement
+  requirement: &2153327260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152054480
+  version_requirements: *2153327260
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).
 
@@ -450,9 +450,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1357637843910363817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: