protobuf-rspec 0.1.1 → 0.1.2

data/lib/protobuf/rspec/helpers.rb

@@ -133,7 +133,7 @@ module Protobuf
         #
         # Asserting the request object can be done one of two ways: direct or explicit. If you would like to directly test
         # the object that is given as a request you should provide a :request object as part of the cb_mocks third parameter hash.
-        # Alternatively you can do an explicit assertion by providing a block to mock_remote_service. The block will be yielded with
+        # Alternatively you can do an explicit assertion by providing a block to mock_rpc. The block will be yielded with
         # the request object as its only parameter. This allows you to perform your own assertions on the request object
         # (e.g. only check a few of the fields in the request). Also note that if a :request param is given in the third param,
         # the block will be ignored.
@@ -153,7 +153,7 @@ module Protobuf
         #
         #     # spec
         #     it 'verifies the on_success method behaves correctly' do
-        #       mock_remote_service(Proto::UserService, :client, response: mock('response_mock', status: 'success'))
+        #       mock_rpc(Proto::UserService, :client, response: mock('response_mock', status: 'success'))
         #       create_user(request).should eq('success')
         #     end
         #
@@ -173,7 +173,7 @@ module Protobuf
         #
         #     # spec
         #     it 'verifies the on_success method behaves correctly' do
-        #       mock_remote_service(Proto::UserService, :client, error: mock('error_mock', message: 'this is an error message'))
+        #       mock_rpc(Proto::UserService, :client, error: mock('error_mock', message: 'this is an error message'))
         #       ErrorReporter.should_receive(:report).with('this is an error message')
         #       create_user(request).should eq('error')
         #     end
@@ -191,7 +191,7 @@ module Protobuf
         #     # spec
         #     it 'verifies the request is built correctly' do
         #       expected_request = ... # some expectation
-        #       mock_remote_service(Proto::UserService, :client, request: expected_request)
+        #       mock_rpc(Proto::UserService, :client, request: expected_request)
         #       create_user(request)
         #     end
         #
@@ -207,7 +207,7 @@ module Protobuf
         #
         #     # spec
         #     it 'verifies the request is built correctly' do
-        #       mock_remote_service(Proto::UserService, :client) do |given_request|
+        #       mock_rpc(Proto::UserService, :client) do |given_request|
         #         given_request.field1.should eq 'rainbows'
         #         given_request.field2.should eq 'ponies'
         #       end
@@ -216,16 +216,10 @@ module Protobuf
         #
         # @param [Class] klass the service class constant
         # @param [Symbol, String] method a symbol or string denoting the method to call
-        # @param [Hash] cb_mocks provides expectation objects to invoke on_success (with :response), on_failure (with :error), and the request object (:request)
+        # @param [Hash] callbacks provides expectation objects to invoke on_success (with :response), on_failure (with :error), and the request object (:request)
         # @param [Block] assert_block when given, will be invoked with the request message sent to the client method
         # @return [Mock] the stubbed out client mock
-        def mock_remote_service(klass, method, cb_mocks={}, &assert_block)
-          self.class.subject_service { klass }
-          mock_rpc(method, cb_mocks, &assert_block)
-        end
-        alias_method :mock_service, :mock_remote_service
-
-        def mock_rpc(method, callbacks = {}, &assert_block)
+        def mock_rpc(klass, method, callbacks={}, &assert_block)
           client = double('Client', :on_success => true, :on_failure => true)
           client.stub(method).and_yield(client)
 
@@ -246,6 +240,8 @@ module Protobuf
 
           client
         end
+        alias_method :mock_service, :mock_rpc
+        alias_method :mock_remote_service, :mock_rpc
 
       end
 

data/lib/protobuf/rspec/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module RSpec
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000Z
+date: 2012-10-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
-  requirement: &2154800360 !ruby/object:Gem::Requirement
+  requirement: &2154950180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154800360
+  version_requirements: *2154950180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154799860 !ruby/object:Gem::Requirement
+  requirement: &2154949680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2154799860
+  version_requirements: *2154949680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154799420 !ruby/object:Gem::Requirement
+  requirement: &2154949300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154799420
+  version_requirements: *2154949300
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2154798860 !ruby/object:Gem::Requirement
+  requirement: &2154925960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2154798860
+  version_requirements: *2154925960
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2154798360 !ruby/object:Gem::Requirement
+  requirement: &2154925440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2154798360
+  version_requirements: *2154925440
 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 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3890569250292723612
+      hash: 2223780834525857114
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3890569250292723612
+      hash: 2223780834525857114
 requirements: []
 rubyforge_project: protobuf-rspec
 rubygems_version: 1.8.15