protobuf-rspec 0.2.0 → 0.2.1

data/lib/protobuf/rspec/helpers.rb

@@ -1,14 +1,5 @@
-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.
 #
@@ -30,20 +21,6 @@ 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
         #
@@ -76,10 +53,6 @@ module Protobuf
 
       module InstanceMethods
 
-        def protobuf_raw_responses?
-          self.class.protobuf_raw_responses?
-        end
-
         def subject_service
           self.class.subject_service
         end
@@ -123,43 +96,21 @@ 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 [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, raw_response = false)
+        # @return [Protobuf::Message or String] the resulting protobuf message or error string
+        def local_rpc(rpc_method, request)
           request = subject_service.rpcs[rpc_method].request_type.new(request) if request.is_a?(Hash)
 
-          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
-            return __dispatch_service_call__(rpc_method, request)
-          end
-        end
-
-        def __dispatch_service_call__(rpc_method, request)
-          request_params = { 
+          outer_request_params = { 
             :service_name => subject_service.to_s, 
             :method_name => rpc_method.to_s, 
             :request_proto => request.serialize_to_string
           }
 
-          rpc_request = ::Protobuf::Socketrpc::Request.new(request_params)
-          dispatcher = ::Protobuf::Rpc::ServiceDispatcher.new(rpc_request)
-          dispatcher.invoke!
-        end
+          outer_request = ::Protobuf::Socketrpc::Request.new(outer_request_params)
+          dispatcher = ::Protobuf::Rpc::ServiceDispatcher.new(outer_request)
 
-        # Provides backwards compatability to bridge to the new local_rpc usage.
-        #
-        def call_local_service(klass, rpc_method, request, &block)
-          $stderr.puts '[Deprecated] call_local_service is deprecated. Please use local_rpc in conjunction with subject_service.'
-          self.class.service { klass }
-          local_rpc(rpc_method, request, nil &block)
+          dispatcher.invoke!
         end
-        alias_method :call_service, :call_local_service
 
         # Create a mock service that responds in the way you are expecting to aid in testing client -> service calls.
         # In order to test your success callback you should provide a :response object. Similarly, to test your failure

data/lib/protobuf/rspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-rspec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2156886860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *2156886860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2156839100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
+  version_requirements: *2156839100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2156838620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2156838620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2156837580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+  version_requirements: *2156837580
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2156836540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,12 +65,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+  version_requirements: *2156836540
 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.
@@ -122,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1397050459416852954
+      hash: -1849475935849692850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,10 +106,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1397050459416852954
+      hash: -1849475935849692850
 requirements: []
 rubyforge_project: protobuf-rspec
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Protobuf RSpec helpers for testing services and clients. Meant to be used