dry-auto_inject 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 811a2b285fae7c657e214c57d682488c2b1d3ed8
-  data.tar.gz: 4d6bff629910fc0400e2725b401c2f270fe135bc
+  metadata.gz: 59c074194d93b68ca4f6f5556cb2e50b6b613bb4
+  data.tar.gz: 2441a44b97fba6eceecbe97404f75e52367020eb
 SHA512:
-  metadata.gz: 0220dcb80424b49015821e64bbe51245a0a8c5d0cba462fdf1150e37e00e4f92116edbada4b7ec4a18a8f015cd3bcf20c1c586f6f7c36d0f8843fb9b4d30b12e
-  data.tar.gz: 966a0d328c57c4d72791f30311418892ae69def872d683718bbceae688d52f3afcc76556b60741430fc5dda086659d93bf679eb0ffbf870b48a1846ba2ba0571
+  metadata.gz: 7696fa4ae133db3ee5d2e80bbdd9b293eaf9aa5ab4dab1993ef35280ab82262bbfb3778cba933b722043de629919826f27dcc1c39b4db1d610d5d57fd9f7e707
+  data.tar.gz: 9d896a2cffcf233531d32b02f9c3d91288db46659236b53538993969427974bda1222cd90cb124de2b5249c5d235330b4c15a2337327bc4f0a47c2d2f5f1fe06

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.2.0 2016-02-09
+
+### Added
+
+* Support for hashes as constructor arguments via `Import.hash` interface (solnic)
+
+[Compare v0.1.0...v0.2.0](https://github.com/dryrb/dry-auto_inject/compare/v0.1.0...v0.2.0)
+
 # v0.1.0 2015-11-12
 
 Changed interface from `Dry::AutoInject.new { container(some_container) }` to

data/lib/dry/auto_inject.rb

@@ -39,7 +39,27 @@ module Dry
   #
   # @api public
   def self.AutoInject(container)
-    -> *names { AutoInject.new(names, container) }
+    Injection.new(container)
+  end
+
+  class Injection
+    attr_reader :container, :options
+
+    # @api private
+    def initialize(container, options = {})
+      @container = container
+      @options = options
+    end
+
+    # @api public
+    def hash
+      self.class.new(container, options.merge(type: :hash))
+    end
+
+    # @api public
+    def [](*names)
+      AutoInject.new(names, container, options)
+    end
   end
 
   # @api private
@@ -52,10 +72,16 @@ module Dry
 
     attr_reader :ivars
 
+    attr_reader :options
+
+    attr_reader :type
+
     # @api private
-    def initialize(names, container)
+    def initialize(names, container, options = {})
       @names = names
       @container = container
+      @options = options
+      @type = options.fetch(:type, :args)
       @ivars = names.map(&:to_s).map { |s| s.split('.').last }.map(&:to_sym)
       @instance_mod = Module.new
       define_constructor
@@ -63,6 +89,7 @@ module Dry
 
     # @api private
     def included(klass)
+      define_readers
       define_new_method(klass)
       define_container(klass)
 
@@ -90,6 +117,14 @@ module Dry
 
     # @api private
     def define_new_method(klass)
+      case type
+      when :args then define_new_method_with_args(klass)
+      when :hash then define_new_method_with_hash(klass)
+      end
+    end
+
+    # @api private
+    def define_new_method_with_args(klass)
       klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def self.new(*args)
           names = [#{names.map(&:inspect).join(', ')}]
@@ -99,11 +134,30 @@ module Dry
       RUBY
     end
 
+    # @api private
+    def define_new_method_with_hash(klass)
+      klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def self.new(options = {})
+          names = [#{names.map(&:inspect).join(', ')}]
+          deps = names.each_with_object({}) { |k, r|
+            r[k.to_s.split('.').last.to_sym] = options[k] || container[k]
+          }.merge(options)
+          super(deps)
+        end
+      RUBY
+    end
+
     # @api private
     def define_constructor
-      instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        attr_reader #{ivars.map { |name| ":#{name}" }.join(', ')}
+      case type
+      when :args then define_constructor_with_args
+      when :hash then define_constructor_with_hash
+      end
+    end
 
+    # @api private
+    def define_constructor_with_args
+      instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def initialize(*args)
           super()
           #{ivars.map.with_index { |name, i| "@#{name} = args[#{i}]" }.join("\n")}
@@ -111,5 +165,24 @@ module Dry
       RUBY
       self
     end
+
+    # @api private
+    def define_constructor_with_hash
+      instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def initialize(options)
+          super()
+          #{ivars.map { |name| "@#{name} = options[:#{name}]" }.join("\n")}
+        end
+      RUBY
+      self
+    end
+
+    # @api private
+    def define_readers
+      instance_mod.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        attr_reader #{ivars.map { |name| ":#{name}" }.join(', ')}
+      RUBY
+      self
+    end
   end
 end

data/lib/dry/auto_inject/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class AutoInject < Module
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-auto_inject
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,9 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Container-agnostic automatic constructor injection
 test_files: []
-has_rdoc: