ioc 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f7ece1883442db7d03642ac2a0723e0e4208ec
-  data.tar.gz: abf30ff7dbb9f75f608cbe6fe0b0d4df0a1f0b4a
+  metadata.gz: daea0d62d1d33b2d291e60e8ded2d3e22ea64434
+  data.tar.gz: 8e58e246b0b6f1ca08f0aa1475e25423db9307f5
 SHA512:
-  metadata.gz: 0f6a0d831a5823f85df5eb71577be1cfa38c613cd4f0559c3bb9e8220a07392cbbaf0baf541108014f063ae15ec2cd5b2193621998f7a52e2cc0e2678bbcf422
-  data.tar.gz: 1e492ebbb5e74d66660ba98d4746c01c5b9c4e5c76bd8768ea73f89b5c9970ac02f78e434343eaab559afe7650abb31056323c9502a0717585c749e78f64ff45
+  metadata.gz: 92df3344bbe775ce4ce55ec7a28c043a31151baa1310aa272d69120786b45e3f1c6b27b196a85609323fe6a61e7dcdb5e4a3a0c4135fdea93a95377744957153
+  data.tar.gz: 0dff485f90b20931e6715e2d08ac55509791813aa3c8041386b3b3303f641fe7b56fa9187aedae61b98e1bd5d230ddecba49fb86a47829d2f06ddb2f99658491

data/ioc.gemspec

@@ -1,24 +1,19 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ioc/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ioc"
-  spec.version       = IOC::VERSION
-  spec.authors       = ["Erik Lott"]
-  spec.email         = ["erik.lott@kodio.io"]
-  spec.description   = %q{Minimal inversion of control container for Ruby}
-  spec.summary       = %q{Minimal inversion of control container for Ruby}
-  spec.homepage      = ""
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.name          = 'ioc'
+  spec.version       = '3.0.0'
+  spec.authors       = ['Erik Lott']
+  spec.email         = ['erik.lott@kodio.io']
+  spec.summary       = 'Minimal inversion of control container for Ruby'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
+  spec.files          = ['LICENSE.txt', 'README.md', 'Rakefile', 'ioc.gemspec']
+  spec.files         += Dir.glob('lib/**/*.rb')
+  spec.files         += Dir.glob('spec/**/*')
+  spec.test_files     = Dir.glob('spec/**/*')
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "mocha", "~> 0.14.0"
-end
+end

data/lib/ioc.rb

@@ -1,10 +1 @@
-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/resolver_factory'
 require 'ioc/container'

data/lib/ioc/container.rb

@@ -1,3 +1,6 @@
+require 'ioc/service_class'
+require 'ioc/service_block'
+
 module IOC
   class Container
     def self.install(*installers)
@@ -12,23 +15,21 @@ module IOC
       @cache = {}
     end
     
-    def register(name, object, options={})
-      raise(DuplicateRegistration, "Service '#{name}' has already been registered") if @resolvers.key?(name)
-      @resolvers[name] = ResolverFactory.new_instance(object, self, options)
-    end
-
-    def register_instance(name, object, options={})
-      options[:as] = :instance
-      register(name, object, options)
+    def register(service_name, klass=nil, &block)
+      raise(ArgumentError, "Service '#{service_name}' has already been registered") if @resolvers.key?(service_name)
+      @resolvers[service_name] = 
+        if klass
+          ServiceClass.new(klass)
+        elsif block_given?
+          ServiceBlock.new(block)
+        else
+          raise(ArgumentError, 'expected service')
+        end
     end
 
     def resolve(name)
-      raise(UnknownService, "Service '#{name}' has not been registered") unless @resolvers.key?(name)
-      @cache[name] ||= @resolvers[name].resolve
-    end
-
-    def resolve_anonymous(klass)
-      ClassResolver.new(klass, self).resolve
+      raise(ArgumentError, "Service '#{name}' not registered") unless @resolvers.key?(name)
+      @cache[name] ||= @resolvers[name].resolve(self)
     end
 
     def [](key)

data/lib/ioc/service_block.rb

@@ -0,0 +1,11 @@
+module IOC
+  class ServiceBlock
+    def initialize(block)
+      @block = block
+    end
+
+    def resolve(container)
+      @block.call(container)
+    end
+  end
+end

data/lib/ioc/service_class.rb

@@ -0,0 +1,16 @@
+module IOC
+  class ServiceClass
+    def initialize(klass) 
+      klass.instance_method(:initialize)
+      @klass = klass
+    rescue NoMethodError => e
+      raise(ArgumentError, 'Expected initialize method on registered service')
+    end
+
+    def resolve(container)
+      dependencies = @klass.instance_method(:initialize).parameters.map(&:last)
+      resolved_dependencies = dependencies.map{ |dependency| container.resolve(dependency) }
+      @klass.new(*resolved_dependencies)
+    end
+  end
+end

data/spec/ioc_spec.rb

@@ -2,60 +2,32 @@ require 'spec_helper'
 require 'ioc'
 
 describe IOC::Container do
-  context 'when service is registered as an instance' do
-    it 'can resolve instance' do
-      container = new_container
-      my_object = stub
-      container.register(:myobj, my_object, :as => :instance)
-      container.resolve(:myobj).must_equal(my_object)
+  context 'when class is registered' do
+    it 'resolves a class instance' do
+      container = define_container
+      myclass = define_class
+      container.register(:myclass, myclass)
+      inst = container.resolve(:myclass)
+      inst.must_be_instance_of(myclass)
     end
-  end
-
-  context 'when service is registered as a class' do
-    context 'when class has no dependencies' do
-      it 'resolves to instance' do
-        container = new_container
-        myclass = new_class
-        container.register(:myclass, myclass)
-        container.resolve(:myclass).must_be_instance_of(myclass)
-      end
 
-      it 'caches resolved instance' do
-        container = new_container
-        myclass = new_class
-        container.register(:myclass, myclass)
-        inst = container.resolve(:myclass)
-        container.resolve(:myclass).must_equal(inst)
-      end
+    it 'caches resolved instance' do
+      container = define_container
+      myclass = define_class
+      container.register(:myclass, myclass)
+      inst1 = container.resolve(:myclass)
+      inst2 = container.resolve(:myclass)
+      inst1.must_equal(inst2)
     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)
-
-        container.resolve(:car).must_be_instance_of(car_class)
-      end
-
-      it 'caches 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)
-
-        car = container.resolve(:car)
-        container.resolve(:car).must_equal(car)
-      end
-
       it 'injects dependencies into instance' do
-        container = new_container
-        engine_class = new_class
-        car_class = new_class_with_dependency
+        container = define_container
+        
+        engine_class = define_class
         container.register(:engine, engine_class)
+
+        car_class = define_class_with_engine_dependency
         container.register(:car, car_class)
 
         car = container.resolve(:car)
@@ -63,54 +35,60 @@ describe IOC::Container do
       end
 
       it 'caches dependencies' do
-        container = new_container
-        engine_class = new_class
-        car_class = new_class_with_dependency
+        container = define_container
+        
+        engine_class = define_class
         container.register(:engine, engine_class)
+
+        car_class = define_class_with_engine_dependency
         container.register(:car, car_class)
 
         car = container.resolve(:car)
-        engine = car.engine
-        container.resolve(:engine).must_equal(engine)
+        engine = container.resolve(:engine)
+
+        car.engine.must_equal(engine)
       end
     end
   end
 
-  context 'when service not found' do
-    it 'raises error' do
-      container = new_container
-      proc { container.resolve(:some_service) }.must_raise(IOC::UnknownService)
+  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
 
-  context 'when service is registered twice' do
-    it 'raises error' do
-      container = new_container
-      container.register(:car, stub)
-      proc { container.register(:car, stub) }.must_raise(IOC::DuplicateRegistration)
-    end
+  it 'raises error when service not found' do
+    container = define_container
+    proc { 
+      container.resolve(:some_service) 
+    }.must_raise(ArgumentError)
   end
 
-  context 'when instance is registered as a class' do
-    it 'raises error' do
-      container = new_container
-      object = Object.new
-      container.register(:car, object)
-      proc {container.resolve(:car)}.must_raise(IOC::ResolverError) 
-    end
+  it 'raises error when service registered more than once' do
+    myclass = define_class
+    container = define_container
+    container.register(:myclass, myclass)
+    proc { 
+      container.register(:myclass, myclass) 
+    }.must_raise(ArgumentError)
   end
 
-  it 'can register object as an instance' do
-    object = stub
-    container = IOC::Container.new
-    container.register_instance(:myobj, object)
-    container.resolve(:myobj).must_equal(object)
+  it 'raises error when object registered as class' do
+    myclass = define_class
+    myobject = myclass.new
+    container = define_container
+    proc { 
+      container.register(:myclass, myobject)
+    }.must_raise(ArgumentError)
   end
 
   it 'can register components using an installer' do
     installer_class = Class.new do
-      def self.install(c)
-        c.register(:myobj, 'I was resolved', :as => :instance)
+      def self.install(cont)
+        cont.register(:myobj){|c| 'I was resolved'}
       end
     end
 
@@ -119,33 +97,18 @@ describe IOC::Container do
   end
 
   it 'supports resolving via hash syntax' do
-    container = new_container
-    myclass = new_class
+    container = define_container
+    myclass = Class.new
     container.register(:myclass, myclass)
-    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)
+    inst = container[:myclass]
+    inst.must_be_instance_of(myclass)
   end
 
-  def new_container(*args)
+  def define_container(*args)
     IOC::Container.new(*args)
   end
 
-  def new_class_with_dependency
+  def define_class_with_engine_dependency
     Class.new do
       attr_reader :engine
 
@@ -155,7 +118,7 @@ describe IOC::Container do
     end
   end
 
-  def new_class
+  def define_class
     Class.new
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ioc
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,42 +38,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-description: Minimal inversion of control container for Ruby
+description: 
 email:
 - erik.lott@kodio.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - ioc.gemspec
 - lib/ioc.rb
 - lib/ioc/container.rb
-- lib/ioc/exceptions.rb
-- lib/ioc/resolver_factory.rb
-- lib/ioc/resolvers/abstract_resolver.rb
-- lib/ioc/resolvers/class_resolver.rb
-- lib/ioc/resolvers/instance_resolver.rb
-- lib/ioc/version.rb
+- lib/ioc/service_block.rb
+- lib/ioc/service_class.rb
 - spec/ioc_spec.rb
 - spec/spec_helper.rb
 homepage: ''

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in ioc.gemspec
-gemspec

data/Guardfile

@@ -1,9 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard :minitest, :all_on_start => false do
-  # with Minitest::Spec
-  watch(%r{^spec/(.*)_spec\.rb})
-  watch(%r{^lib/(.+)\.rb})         { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^spec/spec_helper\.rb}) { 'spec' }
-end

data/lib/ioc/exceptions.rb

@@ -1,6 +0,0 @@
-module IOC
-  class IOCError < StandardError; end
-  class UnknownService < IOCError; end
-  class DuplicateRegistration < IOCError; end
-  class ResolverError < IOCError; end
-end

data/lib/ioc/resolver_factory.rb

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

data/lib/ioc/resolvers/abstract_resolver.rb

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

data/lib/ioc/resolvers/class_resolver.rb

@@ -1,27 +0,0 @@
-module IOC
-  class ClassResolver < AbstractResolver
-    def resolve
-      instance
-    end
-
-    private
-
-    def instance
-      klass.new(*resolved_dependencies)
-    end
-
-    def klass
-      @object
-    end
-
-    def dependencies
-      klass.instance_method(:initialize).parameters.map(&:last)
-    rescue NoMethodError => e
-      raise(ResolverError, "Service '#{klass}' missing initialize method ") 
-    end
-
-    def resolved_dependencies
-      dependencies.map{ |dependency| @container.resolve(dependency) }
-    end
-  end
-end

data/lib/ioc/resolvers/instance_resolver.rb

@@ -1,13 +0,0 @@
-module IOC
-  class InstanceResolver < AbstractResolver
-    def resolve
-      instance
-    end
-
-    private
-
-    def instance
-      @object
-    end
-  end
-end

data/lib/ioc/version.rb

@@ -1,3 +0,0 @@
-module IOC
-  VERSION = "2.2.0"
-end