injectable_dependencies 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5a62a3f85f8aa713eda4c0931e8f3274b26d92
-  data.tar.gz: 86d374a14c54ffd19d55960d03f7949580c78929
+  metadata.gz: 5c2a4fa90330ba1e366d71381d99f5409b0f3aa9
+  data.tar.gz: 8bf771ee6115358876cac74faf18dbde528c4109
 SHA512:
-  metadata.gz: d9d6040425e5bf06d404b3649fbe8776b5ed21fe5cf17977895723200956cce7bd123c8b2e2aa320162684e55d61cb9fb60ae0dace8761b5e49e1565322a28b1
-  data.tar.gz: 76a00acbd1367c1eab96f65e59b00343f472775709b813d5d71dccf4f3239bfa8fc14e6b67effdddeda45f94200634d1968f28113a1826c850a1c5759a4960ca
+  metadata.gz: cdce3240c56ce721e5811f05fe77bd9335c04895987cae462e78ecc04dbf8708297933e772a9f91a9029618fe6d86079ededb85941ddb907554c93d05959a379
+  data.tar.gz: f39b722a6baf935f90d0bc4a99728524d6155cb28833c915ee2ce2fcd73135cd12a0fe39e162a148754d8838c59693518806e4f9c3ad1a6905d9e3da020ba4a7

data/lib/injectable_dependencies.rb

@@ -34,11 +34,11 @@ module InjectableDependencies
     protected
 
     def dependencies
-      @dependencies ||= []
+      @@dependencies ||= []
     end
 
     def no_default_dependencies
-      @no_default_dependencies ||= []
+      @@no_default_dependencies ||= []
     end
   end
 

data/lib/injectable_dependencies/version.rb

@@ -1,3 +1,3 @@
 module InjectableDependencies
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/spec/injectable_dependencies_spec.rb

@@ -3,7 +3,7 @@ require 'injectable_dependencies'
 describe InjectableDependencies do
   FooDependency = :foo_dependency
 
-  let(:dependant_class) {
+  let(:dependent_class) {
     Class.new do
       include InjectableDependencies
       dependency(:foo) { FooDependency }
@@ -22,33 +22,33 @@ describe InjectableDependencies do
     end
   }
 
-  let(:dependant) {
-    dependant_class.new
+  let(:dependent) {
+    dependent_class.new
   }
 
   it 'allows the class to declare dependencies' do
-    expect(dependant.foo).to eq FooDependency
+    expect(dependent.foo).to eq FooDependency
   end
 
   it 'does not evaluate dependencies declared by the class until they are requested' do
-    expect{ dependant.bar }.to raise_error(NameError)
+    expect{ dependent.bar }.to raise_error(NameError)
   end
 
   it 'provides a convenience method for setting dependencies from the initializer' do
-    dependant = dependant_class.new(:dependencies => {:bar => :bar_dependency})
-    expect(dependant.bar).to eq :bar_dependency
+    dependent = dependent_class.new(:dependencies => {:bar => :bar_dependency})
+    expect(dependent.bar).to eq :bar_dependency
   end
 
   it 'provides a default initializer that allows dependency overrides' do
-    dependant = dependent_class_with_default_initializer.new(:dependencies => {:bar => :bar_dependency})
-    expect(dependant.bar).to eq :bar_dependency
-    expect(dependant.foo).to be FooDependency
+    dependent = dependent_class_with_default_initializer.new(:dependencies => {:bar => :bar_dependency})
+    expect(dependent.bar).to eq :bar_dependency
+    expect(dependent.foo).to be FooDependency
   end
 
   it 'does not persist dependencies between instances' do
-    s0 = dependant_class.new
-    s1 = dependant_class.new(:dependencies => { :foo => :s1_dep })
-    s2 = dependant_class.new(:dependencies => { :foo => :s2_dep })
+    s0 = dependent_class.new
+    s1 = dependent_class.new(:dependencies => { :foo => :s1_dep })
+    s2 = dependent_class.new(:dependencies => { :foo => :s2_dep })
 
     expect(s0.foo).to eq FooDependency
     expect(s1.foo).to eq :s1_dep
@@ -56,11 +56,74 @@ describe InjectableDependencies do
   end
 
   it 'does not allow undeclared dependencies to be specified in initializer' do
-    expect{ dependant_class.new(:dependencies => {:undeclared_thing => :oops}) } \
+    expect{ dependent_class.new(:dependencies => {:undeclared_thing => :oops}) } \
       .to raise_error(InjectableDependencies::UndeclaredDependencyError,
                       "Cannot override undeclared dependency 'undeclared_thing'.")
   end
 
+  context 'when a class inherits from another class that has dependencies' do
+    let(:inheriting_class) {
+      Class.new(dependent_class)
+    }
+
+    let(:inheriting_class_with_default_initializer) {
+      Class.new(dependent_class_with_default_initializer)
+    }
+
+    let(:inheriting_class_with_own_deps) {
+      Class.new(dependent_class) do
+        dependency(:only_here) { :inheriting_class_dep }
+      end
+    }
+
+    let(:dependent) { inheriting_class.new }
+
+    it 'also inherits the dependency definitions' do
+      expect(dependent.foo).to eq FooDependency
+    end
+
+    it 'does not evaluate dependencies declared by the class until they are requested' do
+      expect{ dependent.bar }.to raise_error(NameError)
+    end
+
+    it 'provides a convenience method for setting dependencies from the initializer' do
+      dependent = inheriting_class.new(:dependencies => {:bar => :bar_dependency})
+      expect(dependent.bar).to eq :bar_dependency
+    end
+
+    it 'provides a default initializer that allows dependency overrides' do
+      dependent = inheriting_class_with_default_initializer.new(:dependencies => {:bar => :bar_dependency})
+      expect(dependent.bar).to eq :bar_dependency
+      expect(dependent.foo).to be FooDependency
+    end
+
+    it 'does not persist dependencies between instances' do
+      s0 = inheriting_class.new
+      s1 = inheriting_class.new(:dependencies => { :foo => :s1_dep })
+      s2 = inheriting_class.new(:dependencies => { :foo => :s2_dep })
+
+      expect(s0.foo).to eq FooDependency
+      expect(s1.foo).to eq :s1_dep
+      expect(s2.foo).to eq :s2_dep
+    end
+
+    it 'does not allow undeclared dependencies to be specified in initializer' do
+      expect{ inheriting_class.new(:dependencies => {:undeclared_thing => :oops}) } \
+        .to raise_error(InjectableDependencies::UndeclaredDependencyError,
+                        "Cannot override undeclared dependency 'undeclared_thing'.")
+    end
+
+    it 'can define its own dependencies' do
+      dependent = inheriting_class_with_own_deps.new
+      expect(dependent.only_here).to eq(:inheriting_class_dep)
+    end
+
+    it 'does not push its dependencies back up the stack' do
+      _ = inheriting_class_with_own_deps.new # to make sure it is created
+      expect{ dependent.only_here }.to raise_error(NoMethodError)
+    end
+  end
+
   context 'when a dependency is defined without a default implementation' do
     context 'when the dependent class has its own initializer' do
       let(:dependent_class) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: injectable_dependencies
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - John Wilger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport