ioc 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e73c2b549c93b5b232498fa2496b2c993d6b07
-  data.tar.gz: 10143c0341005c1070f9b78602a4e355dde0f406
+  metadata.gz: 868245cc4cc63541709598bf36176f20d4b72715
+  data.tar.gz: 89ead53a3ffffbf2084d2de52a2c1c0536088b42
 SHA512:
-  metadata.gz: ac88db41acc966a6b83b592576fe37b546b4cd5dede75fcb6c5208f1a6951a86f90a26297ef4d489c170779e5564694ed6e28ea3382d1e84c24044406b25c187
-  data.tar.gz: 168fa1d831595d5548d0aa38e01af9088951805adb23d30775de6423b80a991b7ea469fb7c08030ea009d2847d1e4c85b8d50e1fd01be6ce185e31a6c2899c92
+  metadata.gz: 40d1e650d54707bab19aef06c71a0e184b461386b73d2e34bf40e588753e515803bb761d0962154b5fa88963f97e081ad154f16dd132dc6454c405f214482f2c
+  data.tar.gz: 228594aa3e7d38d895e333a896eb3c2ec2941f540aeaac1346d72bd8132c918601064f30195af0171766244164d3a2ce600f712aa79ba259bcde5d664ae7ba47

data/lib/ioc.rb

@@ -1,5 +1,11 @@
-require 'ioc/version'
-require 'ioc/container'
-
 module IOC
 end
+
+require 'ioc/version'
+require 'ioc/exceptions'
+require 'ioc/resolvers/abstract_resolver'
+require 'ioc/resolvers/instance_resolver'
+require 'ioc/resolvers/class_resolver'
+require 'ioc/resolvers/factory_resolver'
+require 'ioc/resolver_factory'
+require 'ioc/container'

data/lib/ioc/container.rb

@@ -1,6 +1,3 @@
-require 'ioc/resolver_factory'
-require 'ioc/exceptions'
-
 module IOC
   class Container
     def initialize(resolver_factory=ResolverFactory)
@@ -16,7 +13,7 @@ module IOC
 
     def resolve(name)
       raise(UnknownService, "Service '#{name}' has not been registered") unless @resolvers.key?(name)
-      @cache[name] ||= @resolvers.fetch(name).resolve
+      @resolvers.fetch(name).resolve(@cache)
     end
   end
 end

data/lib/ioc/resolver_factory.rb

@@ -1,6 +1,3 @@
-require 'ioc/resolvers/class_resolver'
-require 'ioc/resolvers/instance_resolver'
-
 module IOC
   class ResolverFactory
     def self.new_instance(name, object, container, options={})

data/lib/ioc/resolvers/abstract_resolver.rb

@@ -6,7 +6,7 @@ module IOC
       @container = container
     end
 
-    def resolve
+    def resolve(cache)
       raise(NotImplementedError)
     end
   end

data/lib/ioc/resolvers/class_resolver.rb

@@ -1,14 +1,15 @@
-require 'ioc/resolvers/abstract_resolver'
-require 'ioc/exceptions'
-
 module IOC
   class ClassResolver < AbstractResolver
-    def resolve
-      klass.new(*resolved_dependencies)
+    def resolve(cache)
+      cache[@name] ||= instance
     end
 
     private
 
+    def instance
+      klass.new(*resolved_dependencies)
+    end
+
     def klass
       @object
     end

data/lib/ioc/resolvers/factory_resolver.rb

@@ -0,0 +1,7 @@
+module IOC
+  class FactoryResolver < ClassResolver
+    def resolve(cache)
+      instance
+    end
+  end
+end

data/lib/ioc/resolvers/instance_resolver.rb

@@ -1,8 +1,12 @@
-require 'ioc/resolvers/abstract_resolver'
-
 module IOC
   class InstanceResolver < AbstractResolver
-    def resolve
+    def resolve(cache)
+      cache[@name] ||= instance
+    end
+
+    private
+
+    def instance
       @object
     end
   end

data/lib/ioc/version.rb

@@ -1,3 +1,3 @@
 module IOC
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/ioc_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'ioc'
 
 describe IOC::Container do
-  context 'when service is registered as instance' do
+  context 'when service is registered as an instance' do
     it 'can resolve instance' do
       container = new_container
       my_object = stub
@@ -11,7 +11,7 @@ describe IOC::Container do
     end
   end
 
-  context 'when service is registered as class' do
+  context 'when service is registered as a class' do
     context 'when class has no dependencies' do
       it 'resolves to instance' do
         container = new_container
@@ -76,6 +76,71 @@ describe IOC::Container do
     end
   end
 
+  context 'when service is registered as a factory' do
+    context 'when class has no dependencies' do
+      it 'resolves to instance' do
+        container = new_container
+        myclass = new_class
+        container.register(:myclass, myclass, :as => :factory)
+        container.resolve(:myclass).must_be_instance_of(myclass)
+      end
+
+      it 'does not cache resolved instance' do
+        container = new_container
+        myclass = new_class
+        container.register(:myclass, myclass, :as => :factory)
+        inst = container.resolve(:myclass)
+        container.resolve(:myclass).wont_equal(inst)
+      end
+    end
+
+    context 'when class has dependencies' do
+      it 'resolves to instance' do
+        container = new_container
+        engine_class = new_class
+        car_class = new_class_with_dependency
+        container.register(:engine, engine_class)
+        container.register(:car, car_class, :as => :factory)
+
+        container.resolve(:car).must_be_instance_of(car_class)
+      end
+
+      it 'does not cache resolved instance' do
+        container = new_container
+        engine_class = new_class
+        car_class = new_class_with_dependency
+        container.register(:engine, engine_class)
+        container.register(:car, car_class, :as => :factory)
+
+        car = container.resolve(:car)
+        container.resolve(:car).wont_equal(car)
+      end
+
+      it 'injects dependencies into instance' do
+        container = new_container
+        engine_class = new_class
+        car_class = new_class_with_dependency
+        container.register(:engine, engine_class)
+        container.register(:car, car_class, :as => :factory)
+
+        car = container.resolve(:car)
+        car.engine.must_be_instance_of(engine_class)
+      end
+
+      it 'caches dependencies' do
+        container = new_container
+        engine_class = new_class
+        car_class = new_class_with_dependency
+        container.register(:engine, engine_class)
+        container.register(:car, car_class, :as => :factory)
+
+        car = container.resolve(:car)
+        engine = car.engine
+        container.resolve(:engine).must_equal(engine)
+      end
+    end
+  end
+
   context 'when service not found' do
     it 'raises error' do
       container = new_container

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ioc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - lib/ioc/resolver_factory.rb
 - lib/ioc/resolvers/abstract_resolver.rb
 - lib/ioc/resolvers/class_resolver.rb
+- lib/ioc/resolvers/factory_resolver.rb
 - lib/ioc/resolvers/instance_resolver.rb
 - lib/ioc/version.rb
 - spec/ioc_spec.rb