duck_puncher 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd23706fe9c393e764f8b626910f65387f4e61c
-  data.tar.gz: 3bfa8e50421e3380e147cf4abf2a851667d15b12
+  metadata.gz: 62f4cac1d15e159d6ba58d71681cec7e34be8c71
+  data.tar.gz: 53ee95a89344c33f8960cf5d957cbb5dbf6d3562
 SHA512:
-  metadata.gz: 95f234da65d3b1d75e20fad48d8c943b0521f9b7cb608ee737ab9b7da200e900c947e350c3b002dc95b33f7fa797e527a8b2f2f6bda6983ec1bc0d25226a2fac
-  data.tar.gz: 0bb151f3465b618042896541a8b23d49803d3d25ee28b61ae757c8fca2f76aef396341ee5748acb1ac899b016b0d1b37719436702f37f04e8c77f9be1e6a2d80
+  metadata.gz: ea6d68c9efd49449907ccfb6aab5b810f6b0081ce399817afc78804a813cf0c66feea9ea0cfe74492e3b1091baa3011cc0cc1492d2bdb2ed6ca5e27433f9e9eb
+  data.tar.gz: dd5bf802c09382798460d26c81650588f10f64de8e2cba77fec53d82e55fffb932fe785178233037d96965b53b9093c7088e2c2f87c608c23828df71f81b05c8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+4.4.2 (01/10/2016)
+==================
+
+* Fix glaring bug in Duck class where the `:only` option is ignored (since 4.4.0)
+
 4.4.1 (12/19/2016)
 ==================
 

data/README.md

@@ -155,7 +155,11 @@ DuckPuncher allows you to utilize the `punch` and `punch!` interface to __decora
 call `DuckPuncher.register` with the name of your module (or an array of names) and any of
 [these options](https://github.com/ridiculous/duck_puncher/blob/master/lib/duck_puncher/duck.rb#L10).
 
+```ruby
+DuckPuncher.register <class>, [<module>, ...]
+```
 
+A full example:
 ```ruby
 # Define some extensions
 module Billable
@@ -181,7 +185,7 @@ class User < Struct.new(:name)
 end
 
 # Register the extensions
-DuckPuncher.register User, :Billable, :Retryable
+DuckPuncher.register User, Billable, Retryable
 
 # Add the #punch method to User instances
 DuckPuncher.(Object, only: :punch)

data/bin/console

@@ -2,9 +2,23 @@
 
 require 'bundler/setup'
 require 'pp'
-require 'duck_puncher'
 require 'irb'
 require 'byebug'
+
+# Stub out Rails
+module Rails
+  module VERSION
+    MAJOR = 4
+  end
+end
+
+# And AR
+module ActiveRecord
+  class Base
+  end
+end
+
+require 'duck_puncher'
 require_relative '../test/fixtures/wut'
 
 DuckPuncher.logger.level = Logger::DEBUG

data/lib/duck_puncher/defaults.rb

@@ -22,7 +22,7 @@ ducks = [
   [Module, DuckPuncher::Ducks::Module],
   [Method, DuckPuncher::Ducks::Method, { before: ->(_target) { DuckPuncher::GemInstaller.initialize! } }],
 ]
-ducks << ['ActiveRecord::Base', DuckPuncher::Ducks::ActiveRecord] if defined? ::ActiveRecord
+ducks << [ActiveRecord::Base, DuckPuncher::Ducks::ActiveRecord] if defined?(Rails) && defined?(ActiveRecord) && defined?(ActiveRecord::Base)
 ducks.each do |duck|
   DuckPuncher.register *duck
 end

data/lib/duck_puncher/duck.rb

@@ -18,19 +18,23 @@ module DuckPuncher
     # @option options [Array,Symbol] :only Specifies the methods to extend onto the current object
     # @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 = {})
+    def call(opts = {})
       opts = options.merge(opts)
       targets = Array(opts[:target] || self.target)
       targets.each do |target|
-        options[:before].call(target) if options[:before]
+        opts[:before].call(target) if opts[:before]
         punches = Array(opts[:only] || Ducks::Module.instance_method(:local_methods).bind(mod).call)
+        unless target.is_a?(::Module)
+          fail ArgumentError, "Invalid target #{target}. Please pass a module as :target"
+        end
         DuckPuncher.logger.info %Q(#{target}#{" <-- #{mod.name}#{punches}" if punches.any?})
-        extender = Usable::ModExtender.new(mod, only: options.delete(:only), method: options.delete(:method))
+        extender = Usable::ModExtender.new(mod, only: opts.delete(:only), method: opts.delete(:method))
         extender.call target
-        extender = nil
-        options[:after].call(target) if options[:after]
+        opts[:after].call(target) if opts[:after]
       end
       targets
     end
+
+    alias punch call
   end
 end

data/lib/duck_puncher/ducks/active_record.rb

@@ -43,7 +43,7 @@ module DuckPuncher
        # shim for backwards compatibility with Rails 3
        def scoped
          where(nil)
-       end if Rails::VERSION::MAJOR != 3
+       end if ::Rails::VERSION::MAJOR > 3
      end
    end
  end

data/lib/duck_puncher/version.rb

@@ -1,3 +1,3 @@
 module DuckPuncher
-  VERSION = '4.4.1'.freeze
+  VERSION = '4.4.2'.freeze
 end

data/test/lib/duck_puncher/duck_test.rb

@@ -0,0 +1,45 @@
+require_relative '../../test_helper'
+
+class DuckTest < MiniTest::Test
+  def setup
+    @class = Class.new
+    @object = @class.new
+    @mod = Module.new { %w[foo bar baz].each { |x| define_method(x, -> {}) } }
+    @subject = DuckPuncher::Duck.new(@class, @mod)
+  end
+
+  def test_punch
+    @subject.target = Kaia
+    refute_respond_to Kaia.new, :baz
+    @subject.call
+    assert_respond_to Kaia.new, :foo
+    assert_respond_to Kaia.new, :bar
+    assert_respond_to Kaia.new, :baz
+  end
+
+  def test_punch_with_instance
+    e = assert_raises ArgumentError do
+      @subject.call target: @object
+    end
+    assert_match /Invalid target #<#{@class}:.*>\. Please pass a module as :target/,
+                 e.message
+  end
+
+  def test_punch_with_only
+    refute_respond_to @object, :foo
+    refute_respond_to @object, :bar
+    @subject.call(only: :foo)
+    refute_respond_to @object, :bar
+    assert_respond_to @object, :foo
+    @subject.call(only: :bar)
+    assert_respond_to @object, :bar
+  end
+
+  def test_punch_with_only_target
+    refute_respond_to @object, :bar
+    @subject.call target: @class, only: [:foo, :bar]
+    assert_respond_to @object, :bar
+    assert_respond_to @object, :foo
+    refute_respond_to @object, :baz
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_puncher
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: usable
@@ -121,6 +121,7 @@ files:
 - lib/duck_puncher/version.rb
 - test/fixtures/test_classes.rb
 - test/fixtures/wut.rb
+- test/lib/duck_puncher/duck_test.rb
 - test/lib/duck_puncher/enumerable_test.rb
 - test/lib/duck_puncher/hash_test.rb
 - test/lib/duck_puncher/method_test.rb
@@ -157,6 +158,7 @@ summary: Administer precision extensions (a.k.a "punches") to your favorite Ruby
 test_files:
 - test/fixtures/test_classes.rb
 - test/fixtures/wut.rb
+- test/lib/duck_puncher/duck_test.rb
 - test/lib/duck_puncher/enumerable_test.rb
 - test/lib/duck_puncher/hash_test.rb
 - test/lib/duck_puncher/method_test.rb