scorpion-ioc 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52fbe5183ff0a1f9d4f205f716bbaddf513767c7
-  data.tar.gz: d50fa2d75a737f998ac3cffe35c89ce9e693dc32
+  metadata.gz: 26f6b97f16d1b60f0a4643d3490011b0f9243249
+  data.tar.gz: 2e17bdbf0e8b42afc657e9ed32f70ff72e571ca8
 SHA512:
-  metadata.gz: 3b3af973484798628141cee2eb677ab5489e1482782e1b20ec9307f1f3f7c693b9a934dc42f6050241343ea07a79989612aa22495ea7ee0901fbca4826e45328
-  data.tar.gz: 5378df2b99f06c9002b1f165a0467bbccefbeb3f4b2afa610efe2952e9e2b9fe136d1e57a2788017a6b9eaa06e060c66ab8d9e98d5025ded6bb9145aa63d3243
+  metadata.gz: dda56d8d4eb81fcccfa1a74d8bab69780cbef9dbec885d3708fe524ae654f8e40a96442363804c259a3e21152d0406eac39b1e5ded82f3b1fbd1eb4cdba86995
+  data.tar.gz: 6fb8b248262d963cbcf41d5fe852406fe64005521999287a3983f140ce5999b7931fa673963ddf8b321c2e403e3c69168f2a9531af1eb01c805a0a47f2b99f83

data/lib/scorpion/rack/env.rb

@@ -0,0 +1,10 @@
+module Scorpion
+  module Rack
+    module Env
+      def self.create( * )
+        fail "Include Scorpion::Rails::Controller in your ApplicationController" if defined? Rails
+        fail "Add Scorpion::Rack::Middleware"
+      end
+    end
+  end
+end

data/lib/scorpion/rack/middleware.rb

@@ -0,0 +1,34 @@
+require "scorpion/rack/env"
+
+module Scorpion
+  module Rack
+    class Middleware
+
+      ENV_KEY = 'scorpion.rack.instance'.freeze
+
+      def initialize( app, nest = nil )
+        @app  = app
+        @nest = nest || Scorpion.instance.build_nest
+      end
+
+      def call( env )
+        env[ENV_KEY] = prepare_scorpion( nest.conceive, env )
+        @app.call(env).tap do
+          free_scorpion( env )
+        end
+      end
+
+      private
+        attr_reader :nest
+
+        def prepare_scorpion( scorpion, env )
+          scorpion.hunt_for Rack::Env, return: env
+          scorpion
+        end
+
+        def free_scorpion( env )
+          env[ENV_KEY].destroy
+        end
+    end
+  end
+end

data/lib/scorpion/rails/controller.rb

@@ -6,7 +6,7 @@ module Scorpion
     # Adds a scorpion nest to support injection into rails controllers.
     module Controller
 
-      ENV_KEY = 'scorpion.instance'.freeze
+      ENV_KEY = 'scorpion.controller.instance'.freeze
 
 
       # Fetch an object from the controller's {#scorpion}.
@@ -61,6 +61,8 @@ module Scorpion
             hunter.hunt_for ActionDispatch::Response do |hunt|
               hunt.fetch( AbstractController::Base ).response
             end
+
+            hunter.hunt_for Scorpion::Rack::Env, return: request.env
           end
         end
 

data/lib/scorpion/rails/railtie.rb

@@ -1,4 +1,5 @@
 require 'rails/railtie'
+require "scorpion/rack/middleware"
 
 module Scorpion
   module Rails

data/lib/scorpion/version.rb

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

data/spec/lib/scorpion/rack/middleware_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+require "scorpion/rack/middleware"
+
+describe Scorpion::Rack::Middleware do
+  let(:app)      { proc{ [ 200, {}, [ 'Sting!' ] ] } }
+  let(:stack)    { Scorpion::Rack::Middleware.new( app ) }
+  let(:request)  { Rack::MockRequest.new( stack ) }
+  let(:response) { request.get('/') }
+
+  it "creates a scorpion" do
+    expect( stack ).to receive( :prepare_scorpion ).and_call_original
+    response
+  end
+
+  it "prepares it with the environment" do
+    proc = ->(env) {
+        scorpion = env[Scorpion::Rack::Middleware::ENV_KEY]
+        expect( scorpion.fetch( Scorpion::Rack::Env) ).to be env
+      app.call( env )
+    }
+
+    request  = Rack::MockRequest::new( Scorpion::Rack::Middleware.new( proc ) )
+    request.get '/'
+  end
+
+  it "frees the scorpion on return" do
+    expect( stack ).to receive( :free_scorpion ).and_call_original
+    response
+  end
+end

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

@@ -153,6 +153,15 @@ describe Scorpion::Rails::Controller, type: :controller do
       get :index
     end
 
+    it "hunts for rack env" do
+      allow( subject ).to receive( :index ) do
+        expect( subject.scorpion.fetch( Scorpion::Rack::Env ) ).to be_present
+        controller.render nothing: true
+      end
+
+      get :index
+    end
+
     it "scopes relations" do
       allow( subject ).to receive( :index ) do
         expect( subject.scorpion( Todo ).all.scorpion ).to be subject.scorpion

data/spec/lib/scorpion/rspec/helper_spec.rb

@@ -40,7 +40,7 @@ describe Scorpion::Rspec::Helper do
     specify{ expect( scorpion.fetch Numeric ).to eq 5 }
     specify{ expect( scorpion.fetch String  ).to eq "hello" }
     specify{ expect( scorpion.fetch Regexp  ).to be_a RSpec::Mocks::TestDouble }
-    specify{ expect( scorpion.fetch ScorpionRspecHelperSpec::Food ).to be_a ScorpionRspecHelperSpec::Food }
+    specify{ expect( scorpion.fetch ScorpionRspecHelperSpec::Food ).to be food }
   end
 
   context "child context" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpion-ioc
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Paul Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,8 @@ files:
 - lib/scorpion/nest.rb
 - lib/scorpion/object.rb
 - lib/scorpion/object_constructor.rb
+- lib/scorpion/rack/env.rb
+- lib/scorpion/rack/middleware.rb
 - lib/scorpion/rails.rb
 - lib/scorpion/rails/active_record.rb
 - lib/scorpion/rails/active_record/association.rb
@@ -184,6 +186,7 @@ files:
 - spec/lib/scorpion/hunter_spec.rb
 - spec/lib/scorpion/object_constructor_spec.rb
 - spec/lib/scorpion/object_spec.rb
+- spec/lib/scorpion/rack/middleware_spec.rb
 - spec/lib/scorpion/rails/active_record/association_spec.rb
 - spec/lib/scorpion/rails/active_record/model_spec.rb
 - spec/lib/scorpion/rails/active_record/relation_spec.rb
@@ -212,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Add IoC to rails with minimal fuss and ceremony
@@ -236,6 +239,7 @@ test_files:
 - spec/lib/scorpion/hunter_spec.rb
 - spec/lib/scorpion/object_constructor_spec.rb
 - spec/lib/scorpion/object_spec.rb
+- spec/lib/scorpion/rack/middleware_spec.rb
 - spec/lib/scorpion/rails/active_record/association_spec.rb
 - spec/lib/scorpion/rails/active_record/model_spec.rb
 - spec/lib/scorpion/rails/active_record/relation_spec.rb