muack 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee7881104f617fa965f32fb46340cd71f6de26d5
-  data.tar.gz: 5047ee579c7fdf9118139d34823c53d1224abbd2
+  metadata.gz: 4ca32470f688bde71bc3a56bed45ead89c3c9123
+  data.tar.gz: c54e8badae54d1b321cf5c95cc0facdc36b2a604
 SHA512:
-  metadata.gz: 10d056827ffb86c201c3720019782e510168a288186b057f4b25f0550a90448fa91b77dd87c36eb976bd94eff8b0600e4bc0dc8d1f4ccdf6c904bc280594838e
-  data.tar.gz: 433d4c055de69a0fd83251aa3e4b0b1e1a012753690470c6b5d738ad7452f1b6e6f9eca586a1fe24c87c4b19c7d19d226c324b14d8f424f8009cd8f5ed3158ec
+  metadata.gz: 7cfb937f5866fa9b92380029a3b2327874b4e28a0e87bb99652e7f0550a8b62731cd0bea78d2854bb2b379ce7dd1734cc5c837333b6463724adbf5cb8733dbbb
+  data.tar.gz: b47a79b28dbfe31d81e78c99308ef45596556531436bcd8294987b5d688301cdfbbee8a8eb7d8437712337b3e39a44f70085ac1b50ca16512faf58bdb9676ddb

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+*.rbc

data/CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## Muack 0.5.1 -- 2013-06-25
+
+* Fix issues with multiple call to any_instance_of with the same class.
+* any_instance_of now accepts a block as mock and others.
+* Fixed various bugs for dispatching methods with proxy and any_instance_of.
+
 ## Muack 0.5.0 -- 2013-06-24
 
 * Birthday!

data/lib/muack.rb

@@ -1,12 +1,6 @@
 
-require 'muack/mock'
-require 'muack/stub'
-require 'muack/proxy'
-
-require 'muack/satisfy'
 require 'muack/session'
-
-require 'muack/any_instance_of'
+require 'muack/satisfy'
 
 module Muack
   def self.verify
@@ -27,27 +21,28 @@ module Muack
   module API
     module_function
     def mock obj=Object.new
-      ret = Muack.session["mk #{obj.__id__}"] ||= Muack::Mock.new(obj)
+      ret = Muack.session.mock(obj)
       if block_given? then yield(ret) else ret end
     end
 
     def stub obj=Object.new
-      ret = Muack.session["sb #{obj.__id__}"] ||= Muack::Stub.new(obj)
+      ret = Muack.session.stub(obj)
       if block_given? then yield(ret) else ret end
     end
 
     def mock_proxy obj=Object.new
-      ret = Muack.session["mp #{obj.__id__}"] ||= Muack::MockProxy.new(obj)
+      ret = Muack.session.mock_proxy(obj)
       if block_given? then yield(ret) else ret end
     end
 
     def stub_proxy obj=Object.new
-      ret = Muack.session["sp #{obj.__id__}"] ||= Muack::StubProxy.new(obj)
+      ret = Muack.session.stub_proxy(obj)
       if block_given? then yield(ret) else ret end
     end
 
     def any_instance_of klass
-      yield Muack::AnyInstanceOf.new(klass)
+      ret = Muack.session.any_instance_of(klass)
+      if block_given? then yield(ret) else ret end
     end
 
     def is_a klass

data/lib/muack/mock.rb

@@ -8,7 +8,7 @@ module Muack
     attr_reader :object
     def initialize object
       @object = object
-      @__mock_ignore = []
+      @__mock_injected = {}
       [:__mock_defis=, :__mock_disps=].each do |m|
         __send__(m, ::Hash.new{ |h, k| h[k] = [] })
       end
@@ -22,7 +22,11 @@ module Muack
     # Public API: Define mocked method
     def method_missing msg, *args, &block
       defi = Definition.new(msg, args, block)
-      __mock_inject_method(defi) if __mock_pure?(defi)
+      if injected = __mock_injected[defi.msg]
+        defi.original_method = injected.original_method
+      else
+        __mock_inject_method(defi)
+      end
       __mock_defis_push(defi)
       Modifier.new(self, defi)
     end
@@ -37,11 +41,6 @@ module Muack
       __mock_defis[defi.msg].pop
     end
 
-    # used for Muack::Modifier#times
-    def __mock_ignore defi
-      @__mock_ignore << defi
-    end
-
     # used for mocked object to dispatch mocked method
     def __mock_dispatch msg, actual_args, actual_block
       if defi = __mock_defis[msg].shift
@@ -77,14 +76,11 @@ module Muack
 
     # used for Muack::Session#reset
     def __mock_reset
-      [__mock_defis.values, __mock_disps.values, @__mock_ignore].
-      flatten.compact.each do |defi|
+      __mock_injected.each_value do |defi|
         object.singleton_class.module_eval do
-          methods = instance_methods(false)
-          if methods.include?(defi.msg) # removed mocked method
-            remove_method(defi.msg)     # could be removed by other defi
-          end
-          if methods.include?(defi.original_method) # restore original method
+          remove_method(defi.msg)
+          # restore original method
+          if instance_methods(false).include?(defi.original_method)
             alias_method defi.msg, defi.original_method
             remove_method defi.original_method
           end
@@ -93,14 +89,11 @@ module Muack
     end
 
     protected # get warnings for private attributes
-    attr_accessor :__mock_defis, :__mock_disps
+    attr_accessor :__mock_defis, :__mock_disps, :__mock_injected
 
     private
-    def __mock_pure? defi
-      __mock_defis[defi.msg].empty? && __mock_disps[defi.msg].empty?
-    end
-
     def __mock_inject_method defi
+      __mock_injected[defi.msg] = defi
       target = object.singleton_class
       Mock.store_original_method(target, defi)
        __mock_inject_mock_method(target, defi)

data/lib/muack/modifier.rb

@@ -14,7 +14,7 @@ module Muack
       if number >= 1
         (number - 1).times{ mock.__mock_defis_push(defi) }
       elsif number == 0
-        mock.__mock_ignore(mock.__mock_defis_pop(defi))
+        mock.__mock_defis_pop(defi)
       else
         raise "What would you expect from calling a method #{number} times?"
       end

data/lib/muack/session.rb

@@ -1,12 +1,27 @@
 
+require 'muack/mock'
+require 'muack/stub'
+require 'muack/proxy'
+require 'muack/any_instance_of'
+
 module Muack
   class Session < Hash
+    def mock       obj; self["mk #{obj.__id__}"] ||= Mock     .new(obj); end
+    def stub       obj; self["sb #{obj.__id__}"] ||= Stub     .new(obj); end
+    def mock_proxy obj; self["mp #{obj.__id__}"] ||= MockProxy.new(obj); end
+    def stub_proxy obj; self["sp #{obj.__id__}"] ||= StubProxy.new(obj); end
+
+    def any_instance_of klass
+      (@any_instance_of ||= {})[klass.__id__] ||= AnyInstanceOf.new(klass)
+    end
+
     def verify
       each_value.all?(&:__mock_verify)
     end
 
     def reset
       each_value(&:__mock_reset)
+      clear
     end
   end
 end

data/lib/muack/version.rb

@@ -1,4 +1,4 @@
 
 module Muack
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/muack.gemspec

@@ -2,14 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "muack"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-06-24"
+  s.date = "2013-06-25"
   s.description = "Muack -- Yet another mocking library.\n\nBasically it's an [RR][] clone, but much faster under heavy use.\nIt's 32x times faster (750s vs 23s) for running [Rib][] tests.\n\n[RR]: https://github.com/rr/rr\n[Rib]: https://github.com/godfat/rib"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
+  ".gitignore",
   ".gitmodules",
   ".travis.yml",
   "CHANGES.md",

data/test/test_any_instance_of.rb

@@ -16,15 +16,39 @@ describe Muack::AnyInstanceOf do
     klass = Class.new{ def f; true; end }
     any_instance_of(klass){ |instance| mock_proxy(instance).f }
     obj = klass.new
-    obj.f.should.eq true
+    obj.f       .should.eq true
     Muack.verify.should.eq true
+    obj.f       .should.eq true
   end
 
   should 'proxy any_instance_of with a block' do
     klass = Class.new{ def f; 0; end }
     any_instance_of(klass){ |instance| mock_proxy(instance).f{ |i| i+1 } }
     obj = klass.new
+    obj.f       .should.eq 1
+    Muack.verify.should.eq true
+    obj.f       .should.eq 0
+  end
+
+  should 'proxy with multiple any_instance_of call' do
+    klass = Class.new{ def f; 0; end }
+    any_instance_of(klass){ |instance| mock_proxy(instance).f{ |i| i+1 } }
+    any_instance_of(klass){ |instance| mock_proxy(instance).f{ |i| i+2 } }
+    obj = klass.new
     obj.f.should.eq 1
+    obj.f.should.eq 2
+    Muack.verify.should.eq true
+    obj.f.should.eq 0
+  end
+
+  should 'mock with multiple any_instance_of call' do
+    klass = Class.new{ def f; 0; end }
+    any_instance_of(klass){ |inst| mock(inst).f(is_a(Fixnum)){ |i| i+1 } }
+    any_instance_of(klass){ |inst| mock(inst).f(is_a(Fixnum)){ |i| i+2 } }
+    obj = klass.new
+    obj.f(0).should.eq 1
+    obj.f(0).should.eq 2
     Muack.verify.should.eq true
+    obj.f.should.eq 0
   end
 end

data/test/test_mock.rb

@@ -68,6 +68,14 @@ describe Muack::Mock do
       mock(Obj).say{1}
       Obj.say.should.eq 1
     end
+
+    should 'not remove original singleton method' do
+      obj = Class.new{ def self.f; 0; end }
+      2.times{ mock(obj).f{ 1 }  }
+      2.times{ obj.f.should.eq 1 }
+      Muack.verify.should.eq true
+      obj.f       .should.eq 0
+    end
   end
 
   describe 'Muack.verify==false' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Muack -- Yet another mocking library.
@@ -24,6 +24,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .gitmodules
 - .travis.yml
 - CHANGES.md