assert 2.11.0 → 2.12.0

data/lib/assert.rb

@@ -17,28 +17,9 @@ module Assert
   def self.suite;  self.config.suite;  end
   def self.runner; self.config.runner; end
 
-  def self.stubs
-    @stubs ||= {}
-  end
-
-  def self.stub(*args, &block)
-    (self.stubs[Assert::Stub.key(*args)] ||= Assert::Stub.new(*args)).tap do |s|
-      s.do = block
-    end
-  end
-
-  def self.unstub(*args)
-    (self.stubs.delete(Assert::Stub.key(*args)) || Assert::Stub::NullStub.new).teardown
-  end
-
-  def self.unstub!
-    self.stubs.keys.each{ |key| self.stubs.delete(key).teardown }
-  end
-
+  # unstub all stubs automatically (see stub.rb)
   class Context
-
-    teardown{ Assert.unstub! } # unstub all stubs automatically
-
+    teardown{ Assert.unstub! }
   end
 
 end

data/lib/assert/stub.rb

@@ -1,5 +1,23 @@
 module Assert
 
+  def self.stubs
+    @stubs ||= {}
+  end
+
+  def self.stub(*args, &block)
+    (self.stubs[Assert::Stub.key(*args)] ||= Assert::Stub.new(*args)).tap do |s|
+      s.do = block
+    end
+  end
+
+  def self.unstub(*args)
+    (self.stubs.delete(Assert::Stub.key(*args)) || Assert::Stub::NullStub.new).teardown
+  end
+
+  def self.unstub!
+    self.stubs.keys.each{ |key| self.stubs.delete(key).teardown }
+  end
+
   StubError = Class.new(ArgumentError)
 
   class Stub
@@ -58,9 +76,11 @@ module Assert
         raise StubError, "#{object.inspect} does not respond to `#{@method_name}`"
       end
       if !object.methods.map(&:to_s).include?(@method_name)
-        @metaclass.send(:define_method, @method_name) do |*args, &block|
-          super(*args, &block)
-        end
+        @metaclass.class_eval <<-method
+          def #{@method_name}(*args, &block)
+            super(*args, &block)
+          end
+        method
       end
 
       if !object.respond_to?(@name) # already stubbed

data/lib/assert/version.rb

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

data/test/unit/stub_tests.rb

@@ -159,16 +159,26 @@ class Assert::Stub
       assert_equal 'true', blkcalled
     end
 
-    should "stub methods even if they are from a super class" do
-      mysubclass = Class.new(@myclass)
-      mysubobj = mysubclass.new
-
-      assert_equal 1, mysubobj.myval(1)
-      stub = Assert::Stub.new(mysubobj, :myval){ |val| val.to_s }
-      assert_equal '1', mysubobj.myval(1)
-      assert_equal '2', mysubobj.myval(2)
-      stub.with(2){ 'two' }
-      assert_equal 'two', mysubobj.myval(2)
+    should "stub methods even if they are not local to the object" do
+      mydelegatorclass = Class.new do
+        def initialize(delegateclass)
+          @delegate = delegateclass.new
+        end
+        def respond_to?(meth)
+          @delegate.respond_to?(meth) || super
+        end
+        def method_missing(meth, *args, &block)
+          respond_to?(meth) ? @delegate.send(meth, *args, &block) : super
+        end
+      end
+      mydelegator = mydelegatorclass.new(@myclass)
+
+      assert_equal [1,2,[3]], mydelegator.myvalargs(1,2,3)
+      stub = Assert::Stub.new(mydelegator, :myvalargs){ |*args| args.inspect }
+      assert_equal '[1, 2, 3]', mydelegator.myvalargs(1,2,3)
+      assert_equal '[4, 5, 6]', mydelegator.myvalargs(4,5,6)
+      stub.with(4,5,6){ 'four-five-six' }
+      assert_equal 'four-five-six', mydelegator.myvalargs(4,5,6)
     end
 
     should "be removable" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 63
   prerelease: 
   segments: 
   - 2
-  - 11
+  - 12
   - 0
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-17 00:00:00 Z
+date: 2014-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement