scorpion-ioc 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e4554b3de6ac16dd3564b7ce94776dbe389ecce
-  data.tar.gz: 32245b81b11860337171ae2df0b867f7bd0758f7
+  metadata.gz: fc3ad78f4a3452b17503b92dd05c67d92b624fef
+  data.tar.gz: ee0e5c93a6371334a930f2428052cfaea063e4f5
 SHA512:
-  metadata.gz: 2b73bd3f9581b6a626d3dd07b4cbafdea26bc938f7f22d1cb4d2cdbcba361ff6b6c529f6fc4c9a0d8b39029735e7782779dd5bb0d15d72a8ee175eedda076c82
-  data.tar.gz: 49b1a70c443588a55f28165bcf89e23fc427b635f257f41233700b56bd3af8166e504f7e80c0d3561830706b1815f0f54d3e0d5c5accc69b9e45e2bd3aeb832e
+  metadata.gz: 105d1a6926bf1c14acd9569335154d4af678785a8014975b1c693347a4fbd3607f5d2fce3c72f5e254ef02bbbf970d7c629f212d24d08fd5dd9d335ade077cc0
+  data.tar.gz: e0947d50f0753da7fd9a4b9166b2f5477d00230b474c05e9322813d2ce8384402ff601dd119ba694c99144cdf801617151a798ce8a75ada3a50b7c7731f56b57

data/lib/scorpion/hunter.rb

@@ -48,10 +48,9 @@ module Scorpion
       replica
     end
 
-    # @see Scorpion#hunt
+    # @see Scorpion#execute
     def execute( hunt, explicit_only = false )
-      dependency   = dependency_map.find( hunt.contract, hunt.traits )
-      dependency ||= parent.dependency_map.find( hunt.contract, hunt.traits ) if parent
+      dependency   = find_dependency( hunt )
       dependency ||= Dependency.define( hunt.contract ) if hunt.traits.blank? && !explicit_only
 
       unsuccessful_hunt( hunt.contract, hunt.traits ) unless dependency
@@ -59,6 +58,16 @@ module Scorpion
       dependency.fetch hunt
     end
 
+    # Find any explicitly defined dependencies that can satisfy the hunt.
+    # @param [Hunt] hunt being resolved.
+    # @return [Dependency] the matching dependency if found
+    def find_dependency( hunt )
+      dependency   = dependency_map.find( hunt.contract, hunt.traits )
+      dependency ||= parent.find_dependency( hunt ) if parent
+
+      dependency
+    end
+
     # @see Scorpion#reset
     def reset
       dependency_map.reset

data/lib/scorpion/version.rb

@@ -1,5 +1,5 @@
 module Scorpion
-  VERSION_NUMBER  = "0.5.21"
+  VERSION_NUMBER  = "0.5.22"
   VERSION_SUFFIX  = ""
   VERSION         = "#{VERSION_NUMBER}#{VERSION_SUFFIX}"
 end

data/spec/lib/scorpion/dependency_map_spec.rb

@@ -82,6 +82,8 @@ describe Scorpion::DependencyMap do
 
   describe "#replicate_from" do
     it "does not dup shared dependency" do
+      # Instead of duping shared dependencies, the scorpion should delegate to
+      # its parent which shares the same instance with all of its children.
       map.chart do
         share do
           capture Test::DependencyMap::Weapon

data/spec/lib/scorpion/hunter_spec.rb

@@ -44,6 +44,9 @@ module Test
       initialize( zoo: Test::Hunter::Zoo )
     end
 
+    class Singleton
+    end
+
   end
 end
 
@@ -59,6 +62,10 @@ describe Scorpion::Hunter do
       hunt_for Test::Hunter::Argumented
 
       hunt_for Test::Hunter::Zoo
+
+      share do
+        capture Test::Hunter::Singleton
+      end
     end
   end
 
@@ -121,6 +128,24 @@ describe Scorpion::Hunter do
     end
   end
 
+  describe "#find_dependency" do
+    def build_hunt( hunter )
+      Scorpion::Hunt.new hunter, Test::Hunter::Singleton, []
+    end
+
+    it "finds a dependency" do
+      expect( hunter.find_dependency( build_hunt( hunter ) ) ).to be_a Scorpion::Dependency
+    end
+
+    it "finds a parent dependency" do
+      expect( hunter.find_dependency( build_hunt( hunter.replicate ) ) ).to be_a Scorpion::Dependency
+    end
+
+    it "finds grandparent dependency" do
+      expect( hunter.find_dependency( build_hunt( hunter.replicate.replicate ) ) ).to be_a Scorpion::Dependency
+    end
+  end
+
   describe "#inspect" do
     it "is helpful" do
       expect( hunter.inspect ).to match /contracts/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpion-ioc
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - Paul Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails