ioc 1.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870b95c905301c1b57ce0709dace5b4d1974ce57
-  data.tar.gz: 7c9f78022bdf6a1c3fa9cdd3773d2052a0c88a76
+  metadata.gz: 16e4bbc94810cfff1a0cce335a242993c9993767
+  data.tar.gz: 0c9e66471ee6b827adccbdcf927bfc042ea13cab
 SHA512:
-  metadata.gz: 29d65414dc5bfd8a28b67d6302151f1cedb1f15db580daf9fc5bdd2fb034dfe6807e118418286f646619959cd08272bdf79c879c06ad5c51a143d91424f86f4b
-  data.tar.gz: 32494aecb6e48f566b7cae7867ca137e682796af7bd5e1d9f4ea6a229c118c9295a3f5318baf91800f08e20c3bfcbb1dbcb7c243c184f6282c2b7d01ff5152ed
+  metadata.gz: 7d8691f028e9efbf5d19eaa37189c10f40a57af2eb2eda2ae8e5d814212bd9ce4d6f1d5991b21e10bf6b8db477da1a266f70cab9b2f4bfa202b8409807392295
+  data.tar.gz: 489021e8551b4d98f2705f377780c5f30949384a88f8409a9e71c53937b26ea7ea30e03cd17ed3ee94d25a5af7ba29471bdeea2ff719657483daca7d397dbf31

data/lib/ioc.rb

@@ -6,6 +6,5 @@ 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

@@ -14,19 +14,20 @@ module IOC
     
     def register(name, object, options={})
       raise(DuplicateRegistration, "Service '#{name}' has already been registered") if @resolvers.key?(name)
-      @resolvers[name] = ResolverFactory.new_instance(name, object, self, options)
+      @resolvers[name] = ResolverFactory.new_instance(object, self, options)
     end
 
     def resolve(name)
-      resolver(name).resolve(@cache)
+      raise(UnknownService, "Service '#{name}' has not been registered") unless @resolvers.key?(name)
+      @cache[name] ||= @resolvers[name].resolve
     end
 
-    def [](key)
-      resolve(key)
+    def resolve_anonymous(klass)
+      ClassResolver.new(klass, self).resolve
     end
 
-    def resolver(name)
-      @resolvers[name] || raise(UnknownService, "Service '#{name}' has not been registered")
+    def [](key)
+      resolve(key)
     end
   end
 end

data/lib/ioc/resolver_factory.rb

@@ -1,8 +1,8 @@
 module IOC
   class ResolverFactory
-    def self.new_instance(name, object, container, options={})
+    def self.new_instance(object, container, options={})
       type = options.fetch(:as, :class)
-      IOC.const_get("#{type.capitalize}Resolver").new(name, object, container)
+      IOC.const_get("#{type.capitalize}Resolver").new(object, container)
     end
   end
 end

data/lib/ioc/resolvers/abstract_resolver.rb

@@ -1,12 +1,11 @@
 module IOC
   class AbstractResolver
-    def initialize(name, object, container)
-      @name = name
+    def initialize(object, container)
       @object = object
       @container = container
     end
 
-    def resolve(cache)
+    def resolve
       raise(NotImplementedError)
     end
   end

data/lib/ioc/resolvers/class_resolver.rb

@@ -1,7 +1,7 @@
 module IOC
   class ClassResolver < AbstractResolver
-    def resolve(cache)
-      cache[@name] ||= instance
+    def resolve
+      instance
     end
 
     private
@@ -17,7 +17,7 @@ module IOC
     def dependencies
       klass.instance_method(:initialize).parameters.map(&:last)
     rescue NoMethodError => e
-      raise(ResolverError, "Service '#{@name}' missing initialize method ") 
+      raise(ResolverError, "Service '#{klass}' missing initialize method ") 
     end
 
     def resolved_dependencies

data/lib/ioc/resolvers/instance_resolver.rb

@@ -1,7 +1,7 @@
 module IOC
   class InstanceResolver < AbstractResolver
-    def resolve(cache)
-      cache[@name] ||= instance
+    def resolve
+      instance
     end
 
     private

data/lib/ioc/version.rb

@@ -1,3 +1,3 @@
 module IOC
-  VERSION = "1.0.0"
+  VERSION = "2.1.0"
 end

data/spec/ioc_spec.rb

@@ -76,71 +76,6 @@ 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
@@ -183,6 +118,22 @@ describe IOC::Container do
     container[:myclass].must_be_instance_of(myclass)
   end
 
+  it 'can resolve anonymous class' do
+    container = new_container
+    myobj = stub
+    anon_class = Class.new do
+      attr_reader :myobj
+      def initialize(myobj)
+        @myobj = myobj
+      end
+    end
+
+    container.register(:myobj, myobj, :as => :instance)    
+    inst = container.resolve_anonymous(anon_class)
+    inst.must_be_instance_of(anon_class)
+    inst.myobj.must_equal(myobj)
+  end
+
   def new_container(*args)
     IOC::Container.new(*args)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ioc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,6 @@ 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

data/lib/ioc/resolvers/factory_resolver.rb

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