assert 2.12.0 → 2.12.1

data/lib/assert/stub.rb

@@ -19,6 +19,8 @@ module Assert
   end
 
   StubError = Class.new(ArgumentError)
+  NotStubbedError = Class.new(StubError)
+  StubArityError = Class.new(StubError)
 
   class Stub
 
@@ -44,18 +46,21 @@ module Assert
         inspect_lookup_stubs.tap do |stubs|
           err_msg += "\nStubs:\n#{stubs}" if !stubs.empty?
         end
-        raise StubError, err_msg
+        raise NotStubbedError, err_msg
       end
       @lookup = Hash.new{ |hash, key| self.do }
     end
 
     def call(*args, &block)
-      raise StubError, "artiy mismatch" unless arity_matches?(args)
+      raise StubArityError, "artiy mismatch" unless arity_matches?(args)
+      @lookup[args].call(*args, &block)
+    rescue NotStubbedError => exception
+      @lookup.rehash
       @lookup[args].call(*args, &block)
     end
 
     def with(*args, &block)
-      raise StubError, "artiy mismatch" unless arity_matches?(args)
+      raise StubArityError, "artiy mismatch" unless arity_matches?(args)
       @lookup[args] = block
     end
 

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.12.0"
+  VERSION = "2.12.1"
 end

data/test/unit/assert_tests.rb

@@ -48,7 +48,7 @@ module Assert
 
     should "set the stub's do block if given a block" do
       Assert.stub(@myobj, :mymeth)
-      assert_raises(StubError){ @myobj.mymeth }
+      assert_raises(NotStubbedError){ @myobj.mymeth }
       Assert.stub(@myobj, :mymeth){ 'mymeth' }
       assert_equal 'mymeth', @myobj.mymeth
     end

data/test/unit/stub_tests.rb

@@ -35,7 +35,7 @@ class Assert::Stub
     end
 
     should "complain when called if no do block was given" do
-      assert_raises Assert::StubError do
+      assert_raises Assert::NotStubbedError do
         @myobj.mymeth
       end
 
@@ -56,14 +56,14 @@ class Assert::Stub
     end
 
     should "complain if stubbed and called with no `do` proc given" do
-      assert_raises(Assert::StubError){ @myobj.mymeth }
+      assert_raises(Assert::NotStubbedError){ @myobj.mymeth }
     end
 
     should "complain if stubbed and called with mismatched arity" do
       Assert::Stub.new(@myobj, :myval){ 'myval' }
-      assert_raises(Assert::StubError){ @myobj.myval }
+      assert_raises(Assert::StubArityError){ @myobj.myval }
       assert_nothing_raised { @myobj.myval(1) }
-      assert_raises(Assert::StubError){ @myobj.myval(1,2) }
+      assert_raises(Assert::StubArityError){ @myobj.myval(1,2) }
 
       Assert::Stub.new(@myobj, :myargs){ 'myargs' }
       assert_nothing_raised { @myobj.myargs }
@@ -71,17 +71,17 @@ class Assert::Stub
       assert_nothing_raised { @myobj.myargs(1,2) }
 
       Assert::Stub.new(@myobj, :myvalargs){ 'myvalargs' }
-      assert_raises(Assert::StubError){ @myobj.myvalargs }
-      assert_raises(Assert::StubError){ @myobj.myvalargs(1) }
+      assert_raises(Assert::StubArityError){ @myobj.myvalargs }
+      assert_raises(Assert::StubArityError){ @myobj.myvalargs(1) }
       assert_nothing_raised { @myobj.myvalargs(1,2) }
       assert_nothing_raised { @myobj.myvalargs(1,2,3) }
     end
 
     should "complain if stubbed with mismatched arity" do
-      assert_raises(Assert::StubError) do
+      assert_raises(Assert::StubArityError) do
         Assert::Stub.new(@myobj, :myval).with(){ 'myval' }
       end
-      assert_raises(Assert::StubError) do
+      assert_raises(Assert::StubArityError) do
         Assert::Stub.new(@myobj, :myval).with(1,2){ 'myval' }
       end
       assert_nothing_raised do
@@ -98,10 +98,10 @@ class Assert::Stub
         Assert::Stub.new(@myobj, :myargs).with(1){ 'myargs' }
       end
 
-      assert_raises(Assert::StubError) do
+      assert_raises(Assert::StubArityError) do
         Assert::Stub.new(@myobj, :myvalargs).with(){ 'myvalargs' }
       end
-      assert_raises(Assert::StubError) do
+      assert_raises(Assert::StubArityError) do
         Assert::Stub.new(@myobj, :myvalargs).with(1){ 'myvalargs' }
       end
       assert_nothing_raised do
@@ -191,6 +191,24 @@ class Assert::Stub
 
   end
 
+  class MutatingArgsStubTests < UnitTests
+    desc "with args that are mutated after they've been used to stub"
+    setup do
+      @arg = ChangeHashObject.new
+
+      @stub = Assert::Stub.new(@myobj, :myval)
+      @stub.with(@arg){ true }
+
+      @arg.change!
+    end
+    subject{ @stub }
+
+    should "not raise a stub error when called" do
+      assert_nothing_raised{ @stub.call(@arg) }
+    end
+
+  end
+
   class NullStubTests < UnitTests
     desc "NullStub"
     setup do
@@ -202,4 +220,18 @@ class Assert::Stub
 
   end
 
+  class ChangeHashObject
+    def initialize
+      @value = nil
+    end
+
+    def hash
+      @value.hash
+    end
+
+    def change!
+      @value = 1
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 2
   - 12
-  - 0
-  version: 2.12.0
+  - 1
+  version: 2.12.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-18 00:00:00 Z
+date: 2014-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -29,9 +29,9 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  version_requirements: *id001
   type: :runtime
   name: ansi
-  version_requirements: *id001
   prerelease: false
 description: Test::Unit style testing framework, just better than Test::Unit.
 email: 
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Test::Unit style testing framework, just better than Test::Unit.