duck_puncher 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f945aea9eb0db7392e51aea5cda254eaad6d5815
-  data.tar.gz: fa1e7a2565caee23e437d38b60358f9fbf382901
+  metadata.gz: 1cb44e09391f847e93e57bcf8440f2c2d15ed047
+  data.tar.gz: 3ce4e5424e681138720017420ac9acf62fb813d2
 SHA512:
-  metadata.gz: 3c05f53aad5478fda527751c1cc3625cf6d0dad18397a08311610d56a13ada9fab6705623f7ae8fec63902636f78255cee3ad3fd892e9b0ada44c9132bba3d3e
-  data.tar.gz: b7310b2c603075ce345f24805bb4d2dc7211515c86b69dc0df775d8aa362cf723c656b3a22a8a0696d0a2fd1b6294e7b96c6a91511d26eb35ea61956865f74c4
+  metadata.gz: 21f328e2955ba0a5d22edb8182ebba32707413aff62e0f788bc87fe5bf889317d601d44cc809cdfb1edb3e8029777080124e26f57b65e0a6b499e0b51c775960
+  data.tar.gz: 1de4fb69952aec16f29c3bfa6034cf4400b5aea73d64bbfee6f7b735c0149e4fb5cd278cacd2d45dfbd4bd7a27faf29117a2ef55393520f2cbbe95b8820b27e7

data/lib/duck_puncher/decoration.rb

@@ -4,7 +4,7 @@ module DuckPuncher
       @decorators ||= ancestral_hash
     end
 
-    def new_decorator(*ducks)
+    def build_decorator_class(*ducks)
       targets = ducks.sort.map(&:target)
       decorator_class = DelegateClass(targets.first)
       DuckPuncher.redefine_constant "#{targets.first.to_s.tr(':', '')}Delegator", decorator_class
@@ -12,6 +12,16 @@ module DuckPuncher
       decorator_class
     end
 
+    def decorate(context, target)
+      cached_decorators[target].inject(context) { |me, (_, decorator)| decorator.new(me) }
+    end
+
+    def cached_decorators
+      @cached_decorators ||= Hash.new do |me, target|
+        me[target] = DuckPuncher.decorators.select { |klass, _| klass >= target }.sort { |a, b| b[0] <=> a[0] }
+      end
+    end
+
     def undecorate(obj)
       obj = obj.__getobj__ while obj.respond_to? :__getobj__
       obj

data/lib/duck_puncher/ducks/object.rb

@@ -11,16 +11,17 @@ module DuckPuncher
         end
       end
 
-      # @description Returns a new decorated version of ourself with the punches mixed in
+      # @description Returns a new decorated version of ourself with the punches mixed in (adds ancestors decorators)
       # @return [<self.class>Delegator]
       def punch
-        DuckPuncher.decorators[DuckPuncher.undecorate(self).class].new(self)
+        DuckPuncher.decorate self, DuckPuncher.undecorate(self).class
       end
 
       # @description Adds the duck punches to the current object (meant to be used on instances, careful with nil and numbers!)
       # @return self
       def punch!
-        DuckPuncher::Ducks.load_mods(DuckPuncher.undecorate(self).class).each { |mod| self.extend mod }
+        target = DuckPuncher.undecorate(self).class
+        DuckPuncher::Ducks.load_mods(target).each { |mod| self.extend mod }
         self
       end
 

data/lib/duck_puncher/registration.rb

@@ -7,15 +7,15 @@ module DuckPuncher
       Array(mods).each do |mod|
         duck = Duck.new target, mod, options
         Ducks.list[target] << duck
-        decorators[target] = new_decorator(duck, *Ducks[target])
+        decorators[target] = build_decorator_class(duck, *Ducks[target])
       end
-      nil
+      @cached_decorators = nil
     end
 
     def deregister(*classes)
       classes.each &Ducks.list.method(:delete)
       classes.each &decorators.method(:delete)
-      nil
+      @cached_decorators = nil
     end
   end
 end

data/lib/duck_puncher/version.rb

@@ -1,3 +1,3 @@
 module DuckPuncher
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.1.0'.freeze
 end

data/test/lib/duck_puncher/object_test.rb

@@ -57,4 +57,22 @@ class ObjectTest < MiniTest::Test
     assert_respond_to @kaia, :talk
     assert_respond_to @kaia, :quack
   end
+
+  def test_soft_punch_includes_all_ancestors
+    DuckPuncher.register Animal, CustomPunch2
+    DuckPuncher.register Dog, CustomPunch
+    DuckPuncher.register Kaia, CustomPunch3
+    @kaia = Kaia.new.punch
+    assert_respond_to @kaia, :wobble
+    assert_respond_to @kaia, :talk
+    assert_respond_to @kaia, :quack
+  end
+
+  def test_soft_punch_with_parent_override
+    DuckPuncher.register Animal, CustomPunch
+    DuckPuncher.register Kaia, ModWithOverride
+    @kaia = Kaia.new.punch
+    assert_respond_to @kaia, :talk
+    assert_equal @kaia.talk, 'talk is cheap'
+  end
 end

data/test/test_helper.rb

@@ -25,6 +25,12 @@ module CustomPunch3
   end
 end
 
+module ModWithOverride
+  def talk
+    'talk is cheap'
+  end
+end
+
 module ModWithNestedMod
   def instance_method_1
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_puncher
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: usable