needle 1.1.0 → 1.2.0

data/test/tc_definition_context.rb

@@ -24,10 +24,22 @@ class TC_DefinitionContext < Test::Unit::TestCase
 
   class MockContainer
     attr_reader :events
-    def initialize; @events = []; end
+    attr_reader :defaults
+    def initialize; @events = []; @defaults = Hash.new; end
     def method_missing(s,*a,&b)
       @events << { :name => s, :args => a, :block => b }
     end
+    def use!( opts )
+      orig = @defaults
+      @defaults = opts
+
+      if block_given?
+        yield self
+        @defaults = orig
+      end
+
+      orig
+    end
   end
 
   def setup
@@ -44,17 +56,17 @@ class TC_DefinitionContext < Test::Unit::TestCase
     assert_not_nil @container.events[0][:block]
   end
 
-  def test_reference_bad
-    assert_raise( NoMethodError ) do
-      @ctx.hello( :arg )
-    end
+  def test_reference_missing_parameterized
+    @ctx.hello( :arg )
+    assert_equal( { :name => :get, :args => [ :hello, :arg ], :block => nil },
+      @container.events[0] )
   end
 
-  def test_register_good
+  def test_reference_missing_empty
     assert_nothing_raised do
       @ctx.hello 
     end
-    assert_equal :[], @container.events[0][:name]
+    assert_equal :get, @container.events[0][:name]
     assert_equal [ :hello ], @container.events[0][:args]
     assert_nil @container.events[0][:block]
   end
@@ -72,4 +84,48 @@ class TC_DefinitionContext < Test::Unit::TestCase
     assert_equal @container, @ctx.this_container
   end
 
+  def test_use_bang_without_block
+    @ctx.use! :foo => :bar
+    assert_equal :bar, @container.defaults[:foo]
+    @ctx.use! :blah => :baz
+    assert_equal :baz, @container.defaults[:blah]
+    assert_nil @container.defaults[:foo]
+  end
+
+  def test_use_bang_with_block
+    @ctx.use! :foo => :bar do |r|
+      assert_equal r.object_id, @ctx.object_id
+      assert_equal :bar, @container.defaults[:foo]
+      @ctx.use! :blah => :baz do
+        assert_nil @container.defaults[:foo]
+        assert_equal :baz, @container.defaults[:blah]
+      end
+      assert_nil @container.defaults[:blah]
+      assert_equal :bar, @container.defaults[:foo]
+    end
+    assert_nil @container.defaults[:foo]
+  end
+
+  def test_use_without_block
+    @ctx.use :foo => :bar
+    assert_equal :bar, @container.defaults[:foo]
+    @ctx.use :blah => :baz
+    assert_equal :baz, @container.defaults[:blah]
+    assert_equal :bar, @container.defaults[:foo]
+  end
+
+  def test_use_with_block
+    @ctx.use :foo => :bar do |r|
+      assert_equal r.object_id, @ctx.object_id
+      assert_equal :bar, @container.defaults[:foo]
+      @ctx.use :blah => :baz do
+        assert_equal :bar, @container.defaults[:foo]
+        assert_equal :baz, @container.defaults[:blah]
+      end
+      assert_nil @container.defaults[:blah]
+      assert_equal :bar, @container.defaults[:foo]
+    end
+    assert_nil @container.defaults[:foo]
+  end
+
 end

data/test/tc_registry.rb

@@ -28,7 +28,7 @@ class TC_Registry < Test::Unit::TestCase
   def test_bootstrap
     assert_respond_to @registry, :service_models
     assert_instance_of Hash, @registry.service_models
-    assert_equal 12, @registry.service_models.length
+    assert_equal 16, @registry.service_models.length
   end
 
   def test_define_no_options
@@ -109,4 +109,16 @@ class TC_Registry < Test::Unit::TestCase
     assert !inner.has_key?( :pipeline_elements )
   end
 
+  def test_parameterized_service
+    reg = Needle::Registry.define do |b|
+      b.require 'services', "A::B::C", :register_parameterized_services
+    end
+
+    assert_raise( ArgumentError ) do
+      reg.baz1 "a", :b, 3
+    end
+
+    assert_equal "a:b:3", reg.baz2( "a", :b, 3 )
+  end
+
 end

data/test/tc_service_point.rb

@@ -16,6 +16,7 @@
 
 $:.unshift "../lib"
 
+require 'needle'
 require 'needle/interceptor'
 require 'needle/pipeline/interceptor'
 require 'needle/service-point'
@@ -39,13 +40,26 @@ class TC_ServicePoint < Test::Unit::TestCase
     def <=>( item )
       priority <=> item.priority
     end
+    def reset!
+    end
   end
 
   class Container
+    def initialize( descended=true )
+      @descended = descended
+    end
+
     def root
       self
     end
 
+    def non_public_services_exist?
+      true
+    end
+
+    def non_public_services_exist=( flag )
+    end
+
     def []( name )
       case name
         when :service_models
@@ -58,6 +72,10 @@ class TC_ServicePoint < Test::Unit::TestCase
     def fullname
       "container"
     end
+
+    def descended_from?( c )
+      @descended
+    end
   end
 
   class Interceptor
@@ -142,4 +160,35 @@ class TC_ServicePoint < Test::Unit::TestCase
     assert_instance_of Needle::InterceptorChainBuilder::InterceptedServiceProxy, inst
   end
 
+  def test_interceptor_after_instance
+    reg = Needle::Registry.new
+    reg.define.foo { "hello" }
+
+    events = []
+    reg.intercept( :foo ).doing do |ch,ctx|
+      events << "first"
+      ch.process_next ctx
+    end
+    reg.intercept( :foo ).doing do |ch,ctx|
+      events << "second"
+      ch.process_next ctx
+    end
+
+    obj1 = reg.foo
+    obj1.length
+    assert_equal [ "first", "second" ], events
+
+    events = []
+    reg.intercept( :foo ).doing do |ch,ctx|
+      events << "third"
+      ch.process_next ctx
+    end
+        
+    obj2 = reg.foo
+    obj2.length
+    assert_equal [ "first", "second", "third" ], events
+
+    assert_not_same obj1, obj2
+  end
+
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: needle
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2004-11-11
+  version: 1.2.0
+date: 2004-11-18
 summary: Needle is a Dependency Injection/Inversion of Control container for Ruby. It supports both type-2 (setter) and type-3 (constructor) injection. It takes advantage of the dynamic nature of Ruby to provide a rich and flexible approach to injecting dependencies.
 require_paths: 
   - lib
@@ -112,6 +112,7 @@ files:
   - lib/needle/pipeline/interceptor.rb
   - lib/needle/pipeline/collection.rb
   - lib/needle/pipeline/element.rb
+  - lib/needle/lifecycle/multiton.rb
   - lib/needle/lifecycle/singleton.rb
   - lib/needle/lifecycle/deferred.rb
   - lib/needle/lifecycle/initialize.rb
@@ -134,6 +135,7 @@ files:
   - test/lifecycle/tc_singleton.rb
   - test/lifecycle/tc_threaded.rb
   - test/lifecycle/tc_initialize.rb
+  - test/lifecycle/tc_multiton.rb
   - test/lifecycle/tc_deferred.rb
   - test/lifecycle/tc_proxy.rb
   - test/models/tc_singleton_deferred_initialize.rb