dry-auto_inject 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8579a2c57e7e2ea5d76b60e853963cf3709da8148a1a1ae6ee6d46ab53f9310
-  data.tar.gz: 0bc45df84ea3536e220d74d193047852f12140edad060f21bf933783300d8e31
+  metadata.gz: 0fe35e3cc69af3c8553b31c5687b46e86a26a51371390ee7f23e31eff74292c1
+  data.tar.gz: 61eaf8236d91026dd0b510ce5e5ca8f5cb68e5b9bd54781d5fcbb981cbd0d663
 SHA512:
-  metadata.gz: cd8ef6effb12ede3fe3d185dcf2949148571dcd124cbae25ae203f7ae31288f538c1b58f6f93cfad68930d25306e8af935d37452ff946c99a2dfcfe192a8b311
-  data.tar.gz: 163dbc62d91b9e27e079339636b52cca8e552c088fe872e609e88a7e9d19a9c313eedf78342c74e374197973cff69780f708609dd9e49248bc4763e457a48918
+  metadata.gz: 6e63f1dd733ffd29956d7a0d5d8e38137066ab6f84a625c68bb1d1953931863cac3bf775450ecc3b70e727b8cd5f896ef7569fc3414c711e85b6fb25a5936e11
+  data.tar.gz: 32539bb893f836435848a10a0a12646a7dadf8d0ceaf7c3269d7b2c1d5302f96f82032a192622134a6db487ae3bb5d981077dd515a64050bfb801ca4592bb1c9

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.1.0 2025-01-07
+
+
+### Fixed
+
+- Update minimal ruby version to 3.1 (@flash-gordon)
+
+
+[Compare v1.0.1...v1.1.0](https://github.com/dry-rb/dry-auto_inject/compare/v1.0.1...v1.1.0)
+
 ## 1.0.1 2023-02-13
 
 

data/README.md

@@ -1,8 +1,9 @@
 <!--- this file is synced from dry-rb/template-gem project -->
+
 [gem]: https://rubygems.org/gems/dry-auto_inject
 [actions]: https://github.com/dry-rb/dry-auto_inject/actions
 
-# dry-auto_inject [![Gem Version](https://badge.fury.io/rb/dry-auto_inject.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-auto_inject/workflows/ci/badge.svg)][actions]
+# dry-auto_inject [![Gem Version](https://badge.fury.io/rb/dry-auto_inject.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-auto_inject/workflows/CI/badge.svg)][actions]
 
 ## Links
 
@@ -14,7 +15,7 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.7.0`
+* MRI `>= 3.1`
 * jruby `>= 9.4` (not tested on CI)
 
 ## License

data/dry-auto_inject.gemspec

@@ -16,23 +16,21 @@ Gem::Specification.new do |spec|
   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.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-auto_inject.gemspec",
+                           "lib/**/*"]
   spec.bindir        = "bin"
   spec.executables   = []
   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/main/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.metadata["allowed_push_host"]     = "https://rubygems.org"
+  spec.metadata["changelog_uri"]         = "https://github.com/dry-rb/dry-auto_inject/blob/main/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.metadata["rubygems_mfa_required"] = "true"
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "dry-core", "~> 1.0"
-  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_dependency "dry-core", "~> 1.1"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/lib/dry/auto_inject/builder.rb

@@ -18,17 +18,13 @@ module Dry
       end
 
       # @api public
-      def [](*dependency_names)
-        default[*dependency_names]
-      end
+      def [](*dependency_names) = default[*dependency_names]
 
-      def respond_to_missing?(name, _include_private = false)
-        strategies.key?(name)
-      end
+      def respond_to_missing?(name, _ = false) = strategies.key?(name)
 
       private
 
-      def method_missing(name, *args, &block)
+      def method_missing(name, ...)
         if strategies.key?(name)
           Injector.new(container, strategies[name], builder: self)
         else

data/lib/dry/auto_inject/dependency_map.rb

@@ -2,17 +2,17 @@
 
 module Dry
   module AutoInject
-    DuplicateDependencyError = Class.new(StandardError)
-    DependencyNameInvalid = Class.new(StandardError)
+    DuplicateDependencyError = ::Class.new(::StandardError)
+    DependencyNameInvalid = ::Class.new(::StandardError)
 
-    VALID_NAME = /([a-z_][a-zA-Z_0-9]*)$/.freeze
+    VALID_NAME = /([a-z_][a-zA-Z_0-9]*)$/
 
     class DependencyMap
       def initialize(*dependencies)
         @map = {}
 
         dependencies = dependencies.dup
-        aliases = dependencies.last.is_a?(Hash) ? dependencies.pop : {}
+        aliases = dependencies.last.is_a?(::Hash) ? dependencies.pop : {}
 
         dependencies.each do |identifier|
           name = name_for(identifier)
@@ -24,17 +24,13 @@ module Dry
         end
       end
 
-      def inspect
-        @map.inspect
-      end
+      def inspect = @map.inspect
 
       def names
         @names ||= @map.keys
       end
 
-      def to_h
-        @map.dup
-      end
+      def to_h = @map.dup
       alias_method :to_hash, :to_h
 
       private

data/lib/dry/auto_inject/injector.rb

@@ -4,7 +4,7 @@ require "dry/auto_inject/strategies"
 
 module Dry
   module AutoInject
-    class Injector < BasicObject
+    class Injector < ::BasicObject
       # @api private
       attr_reader :container
 
@@ -23,19 +23,13 @@ module Dry
         @builder = builder
       end
 
-      def [](*dependency_names)
-        strategy.new(container, *dependency_names)
-      end
+      def [](*dependency_names) = strategy.new(container, *dependency_names)
 
-      def respond_to_missing?(name, _include_private = false)
-        builder.respond_to?(name)
-      end
+      def respond_to_missing?(name, _ = false) = builder.respond_to?(name)
 
       private
 
-      def method_missing(name, *_args)
-        builder.__send__(name)
-      end
+      def method_missing(name, ...) = builder.__send__(name)
     end
   end
 end

data/lib/dry/auto_inject/method_parameters.rb

@@ -14,7 +14,7 @@ module Dry
       ].freeze
 
       def self.of(obj, name)
-        Enumerator.new do |y|
+        ::Enumerator.new do |y|
           begin
             method = obj.instance_method(name)
           rescue ::NameError # rubocop: disable Lint/SuppressedException
@@ -44,32 +44,24 @@ module Dry
       def sequential_arguments?
         return @sequential_arguments if defined? @sequential_arguments
 
-        @sequential_arguments = parameters.any? { |type, _|
+        @sequential_arguments = parameters.any? do |type, _|
           type == :req || type == :opt
-        }
+        end
       end
 
       def keyword_names
-        @keyword_names ||= parameters.each_with_object(Set.new) { |(type, name), names|
+        @keyword_names ||= parameters.each_with_object(::Set.new) do |(type, name), names|
           names << name if type == :key || type == :keyreq
-        }
+        end
       end
 
-      def keyword?(name)
-        keyword_names.include?(name)
-      end
+      def keyword?(name) = keyword_names.include?(name)
 
-      def empty?
-        parameters.empty?
-      end
+      def empty? = parameters.empty?
 
-      def length
-        parameters.length
-      end
+      def length = parameters.length
 
-      def pass_through?
-        PASS_THROUGH.include?(parameters)
-      end
+      def pass_through? = PASS_THROUGH.include?(parameters)
 
       EMPTY = new([])
     end

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

@@ -9,12 +9,14 @@ module Dry
 
         def define_new
           class_mod.class_exec(container, dependency_map) do |container, dependency_map|
+            deps_with_indices = dependency_map.to_h.values.map.with_index
+
             define_method :new do |*args|
-              deps = dependency_map.to_h.values.map.with_index { |identifier, i|
+              deps = deps_with_indices.map do |identifier, i|
                 args[i] || container[identifier]
-              }
+              end
 
-              super(*deps, *args[deps.size..])
+              super(*deps, *args.drop(deps.size))
             end
           end
         end
@@ -46,11 +48,12 @@ module Dry
         end
 
         def define_initialize_with_splat(super_parameters)
-          super_pass = if super_parameters.splat?
-                         "*args"
-                       else
-                         "*args.take(#{super_parameters.length})"
-                       end
+          super_pass =
+            if super_parameters.splat?
+              "*args"
+            else
+              "*args.take(#{super_parameters.length})"
+            end
 
           assignments = dependency_map.names.map.with_index do |name, idx|
             "@#{name} = args[#{idx}]"

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

@@ -9,12 +9,14 @@ module Dry
 
         def define_new
           class_mod.class_exec(container, dependency_map) do |container, dependency_map|
+            deps_map = dependency_map.to_h
+
             define_method :new do |options = {}|
-              deps = dependency_map.to_h.each_with_object({}) { |(name, identifier), obj|
-                obj[name] = options[name] || container[identifier]
-              }.merge(options)
+              deps = deps_map.transform_values do |identifier|
+                options[identifier] || container[identifier]
+              end
 
-              super(deps)
+              super({**deps, **options})
             end
           end
         end
@@ -24,7 +26,7 @@ module Dry
           super_pass = super_params.empty? ? "" : "options"
           assignments = dependency_map.names.map do |name|
             <<~RUBY
-              unless !options.key?(:#{name}) && instance_variable_defined?(:'@#{name}')
+              if options.key?(:#{name}) || !instance_variable_defined?(:'@#{name}')
                 @#{name} = options[:#{name}]
               end
             RUBY
@@ -33,7 +35,7 @@ module Dry
 
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def initialize(options) # def initialize(options)
-                                    #   unless !options.key?(:dep) && instance_variable_defined?(:@dep)
+                                    #   if options.key?(:dep) || !instance_variable_defined?(:@dep)
               #{body}               #     @dep = options[:dep]
                                     #   end
               super(#{super_pass})  #   super(options)

data/lib/dry/auto_inject/strategies.rb

@@ -11,9 +11,9 @@ module Dry
         register :default, strategy
       end
 
-      register :args, proc { Args }
+      register :args, proc { Strategies::Args }
       register :hash, proc { Strategies::Hash }
-      register_default :kwargs, proc { Kwargs }
+      register_default :kwargs, proc { Strategies::Kwargs }
     end
   end
 end

data/lib/dry/auto_inject/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module AutoInject
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/dry/auto_inject.rb

@@ -6,10 +6,10 @@ require "dry/core"
 module Dry
   module AutoInject
     def self.loader
-      @loader ||= Zeitwerk::Loader.new.tap do |loader|
-        root = File.expand_path("..", __dir__)
+      @loader ||= ::Zeitwerk::Loader.new.tap do |loader|
+        root = ::File.expand_path("..", __dir__)
         loader.tag = "dry-auto_inject"
-        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-auto_inject.rb")
+        loader.inflector = ::Zeitwerk::GemInflector.new("#{root}/dry-auto_inject.rb")
         loader.push_dir(root)
         loader.ignore(
           "#{root}/dry-auto_inject.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-auto_inject
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -38,48 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  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'
-  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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Container-agnostic automatic constructor injection
 email:
 - piotr.solnica@gmail.com
@@ -111,7 +69,8 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-auto_inject/blob/main/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: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,15 +78,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Container-agnostic automatic constructor injection
 test_files: []