scorpion-ioc 0.6.2 → 1.0.0

data/lib/scorpion/rails/active_record/relation.rb

@@ -32,14 +32,14 @@ module Scorpion
 
         # from ActiveRecord::Relation
         [ :new, :build, :create, :create! ].each do |method|
-          class_eval <<-EOS, __FILE__, __LINE__ + 1
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{ method }( *args, &block )
               super *args do |*block_args|
                 sting!( block_args )
                 yield *block_args if block_given?
               end
             end
-          EOS
+          RUBY
         end
 
         # from ActiveRecord::SpawnMethods
@@ -48,6 +48,7 @@ module Scorpion
         end
 
         private
+
           # from ActiveRecord::Relation
           def exec_queries( *args, &block )
             sting!( super )

data/lib/scorpion/rails/controller.rb

@@ -1,4 +1,4 @@
-require 'scorpion/nest'
+require "scorpion/nest"
 
 module Scorpion
   module Rails
@@ -6,7 +6,7 @@ module Scorpion
     # Adds a scorpion nest to support injection into rails controllers.
     module Controller
 
-      ENV_KEY = 'scorpion.controller.instance'.freeze
+      ENV_KEY = "scorpion.controller.instance".freeze
 
 
       # Fetch an object from the controller's {#scorpion}.

data/lib/scorpion/rails/job.rb

@@ -1,4 +1,4 @@
-require 'scorpion/nest'
+require "scorpion/nest"
 
 module Scorpion
   module Rails

data/lib/scorpion/rails/mailer.rb

@@ -1,4 +1,4 @@
-require 'scorpion/nest'
+require "scorpion/nest"
 
 module Scorpion
   module Rails

data/lib/scorpion/rails/nest.rb

@@ -1,5 +1,5 @@
-require 'scorpion/nest'
-require 'active_support/core_ext/class/attribute'
+require "scorpion/nest"
+require "active_support/core_ext/class/attribute"
 
 module Scorpion
   module Rails
@@ -32,8 +32,7 @@ module Scorpion
       #
       # @!endgroup Attributes
 
-      def self.included( base )
-
+      def self.included( base ) # rubocop:disable Metrics/MethodLength
         # @!attribute [rw]
         # @return [Scorpion::Nest] the singleton nest used by controllers.
         base.class_attribute :nest_instance
@@ -45,8 +44,9 @@ module Scorpion
           def self.nest
             nest_instance || ( self.nest = Scorpion.instance.build_nest )
           end
+
           def self.nest=( value )
-            nest_instance.destroy if nest_instance
+            nest_instance&.destroy
             self.nest_instance = value
           end
 
@@ -60,14 +60,14 @@ module Scorpion
           # 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]
+            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]
+            instance_hunts << [:capture, args, block]
           end
 
           # Hunting dependencies that cannot be resolved until an instance
@@ -106,9 +106,9 @@ module Scorpion
 
       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
+          self.class.instance_hunts.each do |method, args, block|
+            hunter.send method, *args do |*method_args|
+              instance_exec *method_args, &block
             end
           end
         end
@@ -125,4 +125,4 @@ module Scorpion
 
     end
   end
-end
+end

data/lib/scorpion/rails/railtie.rb

@@ -1,11 +1,11 @@
-require 'rails/railtie'
+require "rails/railtie"
 require "scorpion/rack/middleware"
 
 module Scorpion
   module Rails
     class Railtie < ::Rails::Railtie
 
-      initializer "scorpion.configure" do |app|
+      initializer "scorpion.configure" do |_app|
         ::ActionController::Base.send :include, Scorpion::Rails::Controller if defined? ::ActionController
         ::ActiveJob::Base.send :include, Scorpion::Rails::Job if defined? ::ActiveJob
         ::ActionMailer::Base.send :include, Scorpion::Rails::Mailer if defined? ::ActionMailer

data/lib/scorpion/rspec.rb

@@ -1,8 +1,8 @@
-require 'scorpion'
+require "scorpion"
 
 module Scorpion
   module Rspec
-    require 'scorpion/rspec/helper'
+    require "scorpion/rspec/helper"
 
     def self.scorpion_nest
       @scorpion_nest ||= Scorpion.instance.build_nest

data/lib/scorpion/rspec/helper.rb

@@ -3,7 +3,7 @@ module Scorpion
     module Helper
 
       def self.included( base )
-        base.let( :scorpion ){ Scorpion::Rspec.scorpion_nest.conceive }
+        base.let( :scorpion ) { Scorpion::Rspec.scorpion_nest.conceive }
         base.send :extend, Scorpion::Rspec::Helper::Methods
 
 
@@ -44,7 +44,7 @@ module Scorpion
         # Specify a specific hunting contract and prepare a `let` block of the
         # same name.
         def hunt( name, contract, value = :unspecified, &block )
-          block ||= ->{ value == :unspecified ? instance_double( contract ) : value }
+          block ||= -> { value == :unspecified ? instance_double( contract ) : value }
 
           let( name, &block )
 
@@ -63,7 +63,7 @@ module Scorpion
 
         def hunt!( name, contract, value = :unspecified, &block )
           hunt name, contract, value, &block
-          before(:each){ send name }
+          before(:each) { send name }
         end
 
         # Captures an instance of the given `contract` and assigns it to `name`

data/lib/scorpion/stinger.rb

@@ -7,21 +7,22 @@ module Scorpion
       return instance unless instance
 
       klass = @wrappers[instance.class] ||=
-        Class.new( instance.class ) do
-          def initialize( instance, stinger )
-            @__instance__ = instance
-            @__stinger__  = stinger
-          end
-
-          def respond_to?( *args )
-            @__instance__.respond_to?( *args )
-          end
-
-          private
-            def method_missing( *args, &block )
-              @__stinger__.sting! @__instance__.__send__( *args, &block )
-            end
-        end
+                Class.new( instance.class ) do
+                  def initialize( instance, stinger )
+                    @__instance__ = instance
+                    @__stinger__  = stinger
+                  end
+
+                  def respond_to?( *args )
+                    @__instance__.respond_to?( *args )
+                  end
+
+                  private
+
+                    def method_missing( *args, &block ) # rubocop:disable Style/MethodMissing
+                      @__stinger__.sting! @__instance__.__send__( *args, &block )
+                    end
+                end
 
       klass.new instance, stinger
     end
@@ -49,7 +50,7 @@ module Scorpion
         # Only set scorpion if it hasn't been set yet.
         current_scorpion = object.send :scorpion
         if current_scorpion
-          scorpion.logger.warn I18n.translate :mixed_scorpions, scope: [:scorpion,:warnings,:messages] if current_scorpion != scorpion
+          scorpion.logger.warn I18n.translate :mixed_scorpions, scope: [:scorpion, :warnings, :messages] if current_scorpion != scorpion # rubocop:disable Metrics/LineLength
         else
           object.send :scorpion=, scorpion
         end
@@ -59,9 +60,9 @@ module Scorpion
         return unless objects.respond_to? :each
 
         # Don't eager load relations that haven't been loaded yet.
-        return if objects.respond_to?( :loaded? ) && ! objects.loaded?
+        return if objects.respond_to?( :loaded? ) && !objects.loaded?
 
-        objects.each{ |v| sting! v }
+        objects.each { |v| sting! v }
       end
 
   end

data/lib/scorpion/version.rb

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

data/scorpion.gemspec

@@ -1,15 +1,15 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'scorpion/version'
+require "scorpion/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "scorpion-ioc"
-  spec.version       = "#{Scorpion::VERSION}"
+  spec.version       = "#{ Scorpion::VERSION }"
   spec.authors       = ["Paul Alexander"]
   spec.email         = ["me@phallguy.com"]
-  spec.summary       = %q{Add IoC to rails with minimal fuss and ceremony}
-  spec.description   = %q{Embrace convention over configuration while still benefitting from dependency injection design principles.}
+  spec.summary       = "Add IoC to rails with minimal fuss and ceremony"
+  spec.description   = "Embrace convention over configuration while still benefitting from dependency injection design principles." # rubocop:disable Metrics/LineLength
   spec.homepage      = "https://github.com/phallguy/scorpion"
   spec.license       = "MIT"
 
@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '>= 4.0'
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.add_dependency "rails", ">= 4.0"
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", '~> 10'
-  spec.add_development_dependency "rspec", '~> 3.00'
-  spec.add_development_dependency "rspec-rails", '~> 3.00'
-  spec.add_development_dependency 'combustion', '~> 0.5.3'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "rspec", "~> 3.00"
+  spec.add_development_dependency "rspec-rails", "~> 3.00"
+  spec.add_development_dependency "combustion", "~> 0.5.3"
+  spec.add_development_dependency "sqlite3"
 end

data/spec/internal/db/schema.rb

@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define do
-  #ActiveRecord::Schema.define do
+  # ActiveRecord::Schema.define do
   create_table( :todos, :force => true ) do |t|
     t.string :name
     t.references :author

data/spec/lib/scorpion/attribute_set_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Scorpion::AttributeSet do
-  let( :set ){ Scorpion::AttributeSet.new }
+  let( :set ) { Scorpion::AttributeSet.new }
 
   it "yields attributes" do
     set.define do
-     apples 'apples'
+     apples "apples"
     end
     expect( set.first ).to be_a Scorpion::Attribute
   end
@@ -42,24 +42,6 @@ describe Scorpion::AttributeSet do
       expect( set[:logger] ).to be_lazy
     end
 
-    it "parses traits" do
-      set.define do
-        with_traits nil, :color
-      end
-
-      expect( set[:with_traits].traits ).to eq [:color]
-    end
-
-    it "parses traits and options" do
-      set.define do
-        both nil, :formatted, lazy: true
-      end
-
-      expect( set[:both] ).to be_formatted
-      expect( set[:both] ).to be_lazy
-    end
-
-
     it "parses options" do
       set.define do
         options nil, lazy: true
@@ -86,4 +68,4 @@ describe Scorpion::AttributeSet do
     end
   end
 
-end
+end

data/spec/lib/scorpion/attribute_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Test
   class Attr; end
@@ -6,13 +6,8 @@ end
 
 
 describe Scorpion::Attribute do
-  it "responds to trait? methods" do
-    attr = Scorpion::Attribute.new :name, :contract, :formatted
-    expect( attr ).to be_formatted
-  end
-
   it "resolves contract strings to constants" do
-    attr = Scorpion::Attribute.new :name, 'Test::Attr'
+    attr = Scorpion::Attribute.new :name, "Test::Attr"
     expect( attr.contract ).to be Test::Attr
   end
-end
+end

data/spec/lib/scorpion/chain_hunter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Scorpion::ChainHunter do
 

data/spec/lib/scorpion/dependency/argument_dependency_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Scorpion::Dependency::ArgumentDependency do
   let( :dependency ) { Scorpion::Dependency::ArgumentDependency.new( arg ) }
-  let( :arg )  { "Hello" }
+  let( :arg ) { "Hello" }
 
   it "matches the same type" do
     expect( dependency.satisfies?( String ) ).to be_truthy
@@ -11,8 +11,4 @@ describe Scorpion::Dependency::ArgumentDependency do
   it "doesn't match different types" do
     expect( dependency.satisfies?( Regexp ) ).to be_falsy
   end
-
-  it "doesn't match traits" do
-    expect( dependency.satisfies?( String, :password ) ).to be_falsy
-  end
-end
+end

data/spec/lib/scorpion/dependency/builder_dependency_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Test
   module BuilderDependency
@@ -19,23 +19,23 @@ module Test
 end
 
 describe Scorpion::Dependency::BuilderDependency do
-  let( :scorpion ){ double }
-  let( :hunt ){ Scorpion::Hunt.new( scorpion, String, nil ) }
+  let( :scorpion ) { double }
+  let( :hunt ) { Scorpion::Hunt.new( scorpion, String, nil ) }
 
   it "supports class hunting delegates" do
-    dependency = Scorpion::Dependency::BuilderDependency.new( String, nil, Test::BuilderDependency::ClassDelegate.new )
+    dependency = Scorpion::Dependency::BuilderDependency.new( String, Test::BuilderDependency::ClassDelegate.new )
     expect( dependency.fetch( hunt ) ).to be Test
   end
 
   it "supports module hunting delegates" do
-    dependency = Scorpion::Dependency::BuilderDependency.new( String, nil, Test::BuilderDependency::ModDelegate )
+    dependency = Scorpion::Dependency::BuilderDependency.new( String, Test::BuilderDependency::ModDelegate )
     expect( dependency.fetch( hunt ) ).to be Test
   end
 
   it "supports block hunting delegates" do
-    dependency = Scorpion::Dependency::BuilderDependency.new( String, nil ) do
+    dependency = Scorpion::Dependency::BuilderDependency.new( String ) do
       Test
     end
     expect( dependency.fetch( hunt ) ).to be Test
   end
-end
+end

data/spec/lib/scorpion/dependency/module_dependency_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Test
   module ModuleDependency
@@ -6,8 +6,8 @@ module Test
   end
 end
 describe Scorpion::Dependency::ModuleDependency do
-  let( :scorpion ){ double }
-  let( :dependency )    { Scorpion::Dependency::ModuleDependency.new( Test::ModuleDependency::Example ) }
+  let( :scorpion ) { double }
+  let( :dependency ) { Scorpion::Dependency::ModuleDependency.new( Test::ModuleDependency::Example ) }
 
   it "returns the module itself" do
     expect( dependency.fetch( scorpion ) ).to be Test::ModuleDependency::Example

data/spec/lib/scorpion/dependency_map_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Test
   module DependencyMap
@@ -8,8 +8,8 @@ module Test
 end
 
 describe Scorpion::DependencyMap do
-  let( :scorpion ){ double Scorpion }
-  let( :map ){ Scorpion::DependencyMap.new scorpion }
+  let( :scorpion ) { double Scorpion }
+  let( :map ) { Scorpion::DependencyMap.new scorpion }
 
   describe "#chart" do
     it "yields itself when arg expected" do
@@ -45,27 +45,6 @@ describe Scorpion::DependencyMap do
       expect( map.find( Test::DependencyMap::Armor ) ).to be_nil
     end
 
-
-    context "multiple possible matches" do
-      before( :each ) do
-        map.chart do
-          hunt_for Test::DependencyMap::Weapon, [ :sharp, :one_handed ]
-          hunt_for Test::DependencyMap::Weapon, [ :blunt, :one_handed ]
-        end
-      end
-
-      it "returns the last dependency that matches one trait" do
-        expect( map.find( Test::DependencyMap::Weapon, :one_handed ).traits ).to include :blunt
-      end
-
-      it "returns the last dependency that matches all of the traits" do
-        expect( map.find( Test::DependencyMap::Weapon, [ :one_handed, :blunt ] ).traits ).to include :blunt
-      end
-
-      it "returns the last dependency that matches a unique trait" do
-        expect( map.find( Test::DependencyMap::Weapon, :blunt ).traits ).to include :blunt
-      end
-    end
   end
 
   describe "#hunt_for" do
@@ -107,4 +86,4 @@ describe Scorpion::DependencyMap do
       expect( replica ).not_to be_empty
     end
   end
-end
+end