dry-auto_inject 0.6.0 → 0.9.0

data/lib/dry/auto_inject/dependency_map.rb

@@ -5,7 +5,7 @@ module Dry
     DuplicateDependencyError = Class.new(StandardError)
     DependencyNameInvalid = Class.new(StandardError)
 
-    VALID_NAME = /([a-z_][a-zA-Z_0-9]*)$/
+    VALID_NAME = /([a-z_][a-zA-Z_0-9]*)$/.freeze
 
     class DependencyMap
       def initialize(*dependencies)
@@ -29,7 +29,7 @@ module Dry
       end
 
       def names
-        @name ||= @map.keys
+        @names ||= @map.keys
       end
 
       def to_h
@@ -41,13 +41,18 @@ module Dry
 
       def name_for(identifier)
         matched = VALID_NAME.match(identifier.to_s)
-        raise DependencyNameInvalid, "name +#{identifier}+ is not a valid Ruby identifier" unless matched
+        unless matched
+          raise DependencyNameInvalid,
+                "name +#{identifier}+ is not a valid Ruby identifier"
+        end
+
         matched[0]
       end
 
       def add_dependency(name, identifier)
         name = name.to_sym
         raise DuplicateDependencyError, "name +#{name}+ is already used" if @map.key?(name)
+
         @map[name] = identifier
       end
     end

data/lib/dry/auto_inject/injector.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/strategies'
+require "dry/auto_inject/strategies"
 
 module Dry
   module AutoInject
@@ -14,6 +14,8 @@ module Dry
       # @api private
       attr_reader :builder
 
+      define_method(:respond_to?, ::Kernel.instance_method(:respond_to?))
+
       # @api private
       def initialize(container, strategy, builder:)
         @container = container
@@ -25,13 +27,13 @@ module Dry
         strategy.new(container, *dependency_names)
       end
 
-      def respond_to?(name, include_private = false)
-        Injector.instance_methods.include?(name) || builder.respond_to?(name)
+      def respond_to_missing?(name, _include_private = false)
+        builder.respond_to?(name)
       end
 
       private
 
-      def method_missing(name, *args, &block)
+      def method_missing(name, *_args)
         builder.__send__(name)
       end
     end

data/lib/dry/auto_inject/method_parameters.rb

@@ -1,47 +1,25 @@
-require 'set'
+# frozen_string_literal: true
+
+require "set"
 
 module Dry
   module AutoInject
     # @api private
     class MethodParameters
-      PASS_THROUGH = [[:rest]]
-
-      if RUBY_VERSION >= '2.4.4.' && !defined? JRUBY_VERSION
-        def self.of(obj, name)
-          Enumerator.new do |y|
-            begin
-              method = obj.instance_method(name)
-            rescue NameError
-            end
-
-            loop do
-              break if method.nil?
-
-              y << MethodParameters.new(method.parameters)
-              method = method.super_method
-            end
+      PASS_THROUGH = [[%i[rest]], [%i[rest], %i[keyrest]]].freeze
+
+      def self.of(obj, name)
+        Enumerator.new do |y|
+          begin
+            method = obj.instance_method(name)
+          rescue ::NameError # rubocop: disable Lint/SuppressedException
           end
-        end
-      else
-        # see https://bugs.ruby-lang.org/issues/13973
-        def self.of(obj, name)
-          Enumerator.new do |y|
-            ancestors = obj.ancestors
-
-            loop do
-              klass = ancestors.shift
-              break if klass.nil?
-
-              begin
-                method = klass.instance_method(name)
-
-                next unless method.owner.equal?(klass)
-              rescue NameError
-                next
-              end
-
-              y << MethodParameters.new(method.parameters)
-            end
+
+          loop do
+            break if method.nil?
+
+            y << MethodParameters.new(method.parameters)
+            method = method.super_method
           end
         end
       end
@@ -54,11 +32,13 @@ module Dry
 
       def splat?
         return @splat if defined? @splat
+
         @splat = parameters.any? { |type, _| type == :rest }
       end
 
       def sequential_arguments?
         return @sequential_arguments if defined? @sequential_arguments
+
         @sequential_arguments = parameters.any? { |type, _|
           type == :req || type == :opt
         }
@@ -83,7 +63,7 @@ module Dry
       end
 
       def pass_through?
-        parameters.eql?(PASS_THROUGH)
+        PASS_THROUGH.include?(parameters)
       end
 
       EMPTY = new([])

data/lib/dry/auto_inject/strategies/args.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/strategies/constructor'
-require 'dry/auto_inject/method_parameters'
+require "dry/auto_inject/strategies/constructor"
+require "dry/auto_inject/method_parameters"
 
 module Dry
   module AutoInject
@@ -17,7 +17,7 @@ module Dry
                 args[i] || container[identifier]
               }
 
-              super(*deps, *args[deps.size..-1])
+              super(*deps, *args[deps.size..])
             end
           end
         end
@@ -36,28 +36,35 @@ module Dry
         end
 
         def define_initialize_with_params
-          initialize_args = dependency_map.names.join(', ')
+          initialize_args = dependency_map.names.join(", ")
+
+          assignment = dependency_map.names.map { "@#{_1} = #{_1}" }.join("\n")
 
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def initialize(#{initialize_args})
-              #{dependency_map.names.map { |name| "@#{name} = #{name}" }.join("\n")}
-              super()
-            end
+            def initialize(#{initialize_args})  # def initialize(dep)
+              #{assignment}                     #   @dep = dep
+              super()                           #   super()
+            end                                 # end
           RUBY
         end
 
         def define_initialize_with_splat(super_parameters)
           super_pass = if super_parameters.splat?
-            '*args'
-          else
-            "*args.take(#{super_parameters.length})"
+                         "*args"
+                       else
+                         "*args.take(#{super_parameters.length})"
+                       end
+
+          assignments = dependency_map.names.map.with_index do |name, idx|
+            "@#{name} = args[#{idx}]"
           end
+          body = assignments.join("\n")
 
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def initialize(*args)
-              #{dependency_map.names.map.with_index { |name, i| "@#{name} = args[#{i}]" }.join("\n")}
-              super(#{super_pass})
-            end
+            def initialize(*args)    # def initialize(*args)
+              #{body}                #   @dep = args[0]
+              super(#{super_pass})   #   super(*args)
+            end                      # end
           RUBY
         end
       end

data/lib/dry/auto_inject/strategies/constructor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/dependency_map'
+require "dry/auto_inject/dependency_map"
 
 module Dry
   module AutoInject
@@ -15,6 +15,7 @@ module Dry
         attr_reader :class_mod
 
         def initialize(container, *dependency_names)
+          super()
           @container = container
           @dependency_map = DependencyMap.new(*dependency_names)
           @instance_mod = InstanceMethods.new
@@ -37,8 +38,9 @@ module Dry
         private
 
         def define_readers
+          readers = dependency_map.names.map { ":#{_1}" }
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            attr_reader #{dependency_map.names.map { |name| ":#{name}" }.join(', ')}
+            attr_reader #{readers.join(", ")} # attr_reader :dep1, :dep2
           RUBY
           self
         end
@@ -47,7 +49,7 @@ module Dry
           raise NotImplementedError, "must be implemented by a subclass"
         end
 
-        def define_initialize(klass)
+        def define_initialize(_klass)
           raise NotImplementedError, "must be implemented by a subclass"
         end
       end

data/lib/dry/auto_inject/strategies/hash.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/strategies/constructor'
-require 'dry/auto_inject/method_parameters'
+require "dry/auto_inject/strategies/constructor"
+require "dry/auto_inject/method_parameters"
 
 module Dry
   module AutoInject
@@ -24,13 +24,23 @@ module Dry
 
         def define_initialize(klass)
           super_params = MethodParameters.of(klass, :initialize).first
-          super_pass = super_params.empty? ? '' : 'options'
+          super_pass = super_params.empty? ? "" : "options"
+          assignments = dependency_map.names.map do |name|
+            <<~RUBY
+              unless !options.key?(:#{name}) && instance_variable_defined?(:'@#{name}')
+                @#{name} = options[:#{name}]
+              end
+            RUBY
+          end
+          body = assignments.join("\n")
 
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def initialize(options)
-              #{dependency_map.names.map { |name| "@#{name} = options[:#{name}] unless !options.key?(#{name}) && instance_variable_defined?(:'@#{name}')" }.join("\n")}
-              super(#{super_pass})
-            end
+            def initialize(options) # def initialize(options)
+                                    #   unless !options.key?(:dep) && instance_variable_defined?(:@dep)
+              #{body}               #     @dep = options[:dep]
+                                    #   end
+              super(#{super_pass})  #   super(options)
+            end                     # end
           RUBY
         end
       end

data/lib/dry/auto_inject/strategies/kwargs.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/strategies/constructor'
-require 'dry/auto_inject/method_parameters'
+require "dry/auto_inject/strategies/constructor"
+require "dry/auto_inject/method_parameters"
 
 module Dry
   module AutoInject
@@ -14,19 +14,20 @@ module Dry
           class_mod.class_exec(container, dependency_map) do |container, dependency_map|
             map = dependency_map.to_h
 
-            define_method :new do |*args, **kwargs|
+            define_method :new do |*args, **kwargs, &block|
               map.each do |name, identifier|
-                kwargs[name] ||= container[identifier]
+                kwargs[name] = container[identifier] unless kwargs.key?(name)
               end
 
-              super(*args, **kwargs)
+              super(*args, **kwargs, &block)
             end
           end
         end
 
         def define_initialize(klass)
           super_parameters = MethodParameters.of(klass, :initialize).each do |ps|
-            # Look upwards past `def foo(*)` methods until we get an explicit list of parameters
+            # Look upwards past `def foo(*)` and `def foo(...)` methods
+            # until we get an explicit list of parameters
             break ps unless ps.pass_through?
           end
 
@@ -44,15 +45,15 @@ module Dry
           slice_kwargs = method(:slice_kwargs)
 
           instance_mod.class_exec do
-            define_method :initialize do |**kwargs|
+            define_method :initialize do |**kwargs, &block|
               assign_dependencies.(kwargs, self)
 
               super_kwargs = slice_kwargs.(kwargs, super_parameters)
 
               if super_kwargs.any?
-                super(super_kwargs)
+                super(**super_kwargs, &block)
               else
-                super()
+                super(&block)
               end
             end
           end
@@ -63,18 +64,18 @@ module Dry
           slice_kwargs = method(:slice_kwargs)
 
           instance_mod.class_exec do
-            define_method :initialize do |*args, **kwargs|
+            define_method :initialize do |*args, **kwargs, &block|
               assign_dependencies.(kwargs, self)
 
               if super_parameters.splat?
-                super(*args, kwargs)
+                super(*args, **kwargs, &block)
               else
                 super_kwargs = slice_kwargs.(kwargs, super_parameters)
 
                 if super_kwargs.any?
-                  super(*args, super_kwargs)
+                  super(*args, **super_kwargs, &block)
                 else
-                  super(*args)
+                  super(*args, &block)
                 end
               end
             end

data/lib/dry/auto_inject/strategies.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry-container'
+require "dry-container"
 
 module Dry
   module AutoInject
@@ -16,6 +16,6 @@ module Dry
   end
 end
 
-require 'dry/auto_inject/strategies/args'
-require 'dry/auto_inject/strategies/hash'
-require 'dry/auto_inject/strategies/kwargs'
+require "dry/auto_inject/strategies/args"
+require "dry/auto_inject/strategies/hash"
+require "dry/auto_inject/strategies/kwargs"

data/lib/dry/auto_inject/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module AutoInject
-    VERSION = '0.6.0'
+    VERSION = "0.9.0"
   end
 end

data/lib/dry/auto_inject.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/builder'
+require "dry/auto_inject/builder"
 
 module Dry
   # Configure an auto-injection module

data/lib/dry-auto_inject.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject'
+require "dry/auto_inject"

metadata

@@ -1,92 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: dry-auto_inject
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire:
-bindir: exe
+autorequire: 
+bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
-  name: dry-container
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
-  name: rspec
-  prerelease: false
+        version: '0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
-description:
+        version: '0'
+description: Container-agnostic automatic constructor injection
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - dry-auto_inject.gemspec
 - lib/dry-auto_inject.rb
 - lib/dry/auto_inject.rb
@@ -100,12 +89,15 @@ files:
 - lib/dry/auto_inject/strategies/hash.rb
 - lib/dry/auto_inject/strategies/kwargs.rb
 - lib/dry/auto_inject/version.rb
-- rakelib/rubocop.rake
-homepage: https://github.com/dryrb/dry-auto_inject
+homepage: https://dry-rb.org/gems/dry-auto_inject
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-auto_inject/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-auto_inject
+  bug_tracker_uri: https://github.com/dry-rb/dry-auto_inject/issues
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -113,16 +105,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Container-agnostic automatic constructor injection
 test_files: []

data/.codeclimate.yml

@@ -1,6 +0,0 @@
-engines:
-  rubocop:
-    enabled: true
-ratings:
-  paths:
-    - lib/**

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/vendor/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.rspec

@@ -1,2 +0,0 @@
---color
---require spec_helper

data/.rubocop.yml

@@ -1,19 +0,0 @@
-# Generated by `rubocop --auto-gen-config`
-inherit_from: .rubocop_todo.yml
-
-Metrics/LineLength:
-  Max: 110
-
-Lint/HandleExceptions:
-  Exclude:
-    - rakelib/*.rake
-
-Style/LambdaCall:
-  EnforcedStyle: braces
-
-Style/Documentation:
-  Enabled: false
-
-Style/FileName:
-  Exclude:
-    - lib/dry-pipeline.rb

data/.rubocop_todo.yml

@@ -1,6 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-08-19 22:11:28 +0100 using RuboCop version 0.32.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-cache: bundler
-bundler_args: --without tools
-script:
-  - bundle exec rake
-after_success:
-  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
-rvm:
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
-  - jruby-9.2.4.1
-env:
-  global:
-    - COVERAGE=true
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/19098b4253a72c9796db
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false

data/CONTRIBUTING.md

@@ -1,29 +0,0 @@
-# Issue Guidelines
-
-## Reporting bugs
-
-If you found a bug, report an issue and describe what's the expected behavior versus what actually happens. If the bug causes a crash, attach a full backtrace. If possible, a reproduction script showing the problem is highly appreciated.
-
-## Reporting feature requests
-
-Report a feature request **only after discussing it first on [discuss.dry-rb.org](https://discuss.dry-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discussion thread, and instead summarize what was discussed.
-
-## Reporting questions, support requests, ideas, concerns etc.
-
-**PLEASE DON'T** - use [discuss.dry-rb.org](http://discuss.dry-rb.org) instead.
-
-# Pull Request Guidelines
-
-A Pull Request will only be accepted if it addresses a specific issue that was reported previously, or fixes typos, mistakes in documentation etc.
-
-Other requirements:
-
-1) Do not open a pull request if you can't provide tests along with it. If you have problems writing tests, ask for help in the related issue.
-2) Follow the style conventions of the surrounding code. In most cases, this is standard ruby style.
-3) Add API documentation if it's a new feature
-4) Update API documentation if it changes an existing feature
-5) Bonus points for sending a PR to [github.com/dry-rb/dry-rb.org](github.com/dry-rb/dry-rb.org) which updates user documentation and guides
-
-# Asking for help
-
-If these guidelines aren't helpful, and you're stuck, please post a message on [discuss.dry-rb.org](https://discuss.dry-rb.org).