dry-auto_inject 0.4.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7390d5a0b2fd3f12fc33f412a506e355bcb315e6dc90199740b5e3af34d6918b
-  data.tar.gz: e3864b6de7ba096650403e7cec2adb3baa8cc036c933ba9e89f4c27f443fcac4
+  metadata.gz: 3a0ca61974e0289e42b6058415642ce1fdcdd0c7c47cf5466e85222468147b26
+  data.tar.gz: 2a794922b2761a9e6bee7d0be47e0c5861954d7cc47ebb42143c452054e58ea8
 SHA512:
-  metadata.gz: 2f58d872c1a323b9a9a08d2e4615bb3c8d3adb2153ddab83ee14b18b401c5e78018ce9b67accbbd2005759c8456656619e78fd1145535246b99da46b9c101075
-  data.tar.gz: 91b4b889a5c4cdfc7e7876bed582205f7ffaea8fc970f9d7b098f95b9727d326632b474e820698752b8b9a67b8a2374e15cc076ad04e1570c9fe751bfab1a388
+  metadata.gz: 97034d375899475a0bc2116af339470960cea4bbf9ee7cf996295c7648802f62b8b77a91ae143bcdb8be48bc20216221c2cd65966d972ce8cc025ada343971ce
+  data.tar.gz: c112580b36f24515162b2088e48015238e36b68151b6f4b841ea6c4edae5061f5e05a580b408e320ced4f393701ae08034b23caf0b6ef037b9ea973d2ed95ee9

data/CHANGELOG.md

@@ -1,4 +1,103 @@
-# 0.4.6 / 2018-03-27
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 0.8.0 2021-06-06
+
+
+### Added
+
+- Support For `...` passthrough-args (@ytaben)
+
+### Fixed
+
+- Constructors with kwargs strategy properly forward blocks to super (via #68) (@mintyfresh)
+
+### Changed
+
+- [BREAKING] Support for 2.4 and 2.5 was dropped
+
+[Compare v0.7.0...v0.8.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.7.0...v0.8.0)
+
+## 0.7.0 2019-12-28
+
+
+### Fixed
+
+- Keyword warnings issued by Ruby 2.7 in certain contexts (flash-gordon)
+
+### Changed
+
+- [BREAKING] Support for 2.3 was dropped
+
+[Compare v0.6.1...v0.7.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.6.1...v0.7.0)
+
+## 0.6.1 2019-04-16
+
+
+### Fixed
+
+- Allow explicit injection of falsey values (timriley in [#58](https://github.com/dry-rb/dry-auto_inject/pull/58))
+
+
+[Compare v0.6.0...v0.6.1](https://github.com/dry-rb/dry-auto_inject/compare/v0.6.0...v0.6.1)
+
+## 0.6.0 2018-11-29
+
+
+### Added
+
+- Enhanced support for integrating with existing constructors. The kwargs strategy will now pass dependencies up to the next constructor if it accepts an arbitrary number of arguments with `*args`. Note that this change may break existing code though we think it's unlikely to happen. If something doesn't work for you please report and we'll try to sort it out (flash-gordon + timriley in [#48](https://github.com/dry-rb/dry-auto_inject/pull/48))
+
+### Fixed
+
+- A couple of regressions were fixed along the way, see [#46](https://github.com/dry-rb/dry-auto_inject/issues/46) and [#49](https://github.com/dry-rb/dry-auto_inject/issues/49) (flash-gordon + timriley in [#48](https://github.com/dry-rb/dry-auto_inject/pull/48))
+
+### Changed
+
+- [BREAKING] 0.6.0 supports Ruby 2.3 and above. If you're on 2.3 keep in mind its EOL is scheduled at the end of March, 2019
+
+[Compare v0.5.0...v0.6.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.5.0...v0.6.0)
+
+## 0.5.0 2018-11-09
+
+
+### Changed
+
+- Only assign `nil` dependency instance variables from generated `#initialize` if the instance variable has not been previously defined. This improves compatibility with objects initialized in non-conventional ways (see example below) (timriley in [#47](https://github.com/dry-rb/dry-auto_inject/pull/47))
+
+  ```ruby
+  module SomeFramework
+    class Action
+      def self.new(configuration:, **args)
+        # Do some trickery so `#initialize` on subclasses don't need to worry
+        # about handling a configuration kwarg and passing it to super
+        allocate.tap do |obj|
+          obj.instance_variable_set :@configuration, configuration
+          obj.send :initialize, **args
+        end
+      end
+    end
+  end
+
+  module MyApp
+    class Action < SomeFramework::Action
+      # Inject the configuration object, which is passed to
+      # SomeFramework::Action.new but not all the way through to any subsequent
+      # `#initialize` calls
+      include Import[configuration: "web.action.configuration"]
+    end
+
+    class SomeAction < Action
+      # Subclasses of MyApp::Action don't need to concern themselves with
+      # `configuration` dependency
+      include Import["some_repo"]
+    end
+  end
+  ```
+
+[Compare v0.4.6...v0.5.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.4.6...v0.5.0)
+
+## 0.4.6 2018-03-27
+
 
 ### Changed
 
@@ -6,37 +105,48 @@
 
 [Compare v0.4.5...v0.4.6](https://github.com/dry-rb/dry-auto_inject/compare/v0.4.5...v0.4.6)
 
-# 0.4.5 / 2018-01-02
+## 0.4.5 2018-01-02
+
 
 ### Added
 
 - Improved handling of kwargs being passed to #initialize’s super method (timriley)
 
+
 [Compare v0.4.4...v0.4.5](https://github.com/dry-rb/dry-auto_inject/compare/v0.4.4...v0.4.5)
 
-# 0.4.4 / 2017-09-14
+## 0.4.4 2017-09-14
+
 
 ### Added
 
 - Determine name for dependencies by splitting identifiers on any invalid local variable name characters (e.g. "/", "?", "!"), instead of splitting on dots only (raventid in [#39](https://github.com/dry-rb/dry-auto_inject/pull/39))
 
-# 0.4.3 / 2017-05-27
+
+[Compare v0.4.3...v0.4.4](https://github.com/dry-rb/dry-auto_inject/compare/v0.4.3...v0.4.4)
+
+## 0.4.3 2017-05-27
+
 
 ### Added
 
 - Push sequential arguments along with keywords in the kwargs strategy (hbda + vladra in [#32](https://github.com/dry-rb/dry-auto_inject/pull/32))
 
+
 [Compare v0.4.2...v0.4.3](https://github.com/dry-rb/dry-auto_inject/compare/v0.4.2...v0.4.3)
 
-# 0.4.2 / 2016-10-10
+## 0.4.2 2016-10-10
+
 
 ### Fixed
 
 - Fixed issue where injectors for different containers could not be used on different classes in an inheritance hierarchy (timriley in [#31](https://github.com/dry-rb/dry-auto_inject/pull/31))
 
+
 [Compare v0.4.1...v0.4.2](https://github.com/dry-rb/dry-auto_inject/compare/v0.4.1...v0.4.2)
 
-# 0.4.1 / 2016-08-14
+## 0.4.1 2016-08-14
+
 
 ### Changed
 
@@ -44,138 +154,143 @@
 
 [Compare v0.4.0...v0.4.1](https://github.com/dry-rb/dry-auto_inject/compare/v0.4.0...v0.4.1)
 
-# 0.4.0 / 2016-07-26
+## 0.4.0 2016-07-26
+
 
 ### Added
 
 - Support for strategy chaining, which is helpful in opting for alternatives to an application's normal strategy (timriley in [#25](https://github.com/dry-rb/dry-auto_inject/pull/25))
 
-    ```ruby
-    # Define the application's injector with a non-default
-    MyInject = Dry::AutoInject(MyContainer).hash
+  ```ruby
+  # Define the application's injector with a non-default
+  MyInject = Dry::AutoInject(MyContainer).hash
 
-    # Opt for a different strategy in a particular class
-    class MyClass
-      include MyInject.args["foo"]
-    end
+  # Opt for a different strategy in a particular class
+  class MyClass
+    include MyInject.args["foo"]
+  end
 
-    # You can chain as long as you want (silly example to demonstrate the flexibility)
-    class OtherClass
-      include MyInject.args.hash.kwargs.args["foo"]
-    end
-    ```
+  # You can chain as long as you want (silly example to demonstrate the flexibility)
+  class OtherClass
+    include MyInject.args.hash.kwargs.args["foo"]
+  end
+  ```
+
+### Fixed
+
+- Fixed issue with kwargs injectors used at multiple points in a class inheritance heirarchy (flash-gordon in [#27](https://github.com/dry-rb/dry-auto_inject/pull/27))
 
 ### Changed
 
 - Use a `BasicObject`-based environment for the injector builder API instead of the previous `define_singleton_method`-based approach, which had negative performance characteristics (timriley in [#26](https://github.com/dry-rb/dry-auto_inject/pull/26))
 
-### Fixed
+[Compare v0.3.0,...v0.4.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.3.0,...v0.4.0)
 
-- Fixed issue with kwargs injectors used at multiple points in a class inheritance heirarchy (flash-gordon in [#27](https://github.com/dry-rb/dry-auto_inject/pull/27))
-
-[Compare v0.3.0...v0.4.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.3.0...v0.4.0)
+## 0.3.0, 2016-06-02
 
-# 0.3.0, 2016-06-02
 
 ### Added
 
-* Support for new `kwargs` and `hash` injection strategies
+- Support for new `kwargs` and `hash` injection strategies
 
-    These strategies can be accessed via methods on the main builder object:
+  These strategies can be accessed via methods on the main builder object:
 
-    ```ruby
-    MyInject = Dry::AutoInject(my_container)
+  ```ruby
+  MyInject = Dry::AutoInject(my_container)
 
-    class MyClass
-      include MyInject.hash["my_dep"]
-    end
-    ```
-* Support for user-provided injection strategies
+  class MyClass
+    include MyInject.hash["my_dep"]
+  end
+  ```
+- Support for user-provided injection strategies
 
-    All injection strategies are now held in their own `Dry::AutoInject::Strategies` container. You can add register your own strategies to this container, or choose to provide a strategies container of your own:
+  All injection strategies are now held in their own `Dry::AutoInject::Strategies` container. You can add register your own strategies to this container, or choose to provide a strategies container of your own:
 
-    ```ruby
-    class CustomStrategy < Module
-      # Your strategy code goes here :)
-    end
+  ```ruby
+  class CustomStrategy < Module
+    # Your strategy code goes here :)
+  end
 
-    # Registering your own strategy (globally)
-    Dry::AutoInject::Strategies.register :custom, CustomStrategy
+  # Registering your own strategy (globally)
+  Dry::AutoInject::Strategies.register :custom, CustomStrategy
 
-    MyInject = Dry::AutoInject(my_container)
+  MyInject = Dry::AutoInject(my_container)
 
-    class MyClass
-      include MyInject.custom["my_dep"]
-    end
+  class MyClass
+    include MyInject.custom["my_dep"]
+  end
 
-    # Providing your own container (keeping the existing strategies in place)
-    class MyStrategies < Dry::AutoInject::Strategies
-      register :custom, CustomStrategy
-    end
+  # Providing your own container (keeping the existing strategies in place)
+  class MyStrategies < Dry::AutoInject::Strategies
+    register :custom, CustomStrategy
+  end
 
-    MyInject = Dry::AutoInject(my_container, strategies: MyStrategies)
+  MyInject = Dry::AutoInject(my_container, strategies: MyStrategies)
 
-    class MyClass
-      include MyInject.custom["my_dep"]
-    end
+  class MyClass
+    include MyInject.custom["my_dep"]
+  end
 
-    # Proiding a completely separated container
-    class MyStrategies
-      extend Dry::Container::Mixin
-      register :custom, CustomStrategy
-    end
+  # Proiding a completely separated container
+  class MyStrategies
+    extend Dry::Container::Mixin
+    register :custom, CustomStrategy
+  end
 
-    MyInject = Dry::AutoInject(my_container, strategies: MyStrategies)
-
-    class MyClass
-      include MyInject.custom["my_dep"]
-    end
-    ```
-* User-specified aliases for dependencies
+  MyInject = Dry::AutoInject(my_container, strategies: MyStrategies)
 
-    These aliases enable you to specify your own name for dependencies, both for their local readers and their keys in the kwargs- and hash-based initializers. Specify aliases by passing a hash of names:
+  class MyClass
+    include MyInject.custom["my_dep"]
+  end
+  ```
+- User-specified aliases for dependencies
 
-    ```ruby
-    MyInject = Dry::AutoInject(my_container)
+  These aliases enable you to specify your own name for dependencies, both for their local readers and their keys in the kwargs- and hash-based initializers. Specify aliases by passing a hash of names:
 
-    class MyClass
-      include MyInject[my_dep: "some_other.dep"]
+  ```ruby
+  MyInject = Dry::AutoInject(my_container)
 
-      # Refer to the dependency as `my_dep` inside the class
-    end
+  class MyClass
+    include MyInject[my_dep: "some_other.dep"]
 
-    # Pass your own replacements using the `my_dep` initializer key
-    my_obj = MyClass.new(my_dep: something_else)
-    ```
+    # Refer to the dependency as `my_dep` inside the class
+  end
 
-    A mix of both regular and aliased dependencies can also be injected:
+  # Pass your own replacements using the `my_dep` initializer key
+  my_obj = MyClass.new(my_dep: something_else)
+  ```
 
-    ```ruby
-    include MyInject["some_dep", another_dep: "some_other.dep"]
-    ```
+  A mix of both regular and aliased dependencies can also be injected:
 
-* Inspect the `super` method of the including class’s `#initialize` and send it arguments that will match its own arguments list/arity. This allows auto_inject to be used more easily in existing class inheritance heirarchies.
+  ```ruby
+  include MyInject["some_dep", another_dep: "some_other.dep"]
+  ```
+- Inspect the `super` method of the including class’s `#initialize` and send it arguments that will match its own arguments list/arity. This allows auto_inject to be used more easily in existing class inheritance heirarchies.
 
 ### Changed
 
-* `kwargs` is the new default injection strategy
-* Rubinius support is not available for the `kwargs` strategy (see [#18](https://github.com/dry-rb/dry-auto_inject/issues/18))
+- `kwargs` is the new default injection strategy
+- Rubinius support is not available for the `kwargs` strategy (see [#18](https://github.com/dry-rb/dry-auto_inject/issues/18))
+
+[Compare v0.2.0...v0.3.0,](https://github.com/dry-rb/dry-auto_inject/compare/v0.2.0...v0.3.0,)
 
-[Compare v0.2.0...v0.3.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.2.0...v0.3.0)
+## 0.2.0 2016-02-09
 
-# v0.2.0 2016-02-09
 
 ### Added
 
-* Support for hashes as constructor arguments via `Import.hash` interface (solnic)
+- Support for hashes as constructor arguments via `Import.hash` interface (solnic)
+
 
 [Compare v0.1.0...v0.2.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.1.0...v0.2.0)
 
-# v0.1.0 2015-11-12
+## 0.1.0 2015-11-12
 
 Changed interface from `Dry::AutoInject.new { container(some_container) }` to
-`Dry::AutoInject(some_container)`.
 
-# v0.0.1 2015-08-20
+
+[Compare v0.0.1...v0.1.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.0.1...v0.1.0)
+
+## 0.0.1 2015-08-20
 
 First public release \o/

data/LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2015-2016 Piotr Solnica
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2015-2021 dry-rb team
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,57 +1,30 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-auto_inject
-[travis]: https://travis-ci.org/dry-rb/dry-auto_inject
-[codeclimate]: https://codeclimate.com/github/dry-rb/dry-auto_inject
-[coveralls]: https://coveralls.io/r/dry-rb/dry-auto_inject
+[actions]: https://github.com/dry-rb/dry-auto_inject/actions
+[codacy]: https://www.codacy.com/gh/dry-rb/dry-auto_inject
+[chat]: https://dry-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-auto_inject
 
-# dry-auto_inject [![Join the chat at https://gitter.im/dry-rb/chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dry-rb/chat)
+# dry-auto_inject [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/dry-auto_inject.svg)][gem]
-[![Build Status](https://travis-ci.org/dry-rb/dry-auto_inject.svg?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/dry-rb/dry-auto_inject/badges/gpa.svg)][codeclimate]
-[![Test Coverage](https://codeclimate.com/github/dry-rb/dry-auto_inject/badges/coverage.svg)][codeclimate]
+[![CI Status](https://github.com/dry-rb/dry-auto_inject/workflows/ci/badge.svg)][actions]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/d869ec8dc92e46b6a6eafa551f68c3f4)][codacy]
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/d869ec8dc92e46b6a6eafa551f68c3f4)][codacy]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-auto_inject.svg?branch=master)][inchpages]
-![No monkey-patches](https://img.shields.io/badge/monkey--patches-0-brightgreen.svg)
-
-A simple extension which allows you to automatically inject dependencies to your
-object constructors from a configured container.
-
-It does 3 things:
-
-- Defines a constructor which accepts dependencies
-- Defines attribute readers for dependencies
-- Injects dependencies automatically to the constructor with overridden `.new`
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'dry-auto_inject'
-```
-
-And then execute:
-
-```sh
-$ bundle
-```
-
-Or install it yourself as:
-```sh
-$ gem install dry-auto_inject
-```
 
 ## Links
 
-* [Documentation](http://dry-rb.org/gems/dry-auto_inject/)
-
-## Development
+* [User documentation](https://dry-rb.org/gems/dry-auto_inject)
+* [API documentation](http://rubydoc.info/gems/dry-auto_inject)
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+## Supported Ruby versions
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+This library officially supports the following Ruby versions:
 
-## Contributing
+* MRI `>= 2.6.0`
+* jruby `>= 9.2`
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/dry-rb/dry-auto_inject.
+## License
 
+See `LICENSE` file.

data/dry-auto_inject.gemspec

@@ -1,30 +1,41 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/auto_inject/version'
+require "dry/auto_inject/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-auto_inject'
+  spec.name          = "dry-auto_inject"
+  spec.authors       = ["Piotr Solnica"]
+  spec.email         = ["piotr.solnica@gmail.com"]
+  spec.license       = "MIT"
   spec.version       = Dry::AutoInject::VERSION.dup
-  spec.authors       = ['Piotr Solnica']
-  spec.email         = ['piotr.solnica@gmail.com']
-  spec.license       = 'MIT'
 
-  spec.summary       = 'Container-agnostic automatic constructor injection'
-  spec.homepage      = 'https://github.com/dryrb/dry-auto_inject'
+  spec.summary       = "Container-agnostic automatic constructor injection"
+  spec.description   = spec.summary
+  spec.homepage      = "https://dry-rb.org/gems/dry-auto_inject"
+  spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-auto_inject.gemspec", "lib/**/*"]
+  spec.bindir        = "bin"
+  spec.executables   = []
+  spec.require_paths = ["lib"]
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-auto_inject/blob/master/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-auto_inject"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-auto_inject/issues"
 
-  spec.required_ruby_version = '>= 2.1.0'
+  if defined? JRUBY_VERSION
+    spec.required_ruby_version = ">= 2.5.0"
+  else
+    spec.required_ruby_version = ">= 2.6.0"
+  end
 
-  spec.add_runtime_dependency 'dry-container', '>= 0.3.4'
+  # to update dependencies edit project.yml
+  spec.add_runtime_dependency "dry-container", ">= 0.3.4"
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/dry-auto_inject.rb

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

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
@@ -43,12 +43,4 @@ module Dry
   def self.AutoInject(container, options = {})
     AutoInject::Builder.new(container, options)
   end
-
-  module AutoInject
-    # @api private
-    def self.super_method(klass, method)
-      method = klass.instance_method(method)
-      method unless method.owner.equal?(klass)
-    end
-  end
 end

data/lib/dry/auto_inject/dependency_map.rb

@@ -29,11 +29,11 @@ module Dry
       end
 
       def names
-        @map.keys
+        @names ||= @map.keys
       end
 
       def to_h
-        @map.dup.to_h
+        @map.dup
       end
       alias_method :to_hash, :to_h
 
@@ -42,12 +42,14 @@ 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
+
         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/method_parameters.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'set'
+
+module Dry
+  module AutoInject
+    # @api private
+    class MethodParameters
+      PASS_THROUGH = [[%i[rest]], [%i[rest *], %i[block &]]]
+
+      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
+          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
+          end
+        end
+      end
+
+      attr_reader :parameters
+
+      def initialize(parameters)
+        @parameters = parameters
+      end
+
+      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
+        }
+      end
+
+      def keyword_names
+        @keyword_names ||= parameters.each_with_object(Set.new) { |(type, name), names|
+          names << name if type == :key || type == :keyreq
+        }
+      end
+
+      def keyword?(name)
+        keyword_names.include?(name)
+      end
+
+      def empty?
+        parameters.empty?
+      end
+
+      def length
+        parameters.length
+      end
+
+      def pass_through?
+        PASS_THROUGH.include?(parameters)
+      end
+
+      EMPTY = new([])
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/auto_inject/strategies/constructor'
+require 'dry/auto_inject/method_parameters'
 
 module Dry
   module AutoInject
@@ -22,12 +23,15 @@ module Dry
         end
 
         def define_initialize(klass)
-          super_method = find_super(klass, :initialize)
+          super_parameters = MethodParameters.of(klass, :initialize).each do |ps|
+            # Look upwards past `def foo(*)` methods until we get an explicit list of parameters
+            break ps unless ps.pass_through?
+          end
 
-          if super_method.nil? || super_method.parameters.empty?
+          if super_parameters.empty?
             define_initialize_with_params
           else
-            define_initialize_with_splat(super_method)
+            define_initialize_with_splat(super_parameters)
           end
         end
 
@@ -42,31 +46,20 @@ module Dry
           RUBY
         end
 
-        def define_initialize_with_splat(super_method)
-          super_params = if super_method.parameters.any? { |type, _| type == :rest }
-            '*args'
-          else
-            "*args[0..#{super_method.parameters.length - 1}]"
+        def define_initialize_with_splat(super_parameters)
+          super_pass = if super_parameters.splat?
+                         '*args'
+                       else
+                         "*args.take(#{super_parameters.length})"
           end
 
           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_params})
+              super(#{super_pass})
             end
           RUBY
         end
-
-        def find_super(klass, method_name)
-          super_method = Dry::AutoInject.super_method(klass, method_name)
-
-          # Look upwards past `def foo(*)` methods until we get an explicit list of parameters
-          while super_method && super_method.parameters == [[:rest]]
-            super_method = Dry::AutoInject.super_method(super_method.owner, :initialize)
-          end
-
-          super_method
-        end
       end
 
       register :args, Args

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

@@ -44,11 +44,11 @@ module Dry
         end
 
         def define_new
-          raise NotImplementedError, "must be implemented by a subclass"
+          raise NotImplementedError, 'must be implemented by a subclass'
         end
 
         def define_initialize(klass)
-          raise NotImplementedError, "must be implemented by a subclass"
+          raise NotImplementedError, 'must be implemented by a subclass'
         end
       end
     end

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

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

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/auto_inject/strategies/constructor'
+require 'dry/auto_inject/method_parameters'
 
 module Dry
   module AutoInject
@@ -11,69 +12,91 @@ module Dry
 
         def define_new
           class_mod.class_exec(container, dependency_map) do |container, dependency_map|
-            map = dependency_map.to_h.to_a
+            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_method = Dry::AutoInject.super_method(klass, :initialize)
+          super_parameters = MethodParameters.of(klass, :initialize).each do |ps|
+            # Look upwards past `def foo(*)` and `def foo(...)` methods
+            # until we get an explicit list of parameters
+            break ps unless ps.pass_through?
+          end
 
-          if super_method.nil? || super_method.parameters.empty?
-            define_initialize_with_keywords
+          if super_parameters.splat? || super_parameters.sequential_arguments?
+            define_initialize_with_splat(super_parameters)
           else
-            define_initialize_with_splat(super_method)
+            define_initialize_with_keywords(super_parameters)
           end
 
           self
         end
 
-        def define_initialize_with_keywords
-          initialize_params = dependency_map.names.map { |name| "#{name}: nil" }.join(", ")
-
-          instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def initialize(#{initialize_params})
-              #{dependency_map.names.map { |name| "@#{name} = #{name}" }.join("\n")}
-              super()
-            end
-          RUBY
+        def define_initialize_with_keywords(super_parameters)
+          assign_dependencies = method(:assign_dependencies)
+          slice_kwargs = method(:slice_kwargs)
 
-          self
-        end
+          instance_mod.class_exec do
+            define_method :initialize do |**kwargs, &block|
+              assign_dependencies.(kwargs, self)
 
-        def define_initialize_with_splat(super_method)
-          super_kwarg_names = super_method.parameters.each_with_object([]) { |(type, name), names|
-            names << name if [:key, :keyreq].include?(type)
-          }
+              super_kwargs = slice_kwargs.(kwargs, super_parameters)
 
-          instance_mod.class_exec(dependency_map) do |dependency_map|
-            define_method :initialize do |*args, **kwargs|
-              dependency_map.names.each do |name|
-                instance_variable_set :"@#{name}", kwargs[name]
+              if super_kwargs.any?
+                super(**super_kwargs, &block)
+              else
+                super(&block)
               end
+            end
+          end
+        end
 
-              super_kwargs = kwargs.each_with_object({}) { |(key, _), hsh|
-                if !dependency_map.names.include?(key) || super_kwarg_names.include?(key)
-                  hsh[key] = kwargs[key]
-                end
-              }
+        def define_initialize_with_splat(super_parameters)
+          assign_dependencies = method(:assign_dependencies)
+          slice_kwargs = method(:slice_kwargs)
 
-              if super_kwargs.any?
-                super(*args, **super_kwargs)
+          instance_mod.class_exec do
+            define_method :initialize do |*args, **kwargs, &block|
+              assign_dependencies.(kwargs, self)
+
+              if super_parameters.splat?
+                super(*args, **kwargs, &block)
               else
-                super(*args)
+                super_kwargs = slice_kwargs.(kwargs, super_parameters)
+
+                if super_kwargs.any?
+                  super(*args, **super_kwargs, &block)
+                else
+                  super(*args, &block)
+                end
               end
             end
           end
+        end
 
-          self
+        def assign_dependencies(kwargs, destination)
+          dependency_map.names.each do |name|
+            # Assign instance variables, but only if the ivar is not
+            # previously defined (this improves compatibility with objects
+            # initialized in unconventional ways)
+            if kwargs.key?(name) || !destination.instance_variable_defined?(:"@#{name}")
+              destination.instance_variable_set :"@#{name}", kwargs[name]
+            end
+          end
+        end
+
+        def slice_kwargs(kwargs, super_parameters)
+          kwargs.select do |key|
+            !dependency_map.names.include?(key) || super_parameters.keyword?(key)
+          end
         end
       end
 

data/lib/dry/auto_inject/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module AutoInject
-    VERSION = '0.4.6'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-auto_inject
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -66,44 +66,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+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
 - lib/dry/auto_inject/builder.rb
 - lib/dry/auto_inject/dependency_map.rb
 - lib/dry/auto_inject/injector.rb
+- lib/dry/auto_inject/method_parameters.rb
 - lib/dry/auto_inject/strategies.rb
 - lib/dry/auto_inject/strategies/args.rb
 - lib/dry/auto_inject/strategies/constructor.rb
 - 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: {}
+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:
@@ -112,15 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Container-agnostic automatic constructor injection

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.0
-  - 2.4.3
-  - 2.3.6
-  - jruby-9.1.10.0
-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).

data/Gemfile

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in dry-auto_inject.gemspec
-gemspec
-
-group :test do
-  gem "simplecov"
-  gem "codeclimate-test-reporter", require: nil
-end
-
-group :tools do
-  gem 'byebug', platforms: :mri
-  gem 'pry'
-end

data/Rakefile

@@ -1,14 +0,0 @@
-#!/usr/bin/env rake
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-task default: :spec
-
-desc 'Run all specs in spec directory'
-RSpec::Core::RakeTask.new(:spec)

data/bin/console

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'dry-auto_inject'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-require 'pry'
-Pry.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/rakelib/rubocop.rake

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-begin
-  require 'rubocop/rake_task'
-
-  Rake::Task[:default].enhance [:rubocop]
-
-  RuboCop::RakeTask.new do |task|
-    task.options << '--display-cop-names'
-  end
-
-  namespace :rubocop do
-    desc 'Generate a configuration file acting as a TODO list.'
-    task :auto_gen_config do
-      exec 'bundle exec rubocop --auto-gen-config'
-    end
-  end
-
-rescue LoadError
-end