protobuf-rspec 0.1.3 → 0.2.0

data/lib/protobuf/rspec/helpers.rb

@@ -1,5 +1,14 @@
+require 'rspec/core'
 require 'protobuf/rpc/rpc.pb'
 
+::RSpec.configure do |config|
+  config.add_setting :protobuf_raw_response, :default => false
+
+  def config.protobuf_raw_responses
+    self.protobuf_raw_response = true
+  end
+end
+
 # RSpec Helpers designed to give you mock abstraction of client or service layer.
 # Require as protobuf/rspec/helpers and include into your running RSpec configuration.
 #
@@ -21,6 +30,20 @@ module Protobuf
 
       module ClassMethods
 
+        def metadata_for_protobuf_rspec
+          metadata[:protobuf_rspec] = metadata[:protobuf_rspec] ? metadata[:protobuf_rspec].dup : {}
+        end
+
+        def protobuf_raw_responses(true_or_false = true)
+          metadata_for_protobuf_rspec[:protobuf_raw_response] = true_or_false
+        end
+
+        def protobuf_raw_responses?
+          metadata_for_protobuf_rspec.fetch(:protobuf_raw_response) do 
+            ::RSpec.configuration.protobuf_raw_response?
+          end
+        end
+
         # Set the service subject. Use this method when the described_class is
         # not the class you wish to use with methods like local_rpc. In t
         #
@@ -53,6 +76,10 @@ module Protobuf
 
       module InstanceMethods
 
+        def protobuf_raw_responses?
+          self.class.protobuf_raw_responses?
+        end
+
         def subject_service
           self.class.subject_service
         end
@@ -96,26 +123,33 @@ module Protobuf
         #
         # @param [Symbol, String] method a symbol or string denoting the method to call.
         # @param [Protobuf::Message or Hash] request the request message of the expected type for the given method.
-        # @param [String] a string message indicating an rpc_failed expectation.
         # @param [block] optionally provide a block which will be yielded the service instance just prior to invoking the rpc method.
         # @return [Protobuf::Service] the service instance post-calling the rpc method.
-        def local_rpc(rpc_method, request, expected_error = nil)
+        def local_rpc(rpc_method, request, raw_response = false)
           request = subject_service.rpcs[rpc_method].request_type.new(request) if request.is_a?(Hash)
-          service = subject_service.new(rpc_method, request.serialize_to_string)
 
-          if block_given?
-            $stderr.puts '[Warning] Ignoring error expectation %s due to given block' % expected_error unless expected_error.blank?
-            yield(service)
+          if raw_response || protobuf_raw_responses? || request.serialize_to_string.empty?
+            service = subject_service.new(rpc_method, request.serialize_to_string)
+
+            yield(service) if block_given?
+
+            service.__send__(rpc_method)
+            return service
           else
-            if expected_error.blank?
-              service.should_not_receive(:rpc_failed)
-            else
-              service.should_receive(:rpc_failed).with(expected_error)
-            end
+            return __dispatch_service_call__(rpc_method, request)
           end
+        end
+
+        def __dispatch_service_call__(rpc_method, request)
+          request_params = { 
+            :service_name => subject_service.to_s, 
+            :method_name => rpc_method.to_s, 
+            :request_proto => request.serialize_to_string
+          }
 
-          service.__send__(rpc_method)
-          service
+          rpc_request = ::Protobuf::Socketrpc::Request.new(request_params)
+          dispatcher = ::Protobuf::Rpc::ServiceDispatcher.new(rpc_request)
+          dispatcher.invoke!
         end
 
         # Provides backwards compatability to bridge to the new local_rpc usage.

data/lib/protobuf/rspec/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module RSpec
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
-  requirement: &2155090860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155090860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155090360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2155090360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155089980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155089980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2155089440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2155089440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2155088940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2155088940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Protobuf RSpec helpers for testing services and clients. Meant to be
   used with the protobuf gem. Decouple external services/clients from each other using
   the given helper methods.
@@ -97,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1636365208668398058
+      hash: -1397050459416852954
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,10 +131,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1636365208668398058
+      hash: -1397050459416852954
 requirements: []
 rubyforge_project: protobuf-rspec
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Protobuf RSpec helpers for testing services and clients. Meant to be used