expects_chain 0.1.0 → 0.1.1

data/lib/expects_chain/expectation.rb

@@ -11,6 +11,15 @@ module ExpectsChain
       value
     end
 
+    def self.mocker
+      if @_mocker.nil?
+        framework = RSpec.configuration.mock_framework.framework_name.to_s.capitalize.to_sym
+        raise StandardError.new("expects_chain unsupported framework: #{framework}") unless Mockers.constants.include?(framework)
+        @_mocker = Mockers::const_get(framework)
+      end
+      @_mocker
+    end
+
     private
 
     def set_up_call_chain value
@@ -24,20 +33,17 @@ module ExpectsChain
     end
 
     def set_expectation obj, method, ret
+      type = (@type == :mock ? :expects : :stubs)
+      rtype = :returns
       if method.kind_of?(Array) && method.first.kind_of?(Symbol)
-        mocker.send("#{@type}_object_with_arguments".to_sym, obj, method.shift, method, ret)
+        mocker.new(obj).send(type, method.shift).with(method).send(rtype, ret)
       else
-        mocker.send("#{@type}_object".to_sym, obj, method, ret)
+        mocker.new(obj).send(type, method).send(rtype, ret)
       end
     end
 
     def mocker
-      if @_mocker.nil?
-        framework = RSpec.configuration.mock_framework.framework_name.to_s.capitalize.to_sym
-        raise StandardError.new("expects_chain unsupported framework: #{framework}") unless Mockers.constants.include?(framework)
-        @_mocker = Mockers::const_get(framework)
-      end
-      @_mocker
+      self.class.mocker
     end
   end
 end

data/lib/expects_chain/mockers/base.rb

@@ -0,0 +1,14 @@
+module ExpectsChain
+  module Mockers
+    class Base
+      def initialize obj
+        @object = obj
+      end
+
+      def with args
+        @object = @object.with(*args)
+        self
+      end
+    end
+  end
+end

data/lib/expects_chain/mockers/mocha.rb

@@ -1,20 +1,18 @@
 module ExpectsChain
   module Mockers
-    module Mocha
-      def self.mock_object obj, method, ret
-        obj.expects(method).at_least_once.returns(ret)
+    class Mocha < Base
+      def expects method
+        @object = @object.expects(method).at_least_once
+        self
       end
 
-      def self.mock_object_with_arguments obj, method, attrs, ret
-        obj.expects(method).with(*attrs).at_least_once.returns(ret)
+      def stubs method
+        @object = @object.stubs(method)
+        self
       end
 
-      def self.stub_object obj, method, ret
-        obj.stubs(method).returns(ret)
-      end
-
-      def self.stub_object_with_arguments obj, method, attrs, ret
-        obj.stubs(method).with(*attrs).at_least_once.returns(ret)
+      def returns ret
+        @object = @object.returns(ret)
       end
 
       def self.mock

data/lib/expects_chain/mockers/rspec.rb

@@ -1,20 +1,18 @@
 module ExpectsChain
   module Mockers
-    module Rspec
-      def self.mock_object obj, method, ret
-        obj.should_receive(method).and_return(ret)
+    class Rspec < Base
+      def expects method
+        @object = @object.should_receive(method)
+        self
       end
 
-      def self.mock_object_with_arguments obj, method, attrs, ret
-        obj.should_receive(method).with(*attrs).and_return(ret)
+      def stubs method
+        @object = @object.stub(method)
+        self
       end
 
-      def self.stub_object obj, method, ret
-        obj.stub!(method).and_return(ret)
-      end
-
-      def self.stub_object_with_arguments obj, method, attrs, ret
-        obj.stub!(method).with(*attrs).and_return(ret)
+      def returns ret
+        @object = @object.and_return(ret)
       end
 
       def self.mock

data/lib/expects_chain.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'expects_chain/expectation'
+require 'expects_chain/mockers/base'
 require 'expects_chain/mockers/mocha'
 require 'expects_chain/mockers/rspec'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expects_chain
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies: []
 description: RSpec extension that allows you to set chained expectations on objects.
   Currently supports rspec & mocha
@@ -18,10 +18,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/expects_chain.rb
-- lib/expects_chain/expectation.rb
-- lib/expects_chain/mockers/mocha.rb
+- lib/expects_chain/mockers/base.rb
 - lib/expects_chain/mockers/rspec.rb
+- lib/expects_chain/mockers/mocha.rb
+- lib/expects_chain/expectation.rb
+- lib/expects_chain.rb
 homepage: http://github.com/pewniak747/expects_chain
 licenses: []
 post_install_message: