duck_puncher 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d87f6e9cc70035a1882583f6f8118b50a48a727
-  data.tar.gz: ef1253af39b88d4ca68738aa5ae278c19f2cc235
+  metadata.gz: 65996bcd8666c6b83b5b5c3a71c6517b9ecc7d75
+  data.tar.gz: f1362ac2578ddcd74677066c9d168c267fee119a
 SHA512:
-  metadata.gz: 30e60aeae2f9484ece1756527f2b5217a5af1fecee7fbe72435d7c368d022d72bf47795011ef3a6de8a6698ee280492bba9f408d9eea6b576224bd7323b66470
-  data.tar.gz: 0fe659cc0d20d179246eedd5522da3ea2fa824489b40ca2785ef56b1fd20037af3a75a6649d5946ae4447450dfd3f1d58e617ef15b0929d4ae66ba67e9d3b159
+  metadata.gz: 3cc4e467436746ed770f32df6ab88d0b82b7134940f255cddc6b2899ba852641235afc9af94bd00a828d84bcd59b138656d6109d1ff5b3a7597d0f3a191ec45a
+  data.tar.gz: 223c5e24a33223540342be0ea2bbcfc969080e4bcd9e584e336325f869e39cf7bc88e3d3065107c2cc22b2d972eaa81ab03c7673731ff1438262533a9e7b3bf6

data/README.md

@@ -8,37 +8,37 @@ DuckPuncher provides an interface for administering __duck punches__ (a.k.a "mon
 Default extensions:
 
 ```ruby
-Enumerable
-        #m                  => `[].m(:to_s)` => `[].map(&:to_s)`
-        #m!                 => `[].m!(:upcase)` => `[].map!(&:upcase)`
-        #mm                 => `[].mm(:sub, /[aeiou]/, '*')` => `[].map { |x| x.sub(/[aeiou]/, '*') }` 
-        #mm!                => `[].mm!(:sub, /[aeiou]/, '*')` => `[].map! { |x| x.sub(/[aeiou]/, '*') }` 
-        #except             => `[].except('foo', 'bar')` => `[] - ['foo', 'bar']`
-        #map_keys           => `[{id: 1, name: 'foo'}, {id: 2}].map_keys(:id)` => `[1, 2]`
+Enumerable (including Array, Set, Range, and Enumerator)
+        #m                  # => `[].m(:to_s)`
+        #m!                 # => `[].m!(:upcase)`
+        #mm                 # => `[].mm(:sub, /[aeiou]/, '*')` 
+        #mm!                # => `[].mm!(:sub, /[aeiou]/, '*')` 
+        #except             # => `[].except('foo', 'bar')`
+        #map_keys           # => `[{id: 1}, {id: 2}].map_keys(:id)`
 Hash
-        #dig                => `{a: 1, b: {c: 2}}.dig(:b, :c)` => 2 (Part of standard lib in Ruby >= 2.3)
-        #compact            => `{a: 1, b: nil}.compact` => {a: 1}
+        #dig                # => `{a: 1, b: {c: 2}}.dig(:b, :c)` (Standard in Ruby >= 2.3)
+        #compact            # => `{a: 1, b: nil}.compact` # => {a: 1}
 Numeric
-        #to_currency        => `25.245.to_currency` => 25.25 
-        #to_duration        => `10_000.to_duration` => '2 h 46 min'
-        #to_time_ago        => `10_000.to_time_ago` => '2 hours ago'
-        #to_rad             => `10.15.to_rad` => 0.17715091907742445
+        #to_currency        # => `25.245.to_currency` # => 25.25 
+        #to_duration        # => `10_000.to_duration` # => '2 h 46 min'
+        #to_time_ago        # => `10_000.to_time_ago` # => '2 hours ago'
+        #to_rad             # => `10.15.to_rad`       # => 0.17715091907742445
 String
-        #pluralize          => `'hour'.pluralize(2)` => "hours"
-        #underscore         => `'DuckPuncher::JSONStorage'.underscore` => 'duck_puncher/json_storage'
-        #to_boolean         => `'1'.to_boolean` => true
-        #constantize        => `'MiniTest::Test'.constantize` => MiniTest::Test
+        #pluralize          # => `'hour'.pluralize(2)`          # => "hours"
+        #underscore         # => `'DJ::JSONStorage'.underscore` # => 'dj/json_storage'
+        #to_boolean         # => `'1'.to_boolean`               # => true
+        #constantize        # => `'MiniTest::Test'.constantize` # => MiniTest::Test
 Module
-        #local_methods      => `Kernel.local_methods` returns the methods defined directly in the class + nested constants w/ methods
+        #local_methods      # => `Kernel.local_methods` # => returns the methods defined directly in the class + nested constants w/ methods
 Object
-        #clone!             => `Object.new.clone!` => a deep clone of the object (using Marshal.dump)
-        #punch              => `'duck'.punch` => a copy of 'duck' with String punches mixed in
-        #punch!             => `'duck'.punch!` => destructive version applies extensions directly to the base object
-        #echo               => `'duck'.echo.upcase` => spits out the caller and value of the object and returns the object
-        #track              => `Object.new.track` => Traces methods calls to the object (requires [object_tracker](https://github.com/ridiculous/object_tracker), which it'll try to download)
+        #clone!             # => `Object.new.clone!`  # => a deep clone of the object (using Marshal.dump)
+        #punch              # => `'duck'.punch`       # => a copy of 'duck' with String punches mixed in
+        #punch!             # => `'duck'.punch!`      # => destructive version applies extensions directly to the base object
+        #echo               # => `'duck'.echo.upcase` # => spits out the caller and value of the object and returns the object
+        #track              # => `Object.new.track`   # => Traces methods calls to the object (requires [object_tracker](https://github.com/ridiculous/object_tracker), which it'll try to download)
 Method
-        #to_instruct        => `Benchmark.method(:measure).to_instruct` returns the Ruby VM instruction sequence for the method
-        #to_source          => `Benchmark.method(:measure).to_source` returns the method definition as a string
+        #to_instruct        # => `Benchmark.method(:measure).to_instruct` returns the Ruby VM instruction sequence for the method
+        #to_source          # => `Benchmark.method(:measure).to_source` returns the method definition as a string
 ```
 
 ## Usage

data/lib/duck_puncher/defaults.rb

@@ -5,8 +5,14 @@ end
 
 ducks = [
   [String, DuckPuncher::Ducks::String],
-  [Enumerable, DuckPuncher::Ducks::Enumerable],
-  [Array, DuckPuncher::Ducks::Enumerable],
+  [Enumerable, DuckPuncher::Ducks::Enumerable, {
+    # Re-include Enumerable in these classes to pick up the new extensions
+    after: proc {
+      [Array, Set, Range, Enumerator].each do |k|
+        DuckPuncher.logger.debug("Sending include to #{k} with Enumerable") and k.send(:include, Enumerable)
+      end
+    }
+  }],
   [Numeric, DuckPuncher::Ducks::Numeric],
   [Hash, DuckPuncher::Ducks::Hash],
   [Object, DuckPuncher::Ducks::Object],

data/lib/duck_puncher/duck.rb

@@ -19,7 +19,8 @@ module DuckPuncher
     # @option options [Symbol,String] :method Specifies if the methods should be included or prepended (:include)
     # @return [Class] The class that was just punched
     def punch(opts = {})
-      targets = Array(opts.delete(:target) || self.target)
+      opts = options.merge opts
+      targets = Array(opts[:target] || self.target)
       targets.each do |target|
         options[:before].call(target) if options[:before]
         target.extend Usable

data/lib/duck_puncher/registration.rb

@@ -4,7 +4,7 @@ module DuckPuncher
     def register(target, *mods)
       options = mods.last.is_a?(Hash) ? mods.pop : {}
       target = DuckPuncher.lookup_constant target
-      Ducks.list[target] = [] unless Ducks.list.key?(target)
+      Ducks.list[target] = Set.new [] unless Ducks.list.key?(target)
       Array(mods).each do |mod|
         duck = Duck.new target, mod, options
         Ducks.list[target] << duck

data/lib/duck_puncher/version.rb

@@ -1,3 +1,3 @@
 module DuckPuncher
-  VERSION = '4.2.1'.freeze
+  VERSION = '4.2.2'.freeze
 end

data/lib/duck_puncher.rb

@@ -40,7 +40,7 @@ module DuckPuncher
       classes.each do |klass|
         klass = lookup_constant(klass)
         Ducks[klass].sort.each do |duck|
-          punches = Array(options[:only] || Ducks::Module.instance_method(:local_methods).bind(duck.mod).call)
+          punches = Array(options[:only] || duck.options[:only] || Ducks::Module.instance_method(:local_methods).bind(duck.mod).call)
           options[:target] = klass
           logger.info %Q(#{klass}#{" <-- #{duck.mod.name}#{punches}" if punches.any?})
           unless duck.punch(options)

data/test/fixtures/test_classes.rb

@@ -0,0 +1,42 @@
+module CustomPunch
+  def talk
+    p self
+    self
+  end
+end
+
+module CustomPunch2
+  def quack
+    'quack'
+  end
+end
+
+module CustomPunch3
+  def wobble
+  end
+end
+
+module ModWithOverride
+  def talk
+    'talk is cheap'
+  end
+end
+
+module ModWithNestedMod
+  def instance_method_1
+  end
+
+  module ClassMethods
+    def class_method_1
+    end
+  end
+end
+
+class Animal
+end
+
+class Dog < Animal
+end
+
+class Kaia < Dog
+end

data/test/lib/duck_puncher/enumerable_test.rb

@@ -17,6 +17,25 @@ class EnumerableTest < MiniTest::Test
     assert_equal subject.object_id, subject.m!(:upcase).object_id
   end
 
+  def test_m_with_range
+    @subject = ('a'..'f')
+    assert_equal %w[A B C D E F], @subject.punch.m(:upcase)
+    assert_equal %w[A B C D E F], @subject.punch!.m(:upcase)
+  end
+
+  def test_m_with_enum
+    @subject = ('A'..'F').to_enum
+    assert_equal %w[B C D E F G], @subject.punch.m(:next)
+    assert_equal %w[B C D E F G], @subject.punch!.m(:next)
+  end
+
+  def test_mm_with_set
+    @subject = Set.new %w[a b c d e f]
+    assert_equal %w[A B C D E F], @subject.punch.m(:upcase)
+    assert_equal %w[A B C D E F], @subject.punch!.m(:upcase)
+    assert_equal %w[B C D E F G], @subject.punch!.m!(:upcase).m(:next)
+  end
+
   def test_mm_with_two_args
     subject.punch!
     assert_equal subject.map { |x| x.prepend('btn-') }, subject.mm(:prepend, 'btn-')

data/test/test_helper.rb

@@ -2,50 +2,8 @@ require 'minitest'
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'duck_puncher'
+require_relative 'fixtures/test_classes'
 
 Minitest::Reporters.use!
 
-DuckPuncher.logger.level = Logger::INFO
-
-module CustomPunch
-  def talk
-    p self
-    self
-  end
-end
-
-module CustomPunch2
-  def quack
-    'quack'
-  end
-end
-
-module CustomPunch3
-  def wobble
-  end
-end
-
-module ModWithOverride
-  def talk
-    'talk is cheap'
-  end
-end
-
-module ModWithNestedMod
-  def instance_method_1
-  end
-
-  module ClassMethods
-    def class_method_1
-    end
-  end
-end
-
-class Animal
-end
-
-class Dog < Animal
-end
-
-class Kaia < Dog
-end
+DuckPuncher.logger.level = Logger::DEBUG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duck_puncher
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Ryan Buckley
@@ -123,6 +123,7 @@ files:
 - lib/duck_puncher/registration.rb
 - lib/duck_puncher/utilities.rb
 - lib/duck_puncher/version.rb
+- test/fixtures/test_classes.rb
 - test/fixtures/wut.rb
 - test/lib/duck_puncher/enumerable_test.rb
 - test/lib/duck_puncher/hash_test.rb
@@ -158,6 +159,7 @@ signing_key:
 specification_version: 4
 summary: Administer precision extensions (a.k.a "punches") to your favorite Ruby classes
 test_files:
+- test/fixtures/test_classes.rb
 - test/fixtures/wut.rb
 - test/lib/duck_puncher/enumerable_test.rb
 - test/lib/duck_puncher/hash_test.rb