rsubstitute 0.0.1 → 0.0.2

data/lib/rsubstitute.rb

@@ -1,18 +1,16 @@
 class Call
-    def initialize(method, *args, &block)
-        @method, @args, @block = method, args, block
+    def initialize(method, args)
+        @method, @args = method, args
     end
 
-    def matches(method, *args, &block)
+    def matches(method, args)
         @method == method and args_match(args)
     end
 
     private
 
     def args_match(args)
-        return true if @args == args
-        return false if @args.nil? or args.nil?
-        return @args <=> args
+        @args == args
     end
 end
 
@@ -40,13 +38,13 @@ class Substitute
     def method_missing(method, *args, &block)
         assert_was_received = @assert_next
         @assert_next = false
-        if assert_was_received and not @calls.any? {|x| x.matches(method, args, block)}
+        if assert_was_received and not @calls.any? {|x| x.matches(method, args)}
             raise "Call #{method} not received with specified args"
         end
 
-        @calls << Call.new(method, args, block)
+        @calls << Call.new(method, args)
         matching_result_pair = @results.reverse.find do |x| 
-                            x[0].matches(method, args, block)
+                            x[0].matches(method, args)
                         end
         if (matching_result_pair.nil?)
             value_to_return = Object.new

data/test/rsubstitute_spec.rb

@@ -20,7 +20,13 @@ describe "when method is called on substitute" do
 
     it "throws when the same method with different args was received" do
         lambda {
-            @sub.received.some_method("a")
+            @sub.received.some_method(999)
+        }.should raise_exception
+    end
+
+    it "throws when the same method with different number of args was received" do
+        lambda {
+            @sub.received.some_method(123, 2345, 456)
         }.should raise_exception
     end
 end
@@ -34,12 +40,12 @@ describe "when setting a return value for a method" do
 
     it "returns that value when called" do
         result = @sub.some_method(1)
-        result.should == @value_to_return
+        result.should equal @value_to_return
     end
 
     it "returns something else when called with different args" do
         result = @sub.some_method(2)
-        result.should != @value_to_return
+        result.should_not equal @value_to_return
     end
 
     it "returns a new value when a new value is set for the method" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Tchepak
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +10:00
+date: 2010-09-10 00:00:00 +10:00
 default_executable: 
 dependencies: []