needle 0.5.0 → 0.6.0

data/test/models/tc_singleton_deferred.rb

@@ -16,39 +16,17 @@
 
 $:.unshift "../../lib"
 
-require "needle/models/singleton-deferred"
+require "needle"
 require "test/unit"
+require File.join( File.dirname( __FILE__ ), "model_test" )
 
-class TC_ModelsSingletonDeferred < Test::Unit::TestCase
+class TC_Model_Singleton_Deferred < Test::Unit::TestCase
+  include ModelTest
 
-  def test_instance
-    instantiated = false
-    model = Needle::Models::SingletonDeferred.new( nil ) { 
-      instantiated = true
-      Hash.new
-    }
+  use :singleton_deferred
 
-    assert !instantiated
-    proto = model.instance
-    assert !instantiated
-    proto[:test] = :value
-    assert instantiated
-    assert_equal :value, proto[:test]
-  end
-
-  def test_container
-    model = Needle::Models::SingletonDeferred.new( :container ) { |c|
-      assert_equal :container, c
-      Hash.new
-    }
-    model.instance[:test] = :value
-  end
-
-  def test_model
-    model = Needle::Models::SingletonDeferred.new( nil ) { Hash.new }
-    p1 = model.instance
-    p2 = model.instance
-    assert_same p1, p2
-  end
+  assert_singleton
+  assert_deferred
+  assert_no_init
 
 end

data/test/models/tc_singleton_deferred_initialize.rb

@@ -0,0 +1,32 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require "needle"
+require "test/unit"
+require File.join( File.dirname( __FILE__ ), "model_test" )
+
+class TC_Model_Singleton_Deferred_Initialize < Test::Unit::TestCase
+  include ModelTest
+
+  use :singleton_deferred_initialize
+
+  assert_singleton
+  assert_deferred
+  assert_init
+
+end

data/test/models/tc_singleton_initialize.rb

@@ -0,0 +1,32 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require "needle"
+require "test/unit"
+require File.join( File.dirname( __FILE__ ), "model_test" )
+
+class TC_Model_Singleton_Initialize < Test::Unit::TestCase
+  include ModelTest
+
+  use :singleton_initialize
+
+  assert_singleton
+  assert_immediate
+  assert_init
+
+end

data/test/models/tc_threaded.rb

@@ -0,0 +1,32 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require "needle"
+require "test/unit"
+require File.join( File.dirname( __FILE__ ), "model_test" )
+
+class TC_Model_Threaded < Test::Unit::TestCase
+  include ModelTest
+
+  use :threaded
+
+  assert_threaded
+  assert_immediate
+  assert_no_init
+
+end

data/test/models/tc_threaded_deferred.rb

@@ -0,0 +1,32 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require "needle"
+require "test/unit"
+require File.join( File.dirname( __FILE__ ), "model_test" )
+
+class TC_Model_Threaded_Deferred < Test::Unit::TestCase
+  include ModelTest
+
+  use :threaded_deferred
+
+  assert_threaded
+  assert_deferred
+  assert_no_init
+
+end

data/test/models/tc_threaded_deferred_initialize.rb

@@ -0,0 +1,32 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require "needle"
+require "test/unit"
+require File.join( File.dirname( __FILE__ ), "model_test" )
+
+class TC_Model_Threaded_Deferred_Initialize < Test::Unit::TestCase
+  include ModelTest
+
+  use :threaded_deferred_initialize
+
+  assert_threaded
+  assert_deferred
+  assert_init
+
+end

data/test/models/tc_threaded_initialize.rb

@@ -0,0 +1,32 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require "needle"
+require "test/unit"
+require File.join( File.dirname( __FILE__ ), "model_test" )
+
+class TC_Model_Threaded_Initialize < Test::Unit::TestCase
+  include ModelTest
+
+  use :threaded_initialize
+
+  assert_threaded
+  assert_immediate
+  assert_init
+
+end

data/test/pipeline/tc_collection.rb

@@ -0,0 +1,116 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require 'needle/pipeline/collection'
+require 'test/unit'
+
+class TC_Pipeline_Collection < Test::Unit::TestCase
+
+  class MockElement
+    attr_reader :service_point
+    attr_reader :name
+    attr_reader :priority
+    attr_accessor :succ
+
+    def initialize( point, name, priority, options )
+      @service_point = point
+      @name, @priority = name, priority
+    end
+
+    def call( *args )
+      args.first << "|Mock"
+      succ.call *args
+      args.first << "|Done"
+    end
+
+    def <=>( element )
+      priority <=> element.priority
+    end
+  end
+
+  def setup
+    elements = { :pipeline_elements => { :mock => MockElement } }
+    point = Struct.new( :container ).new( elements )
+    @collection = Needle::Pipeline::Collection.new( point )
+  end
+
+  def test_add_anonymous_block
+    @collection.add do |me,*args|
+      args.first << "|A"
+      result = me.succ.call( *args )
+      args.first << "|B"
+      result
+    end
+
+    chain = @collection.chain_to( proc { |a| a << "|tail" } )
+    b = ""
+    chain.call( b )
+    assert_equal b, "|A|tail|B"
+  end
+
+  def test_add_named_block
+    @collection.add( "block" ) do |chain,*args|
+      args.first << "|A"
+      result = chain.call( *args )
+      args.first << "|B"
+      result
+    end
+
+    assert_not_nil @collection.get( :block )
+  end
+
+  def test_add_named_element
+    @collection.add :mock
+
+    chain = @collection.chain_to( proc { |a| a << "|tail" } )
+    b = ""
+    chain.call( b )
+    assert_equal b, "|Mock|tail|Done"
+  end
+
+  def test_add_prioritize
+    @collection.add :mock, 50
+    @collection.add 25 do |me,*args|
+      args.first << "|proc"
+      r = me.succ.call( *args )
+      args.first << "|end"
+      r
+    end
+
+    chain = @collection.chain_to( proc { |a| a << "|tail" } )
+    b = ""
+    chain.call( b )
+    assert_equal b, "|Mock|proc|tail|end|Done"
+  end
+
+  def test_add_prioritize_reverse
+    @collection.add :mock, 25
+    @collection.add 50 do |me,*args|
+      args.first << "|proc"
+      r = me.succ.call( *args )
+      args.first << "|end"
+      r
+    end
+
+    chain = @collection.chain_to( proc { |a| a << "|tail" } )
+    b = ""
+    chain.call( b )
+    assert_equal b, "|proc|Mock|tail|Done|end"
+  end
+
+end

data/test/pipeline/tc_element.rb

@@ -0,0 +1,72 @@
+#--
+# =============================================================================
+# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# All rights reserved.
+#
+# This source file is distributed as part of the Needle dependency injection
+# library for Ruby. This file (and the library as a whole) may be used only as
+# allowed by either the BSD license, or the Ruby license (or, by association
+# with the Ruby license, the GPL). See the "doc" subdirectory of the Needle
+# distribution for the texts of these licenses.
+# -----------------------------------------------------------------------------
+# needle website : http://needle.rubyforge.org
+# project website: http://rubyforge.org/projects/needle
+# =============================================================================
+#++
+
+$:.unshift "../../lib"
+
+require 'needle/pipeline/element'
+require 'test/unit'
+
+class TC_Pipeline_Element < Test::Unit::TestCase
+
+  def test_default_priority
+    assert_equal 0, Needle::Pipeline::Element.default_priority
+    element = Needle::Pipeline::Element.new nil
+    assert_equal Needle::Pipeline::Element.default_priority, element.priority
+  end
+
+  def test_default_name
+    element = Needle::Pipeline::Element.new nil
+    assert_nil element.name
+  end
+
+  def test_name
+    element = Needle::Pipeline::Element.new nil, :test
+    assert_equal :test, element.name
+  end
+
+  def test_priority
+    element = Needle::Pipeline::Element.new nil, :test, 50
+    assert_equal 50, element.priority
+  end
+
+  def test_index_operator
+    element = Needle::Pipeline::Element.new nil
+    assert_raise( NotImplementedError ) { element[:arg] }
+  end
+
+  def test_call
+    element = Needle::Pipeline::Element.new nil
+    assert_raise( NotImplementedError ) { element.call( :arg ) }
+  end
+
+  def test_ordering
+    element1 = Needle::Pipeline::Element.new( nil, :test1, 25 )
+    element2 = Needle::Pipeline::Element.new( nil, :test2, 75 )
+
+    assert_equal -1, element1 <=> element2
+    assert_equal  1, element2 <=> element1
+  end
+
+  def test_comparable
+    element1 = Needle::Pipeline::Element.new( nil, :test1, 25 )
+    element2 = Needle::Pipeline::Element.new( nil, :test2, 75 )
+
+    assert element1 < element2
+    assert element2 > element1
+    assert element1 != element2
+  end
+
+end

data/test/tc_container.rb

@@ -17,11 +17,12 @@
 $:.unshift "../lib"
 
 require 'needle/container'
+require 'needle/registry'
 require 'test/unit'
 
 class TC_Container < Test::Unit::TestCase
 
-  class TC_RegistrationContext < Test::Unit::TestCase
+  class TC_DefinitionContext < Test::Unit::TestCase
     class MockContainer
       attr_reader :events
       def initialize; @events = []; end
@@ -32,7 +33,7 @@ class TC_Container < Test::Unit::TestCase
 
     def setup
       @container = MockContainer.new
-      @ctx = Needle::Container::RegistrationContext.new( @container )
+      @ctx = Needle::Container::DefinitionContext.new( @container )
     end
 
     def test_register
@@ -68,17 +69,10 @@ class TC_Container < Test::Unit::TestCase
       assert_nil @container.events[0][:block]
     end
 
-  end
-
-  class Model
-    def initialize( container, opts={}, &callback )
-      @container, @callback = container, callback
-      @inst = nil
-    end
-    def instance
-      return @inst if @inst
-      @inst = @callback.call( @container )
+    def test_this_container
+      assert_equal @container, @ctx.this_container
     end
+
   end
 
   def test_default
@@ -128,7 +122,7 @@ class TC_Container < Test::Unit::TestCase
 
   def test_register
     container = Needle::Container.new
-    container.register( :test, :model=>Model ) { Hash.new }
+    container.register( :test, :pipeline=>[] ) { Hash.new }
 
     assert_nothing_raised { container[:test] }
     assert_nothing_raised { container.test }
@@ -139,13 +133,21 @@ class TC_Container < Test::Unit::TestCase
     assert container.respond_to?(:test)
   end
 
-  def test_register!
+  def test_builder
     container = Needle::Container.new
+    b1 = container.builder
+    b2 = container.builder
+
+    assert_same b1.__id__, b2.__id__
+  end
 
-    container.register! do
-      test( :model=>Model ) { Hash.new }
-      namespace :subitem, :model=>Model do
-        test2( :model=>Model ) { Hash.new }
+  def test_define_block
+    container = Needle::Container.new
+
+    container.define do |b|
+      b.test( :pipeline=>[] ) { Hash.new }
+      b.namespace :subitem, :pipeline=>[] do |b2|
+        b2.test2( :pipeline=>[] ) { Hash.new }
       end
     end
 
@@ -155,35 +157,46 @@ class TC_Container < Test::Unit::TestCase
     assert_instance_of Hash, container.subitem.test2
   end
 
-  def test_namespace
+  def test_define_noblock
     container = Needle::Container.new
-    container.namespace( :test, :model=>Model )
-    assert_instance_of Needle::Container, container.test
+    container.define.test( :pipeline=>[] ) { Hash.new }
+    assert container.has_key?( :test )
+    assert_instance_of Hash, container.test
+  end
 
-    container.namespace( :test2, :model=>Model ) do |ns|
-      assert_instance_of Needle::Container, ns
+  def test_define!
+    container = Needle::Container.new
+
+    container.define! do
+      test( :pipeline=>[] ) { Hash.new }
+      namespace! :subitem, :pipeline=>[] do
+        test2( :pipeline=>[] ) { Hash.new }
+      end
     end
 
-    assert_instance_of Needle::Container, container.test2
+    assert container.has_key?( :test )
+    assert_instance_of Hash, container.test
+    assert container.subitem.has_key?( :test2 )
+    assert_instance_of Hash, container.subitem.test2
   end
 
-  def test_multi_namespace
+  def test_namespace
     container = Needle::Container.new
-    container.namespace( :test, :test2, :test3, :model=>Model )
+    container.namespace( :test, :pipeline=>[] )
     assert_instance_of Needle::Container, container.test
-    assert_instance_of Needle::Container, container.test.test2
-    assert_instance_of Needle::Container, container.test.test2.test3
 
-    container.namespace( :test, :test2, :test3, :model=>Model ) do |ns|
-      assert_same ns, container.test.test2.test3
+    container.namespace( :test2, :pipeline=>[] ) do |ns|
+      assert_instance_of Needle::Container, ns
     end
+
+    assert_instance_of Needle::Container, container.test2
   end
 
   def test_has_key
     container = Needle::Container.new
 
     assert !container.has_key?(:test)
-    container.register( :test, :model=>Model ) { Hash.new }
+    container.register( :test, :pipeline=>[] ) { Hash.new }
     assert container.has_key?(:test)
   end
 
@@ -191,7 +204,7 @@ class TC_Container < Test::Unit::TestCase
     container = Needle::Container.new
 
     assert !container.knows_key?(:test)
-    container.register( :test, :model=>Model ) { Hash.new }
+    container.register( :test, :pipeline=>[] ) { Hash.new }
     assert container.knows_key?(:test)
   end
 
@@ -199,7 +212,7 @@ class TC_Container < Test::Unit::TestCase
     outer = Needle::Container.new
     inner = Needle::Container.new( outer )
 
-    outer.register( :test, :model=>Model ) { Hash.new }
+    outer.register( :test, :pipeline=>[] ) { Hash.new }
     assert !inner.has_key?(:test)
     assert inner.knows_key?(:test)
   end
@@ -208,7 +221,7 @@ class TC_Container < Test::Unit::TestCase
     outer = Needle::Container.new
     inner = Needle::Container.new( outer )
 
-    outer.register( :test, :model=>Model ) { Hash.new }
+    outer.register( :test, :pipeline=>[] ) { Hash.new }
     assert_nothing_raised do
       inner[:test]
     end
@@ -231,8 +244,8 @@ class TC_Container < Test::Unit::TestCase
   end
 
   def test_intercept
-    container = Needle::Container.new
-    container.register( :test, :model=>Model ) { Hash.new }
+    container = Needle::Registry.new
+    container.register( :test ) { Hash.new }
 
     filtered = false
     container.intercept( :test ).doing { |chain,ctx| filtered = true; chain.process_next(ctx) }
@@ -243,4 +256,32 @@ class TC_Container < Test::Unit::TestCase
     assert filtered
   end
 
+  def test_find_definition_missing
+    container = Needle::Container.new
+    assert_nil container.find_definition( :bogus )
+  end
+
+  def test_find_definition_found_local
+    container = Needle::Container.new
+    container.register( :test, :pipeline=>[] ) { Object.new }
+    assert_not_nil container.find_definition( :test )
+  end
+
+  def test_find_definition_found_ancestor
+    outer = Needle::Container.new
+    inner = Needle::Container.new( outer )
+    outer.register( :test, :pipeline=>[] ) { Object.new }
+    assert_not_nil inner.find_definition( :test )
+  end
+
+  def test_pipeline
+    container = Needle::Container.new
+    container.register( :test, :pipeline=>[] ) { Object.new }
+    assert_instance_of Needle::Pipeline::Collection, container.pipeline( :test )
+
+    p1 = container.pipeline(:test)
+    p2 = container.pipeline(:test)
+    assert_same p1, p2
+  end
+
 end

data/test/tc_logger.rb

@@ -42,6 +42,11 @@ class TC_Logger < Test::Unit::TestCase
     end
   end
 
+  def teardown
+    logs = Dir[File.join(File.dirname(__FILE__),"*.log")]
+    File.delete *logs unless logs.empty?
+  end
+
   def test_log_filename
     factory = Needle::LogFactory.new
     assert_equal Needle::LogFactory::DEFAULT_LOG_FILENAME,