scorpion-ioc 0.6.2 → 1.0.0

data/spec/lib/scorpion/dependency_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Test
   module Dependency
@@ -19,70 +19,43 @@ end
 
 describe Scorpion::Dependency do
   context "inheritance" do
-    let( :dependency ){ Scorpion::Dependency.new( Test::Dependency::Derived ) }
+    let( :dependency ) { Scorpion::Dependency.new( Test::Dependency::Derived ) }
 
     it "matches more derived class when looking for base class" do
-      expect( dependency.satisfies? Test::Dependency::Base ).to be_truthy
+      expect( dependency.satisfies?(Test::Dependency::Base) ).to be_truthy
     end
 
     it "matches same class when looking for base class" do
-      expect( dependency.satisfies? Test::Dependency::Derived ).to be_truthy
+      expect( dependency.satisfies?(Test::Dependency::Derived) ).to be_truthy
     end
 
     it "does not inherit symbols" do
-      expect( Scorpion::Dependency.new( :a ).satisfies? :b ).to be_falsy
+      expect( Scorpion::Dependency.new( :a ).satisfies?(:b) ).to be_falsy
     end
 
     it "can satisfy a module with a class" do
-      expect( dependency.satisfies? Test::Dependency::Mod ).to be_truthy
-    end
-
-  end
-
-  describe "traits" do
-
-    context "symbolic" do
-      let( :dependency ){ Scorpion::Dependency.new Test::Dependency::Base, :apples }
-      it "satisfies matched traits" do
-        expect( dependency.satisfies? Test::Dependency::Base, :apples ).to be_truthy
-      end
-
-      it "doesn't satisfy mis-matched traits" do
-        expect( dependency.satisfies? Test::Dependency::Base, :oranges ).to be_falsy
-      end
-    end
-
-    context "module" do
-      let( :dependency ){ Scorpion::Dependency.new Test::Dependency::Derived }
-
-      it "satisfies module traits" do
-        expect( dependency.satisfies? Test::Dependency::Base, Test::Dependency::Derived ).to be_truthy
-      end
+      expect( dependency.satisfies?(Test::Dependency::Mod) ).to be_truthy
     end
 
   end
 
   it "can satisfy symbol contracts" do
-    expect( Scorpion::Dependency.new( :symbol ).satisfies? :symbol ).to be_truthy
-  end
-
-  it "satisfies ignores tail hash traits" do
-    expect( Scorpion::Dependency.new( Test::Dependency::Base ).satisfies?( Test::Dependency::Base, ) )
+    expect( Scorpion::Dependency.new( :symbol ).satisfies?(:symbol) ).to be_truthy
   end
 
   describe "equality" do
-    let( :dependency )      { Scorpion::Dependency.new( Test::Dependency::Derived ) }
+    let( :dependency ) { Scorpion::Dependency.new( Test::Dependency::Derived ) }
     let( :same )      { Scorpion::Dependency.new( Test::Dependency::Derived ) }
     let( :different ) { Scorpion::Dependency.new( Test::Dependency::Base ) }
 
-    specify{ expect( dependency ).to eq same }
-    specify{ expect( dependency ).not_to eq different }
-    specify{ expect( dependency.hash ).to eq same.hash }
+    specify { expect( dependency ).to eq same }
+    specify { expect( dependency ).not_to eq different }
+    specify { expect( dependency.hash ).to eq same.hash }
   end
 
   describe ".define" do
-    let( :scorpion ){ double Scorpion }
-    let( :hunt )    { Scorpion::Hunt.new scorpion, String, nil }
+    let( :scorpion ) { double Scorpion }
+    let( :hunt ) { Scorpion::Hunt.new scorpion, String, nil }
 
     it "is a ClassDependency for class hunts" do
       dependency = Scorpion::Dependency.define String
@@ -98,22 +71,22 @@ describe Scorpion::Dependency do
       dependency = Scorpion::Dependency.define String, return: "AWESEOME"
 
       expect( dependency ).to be_a Scorpion::Dependency::BuilderDependency
-      expect( dependency.fetch hunt ).to eq "AWESEOME"
+      expect( dependency.fetch(hunt) ).to eq "AWESEOME"
     end
 
     it "is a BuilderDependency for block hunts" do
       dependency =  Scorpion::Dependency.define String do
                 "YASS"
-              end
+      end
 
       expect( dependency ).to be_a Scorpion::Dependency::BuilderDependency
     end
 
     it "is a BuilderDependency for with: option" do
-      dependency = Scorpion::Dependency.define String, with: ->(scorpion,*args,&block){ "YASSS" }
+      dependency = Scorpion::Dependency.define String, with: ->(_scorpion, *_args) { "YASSS" }
 
       expect( dependency ).to be_a Scorpion::Dependency::BuilderDependency
-      expect( dependency.fetch hunt ).to eq "YASSS"
+      expect( dependency.fetch(hunt) ).to eq "YASSS"
     end
 
     it "is a BuilderDependency when hunted class implements #create" do
@@ -128,4 +101,4 @@ describe Scorpion::Dependency do
 
   end
 
-end
+end

data/spec/lib/scorpion/error_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Scorpion::UnsuccessfulHunt do
   it "formats the default message" do

data/spec/lib/scorpion/hunt_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 
 module Test
@@ -18,48 +18,29 @@ module Test
 end
 
 describe Scorpion::Hunt do
-  
-  let( :scorpion ){ double Scorpion }
-  let( :hunt ){ Scorpion::Hunt.new scorpion, String, nil }
 
-  describe "#fetch_by_traits" do
+  let( :scorpion ) { double Scorpion }
+  let( :hunt ) { Scorpion::Hunt.new scorpion, String, nil }
+
+  describe "#fetch" do
     it "changes context" do
       expect( scorpion ).to receive( :execute ) do |hunt|
         expect( hunt.contract ).to eq Regexp
       end
 
-      hunt.fetch_by_traits Regexp, nil
+      hunt.fetch Regexp, nil
     end
 
     it "restores context" do
       expect( scorpion ).to receive( :execute )
 
-      hunt.fetch_by_traits Numeric, nil
+      hunt.fetch Numeric, nil
       expect( hunt.contract ).to eq String
     end
-
-    it "finds matching argument in parent" do
-      hunt.dependencies[:label] = "Hello"
-
-      expect( hunt.fetch String ).to eq "Hello"
-    end
-
-    it "finds matching argument in grandparent" do
-      hunt = Scorpion::Hunt.new scorpion, String, nil, label: "Hello"
-      hunt.send :push, Regexp, nil, [], {}, nil
-
-      expect( scorpion ).to receive( :execute ) do |hunt|
-        next if hunt.contract == String
-
-        expect( hunt.fetch String ).to eq "Hello"
-      end.at_least(:once)
-
-      hunt.fetch Numeric
-    end
   end
 
   describe "#inject" do
-    let( :target )  do
+    let( :target ) do
       Test::Hunt::Target.new
     end
 
@@ -89,6 +70,13 @@ describe Scorpion::Hunt do
       expect( target.sailor? ).to be_falsy
     end
 
+    it "uses the same hunt when lazy fetching" do
+      hunt.inject target
+
+      expect( hunt ).to receive( :fetch ).with( Test::Hunt::Logger )
+      target.sailor
+    end
+
     it "invokes on_injected" do
       expect( target ).to receive( :on_injected )
       hunt.inject target
@@ -96,4 +84,4 @@ describe Scorpion::Hunt do
 
   end
 
-end
+end

data/spec/lib/scorpion/hunter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Test
   module Hunter
@@ -29,9 +29,12 @@ module Test
 
       depend_on do
         city City
+        zoo Test::Hunter::Zoo
       end
 
-      initialize( zoo: Test::Hunter::Zoo )
+      def initialize( zoo = nil )
+        self.zoo = zoo
+      end
     end
 
     class City
@@ -39,9 +42,12 @@ module Test
 
       depend_on do
         park Park
+        zoo Test::Hunter::Zoo
       end
 
-      initialize( zoo: Test::Hunter::Zoo )
+      def initialize( zoo = nil )
+        self.zoo = zoo
+      end
     end
 
     class Singleton
@@ -54,11 +60,10 @@ describe Scorpion::Hunter do
 
   let( :hunter ) do
     Scorpion::Hunter.new do
-      capture Test::Hunter::Lion, :tame
+      capture Test::Hunter::Lion
 
       hunt_for Test::Hunter::Bear
-      hunt_for Test::Hunter::Lion, :male
-      hunt_for Test::Hunter::Grizly, :female
+      hunt_for Test::Hunter::Grizly
       hunt_for Test::Hunter::Argumented
 
       hunt_for Test::Hunter::Zoo
@@ -70,17 +75,17 @@ describe Scorpion::Hunter do
   end
 
   it "spawns dependency" do
-    expect( hunter.fetch Test::Hunter::Beast ).to be_a Test::Hunter::Beast
+    expect( hunter.fetch(Test::Hunter::Beast) ).to be_a Test::Hunter::Beast
   end
 
   it "spawns a new instance for multiple requests" do
     first = hunter.fetch Test::Hunter::Beast
-    expect( hunter.fetch Test::Hunter::Beast ).not_to be first
+    expect( hunter.fetch(Test::Hunter::Beast) ).not_to be first
   end
 
   it "spawns the same instance for captured dependency" do
-    first = hunter.fetch_by_traits Test::Hunter::Beast, :tame
-    expect( hunter.fetch_by_traits Test::Hunter::Beast, :tame ).to be first
+    first = hunter.fetch Test::Hunter::Lion
+    expect( hunter.fetch(Test::Hunter::Lion) ).to be first
   end
 
   it "injects nested objects" do
@@ -94,11 +99,7 @@ describe Scorpion::Hunter do
   end
 
   it "implicitly spawns Class contracts" do
-    expect( hunter.fetch Test::Hunter::Implicit ).to be_a Test::Hunter::Implicit
-  end
-
-  it "implicitly spawns Class contracts with empty traits" do
-    expect( hunter.fetch_by_traits Test::Hunter::Implicit, [] ).to be_a Test::Hunter::Implicit
+    expect( hunter.fetch(Test::Hunter::Implicit) ).to be_a Test::Hunter::Implicit
   end
 
   it "initialize explicit contracts" do
@@ -109,23 +110,30 @@ describe Scorpion::Hunter do
 
   it "delegates hunting definitions" do
     hunter.hunt_for Test::Hunter::Zoo, return: :nyc
-    expect( hunter.fetch Test::Hunter::Zoo ).to eq :nyc
+    expect( hunter.fetch(Test::Hunter::Zoo) ).to eq :nyc
   end
 
   context "child dependencies" do
     it "passes initializer args to child dependencies" do
-      zoo  = Test::Hunter::Zoo.new
-      city = hunter.fetch Test::Hunter::City, zoo: zoo
+      zoo  = hunter.new Test::Hunter::Zoo
+      city = hunter.fetch Test::Hunter::City, zoo
 
       expect( city.park.zoo ).to be zoo
     end
 
     it "passes self to child dependencies" do
-      zoo  = Test::Hunter::Zoo.new
-      city = hunter.fetch Test::Hunter::City, zoo: zoo
+      zoo  = hunter.new Test::Hunter::Zoo
+      city = hunter.fetch Test::Hunter::City, zoo
 
       expect( city.park.city ).to be city
     end
+
+    it "gets a new instance for the same contract on a different hunt" do
+      zoo = hunter.new Test::Hunter::Zoo
+      other_zoo = hunter.new Test::Hunter::Zoo
+
+      expect( zoo ).not_to be other_zoo
+    end
   end
 
   describe "#find_dependency" do
@@ -152,4 +160,4 @@ describe Scorpion::Hunter do
       expect( hunter.inspect ).not_to match /0x/
     end
   end
-end
+end

data/spec/lib/scorpion/object_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Test
   module Object
@@ -10,7 +10,7 @@ module Test
     class Mamal
       include Scorpion::Object
 
-      def initialize( family, parent = nil, options={}, &block )
+      def initialize( family, parent = nil, options = {}, &block )
         @family    = family
         @parent    = parent
         @options   = inject_from! options
@@ -37,8 +37,9 @@ module Test
         cheese  Test::Object::Logger
         logger  Test::Object::BackLogger
       end
-      def initialize( options = {} )
-        super 'mouse', nil, options
+
+      def initialize( **options )
+        super "mouse", nil, options
       end
     end
 
@@ -53,7 +54,7 @@ end
 
 describe Scorpion::Object do
 
-  let( :scorpion ){ double Scorpion }
+  let( :scorpion ) { double Scorpion }
   let( :hunt )    { double Scorpion::Hunt }
 
   before( :each ) do
@@ -74,7 +75,7 @@ describe Scorpion::Object do
   describe ".spawn" do
 
     it "can spawn" do
-      mamal = Test::Object::Mamal.spawn hunt, 'mouse', 'rodent', name: 'name'
+      mamal = Test::Object::Mamal.spawn hunt, "mouse", "rodent", name: "name"
       expect( mamal ).to be_a Test::Object::Mamal
     end
 
@@ -84,14 +85,14 @@ describe Scorpion::Object do
     end
 
     it "can inherit" do
-      mouse = Test::Object::Mouse.spawn hunt, { name: 'name' }, {}
-      expect( mouse.family ).to eq 'mouse'
-      expect( mouse.options ).to include name: 'name'
+      mouse = Test::Object::Mouse.spawn hunt, name: "name"
+      expect( mouse.family ).to eq "mouse"
+      expect( mouse.options ).to include name: "name"
     end
 
     it "yields to constructor" do
       expect do |b|
-        Test::Object::Mouse.spawn hunt, name: 'name', &b
+        Test::Object::Mouse.spawn hunt, name: "name", &b
       end.to yield_control
     end
 
@@ -99,10 +100,10 @@ describe Scorpion::Object do
 
   describe "accessors" do
     let( :object ) do
-      Test::Object::Mamal.spawn hunt, 'harry', 'jim', name: 'name', manager: double
+      Test::Object::Mamal.spawn hunt, "harry", "jim", name: "name", manager: double
     end
 
-    subject{ object }
+    subject { object }
 
     it "defines accessors" do
       expect( object ).to     respond_to :user_service
@@ -110,12 +111,12 @@ describe Scorpion::Object do
     end
 
     it "supports private reader" do
-      expect( object.respond_to? :executive_manager, false ).to be_falsy
-      expect( object.respond_to? :executive_manager, true ).to be_truthy
+      expect( object.respond_to?(:executive_manager, false) ).to be_falsy
+      expect( object.respond_to?(:executive_manager, true) ).to be_truthy
     end
 
     it "supports public writer" do
-      expect( object.respond_to? :manager=, false ).to be_truthy
+      expect( object.respond_to?(:manager=, false) ).to be_truthy
     end
 
     describe "#attr_dependency" do
@@ -130,7 +131,7 @@ describe Scorpion::Object do
       end
     end
 
-    describe  "inheritance" do
+    describe "inheritance" do
       let( :object ) do
         Test::Object::Mouse.spawn hunt
       end
@@ -144,7 +145,7 @@ describe Scorpion::Object do
       end
 
       it "doesn't effect other classes" do
-        expect( Test::Object::Bear.spawn( hunt, 'Yogi' ).injected_attributes[:logger].contract ).to be Test::Object::ColorLogger
+        expect( Test::Object::Bear.spawn( hunt, "Yogi" ).injected_attributes[:logger].contract ).to be Test::Object::ColorLogger # rubocop:disable Metrics/LineLength
       end
 
     end
@@ -154,7 +155,7 @@ describe Scorpion::Object do
   describe "feasting" do
     let( :logger )  { Test::Object::Logger.new }
     let( :options ) { { manager: logger, color: :red } }
-    let( :object )    { Test::Object::Mouse.new name: 'mighty' }
+    let( :object )    { Test::Object::Mouse.new name: "mighty" }
 
 
     describe "#inject_from" do
@@ -215,4 +216,4 @@ describe Scorpion::Object do
     end
   end
 
-end
+end