dependency_injection 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b458f920f5b8f2c818570729207cb4db1c537a8c
-  data.tar.gz: 9a83107daf4cf6f131d69a035e7cb8f16ff655fb
+  metadata.gz: eb8480e78fb38c546e3c81c90e1f6f9a1a5802e8
+  data.tar.gz: 54d44e720653e8410c041fc1329764d6cbbc2006
 SHA512:
-  metadata.gz: 2f92f31ffdbec7ff33b625e16f39176590fd1cf5bc304bd3f8103a85f7dfa026f2de237ae5aee01b0c11de72f8805be4213fcfdd240f7b51cad1abdfda57b2e6
-  data.tar.gz: c881904dba9631b7c2121b007d0feee0dfe0e2a694bf942c3fc441b4fa239707a0d8c5502fb1d94d6982afd090d34c1ffcf80868e5eec4c714988018869113fd
+  metadata.gz: 826b68d278823ec060007d8c631443ef9d1368b5573312c241c2969622d185d8e6b4047f07f42f9cfcb7b0dd5dcc18fbe285376ade582d8e28ecd003698b9293
+  data.tar.gz: 4aa1c43f77731c12307829b730dd0d2fd2af1a8fc344b816dd820ab24beab3d1e27ac844d2f4bb06875054b90c0a13f496619b34d37cda2bf8d573a7c440f7a0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.2 (2014-03-16)
+
+* Fix an error when a service takes an arrays as parameter
+
 # 0.4.1 (2014-02-23)
 
 * Nothing adding/removed. Just fix the Gemfile.lock

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dependency_injection (0.4.1)
+    dependency_injection (0.4.2)
       activesupport
 
 GEM

data/lib/dependency_injection/definition.rb

@@ -87,27 +87,27 @@ module DependencyInjection
       resolve_references(resolve_container_parameters(arguments))
     end
 
-    def resolve_container_parameters(arguments)
-      arguments.map do |argument|
-        if /^%(?<parameter_name>.*)%$/ =~ argument
-          @container.parameters[parameter_name]
-        else
-          argument
-        end
+    def resolve_container_parameters(argument)
+      if argument.kind_of?(Array)
+        argument.map { |arg| resolve(arg) }
+      elsif /^%(?<parameter_name>.*)%$/ =~ argument
+        @container.parameters[parameter_name]
+      else
+        argument
       end
     end
 
-    def resolve_references(arguments)
-      arguments.map do |argument|
-        if /^@(?<reference_name>.*)/ =~ argument
-          reference_definition = @container.find(reference_name)
-          reference            = reference_definition.object
-          raise ScopeWideningInjectionError if reference_definition.scope == :prototype && scope == :container
-
-          reference
-        else
-          argument
-        end
+    def resolve_references(argument)
+      if argument.kind_of?(Array)
+        argument.map { |arg| resolve(arg) }
+      elsif /^@(?<reference_name>.*)/ =~ argument
+        reference_definition = @container.find(reference_name)
+        reference            = reference_definition.object
+        raise ScopeWideningInjectionError if reference_definition.scope == :prototype && scope == :container
+
+        reference
+      else
+        argument
       end
     end
   end

data/lib/dependency_injection/version.rb

@@ -1,3 +1,3 @@
 module DependencyInjection
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/test/dependency_injection/test_definition.rb

@@ -189,6 +189,10 @@ class TestDefinition < Minitest::Test
     assert_equal(['first', 'value'], @definition.send(:resolve_container_parameters, %w(first %parameter%)))
   end
 
+  def test_resolving_references_with_array
+    assert_equal(['first', ['second', 'third']], @definition.send(:resolve_references, ['first', ['second', 'third']]))
+  end
+
   def test_resolving_references_without_references
     assert_equal(%w(first second), @definition.send(:resolve_references, %w(first second)))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependency_injection
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kevin Disneur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport