dry-auto_inject 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a0ca61974e0289e42b6058415642ce1fdcdd0c7c47cf5466e85222468147b26
-  data.tar.gz: 2a794922b2761a9e6bee7d0be47e0c5861954d7cc47ebb42143c452054e58ea8
+  metadata.gz: fbf423b57383e30d33060a0d0566ca2c9d9c451289f38132974325e5d7cdc2b8
+  data.tar.gz: a35a4d23402b9b5a1b47de1c953c0e089e646334c1ffffcaa4c320539d8eeecd
 SHA512:
-  metadata.gz: 97034d375899475a0bc2116af339470960cea4bbf9ee7cf996295c7648802f62b8b77a91ae143bcdb8be48bc20216221c2cd65966d972ce8cc025ada343971ce
-  data.tar.gz: c112580b36f24515162b2088e48015238e36b68151b6f4b841ea6c4edae5061f5e05a580b408e320ced4f393701ae08034b23caf0b6ef037b9ea973d2ed95ee9
+  metadata.gz: 561d57d6c0aae98c94a6c6121dcd47601178fe37ce3c6077d87f28b85f4da7113112a66efba4c091f50dcbc1983212d2212abacf175845a212064cdbe340a389
+  data.tar.gz: 942e8def2974a6d131180ab66e1895ff2104ba960372513edea233598bb65ca52c612f359fcd33a43f698593aad288aa9012b75e29072c8d35e0a3af0bde87ae

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.9.0 2022-01-26
+
+
+### Changed
+
+- [BREAKING] Support for ... was changed, now constructors with such signature are not considered
+as pass-through because they can forward arguments to another method (flash-gordon in [#78](https://github.com/dry-rb/dry-auto_inject/pull/78))
+
+- [BREAKING] Support for 2.6 was dropped
+
+[Compare v0.8.0...v0.9.0](https://github.com/dry-rb/dry-auto_inject/compare/v0.8.0...v0.9.0)
+
 ## 0.8.0 2021-06-06
 
 
@@ -9,7 +21,7 @@
 
 ### Fixed
 
-- Constructors with kwargs strategy properly forward blocks to super (via #68) (@mintyfresh)
+- Constructors with kwargs strategy properly forward blocks to super (mintyfresh in [#68](https://github.com/dry-rb/dry-auto_inject/pull/68))
 
 ### Changed
 

data/README.md

@@ -22,8 +22,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.6.0`
-* jruby `>= 9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-auto_inject.gemspec

@@ -26,11 +26,7 @@ Gem::Specification.new do |spec|
   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"
 
-  if defined? JRUBY_VERSION
-    spec.required_ruby_version = ">= 2.5.0"
-  else
-    spec.required_ruby_version = ">= 2.6.0"
-  end
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "dry-container", ">= 0.3.4"

data/lib/dry/auto_inject/builder.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
-require 'dry/auto_inject/strategies'
-require 'dry/auto_inject/injector'
+require "dry/auto_inject/strategies"
+require "dry/auto_inject/injector"
 
 module Dry
   module AutoInject
-    class Builder < BasicObject
+    class Builder
       # @api private
       attr_reader :container
 
       # @api private
       attr_reader :strategies
 
+      # This clashes with the hash strategy
+      undef hash
+
       def initialize(container, options = {})
         @container = container
         @strategies = options.fetch(:strategies) { Strategies }
@@ -22,8 +25,8 @@ module Dry
         default[*dependency_names]
       end
 
-      def respond_to?(name, include_private = false)
-        Builder.public_instance_methods.include?(name) || strategies.key?(name)
+      def respond_to_missing?(name, _include_private = false)
+        strategies.key?(name)
       end
 
       private

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)
@@ -41,7 +41,10 @@ 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

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,49 +1,25 @@
 # frozen_string_literal: true
 
-require 'set'
+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
+      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

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'
+                         "*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,18 +38,19 @@ 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
 
         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'
+        def define_initialize(_klass)
+          raise NotImplementedError, "must be implemented by a subclass"
         end
       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

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.8.0'
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-auto_inject
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="