dry-auto_inject 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7390d5a0b2fd3f12fc33f412a506e355bcb315e6dc90199740b5e3af34d6918b
-  data.tar.gz: e3864b6de7ba096650403e7cec2adb3baa8cc036c933ba9e89f4c27f443fcac4
+  metadata.gz: 46f037cd532619db63a95ff30c43c93b1146b4dbb8bccd2b803100d8fef8dff5
+  data.tar.gz: 8e9c7512c0ac99c16b8aa7a5308a241e1714b5239923f4a9876aaa3d9e47abc9
 SHA512:
-  metadata.gz: 2f58d872c1a323b9a9a08d2e4615bb3c8d3adb2153ddab83ee14b18b401c5e78018ce9b67accbbd2005759c8456656619e78fd1145535246b99da46b9c101075
-  data.tar.gz: 91b4b889a5c4cdfc7e7876bed582205f7ffaea8fc970f9d7b098f95b9727d326632b474e820698752b8b9a67b8a2374e15cc076ad04e1570c9fe751bfab1a388
+  metadata.gz: 8a1f3de5df6540384bb87e915e471d0e8470b7848ac0cf29759e2ac9985d428885d733d1376185a2cfcc6d2afdcad7e2567a82dd2d07b9be7cecaeb5d22c740e
+  data.tar.gz: 07cacefa01e1802cad3290ce9ceee9a9e7611414bcb02593753844bc00ec7e05ff89f990454dc22e4d97cbbcc5f1fef93c96bf1a016689fa9ff4dd8d7226efe3

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+# 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

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

@@ -27,7 +27,7 @@ module Dry
 
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def initialize(options)
-              #{dependency_map.names.map { |name| "@#{name} = options[:#{name}]" }.join("\n")}
+              #{dependency_map.names.map { |name| "@#{name} = options[:#{name}] unless !options.key?(#{name}) && instance_variable_defined?(:'@#{name}')" }.join("\n")}
               super(#{super_params})
             end
           RUBY

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

@@ -40,7 +40,7 @@ module Dry
 
           instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def initialize(#{initialize_params})
-              #{dependency_map.names.map { |name| "@#{name} = #{name}" }.join("\n")}
+              #{dependency_map.names.map { |name| "@#{name} = #{name} unless #{name}.nil? && instance_variable_defined?(:'@#{name}')" }.join("\n")}
               super()
             end
           RUBY
@@ -56,7 +56,10 @@ module Dry
           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]
+                # Assign instance variables, but only if the ivar is not
+                # previously defined (this improves compatibility with objects
+                # initialized in unconventional ways)
+                instance_variable_set :"@#{name}", kwargs[name] unless kwargs[name].nil? && instance_variable_defined?(:"@#{name}")
               end
 
               super_kwargs = kwargs.each_with_object({}) { |(key, _), hsh|

data/lib/dry/auto_inject/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module AutoInject
-    VERSION = '0.4.6'
+    VERSION = '0.5.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.5.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Container-agnostic automatic constructor injection