ioc 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daea0d62d1d33b2d291e60e8ded2d3e22ea64434
-  data.tar.gz: 8e58e246b0b6f1ca08f0aa1475e25423db9307f5
+  metadata.gz: 88f7a749eb3e62a7f4633a46b76fc0d353315588
+  data.tar.gz: 23827f1f2cb06e3f27240287edaf5d5ce3ab890d
 SHA512:
-  metadata.gz: 92df3344bbe775ce4ce55ec7a28c043a31151baa1310aa272d69120786b45e3f1c6b27b196a85609323fe6a61e7dcdb5e4a3a0c4135fdea93a95377744957153
-  data.tar.gz: 0dff485f90b20931e6715e2d08ac55509791813aa3c8041386b3b3303f641fe7b56fa9187aedae61b98e1bd5d230ddecba49fb86a47829d2f06ddb2f99658491
+  metadata.gz: 1c72d08fb16c77a1c40145e4f05a828c370c2974fc5a6673f5b090bdbcf5be929139171ed3500aa40c8484317a7de0c16c8d95bb9f0444cf6b59feafb7082d55
+  data.tar.gz: 5e59363962cd2c7823d71a1647eb32dd8d7a4a6e9fbc4fccce34479a15b9abd3b2e25e0b135458f895a62a4c9e440b78b78974185f7980a3d53687fb662d2483

data/ioc.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'ioc'
-  spec.version       = '3.0.0'
+  spec.version       = '4.0.0'
   spec.authors       = ['Erik Lott']
   spec.email         = ['erik.lott@kodio.io']
   spec.summary       = 'Minimal inversion of control container for Ruby'

data/lib/ioc.rb

@@ -1 +1 @@
-require 'ioc/container'
+require "ioc/container"

data/lib/ioc/container.rb

@@ -1,39 +1,39 @@
-require 'ioc/service_class'
-require 'ioc/service_block'
+require "ioc/service_class"
+require "ioc/service_block"
+require "ioc/unresolvable_container"
 
 module IOC
   class Container
-    def self.install(*installers)
-      [*installers].inject(new) do |c, installer|
-        installer.install(c)
-        c
-      end
-    end
-
-    def initialize
-      @resolvers = {}
+    def initialize(parent=UnresolvableContainer.new)
+      @services = {}
       @cache = {}
+      @parent = parent
     end
     
     def register(service_name, klass=nil, &block)
-      raise(ArgumentError, "Service '#{service_name}' has already been registered") if @resolvers.key?(service_name)
-      @resolvers[service_name] = 
+      raise(ArgumentError, "Service '#{service_name}' has already been registered") if @services.key?(service_name)
+      @services[service_name] = 
         if klass
           ServiceClass.new(klass)
         elsif block_given?
           ServiceBlock.new(block)
         else
-          raise(ArgumentError, 'expected service')
+          raise(ArgumentError, "expected service")
         end
     end
 
     def resolve(name)
-      raise(ArgumentError, "Service '#{name}' not registered") unless @resolvers.key?(name)
-      @cache[name] ||= @resolvers[name].resolve(self)
+      @cache[name] ||= service_locator(name)
     end
 
     def [](key)
       resolve(key)
     end
+
+    private
+
+    def service_locator(name)
+      @services.key?(name) ? @services[name].resolve(self) : @parent.resolve(name)
+    end
   end
 end

data/lib/ioc/service_class.rb

@@ -4,7 +4,7 @@ module IOC
       klass.instance_method(:initialize)
       @klass = klass
     rescue NoMethodError => e
-      raise(ArgumentError, 'Expected initialize method on registered service')
+      raise(ArgumentError, "Expected initialize method on registered service")
     end
 
     def resolve(container)

data/lib/ioc/unresolvable_container.rb

@@ -0,0 +1,7 @@
+module IOC
+  class UnresolvableContainer
+    def resolve(name)
+      raise(ArgumentError, "Service '#{name}' not registered")
+    end
+  end
+end

data/spec/{ioc_spec.rb → container_spec.rb}

@@ -1,9 +1,9 @@
-require 'spec_helper'
-require 'ioc'
+require "spec_helper"
+require "ioc"
 
 describe IOC::Container do
-  context 'when class is registered' do
-    it 'resolves a class instance' do
+  context "when class is registered" do
+    it "resolves a class instance" do
       container = define_container
       myclass = define_class
       container.register(:myclass, myclass)
@@ -11,7 +11,7 @@ describe IOC::Container do
       inst.must_be_instance_of(myclass)
     end
 
-    it 'caches resolved instance' do
+    it "caches resolved instance" do
       container = define_container
       myclass = define_class
       container.register(:myclass, myclass)
@@ -20,8 +20,8 @@ describe IOC::Container do
       inst1.must_equal(inst2)
     end
 
-    context 'when class has dependencies' do
-      it 'injects dependencies into instance' do
+    context "when class has dependencies" do
+      it "injects dependencies into instance" do
         container = define_container
         
         engine_class = define_class
@@ -34,7 +34,7 @@ describe IOC::Container do
         car.engine.must_be_instance_of(engine_class)
       end
 
-      it 'caches dependencies' do
+      it "caches dependencies" do
         container = define_container
         
         engine_class = define_class
@@ -51,23 +51,23 @@ describe IOC::Container do
     end
   end
 
-  context 'when block is registered' do
-    it 'returns result of block' do
-      myobject = 'a string object'
+  context "when block is registered" do
+    it "returns result of block" do
+      myobject = "a string object"
       container = define_container
       container.register(:myobject){|c| myobject }
       container.resolve(:myobject).must_equal(myobject)
     end
   end
 
-  it 'raises error when service not found' do
+  it "raises error when service not found" do
     container = define_container
     proc { 
       container.resolve(:some_service) 
     }.must_raise(ArgumentError)
   end
 
-  it 'raises error when service registered more than once' do
+  it "raises error when service registered more than once" do
     myclass = define_class
     container = define_container
     container.register(:myclass, myclass)
@@ -76,7 +76,7 @@ describe IOC::Container do
     }.must_raise(ArgumentError)
   end
 
-  it 'raises error when object registered as class' do
+  it "raises error when object registered as class" do
     myclass = define_class
     myobject = myclass.new
     container = define_container
@@ -85,18 +85,7 @@ describe IOC::Container do
     }.must_raise(ArgumentError)
   end
 
-  it 'can register components using an installer' do
-    installer_class = Class.new do
-      def self.install(cont)
-        cont.register(:myobj){|c| 'I was resolved'}
-      end
-    end
-
-    container = IOC::Container.install(installer_class)
-    container.resolve(:myobj).must_equal('I was resolved')
-  end
-
-  it 'supports resolving via hash syntax' do
+  it "supports resolving via hash syntax" do
     container = define_container
     myclass = Class.new
     container.register(:myclass, myclass)
@@ -104,6 +93,15 @@ describe IOC::Container do
     inst.must_be_instance_of(myclass)
   end
 
+  it "can resolve service from parent container" do
+    myobject = Object.new
+    parent_container = define_container
+    parent_container.register(:myobject){ myobject }
+
+    child_container = define_container(parent_container)
+    child_container.resolve(:myobject).must_equal(myobject)
+  end
+
   def define_container(*args)
     IOC::Container.new(*args)
   end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'minitest/autorun'
+require "minitest/autorun"
 
 def context *args, &block
   describe *args, &block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ioc
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,8 @@ files:
 - lib/ioc/container.rb
 - lib/ioc/service_block.rb
 - lib/ioc/service_class.rb
-- spec/ioc_spec.rb
+- lib/ioc/unresolvable_container.rb
+- spec/container_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -80,5 +81,5 @@ signing_key:
 specification_version: 4
 summary: Minimal inversion of control container for Ruby
 test_files:
-- spec/ioc_spec.rb
+- spec/container_spec.rb
 - spec/spec_helper.rb