dry-auto_inject 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca52f52195a91514c09f9a3e5c1e0a09d295eedb
-  data.tar.gz: c9202a9e5de781177a5c2415c95959bf67c1d710
+  metadata.gz: 6f9eb1effcee4d7bd3a8741b9d66b736ec2a1254
+  data.tar.gz: f8401c55f988c919a09033e510fd58566bd76484
 SHA512:
-  metadata.gz: d0f4d22af2854ee5546068ba0d1035c418adc4eaddde28812b5fd1063467d62169a4a42dff2999974bc25e09a2eca67cd48d775a4ec99b00fc0a85c260f2d1fb
-  data.tar.gz: ba86065fc3bda9feda3623469ff01609b686dcbb383fb37dfb5bc5b17fb0c88ed625a7c41c58e708509b17ad4346980a995754f2592b1030acc37e51924ec356
+  metadata.gz: 6c6eea940b2c7c57137a737e3d66abd763ec2ff4e51725e7386bf15020efabe6c2485e412f0088fe54dccc16114914d0bada89d3a5a1c55e11da73f211b155e5
+  data.tar.gz: aac93975a6bbcd756108a72310d7f8995430bae11a97c867a3073e1503e95012cd177187d4aff0b4a9a4db6c988a3b21eb4f26074261eda5a0fdc450e56dacdb

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 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))
+
+# 0.4.1 / 2016-08-14
+
+### Changed
+
+- Loosened version dependency on dry-container (AMHOL)
+
 # 0.4.0 / 2016-07-26
 
 ### Added

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

@@ -7,14 +7,16 @@ module Dry
       class Args < Constructor
         private
 
-        def define_new(klass)
-          klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def self.new(*args)
-              names = #{dependency_map.inspect}
-              deps = names.values.map.with_index { |identifier, i| args[i] || container[identifier] }
+        def define_new
+          class_mod.class_exec(container, dependency_map) do |container, dependency_map|
+            define_method :new do |*args|
+              deps = dependency_map.to_h.values.map.with_index { |identifier, i|
+                args[i] || container[identifier]
+              }
+
               super(*deps, *args[deps.size..-1])
             end
-          RUBY
+          end
         end
 
         def define_initialize(klass)

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

@@ -4,13 +4,7 @@ module Dry
   module AutoInject
     class Strategies
       class Constructor < Module
-        ClassMethods = Class.new(Module) do
-          def initialize(container)
-            super()
-            define_method(:container) { container }
-          end
-        end
-
+        ClassMethods = Class.new(Module)
         InstanceMethods = Class.new(Module)
 
         attr_reader :container
@@ -22,14 +16,14 @@ module Dry
           @container = container
           @dependency_map = DependencyMap.new(*dependency_names)
           @instance_mod = InstanceMethods.new
-          @class_mod = ClassMethods.new(container)
+          @class_mod = ClassMethods.new
         end
 
         # @api private
         def included(klass)
           define_readers
 
-          define_new(klass)
+          define_new
           define_initialize(klass)
 
           klass.send(:include, instance_mod)
@@ -47,7 +41,7 @@ module Dry
           self
         end
 
-        def define_new(klass)
+        def define_new
           raise NotImplementedError, "must be implemented by a subclass"
         end
 

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

@@ -7,16 +7,16 @@ module Dry
       class Hash < Constructor
         private
 
-        def define_new(_klass)
-          class_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def new(options = {})
-              names = #{dependency_map.inspect}
-              deps = names.each_with_object({}) { |(name, identifier), obj|
+        def define_new
+          class_mod.class_exec(container, dependency_map) do |container, dependency_map|
+            define_method :new do |options = {}|
+              deps = dependency_map.to_h.each_with_object({}) { |(name, identifier), obj|
                 obj[name] = options[name] || container[identifier]
               }.merge(options)
+
               super(deps)
             end
-          RUBY
+          end
         end
 
         def define_initialize(klass)

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

@@ -7,16 +7,16 @@ module Dry
       class Kwargs < Constructor
         private
 
-        def define_new(_klass)
-          class_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def new(**args)
-              names = #{dependency_map.inspect}
-              deps = names.each_with_object({}) { |(name, identifier), obj|
+        def define_new
+          class_mod.class_exec(container, dependency_map) do |container, dependency_map|
+            define_method :new do |**args|
+              deps = dependency_map.to_h.each_with_object({}) { |(name, identifier), obj|
                 obj[name] = args[name] || container[identifier]
               }.merge(args)
+
               super(**deps)
             end
-          RUBY
+          end
         end
 
         def define_initialize(klass)

data/lib/dry/auto_inject/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module AutoInject
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.4.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-auto_inject
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -123,4 +123,3 @@ signing_key:
 specification_version: 4
 summary: Container-agnostic automatic constructor injection
 test_files: []
-has_rdoc: