duck_puncher 4.4.2 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 62f4cac1d15e159d6ba58d71681cec7e34be8c71
-  data.tar.gz: 53ee95a89344c33f8960cf5d957cbb5dbf6d3562
+SHA256:
+  metadata.gz: d1fcb68e87edfbb74d3a7c6d1d3699e4d636825096d63a4bd0ebf5084e159bf8
+  data.tar.gz: f5ef839a1ee7c73bf22ede9d831142b4d68b97de1c0581269c798e2a86732603
 SHA512:
-  metadata.gz: ea6d68c9efd49449907ccfb6aab5b810f6b0081ce399817afc78804a813cf0c66feea9ea0cfe74492e3b1091baa3011cc0cc1492d2bdb2ed6ca5e27433f9e9eb
-  data.tar.gz: dd5bf802c09382798460d26c81650588f10f64de8e2cba77fec53d82e55fffb932fe785178233037d96965b53b9093c7088e2c2f87c608c23828df71f81b05c8
+  metadata.gz: 19cc97cf751f1bd1bd2b140da0ecc267b02832ddfbd5ce165682409e575c233784fd4f45035e320d254965dedb933f6726473b5d1f2e34d0aa98abdf6fabd2f5
+  data.tar.gz: d17270cbdb1634ead0c15e3c24238eeea6b50270fc5e01371a28bc60c9aeaaa007852ab5f385620b99707087cf8b1165d9b7a9fe8de6677710d0a8fd6943ed66

data/duck_puncher.gemspec

@@ -13,16 +13,16 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ridiculous/duck_puncher"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/).keep_if { |f| f =~ /duck_puncher/ and f !~ %r{test/} }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_runtime_dependency "usable", ">= 3.3"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake", '~> 10.1'
   spec.add_development_dependency "minitest", '~> 5.0'
   spec.add_development_dependency "minitest-reporters", '~> 1.1'

data/lib/duck_puncher.rb

@@ -23,7 +23,7 @@ module DuckPuncher
 
   class << self
     # @description Include additional functionality
-    include Registration    # [:register, :deregister]
+    include Registration    # [:register, :register!, :deregister]
     include Decoration      # [:decorators, :build_decorator_class, :decorate, :cached_decorators, :undecorate]
     include Utilities       # [:lookup_constant, :redefine_constant]
     include AncestralHash   # [:ancestral_hash]
@@ -62,6 +62,14 @@ module DuckPuncher
       @punched_ducks ||= Set.new
     end
 
+    # Register an extension with a target class
+    # When given a block, the block is used to create an anonymous module
+    # @param target [Class,Module,Object] constant or instance to extend
+    # @param mods [Array<Module>] modules to extend or mix into the target. The last argument can be a hash of options to customize the extension
+    # @option :only [Symbol, Array<Symbol>] list of methods to extend onto the target (the module must have these defined)
+    # @option :method [Symbol,String] the method used to apply the module, e.g. :extend (:include)
+    # @option :before [Proc] A hook that is called with the target class before #punch
+    # @option :after [Proc] A hook that is called with the target class after #punch
     def register(*)
       target, *_ = super
       decorators[target] = build_decorator_class(*Ducks[target])

data/lib/duck_puncher/defaults.rb

@@ -24,5 +24,5 @@ ducks = [
 ]
 ducks << [ActiveRecord::Base, DuckPuncher::Ducks::ActiveRecord] if defined?(Rails) && defined?(ActiveRecord) && defined?(ActiveRecord::Base)
 ducks.each do |duck|
-  DuckPuncher.register *duck
+  DuckPuncher.register(*duck)
 end

data/lib/duck_puncher/duck.rb

@@ -5,6 +5,8 @@ module DuckPuncher
     # @param target [String,Class] Class or module to punch
     # @param mod [String,Module] The module that defines the extensions
     # @param [Hash] options to modify the duck #punch method behavior
+    # @option options :only [Symbol, Array<Symbol>] list of methods to extend onto the target (the module must have these defined)
+    # @option options :method [Symbol,String] the method used to apply the module, e.g. :extend (:include)
     # @option options :before [Proc] A hook that is called with the target class before +punch+
     # @option options :after [Proc] A hook that is called with the target class after +punch+
     def initialize(target, mod, options = {})
@@ -14,9 +16,9 @@ module DuckPuncher
     end
 
     # @param [Hash] opts to modify punch
-    # @option options [Class] :target Specifies the class to be punched
-    # @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)
+    # @option options :target [Class] Specifies the class to be punched (overrides @target)
+    # @option options :only [Array,Symbol] Specifies the methods to extend onto the current object
+    # @option options :method [Symbol,String] Specifies if the methods should be included or prepended (:include)
     # @return [Class] The class that was just punched
     def call(opts = {})
       opts = options.merge(opts)

data/lib/duck_puncher/ducks/active_record.rb

@@ -1,50 +1,57 @@
 module DuckPuncher
- module Ducks
-   module ActiveRecord
-     def self.included(base)
-       base.extend(ClassMethods)
-     end
-
-     def associations?
-       associations.present?
-     end
-
-     def associations
-       reflections.select { |key, _| send(key).present? rescue nil }.keys
-     end
-
-     module ClassMethods
-       def except_for(*ids)
-         scoped.where("#{quoted_table_name}.id NOT IN (?)", ids)
-       end
-
-       def since(time)
-         scoped.where("#{quoted_table_name}.created_at > ?", time)
-       end
-
-       alias created_since since
-
-       def before(time)
-         scoped.where("#{quoted_table_name}.created_at < ?", time)
-       end
-
-       def updated_since(time)
-         scoped.where("#{quoted_table_name}.updated_at > ?", time)
-       end
-
-       def between(start_at, end_at)
-         scoped.where("#{quoted_table_name}.created_at BETWEEN ? AND ", start_at, end_at)
-       end
-
-       def latest
-         scoped.order("#{quoted_table_name}.id ASC").last
-       end
-
-       # shim for backwards compatibility with Rails 3
-       def scoped
-         where(nil)
-       end if ::Rails::VERSION::MAJOR > 3
-     end
-   end
- end
+  module Ducks
+    module ActiveRecord
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      def associations?
+        associations.present?
+      end
+
+      def associations
+        results = []
+        refls = send respond_to?(:reflections) ? :reflections : :_reflections
+        refls.each do |key, reflection|
+          begin
+            if reflection.macro.to_s =~ /many/ ? public_send(key).exists? : public_send(key).present?
+              results << key
+            end
+          rescue
+            nil
+          end
+        end
+        results
+      end
+
+      module ClassMethods
+        def except_for(*ids)
+          scoped.where("#{quoted_table_name}.#{primary_key} NOT IN (?)", ids)
+        end
+
+        def since(time)
+          scoped.where("#{quoted_table_name}.created_at > ?", time)
+        end
+
+        alias created_since since
+
+        def before(time)
+          scoped.where("#{quoted_table_name}.created_at < ?", time)
+        end
+
+        def updated_since(time)
+          scoped.where("#{quoted_table_name}.updated_at > ?", time)
+        end
+
+        def between(start_at, end_at)
+          scoped.where("#{quoted_table_name}.created_at BETWEEN ? AND ", start_at, end_at)
+        end
+
+        # shim for backwards compatibility with Rails 3
+        def scoped
+          where(nil)
+        end if ::Rails::VERSION::MAJOR > 3
+      end
+    end
+  end
 end

data/lib/duck_puncher/ducks/method.rb

@@ -41,7 +41,7 @@ module DuckPuncher
 
         def to_s
           if lines.any?
-            lines.join.gsub /^\s{#{find_indent_size(lines.first)}}/, ''
+            lines.join.gsub(/^\s{#{find_indent_size(lines.first)}}/, '')
           else
             ''
           end

data/lib/duck_puncher/ducks/object.rb

@@ -5,10 +5,17 @@ module DuckPuncher
         Marshal.load Marshal.dump self
       end unless defined? clone!
 
-      def require!(file_or_gem, version = '')
+      def require!(file_or_gem, version = '', patience: 1)
         if DuckPuncher::GemInstaller.new.perform(file_or_gem, version)
-          require file_or_gem.tr('-', '/')
+          if require file_or_gem.tr('-', '/')
+            true
+          elsif patience > 0
+            sleep 0.005
+            require!(file_or_gem, version, patience: patience - 1)
+          end
         end
+      rescue ::LoadError
+        require!(file_or_gem, version, patience: patience - 1) unless patience.zero?
       end
 
       # @description Returns a new decorated version of ourself with the punches mixed in (adds ancestors decorators)
@@ -32,15 +39,17 @@ module DuckPuncher
         self
       end
 
-      def track
+      def track!(patience: 1)
         begin
-          require 'object_tracker' || raise(LoadError)
-        rescue LoadError
+          require 'object_tracker' || raise(::LoadError)
+        rescue ::LoadError
           DuckPuncher.(Object, only: :require!) unless respond_to? :require!
           require! 'object_tracker'
         end
-        extend ::ObjectTracker
-        track_all!
+        ::ObjectTracker.(self)
+      rescue ::Exception
+        sleep 0.005
+        track!(patience: patience - 1) unless patience.zero?
       end
     end
   end

data/lib/duck_puncher/gem_installer.rb

@@ -19,7 +19,7 @@ class DuckPuncher::GemInstaller
   def perform(*args)
     require 'rubygems/dependency_installer'
     installer = Gem::DependencyInstaller.new(install_dir: Bundler.bundle_path.to_s, bin_dir: RbConfig::CONFIG['bindir'])
-    installer.install *args.reject(&:empty?)
+    installer.install(*args.reject(&:empty?))
     installer.installed_gems.each do |gem|
       full_load_path = Bundler.bundle_path.join('gems', "#{gem.name}-#{gem.version}", "lib")
       next if $LOAD_PATH.include?(full_load_path.to_s)

data/lib/duck_puncher/json_storage.rb

@@ -7,7 +7,7 @@ module DuckPuncher
     end
 
     def self.write(file_name, key, load_path)
-      FileUtils.mkdir(dir_name) unless File.exists?(dir_name)
+      FileUtils.mkdir(dir_name) unless File.exist?(dir_name)
       data = read(file_name)
       key = key.to_sym
       data[key] ||= {}
@@ -18,7 +18,7 @@ module DuckPuncher
     end
 
     def self.read(file_name)
-      if File.exists?(dir_name.join file_name)
+      if File.exist?(dir_name.join file_name)
         JSON.parse File.read(dir_name.join file_name), symbolize_names: true
       else
         {}

data/lib/duck_puncher/registration.rb

@@ -1,25 +1,37 @@
 module DuckPuncher
   # @note When updating this file please update comment regarding this module in duck_puncher.rb
   module Registration
-    def register(target, *mods)
+    # Register an extension with a target class
+    # When given a block, the block is used to create an anonymous module
+    # @param target [Class,Module,Object] constant or instance to extend
+    # @param mods [Array<Module>] modules to extend or mix into the target. The last argument can be a hash of options to customize the extension
+    # @option :only [Symbol, Array<Symbol>] list of methods to extend onto the target (the module must have these defined)
+    # @option :method [Symbol,String] the method used to apply the module, e.g. :extend (:include)
+    # @option :before [Proc] A hook that is called with the target class before #punch
+    # @option :after [Proc] A hook that is called with the target class after #punch
+    def register(target, *mods, &block)
       options = mods.last.is_a?(Hash) ? mods.pop : {}
+      mods << Module.new(&block) if block
       target = DuckPuncher.lookup_constant target
       Ducks.list[target] = Set.new [] unless Ducks.list.key?(target)
       mods = Array(mods).each do |mod|
-        duck = UniqueDuck.new Duck.new target, mod, options
+        duck = UniqueDuck.new Duck.new(target, mod, options)
         Ducks.list[target] << duck
       end
       [target, *mods]
     end
 
-    def register!(*args)
-      register *args
-      call args.first
+    # Register an extension and then immediately activate it
+    # See #register for accepted arguments
+    def register!(*args, &block)
+      register(*args, &block)
+      call(args.first)
     end
 
-    def deregister(*classes)
-      classes.each &Ducks.list.method(:delete)
-      classes.each &decorators.method(:delete)
+    # Remove extensions for a given class or list of classes
+    def deregister(*targets)
+      targets.each(&Ducks.list.method(:delete))
+      targets.each(&decorators.method(:delete))
     end
   end
 end

data/lib/duck_puncher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_puncher
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 5.0.1
 platform: ruby
 authors:
 - Ryan Buckley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: usable
@@ -28,14 +28,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -83,21 +83,10 @@ dependencies:
 description: Administer precision punches
 email:
 - arebuckley@gmail.com
-executables:
-- console
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
-- CHANGELOG.md
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- bin/console
 - duck_puncher.gemspec
 - lib/duck_puncher.rb
 - lib/duck_puncher/ancestral_hash.rb
@@ -119,23 +108,11 @@ files:
 - lib/duck_puncher/unique_duck.rb
 - lib/duck_puncher/utilities.rb
 - 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
-- test/lib/duck_puncher/module_test.rb
-- test/lib/duck_puncher/numeric_test.rb
-- test/lib/duck_puncher/object_test.rb
-- test/lib/duck_puncher/string_test.rb
-- test/lib/duck_puncher_test.rb
-- test/test_helper.rb
 homepage: https://github.com/ridiculous/duck_puncher
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,21 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.11
+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/duck_test.rb
-- test/lib/duck_puncher/enumerable_test.rb
-- test/lib/duck_puncher/hash_test.rb
-- test/lib/duck_puncher/method_test.rb
-- test/lib/duck_puncher/module_test.rb
-- test/lib/duck_puncher/numeric_test.rb
-- test/lib/duck_puncher/object_test.rb
-- test/lib/duck_puncher/string_test.rb
-- test/lib/duck_puncher_test.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.duck_puncher/
-.byebug_history