better_receive 0.1.0 → 0.1.1

data/better_receive.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("rspec", "~> 2.0")
   gem.add_development_dependency("rake", ">= 0")
+  gem.add_development_dependency("pry", ">= 0")
 end

data/lib/better_receive.rb

@@ -1,11 +1,10 @@
 require "better_receive/version"
+require "better_receive/mock"
 
 module BetterReceive
-  def better_receive(method_name, *args, &block)
-    self.should RSpec::Matchers::BuiltIn::RespondTo.new(method_name)
-
-    self.should_receive(method_name, *args, &block)
+  def better_receive(method_name, options={}, &block)
+    Mock.new(self).verify(method_name, options, &block)
   end
 end
 
-BasicObject.class_eval  { include BetterReceive }
+BasicObject.class_eval { include BetterReceive }

data/lib/better_receive/mock.rb

@@ -0,0 +1,29 @@
+module BetterReceive
+  class Mock
+    attr_reader :expectation, :object
+
+    def initialize(object)
+      @object = object
+    end
+
+    def verify(selector, options, &block)
+      object.should respond_to(selector)
+
+      mock_method(selector, options, &block)
+    end
+
+    private
+
+    def mock_method(selector, options, &block)
+      mock_proxy = object.send(:__mock_proxy)
+
+      location = options[:expected_from] || caller(1)[2]
+      @expectation = mock_proxy.add_message_expectation(location, selector, options, &block)
+    end
+
+    def respond_to(selector)
+      RSpec::Matchers::BuiltIn::RespondTo.new(selector)
+    end
+
+  end
+end

data/lib/better_receive/version.rb

@@ -1,3 +1,3 @@
 module BetterReceive
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/better_receive_spec.rb

@@ -25,33 +25,40 @@ describe BetterReceive do
       }
     end
 
-    it "checks that the object receives the specified method" do
-      foo.should_receive(:should_receive).and_call_original
+    context "when mocking" do
+      let(:mock_proxy) { double(RSpec::Mocks::Proxy) }
 
-      foo.better_receive(:bar)
+      it "creates a mock proxy and adds an expectation to it" do
+        foo.should_receive(:send).with(:__mock_proxy).and_return(mock_proxy)
+        mock_proxy.should_receive(:add_message_expectation)
 
-      foo.bar
-    end
+        foo.better_receive(:bar)
+      end
 
-    it "returns an rspec mock object(responds to additional matchers ('with', 'once'...))" do
-      foo.better_receive(:bar).should be_a RSpec::Mocks::MessageExpectation
+      it "returns an rspec message expectation(responds to additional matchers ('with', 'once'...))" do
+        foo.better_receive(:bar).should be_a RSpec::Mocks::MessageExpectation
 
-      foo.bar
+        foo.bar
 
-      foo.better_receive(:bar).with('wibble')
+        foo.better_receive(:bar).with('wibble')
 
-      foo.bar('wibble')
-    end
+        foo.bar('wibble')
+      end
 
-    context "when passing arguments" do
-      it "passes all arguments through to should_receive" do
-        arg1 = 1
-        arg2 = 2
-        block = Proc.new {}
+      context "and passing arguments" do
+        let(:block_param) { Proc.new {} }
+        let(:options) { {passed: true} }
 
-        foo.should_receive(:should_receive).with(:bar, arg1, arg2, block)
+        it "passes all arguments through to the mock_proxy" do
+          foo.should_receive(:send).with(:__mock_proxy).and_return(mock_proxy)
+          mock_proxy.should_receive(:add_message_expectation) do |*args, &block|
+            args[1].should == :bar
+            args[2].should == options
+            block.should == block_param
+          end
 
-        foo.better_receive(:bar, arg1, arg2, block)
+          foo.better_receive(:bar, passed: true, &block_param)
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require 'better_receive'
+require 'pry'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_receive
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Assert that an object responds to a method before asserting that the
   method is received.
 email:
@@ -61,6 +77,7 @@ files:
 - Rakefile
 - better_receive.gemspec
 - lib/better_receive.rb
+- lib/better_receive/mock.rb
 - lib/better_receive/version.rb
 - spec/lib/better_receive_spec.rb
 - spec/spec_helper.rb