fakes 1.1.2 → 1.1.3

data/lib/fakes/arg_matching/arg_match_factory.rb

@@ -1,12 +1,12 @@
 module Fakes
   class ArgMatchFactory
     def self.create_arg_matcher_using(args)
-      matcher = CombinedArgMatcher.new      
+      combined_matcher = CombinedArgMatcher.new      
       args.each do|arg|
-        current_matcher = arg.respond_to?(:matches?) ? arg : RegularArgMatcher.new(arg)
-        matcher.add current_matcher
+        matcher = arg.respond_to?(:matches?) ? arg : RegularArgMatcher.new(arg)
+        combined_matcher << matcher
       end
-      matcher
+      combined_matcher
     end
   end
 end

data/lib/fakes/arg_matching/argument_matching.rb

@@ -24,7 +24,7 @@ module Fakes
     end
 
     def regex(pattern)
-      condition { |string_value| pattern =~ string_value }
+      condition { |string_argument| pattern =~ string_argument }
     end
 
     def condition(&conditional_block)

data/lib/fakes/arg_matching/combined_arg_matcher.rb

@@ -8,17 +8,20 @@ module Fakes
 
     def matches?(args)
       matches = true
-      @all_matchers.each_with_index do |matcher, index|
+
+      all_matchers.each_with_index do |matcher, index|
         value = args[index]
         matches &= matcher.matches?(value)
         return false unless matches
       end
+
       matches
     end
 
     def add(matcher)
-      @all_matchers << matcher
+      all_matchers << matcher
     end
+    alias :<< :add
     
   end
 end

data/lib/fakes/fake.rb

@@ -26,8 +26,16 @@ module Fakes
       return @method_invocations[symbol]
     end
 
-    def never_received?(symbol)
-      return !@method_invocations.has_key?(symbol)
+    def never_received?(symbol, *args)
+      return !received?(symbol, *args)
+    end
+
+    def received?(symbol, *args)
+      method = received(symbol)
+      return false if method.nil?
+
+      argument_set = method.called_with(*args)
+      return !argument_set.nil?
     end
   end
 end

data/lib/fakes/version.rb

@@ -1,3 +1,3 @@
 module Fakes
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/specs/fake_spec.rb

@@ -60,15 +60,16 @@ module Fakes
       let(:invocations){Hash.new}
       let(:sut){Fake.new(invocations)}
       let(:existing){:hello}
-      let(:method_invocation){Object.new}
+      let(:method_invocation){ Object.new }
 
       before (:each) do
         invocations[existing] = method_invocation
+        method_invocation.stub(:called_with).and_return(false)
       end
 
 
       it "should base its decision on the list of received invocations" do
-        [:other,existing].each do|item|
+        [:other, existing].each do|item|
           sut.never_received?(item).should_not be_equal(invocations.has_key?(item))
         end
       end
@@ -292,6 +293,15 @@ module Fakes
           fake.received(:hello).called_with(1,[1,2,3,5]).should be_nil
         end
 
+        it 'should be able to determine if it received a method call' do
+          fake = Fake.new
+          fake.hello(1,[1,2,3,4])
+            
+          fake.received?(:hello,1,[1,2,3,4]).should be_true
+          fake.received?(:hello).should be_true
+        end
+        
+
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakes
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2245733213966306634
+      hash: -4322059409981481306
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2245733213966306634
+      hash: -4322059409981481306
 requirements: []
 rubyforge_project: fakes
 rubygems_version: 1.8.25