scorpion-ioc 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83cc2664a50b6fa52391b9e4eb4298dc6fedddaf
-  data.tar.gz: 5ad0dd976c29515fa2d0370dfe076c65dc0c8c72
+SHA256:
+  metadata.gz: 2dec6c31f7811566996a4a3ca8c68bf1410b4de4aef812c5ac5253446f245251
+  data.tar.gz: c2b3051d4305fbbc5a52d127e7fbeb4da2542aa1e692507bb29040c825d94539
 SHA512:
-  metadata.gz: d002e9f5811a17bcd97671e6d42a28bd887a026b6018c8d880599d13b819f751fe1ad787f53164fab26ccaa7d7e7c996a41801cf679452e13b272e952ed9829d
-  data.tar.gz: cde9494df20a7f46619618c23c5fdb3f71a172dcdd9cb0a6d824e808284b703c2c55f0c1491ffd8bdecaca4578e4d04ba4b15b42ae858c80a3a28dbf36232b2c
+  metadata.gz: 8fe35344e749df6e51188d16ae5376c9a15ba76c1ca8d814055161a251de3ea090c97c1a686f51516af2aceb1cc16d130125a1833f1d081732143967ab219991
+  data.tar.gz: 973decbb90a6a1f9ad065554af749cf8f257f352fb9a65a15b6e7a16eacb97208605cf86942356f00eccc87d93f5ec5853ef0f32c4a798c768e233f697523530

data/lib/scorpion/rack/middleware.rb

@@ -8,13 +8,23 @@ module Scorpion
 
       def initialize( app, nest = nil )
         @app  = app
-        @nest = nest || Scorpion.instance.build_nest
+        @nest = nest
       end
 
       def call( env )
-        env[ENV_KEY] = prepare_scorpion( nest.conceive, env )
+        # If we don't have a nest yet, build one from the configured global
+        # scorpion.
+        @nest ||= Scorpion.instance.build_nest
+
+        conceived = false
+        env[ENV_KEY] ||=
+          begin
+            conceived = true
+            prepare_scorpion( nest.conceive, env )
+          end
+
         @app.call(env).tap do
-          free_scorpion( env )
+          free_scorpion( env ) if conceived
         end
       end
 

data/lib/scorpion/rails/controller.rb

@@ -8,7 +8,6 @@ module Scorpion
 
       ENV_KEY = "scorpion.instance".freeze
 
-
       # Fetch an object from the controller's {#scorpion}.
       # @see Scorpion#fetch
       def fetch( *args, &block )
@@ -71,6 +70,8 @@ module Scorpion
         end
 
         def free_scorpion
+          return unless conceived_scorpion?
+
           scorpion.try( :destroy )
           request.env.delete ENV_KEY
         end

data/lib/scorpion/rails/nest.rb

@@ -101,9 +101,14 @@ module Scorpion
       end
 
       def conceive_scorpion
+        @conceived_scorpion = true
         nest.conceive
       end
 
+      def conceived_scorpion?
+        !!@conceived_scorpion
+      end
+
       def append_instance_hunts( scorpion )
         scorpion.prepare do |hunter|
           self.class.instance_hunts.each do |method, args, block|

data/lib/scorpion/version.rb

@@ -1,5 +1,5 @@
 module Scorpion
-  VERSION_NUMBER  = "1.0.3".freeze
+  VERSION_NUMBER  = "1.0.4".freeze
   VERSION_SUFFIX  = "".freeze
   VERSION         = "#{ VERSION_NUMBER }#{ VERSION_SUFFIX }".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpion-ioc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Paul Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Add IoC to rails with minimal fuss and ceremony