scorpion-ioc 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5315d42c953ef2d6cbdd91f5cbdfb022446cb809
-  data.tar.gz: c532df0cf7a914d1b90dca8525f73b9da5e71328
+  metadata.gz: 5e1ee73f894ab57634fbe1f1eb2a162b469cb569
+  data.tar.gz: e4f8915f1d95b9ad6f0e6545207c10c3de3d0a8c
 SHA512:
-  metadata.gz: 162246ea77d34ff5b08f8d618a06dcbacfe0acda81aa9e97550873e776da7a348a5446ddf97b12747accbb2f673cd414f0c5ae292c83b22e6d8ffcd43cf14748
-  data.tar.gz: 076ab0215464ce508c78cadb67782fb090a212d8bbacaf57d47495f4512f11a324d1ac5d09bc35698f4d763811f9e3a720ca9ba6135cb1b9a9abb87252d58b09
+  metadata.gz: 0b6a6c1f1aabee3940ffff6a326445a4a30bcd3c0ebf6582411fd2b644ae131b34756de4036c5f63b8e20884f2d130a94f4743b49fb60d938075d8e679fe022d
+  data.tar.gz: 4dd7b17c65d5706f475ad69894bf1fdd63fa549a329a9ffe0d1e6e872b56c8b3883717d319f63d0cff36b835bf952559e56d93af415ade1d49f1db6805f6c889

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.3.1

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/scorpion/rspec/helper.rb

@@ -11,6 +11,21 @@ module Scorpion
         base.infest_nest ActiveJob::Base        if defined? ActiveJob::Base
         base.infest_nest ActionMailer::Base     if defined? ActionMailer::Base
 
+        base.before( :each ) do
+          allow( Scorpion ).to receive( :instance ) do
+            # Always override the 'global' scorpion with the scorpion from the
+            # spec. Any existing nests will not be affected, only code the
+            # naively reaches into global scorpion context.
+            @@global_scorpion_warned ||=
+              begin
+                puts( "Using global scorpion is not recommended. Objects should be created with scorpion.fetch or scorpion.new" )
+                true
+              end
+
+            scorpion
+          end
+        end
+
         super
       end
 

data/lib/scorpion/version.rb

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

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

@@ -57,19 +57,25 @@ describe Scorpion::Rails::Controller, type: :controller do
     end
 
     it "retrieves scorpion from `env`" do
-      expect( subject.env ).to receive( :[] )
-        .with( Scorpion::Rails::Controller::ENV_KEY )
-        .at_least( :once )
-        .and_call_original
+      expect( subject ).to receive( :scorpion ).at_least( :once ).and_wrap_original do |method, *args|
+        scorpion = method.call( *args )
+        expect( scorpion ).to be subject.request.env[ Scorpion::Rails::Controller::ENV_KEY ]
+
+        scorpion
+      end
 
       get :index
     end
 
     it "stores the scorpion in `env`" do
-      expect( subject.env ).to receive( :[]= )
-        .with( Scorpion::Rails::Controller::ENV_KEY, kind_of( Scorpion ) )
-        .at_least( :once )
-        .and_call_original
+      expect( subject ).to receive( :assign_scorpion ).and_wrap_original do |method, *args|
+        expect( subject.request.env ).to receive( :[]= )
+            .with( Scorpion::Rails::Controller::ENV_KEY, kind_of( Scorpion ) )
+            .at_least( :once )
+            .and_call_original
+
+        method.call( *args )
+      end
 
       get :index
     end
@@ -171,4 +177,4 @@ describe Scorpion::Rails::Controller, type: :controller do
       get :index
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpion-ioc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Paul Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,7 +112,8 @@ description: Embrace convention over configuration while still benefitting from
   injection design principles.
 email:
 - me@phallguy.com
-executables: []
+executables:
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
@@ -128,6 +129,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/rspec
 - circle.yml
 - config.ru
 - lib/scorpion-ioc.rb