needle 0.5.0 → 0.6.0

data/test/tc_registry.rb

@@ -28,7 +28,45 @@ class TC_Registry < Test::Unit::TestCase
   def test_bootstrap
     assert_respond_to @registry, :service_models
     assert_instance_of Hash, @registry.service_models
-    assert_equal 4, @registry.service_models.length
+    assert_equal 12, @registry.service_models.length
+  end
+
+  def test_new_no_options!
+    reg = Needle::Registry.new! do
+      svc1 { Object.new }
+    end
+
+    assert_respond_to reg, :svc1
+  end
+
+  def test_new_with_options!
+    reg = Needle::Registry.new!( :logs => { :device => STDOUT } ) do
+      svc1 { Object.new }
+    end
+
+    assert_respond_to reg, :svc1
+    assert_equal STDOUT, reg.logs.device
+  end
+
+  def test_new_no_options
+    reg = Needle::Registry.new do |r|
+      r.register( :svc ) { Object.new }
+    end
+
+    assert_respond_to reg, :svc
+  end
+
+  def test_new_with_options
+    reg = Needle::Registry.new( :logs => { :device => STDOUT } ) do |r|
+      r.register( :svc ) { Object.new }
+    end
+
+    assert_respond_to reg, :svc
+    assert_equal STDOUT, reg.logs.device
+  end
+
+  def test_fullname
+    assert_equal "[]", @registry.fullname
   end
 
 end

data/test/tc_service_point.rb

@@ -17,17 +17,27 @@
 $:.unshift "../lib"
 
 require 'needle/interceptor'
+require 'needle/pipeline/interceptor'
 require 'needle/service-point'
 require 'test/unit'
 
 class TC_ServicePoint < Test::Unit::TestCase
 
   class Model
-    def initialize(container,opts={},&callback)
-      @callback = callback
+    attr_reader :service_point
+    attr_reader :name
+    attr_reader :priority
+    attr_accessor :succ
+
+    def initialize(point,name,priority,opts={},&callback)
+      @point = point
+      @priority = priority || 0
     end
-    def instance
-      @callback.call
+    def call( *args )
+      succ.call( *args )
+    end
+    def <=>( item )
+      priority <=> item.priority
     end
   end
 
@@ -36,8 +46,13 @@ class TC_ServicePoint < Test::Unit::TestCase
       self
     end
 
-    def service_models
-      { :mock => Model }
+    def []( name )
+      case name
+        when :service_models
+          { :mock => [ :mock ] }
+        when :pipeline_elements
+          { :mock => Model, :interceptor => Needle::Pipeline::InterceptorElement }
+      end
     end
 
     def fullname
@@ -71,7 +86,7 @@ class TC_ServicePoint < Test::Unit::TestCase
 
     assert_nothing_raised do
       point =
-        Needle::ServicePoint.new( @container, "test", :model => Model ) {
+        Needle::ServicePoint.new( @container, "test", :pipeline => [] ) {
           Hash.new }
     end
   end
@@ -85,6 +100,27 @@ class TC_ServicePoint < Test::Unit::TestCase
     assert_instance_of Hash, inst
   end
 
+  def test_constructor_parms_single
+    point =
+      Needle::ServicePoint.new( @container, "test", :model => :mock ) do |c,p|
+        assert_equal @container, c
+        Hash.new
+      end
+
+    point.instance
+  end
+
+  def test_constructor_parms_multiple
+    point =
+      Needle::ServicePoint.new( @container, "test", :model => :mock ) do |c,p|
+        assert_equal @container, c
+        assert_equal point, p
+        Hash.new
+      end
+
+    point.instance
+  end
+
   def test_interceptor
     point =
       Needle::ServicePoint.new( @container, "test", :model => :mock ) {

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: needle
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2004-10-14
+  version: 0.6.0
+date: 2004-10-21
 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
@@ -26,9 +26,15 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
   version: 
 platform: ruby
 files: 
+  - benchmarks/instantiation.rb
+  - benchmarks/interceptors.rb
+  - benchmarks/instantiability.rb
+  - benchmarks/interceptors2.rb
   - doc/README
   - doc/LICENSE-RUBY
+  - doc/di-in-ruby.rdoc
   - doc/manual-html
+  - doc/images
   - doc/LICENSE-BSD
   - doc/LICENSE-GPL
   - doc/manual
@@ -41,7 +47,7 @@ files:
   - doc/manual-html/chapter-6.html
   - doc/manual-html/chapter-7.html
   - doc/manual-html/index.html
-  - doc/manual/img
+  - doc/images/di_classdiagram.jpg
   - doc/manual/manual.css
   - doc/manual/manual.yml
   - doc/manual/tutorial.erb
@@ -53,6 +59,7 @@ files:
   - doc/manual/parts/02_namespaces.txt
   - doc/manual/parts/01_support.txt
   - doc/manual/parts/02_services.txt
+  - doc/manual/parts/01_alternatives.txt
   - doc/manual/parts/01_what_is_needle.txt
   - doc/manual/parts/02_creating.txt
   - doc/manual/parts/01_license.txt
@@ -63,35 +70,55 @@ files:
   - lib/needle/interceptor.rb
   - lib/needle/service-point.rb
   - lib/needle/logger.rb
-  - lib/needle/models.rb
+  - lib/needle/thread.rb
+  - lib/needle/pipeline
   - lib/needle/registry.rb
+  - lib/needle/lifecycle
   - lib/needle/interceptor-chain.rb
-  - lib/needle/models
   - lib/needle/include-exclude.rb
   - lib/needle/container.rb
   - lib/needle/logging-interceptor.rb
   - lib/needle/version.rb
   - lib/needle/log-factory.rb
   - lib/needle/errors.rb
-  - lib/needle/models/prototype.rb
-  - lib/needle/models/singleton.rb
-  - lib/needle/models/singleton-deferred.rb
-  - lib/needle/models/prototype-deferred.rb
-  - lib/needle/models/proxy.rb
+  - lib/needle/pipeline/interceptor.rb
+  - lib/needle/pipeline/collection.rb
+  - lib/needle/pipeline/element.rb
+  - lib/needle/lifecycle/singleton.rb
+  - lib/needle/lifecycle/deferred.rb
+  - lib/needle/lifecycle/initialize.rb
+  - lib/needle/lifecycle/proxy.rb
+  - lib/needle/lifecycle/threaded.rb
   - test/tc_service_point.rb
   - test/tc_registry.rb
+  - test/pipeline
   - test/tc_interceptor.rb
   - test/ALL-TESTS.rb
+  - test/lifecycle
   - test/models
   - test/tc_interceptor_chain.rb
   - test/tc_logger.rb
-  - test/tc_models.rb
   - test/tc_container.rb
+  - test/pipeline/tc_element.rb
+  - test/pipeline/tc_collection.rb
+  - test/lifecycle/tc_singleton.rb
+  - test/lifecycle/tc_threaded.rb
+  - test/lifecycle/tc_initialize.rb
+  - test/lifecycle/tc_deferred.rb
+  - test/lifecycle/tc_proxy.rb
+  - test/models/tc_singleton_deferred_initialize.rb
+  - test/models/tc_singleton_initialize.rb
   - test/models/tc_prototype.rb
   - test/models/tc_singleton.rb
   - test/models/tc_singleton_deferred.rb
+  - test/models/tc_threaded_deferred.rb
+  - test/models/tc_prototype_initialize.rb
+  - test/models/tc_threaded.rb
+  - test/models/tc_prototype_deferred_initialize.rb
+  - test/models/tc_threaded_initialize.rb
+  - test/models/tc_threaded_deferred_initialize.rb
   - test/models/tc_prototype_deferred.rb
-  - test/models/tc_proxy.rb
+  - test/models/model_test.rb
 test_files: 
   - test/ALL-TESTS.rb
 rdoc_options: 

data/lib/needle/models/singleton-deferred.rb

@@ -1,57 +0,0 @@
-#--
-# =============================================================================
-# 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
-# =============================================================================
-#++
-
-require 'needle/models/proxy'
-require 'thread'
-
-module Needle
-  module Models
-
-    # The definition of the "singleton-deferred" lifecycle service model.
-    # This will result in deferred instantiation of the requested service,
-    # with a new instance being returned the first time #instance is invoked,
-    # and that same instance returned every time thereafter.
-    #
-    # This model is thread-safe.
-    class SingletonDeferred
-
-      # Create a new SingletonDeferred service model.
-      def initialize( container, opts={}, &callback )
-        @container = container
-        @callback = callback
-        @mutex = Mutex.new
-        @instance = nil
-      end
-
-      # Return the cached instance, if it exists. Otherwise, create new
-      # Proxy instance that wraps the container and callback references of
-      # this service model, and cache it. Then return that instance.
-      #
-      # This method is thread-safe.
-      def instance
-        return @instance if @instance
-
-        @mutex.synchronize do
-          return @instance if @instance
-          @instance = Proxy.new( @container, &@callback )
-        end
-
-        return @instance
-      end
-    end
-
-  end
-end

data/lib/needle/models/singleton.rb

@@ -1,56 +0,0 @@
-#--
-# =============================================================================
-# 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
-# =============================================================================
-#++
-
-require 'thread'
-
-module Needle
-  module Models
-
-    # The definition of the "singleton" lifecycle service model. This will
-    # result in immediate instantiation of the requested service, with a new
-    # instance being returned the first time #instance is invoked, and that
-    # same instance returned every time thereafter.
-    #
-    # This model is thread-safe.
-    class Singleton
-
-      # Create a new instance of the singleton service model.
-      def initialize( container, opts={}, &callback )
-        @container = container
-        @callback = callback
-        @mutex = Mutex.new
-        @instance = nil
-      end
-
-      # Return the cached instance, if it exists. Otherwise, create new
-      # instance by invoking the registered callback, caching the result.
-      # Then return that instance.
-      #
-      # This method is thread-safe.
-      def instance
-        return @instance if @instance
-
-        @mutex.synchronize do
-          return @instance if @instance
-          @instance = @callback.call( @container )
-        end
-
-        return @instance
-      end
-    end
-
-  end
-end

data/lib/needle/models.rb

@@ -1,44 +0,0 @@
-#--
-# =============================================================================
-# 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
-# =============================================================================
-#++
-
-require 'needle/models/prototype'
-require 'needle/models/prototype-deferred'
-require 'needle/models/singleton'
-require 'needle/models/singleton-deferred'
-
-module Needle
-  module Models
-
-    # A convenience method for registering all standard service models with
-    # a container. This also defines a <tt>:service_models</tt> service,
-    # implemented as a Hash, which is used for keeping the references to
-    # installed service models.
-    #
-    # This method is called internally by Registry when it is instantiated,
-    # and should never be called directly.
-    def register( registry )
-      registry.register( :service_models, :model => Singleton ) { Hash.new }
-      registry[:service_models].update(
-        :singleton => Singleton,
-        :singleton_deferred => SingletonDeferred,
-        :prototype => Prototype,
-        :prototype_deferred => PrototypeDeferred
-      )
-    end
-    module_function :register
-
-  end
-end