scorpion-ioc 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29856218ea99773e68ec15b55e63f6811455502e
-  data.tar.gz: 82c22e654b2356a5ebd2a06208488917dc3fef1b
+  metadata.gz: 449b0bb3ad037a6a6f8a58240d36fa3dcc435701
+  data.tar.gz: 4db64b7b1356846822c8d23359f06c7398cd2cae
 SHA512:
-  metadata.gz: ec8b7239dce0671f76b85a4ef257e897d70629a3cbba4728d2936ae6fa48f33894fe6553ca1f385b1d07cd0d502085ca4d5c0e3daf5f60aff3cd7fcdba5791c2
-  data.tar.gz: 7357980ce557a695e4aa8080e5c5becbc75ced88406a738ef4d25e46597173c2f6dbe682da2fca5a154a079464379c8295846d900cf5e378ac8ff2532330e10d
+  metadata.gz: 88dc269d8d2d3308e64c7ea4705bb2e4ba8a17d41fc65b66debff93f801c2d284c47465231363f25c27a68fb24fbf963f8e8860bcbcc6a8348dbda0659810a9f
+  data.tar.gz: 2bb0982f0e941f8bce69a050875c4ef52223d00a413faf480cd9cd2d21384abcb22e0d9683e2451ecd87a1d8b962aea89956ae0c8cb34adc675252c6cca8c101

data/lib/scorpion/rails/job.rb

@@ -12,7 +12,7 @@ module Scorpion
         base.send :include, Scorpion::Object
         base.send :include, Scorpion::Rails::Nest
         base.send :around_perform do |job, block|
-          job.with_scorpion &block
+          job.send :with_scorpion, &block
         end
 
         super

data/lib/scorpion/rails/nest.rb

@@ -55,12 +55,40 @@ module Scorpion
           def self.scorpion_nest( &block )
             nest.prepare &block
           end
+
+          # Define dependency resolution that isn't resolved until an instance
+          # of a scorpion is conceived to handle an idividual request.
+          # @param (see DependencyMap#hunt_for )
+          def self.hunt_for( *args, &block )
+            instance_hunts << [:hunt_for,args,block]
+          end
+
+          # Define dependency resolution that isn't resolved until an instance
+          # of a scorpion is conceived to handle an idividual request.
+          # @param (see DependencyMap#capture )
+          def self.capture( *args, &block )
+            instance_hunts << [:capture,args,block]
+          end
+
+          # Hunting dependencies that cannot be resolved until an instance
+          # of the nest class has been created.
+          def self.instance_hunts
+            @instance_hunts ||= begin
+              if superclass.respond_to?( :instance_hunts )
+                superclass.instance_hunts.dup
+              else
+                []
+              end
+            end
+          end
         end
         base.nest ||= Scorpion.instance.build_nest
 
         super
       end
 
+      private
+
       # Fetch a scorpion and feed the controller it's dependencies, then yield
       # to perform the action within the context of that scorpion.
       def with_scorpion( &block )
@@ -76,11 +104,22 @@ module Scorpion
         nest.conceive
       end
 
+      def append_instance_hunts( scorpion )
+        scorpion.prepare do |hunter|
+          self.class.instance_hunts.each do |method,args,block|
+            hunter.send method, *args do |*args|
+              instance_exec *args, &block
+            end
+          end
+        end
+      end
+
       def ensure_scorpion( existing )
         scorpion = existing
         scorpion = assign_scorpion( conceive_scorpion ) unless existing
 
         prepare_scorpion( scorpion ) if respond_to?( :prepare_scorpion, true )
+        append_instance_hunts( scorpion )
         scorpion
       end
 

data/lib/scorpion/version.rb

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

data/spec/lib/scorpion/rails/controller_spec.rb

@@ -5,6 +5,7 @@ module Test
     class Service; end
     class Cache; end
     class Guard; end
+    class Provided; end
   end
 end
 
@@ -16,11 +17,25 @@ describe Scorpion::Rails::Controller, type: :controller do
       cache   Test::Nest::Cache
     end
 
+    hunt_for Test::Nest::Provided do |scorpion|
+      scorpion.new Test::Nest::Provided
+    end
+
+    hunt_for String do |scorpion|
+      instance_value
+    end
+
     def index
       @guard1 = scorpion.fetch Test::Nest::Guard
       @guard2 = scorpion.fetch Test::Nest::Guard
       render nothing: true
     end
+
+    private
+
+      def instance_value
+        "Snappy"
+      end
   end
 
   context "basics" do
@@ -68,6 +83,14 @@ describe Scorpion::Rails::Controller, type: :controller do
       expect( subject.cache ).to be_present
     end
 
+    it "hunts for instance provided dependencies" do
+      expect( subject.scorpion.fetch( Test::Nest::Provided ) ).to be_a Test::Nest::Provided
+    end
+
+    it "instance dependencies can access instance methods" do
+      expect( subject.scorpion.fetch( String ) ).to eq "Snappy"
+    end
+
     it "spawns multiple guards" do
       expect( assigns( :guard1 ) ).to     be_present
       expect( assigns( :guard2 ) ).to     be_present
@@ -130,7 +153,6 @@ describe Scorpion::Rails::Controller, type: :controller do
       get :index
     end
 
-
     it "scopes relations" do
       allow( subject ).to receive( :index ) do
         expect( subject.scorpion( Todo ).all.scorpion ).to be subject.scorpion

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpion-ioc
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Paul Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails