needle 1.2.1 → 1.3.0

data/doc/LICENSE-BSD

@@ -1,4 +1,4 @@
-Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/doc/LICENSE-RUBY

@@ -1,4 +1,4 @@
-Needle is copyrighted free software by Jamis Buck <jgb3@email.byu.edu>.
+Needle is copyrighted free software by Jamis Buck <jamis@37signals.com>.
 You can redistribute it and/or modify it under either the terms of the GPL
 (see the file GPL), or the conditions below:
 

data/doc/di-in-ruby.rdoc

@@ -1,7 +1,7 @@
 = Dependency Injection in Ruby
 By Jim Weirich, slightly adapted for Needle (original article at http://onestepback.org/index.cgi/Tech/Ruby/DependencyInjectionInRuby.rdoc)
 
-<em>(The API described in the original version of this article inspired the creation of the Needle framework. This article has been modified slightly so that the DI examples use Needle, instead of the framework Jim originally presented. This has proven to be a very minor modification, since the two syntaxes are nearly identical. -- Jamis Buck (jgb3@email.byu.edu))</em>
+<em>(The API described in the original version of this article inspired the creation of the Needle framework. This article has been modified slightly so that the DI examples use Needle, instead of the framework Jim originally presented. This has proven to be a very minor modification, since the two syntaxes are nearly identical. -- Jamis Buck (jamis@37signals.com))</em>
 
 <em>This article is modified and distributed under the terms of the Creative Commons Attribution-NonCommercial 1.0 license (http://creativecommons.org/licenses/by-nc/1.0).</em>
 

data/doc/manual-html/chapter-1.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>
@@ -467,7 +467,7 @@
 	<p>This manual (in any form, be it source or otherwise) and the scripts and templates used to generate it, are all distributed under the <a href="http://creativecommons.org">Creative Commons</a> <a href="http://creativecommons.org/licenses/by-sa/2.0">Attribution-ShareAlike</a> license.</p>
 
 
-	<p>If you desire permission to use either Needle or the manual in a manner incompatible with these licenses, please contact the copyright holder (<a href="mailto:jgb3@email.byu.edu">Jamis Buck</a>) in order to negotiate a more compatible license.</p>
+	<p>If you desire permission to use either Needle or the manual in a manner incompatible with these licenses, please contact the copyright holder (<a href="mailto:jamis@37signals.com">Jamis Buck</a>) in order to negotiate a more compatible license.</p>
    </div>
 
 

data/doc/manual-html/chapter-2.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/chapter-3.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/chapter-4.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/chapter-5.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/chapter-6.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/chapter-7.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/chapter-8.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/chapter-9.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>

data/doc/manual-html/index.html

@@ -14,8 +14,8 @@
           </div>
         </td><td valign='middle' align='right'>
           <div class="info">
-            Needle Version: <strong>1.2.1</strong><br />
-            Manual Last Updated: <strong>2005-07-27 05:49 UTC</strong>
+            Needle Version: <strong>1.3.0</strong><br />
+            Manual Last Updated: <strong>2005-12-24 15:20 UTC</strong>
           </div>
         </td></tr>
       </table>
@@ -245,7 +245,7 @@
 <p class="copyright">
   Copyright &copy; 2004
                    Jamis Buck
-                   (<a href="mailto:jgb3@email.byu.edu">jgb3@email.byu.edu</a>)
+                   (<a href="mailto:jamis@37signals.com">jamis@37signals.com</a>)
 </p>
 
 

data/doc/manual/manual.yml

@@ -8,7 +8,7 @@
 meta: !^meta
   copyright: 2004
   author: Jamis Buck
-  email: jgb3@email.byu.edu
+  email: jamis@37signals.com
 
 product: !^product
   name: Needle

data/doc/manual/parts/01_license.txt

@@ -2,4 +2,4 @@ Needle is made available under either the BSD license, or the same license Ruby
 
 This manual (in any form, be it source or otherwise) and the scripts and templates used to generate it, are all distributed under the "Creative Commons":http://creativecommons.org "Attribution-ShareAlike":http://creativecommons.org/licenses/by-sa/2.0 license.
 
-If you desire permission to use either Needle or the manual in a manner incompatible with these licenses, please contact the copyright holder ("Jamis Buck":mailto:jgb3@email.byu.edu) in order to negotiate a more compatible license.
+If you desire permission to use either Needle or the manual in a manner incompatible with these licenses, please contact the copyright holder ("Jamis Buck":mailto:jamis@37signals.com) in order to negotiate a more compatible license.

data/lib/needle.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/container.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -305,7 +305,7 @@ module Needle
       point = find_definition( name )
       raise ServiceNotFound, "#{fullname}.#{name}" unless point
 
-      point.instance( *args )
+      point.instance( self, *args )
     end
 
     alias :[] :get

data/lib/needle/definition-context.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/errors.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/include-exclude.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/interceptor-chain.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/interceptor.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/lifecycle/deferred.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/lifecycle/initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/lifecycle/multiton.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/lifecycle/proxy.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/lifecycle/singleton.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/lifecycle/threaded.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/log-factory.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/logger.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -130,10 +130,15 @@ module Needle
     # Format the message using the given parameters. If a message format has
     # not been given, just call the superclass's implementation. Otherwise,
     # process the tokens from the parsed message format.
-    def format_message( severity, timestamp, msg, progname )
+    def format_message( severity, timestamp, *args )
       if @message_format.nil?
         super
       else
+        msg, progname = args
+        
+        # check for API change in 1.8.3 and later
+        msg, progname = progname, msg if respond_to?(:formatter=)
+
         opts = {
           :severity => severity,
           :timestamp => timestamp,

data/lib/needle/logging-interceptor.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/pipeline/collection.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -123,7 +123,7 @@ module Needle
           if head
             tail.succ = el
             tail = el
-          else
+          else # first time through...
             head = tail = el
           end
         end

data/lib/needle/pipeline/element.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/pipeline/interceptor.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/registry.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/service-point.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -103,18 +103,23 @@ module Needle
     # on the style of lifecycle management chosen for this service point, this
     # may or may not be a new instance for every invocation of this method.
     #
-    # Any arguments to this method will be passed through to the chain, which
-    # may cause an error if there is an element in the pipeline that does not
-    # accept additional arguments. Regardless, the first two parameters to
+    # The first argument is the container that should be used to resolve this
+    # service point. Assuming the container to be used is this service point's
+    # own container would mean that any nested service points couldn't override
+    # service points their parents' service points used.
+    #
+    # Any extra arguments to this method will be passed through to the chain,
+    # which may cause an error if there is an element in the pipeline that does
+    # not accept additional arguments. Regardless, the first two parameters to
     # the chain will always be the container and the service point.
-    def instance( *args )
+    def instance( actual_container, *args )
       unless @chain
         @chain_mutex.synchronize do
           @chain = @pipeline.chain_to( @callback ) unless @chain
         end
       end
 
-      @chain.call( @container, self, *args )
+      @chain.call( actual_container, self, *args )
     end
 
   end

data/lib/needle/thread.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/lib/needle/version.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -18,8 +18,8 @@ module Needle
   module Version
 
     MAJOR = 1
-    MINOR = 2
-    TINY  = 1
+    MINOR = 3
+    TINY  = 0
     
     # The version of the Needle library in use.
     STRING = [ MAJOR, MINOR, TINY ].join( "." )

data/test/ALL-TESTS.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/lifecycle/tc_deferred.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/lifecycle/tc_initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/lifecycle/tc_multiton.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/lifecycle/tc_proxy.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/lifecycle/tc_singleton.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/lifecycle/tc_threaded.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/model_test.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_prototype.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_prototype_deferred.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_prototype_deferred_initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_prototype_initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_singleton.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_singleton_deferred.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_singleton_deferred_initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_singleton_initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_threaded.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_threaded_deferred.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_threaded_deferred_initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/models/tc_threaded_initialize.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/pipeline/tc_collection.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/pipeline/tc_element.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/tc_container.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -250,6 +250,20 @@ class TC_Container < Test::Unit::TestCase
     assert inner.knows_key?(:test)
   end
 
+  def test_services_from_child_available_to_parent_services
+    outer = new_container
+    inner = new_container( outer )
+
+    outer.define do |b|
+      b.override_me { "override_me" }
+      b.use_override { |c, p| c.override_me.intern }
+    end
+    inner = Needle::Registry.define( :parent => outer ) do |b|
+      b.override_me { "the_child_override" }
+    end
+    assert_same(:the_child_override, inner[:use_override])
+  end
+
   def test_service_in_parent
     outer = new_container
     inner = new_container( outer )

data/test/tc_definition_context.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/tc_interceptor.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/tc_interceptor_chain.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/tc_logger.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection

data/test/tc_registry.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -91,6 +91,17 @@ class TC_Registry < Test::Unit::TestCase
     assert_equal @registry, inner.parent
   end
 
+  def test_nested_child_services_accessible_to_parent_services
+    @registry.define do |b|
+      b.override_me { "override_me" }
+      b.use_override { |c, p| c.override_me.intern }
+    end
+    inner = Needle::Registry.define( :parent => @registry ) do |b|
+      b.override_me { "the_child_override" }
+    end
+    assert_same(:the_child_override, inner[:use_override])
+  end
+
   def test_explicit_name
     reg = Needle::Registry.new( :name => :test )
     assert_equal :test, reg.name

data/test/tc_service_point.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
+# Copyright (c) 2004, Jamis Buck (jamis@37signals.com)
 # All rights reserved.
 #
 # This source file is distributed as part of the Needle dependency injection
@@ -114,7 +114,7 @@ class TC_ServicePoint < Test::Unit::TestCase
       Needle::ServicePoint.new( @container, "test", :pipeline => [ Model ] ) {
         Hash.new }
 
-    inst = point.instance
+    inst = point.instance(@container)
     assert_instance_of Hash, inst
   end
 
@@ -123,7 +123,7 @@ class TC_ServicePoint < Test::Unit::TestCase
       Needle::ServicePoint.new( @container, "test", :model => :mock ) {
         Hash.new }
 
-    inst = point.instance
+    inst = point.instance(@container)
     assert_instance_of Hash, inst
   end
 
@@ -134,7 +134,7 @@ class TC_ServicePoint < Test::Unit::TestCase
         Hash.new
       end
 
-    point.instance
+    point.instance(@container)
   end
 
   def test_constructor_parms_multiple
@@ -145,7 +145,7 @@ class TC_ServicePoint < Test::Unit::TestCase
         Hash.new
       end
 
-    point.instance
+    point.instance(@container)
   end
 
   def test_interceptor
@@ -156,7 +156,7 @@ class TC_ServicePoint < Test::Unit::TestCase
     interceptor = Needle::Interceptor.new.with { Interceptor }
     point.interceptor interceptor
 
-    inst = point.instance
+    inst = point.instance(@container)
     assert_instance_of Needle::InterceptorChainBuilder::InterceptedServiceProxy, inst
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: needle
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2005-07-26
+  version: 1.3.0
+date: 2005-12-24 00:00:00 -07:00
 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
-email: jgb3@email.byu.edu
+- lib
+email: jamis@37signals.com
 homepage: http://needle.rubyforge.org
 rubyforge_project: 
 description: 
@@ -18,158 +18,163 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Jamis Buck
+- Jamis Buck
 files: 
-  - benchmarks/instantiability.rb
-  - benchmarks/instantiation.rb
-  - benchmarks/interceptors.rb
-  - benchmarks/interceptors2.rb
-  - doc/di-in-ruby.rdoc
-  - doc/faq
-  - doc/images
-  - doc/LICENSE-BSD
-  - doc/LICENSE-GPL
-  - doc/LICENSE-RUBY
-  - doc/manual
-  - doc/manual-html
-  - doc/README
-  - doc/faq/faq.rb
-  - doc/faq/faq.yml
-  - doc/images/di_classdiagram.jpg
-  - doc/manual/chapter.erb
-  - doc/manual/img
-  - doc/manual/index.erb
-  - doc/manual/manual.rb
-  - doc/manual/manual.yml
-  - doc/manual/page.erb
-  - doc/manual/parts
-  - doc/manual/stylesheets
-  - doc/manual/tutorial.erb
-  - doc/manual/img/Needle.ai
-  - doc/manual/img/needle.png
-  - doc/manual/parts/01_alternatives.txt
-  - doc/manual/parts/01_license.txt
-  - doc/manual/parts/01_support.txt
-  - doc/manual/parts/01_use_cases.txt
-  - doc/manual/parts/01_what_is_needle.txt
-  - doc/manual/parts/02_creating.txt
-  - doc/manual/parts/02_namespaces.txt
-  - doc/manual/parts/02_overview.txt
-  - doc/manual/parts/02_services.txt
-  - doc/manual/parts/03_conventional.txt
-  - doc/manual/parts/03_locator.txt
-  - doc/manual/parts/03_overview.txt
-  - doc/manual/parts/04_overview.txt
-  - doc/manual/parts/04_setup.txt
-  - doc/manual/parts/customizing_contexts.txt
-  - doc/manual/parts/customizing_interceptors.txt
-  - doc/manual/parts/customizing_namespaces.txt
-  - doc/manual/parts/interceptors_architecture.txt
-  - doc/manual/parts/interceptors_attaching.txt
-  - doc/manual/parts/interceptors_custom.txt
-  - doc/manual/parts/interceptors_ordering.txt
-  - doc/manual/parts/interceptors_overview.txt
-  - doc/manual/parts/libraries_creating.txt
-  - doc/manual/parts/libraries_overview.txt
-  - doc/manual/parts/libraries_using.txt
-  - doc/manual/parts/logging_configuration.txt
-  - doc/manual/parts/logging_logfactory.txt
-  - doc/manual/parts/logging_overview.txt
-  - doc/manual/parts/models_models.txt
-  - doc/manual/parts/models_overview.txt
-  - doc/manual/parts/models_pipelines.txt
-  - doc/manual/stylesheets/manual.css
-  - doc/manual/stylesheets/ruby.css
-  - doc/manual-html/chapter-1.html
-  - doc/manual-html/chapter-2.html
-  - doc/manual-html/chapter-3.html
-  - doc/manual-html/chapter-4.html
-  - doc/manual-html/chapter-5.html
-  - doc/manual-html/chapter-6.html
-  - doc/manual-html/chapter-7.html
-  - doc/manual-html/chapter-8.html
-  - doc/manual-html/chapter-9.html
-  - doc/manual-html/index.html
-  - doc/manual-html/needle.png
-  - doc/manual-html/stylesheets
-  - doc/manual-html/stylesheets/manual.css
-  - doc/manual-html/stylesheets/ruby.css
-  - lib/needle
-  - lib/needle.rb
-  - lib/needle/container.rb
-  - lib/needle/definition-context.rb
-  - lib/needle/errors.rb
-  - lib/needle/include-exclude.rb
-  - lib/needle/interceptor-chain.rb
-  - lib/needle/interceptor.rb
-  - lib/needle/lifecycle
-  - lib/needle/log-factory.rb
-  - lib/needle/logger.rb
-  - lib/needle/logging-interceptor.rb
-  - lib/needle/pipeline
-  - lib/needle/registry.rb
-  - lib/needle/service-point.rb
-  - lib/needle/thread.rb
-  - lib/needle/version.rb
-  - lib/needle/lifecycle/deferred.rb
-  - lib/needle/lifecycle/initialize.rb
-  - lib/needle/lifecycle/multiton.rb
-  - lib/needle/lifecycle/proxy.rb
-  - lib/needle/lifecycle/singleton.rb
-  - lib/needle/lifecycle/threaded.rb
-  - lib/needle/pipeline/collection.rb
-  - lib/needle/pipeline/element.rb
-  - lib/needle/pipeline/interceptor.rb
-  - test/ALL-TESTS.rb
-  - test/lifecycle
-  - test/models
-  - test/pipeline
-  - test/services.rb
-  - test/tc_container.rb
-  - test/tc_definition_context.rb
-  - test/tc_interceptor.rb
-  - test/tc_interceptor_chain.rb
-  - test/tc_logger.rb
-  - test/tc_registry.rb
-  - test/tc_service_point.rb
-  - test/lifecycle/tc_deferred.rb
-  - test/lifecycle/tc_initialize.rb
-  - test/lifecycle/tc_multiton.rb
-  - test/lifecycle/tc_proxy.rb
-  - test/lifecycle/tc_singleton.rb
-  - test/lifecycle/tc_threaded.rb
-  - test/models/model_test.rb
-  - test/models/tc_prototype.rb
-  - test/models/tc_prototype_deferred.rb
-  - test/models/tc_prototype_deferred_initialize.rb
-  - test/models/tc_prototype_initialize.rb
-  - test/models/tc_singleton.rb
-  - test/models/tc_singleton_deferred.rb
-  - test/models/tc_singleton_deferred_initialize.rb
-  - test/models/tc_singleton_initialize.rb
-  - test/models/tc_threaded.rb
-  - test/models/tc_threaded_deferred.rb
-  - test/models/tc_threaded_deferred_initialize.rb
-  - test/models/tc_threaded_initialize.rb
-  - test/pipeline/tc_collection.rb
-  - test/pipeline/tc_element.rb
+- benchmarks/instantiability.rb
+- benchmarks/instantiation.rb
+- benchmarks/interceptors.rb
+- benchmarks/interceptors2.rb
+- doc/di-in-ruby.rdoc
+- doc/faq
+- doc/images
+- doc/LICENSE-BSD
+- doc/LICENSE-GPL
+- doc/LICENSE-RUBY
+- doc/manual
+- doc/manual-html
+- doc/README
+- doc/faq/faq.rb
+- doc/faq/faq.yml
+- doc/images/di_classdiagram.jpg
+- doc/manual/chapter.erb
+- doc/manual/img
+- doc/manual/index.erb
+- doc/manual/manual.rb
+- doc/manual/manual.yml
+- doc/manual/page.erb
+- doc/manual/parts
+- doc/manual/stylesheets
+- doc/manual/tutorial.erb
+- doc/manual/img/Needle.ai
+- doc/manual/img/needle.png
+- doc/manual/parts/01_alternatives.txt
+- doc/manual/parts/01_license.txt
+- doc/manual/parts/01_support.txt
+- doc/manual/parts/01_use_cases.txt
+- doc/manual/parts/01_what_is_needle.txt
+- doc/manual/parts/02_creating.txt
+- doc/manual/parts/02_namespaces.txt
+- doc/manual/parts/02_overview.txt
+- doc/manual/parts/02_services.txt
+- doc/manual/parts/03_conventional.txt
+- doc/manual/parts/03_locator.txt
+- doc/manual/parts/03_overview.txt
+- doc/manual/parts/04_overview.txt
+- doc/manual/parts/04_setup.txt
+- doc/manual/parts/customizing_contexts.txt
+- doc/manual/parts/customizing_interceptors.txt
+- doc/manual/parts/customizing_namespaces.txt
+- doc/manual/parts/interceptors_architecture.txt
+- doc/manual/parts/interceptors_attaching.txt
+- doc/manual/parts/interceptors_custom.txt
+- doc/manual/parts/interceptors_ordering.txt
+- doc/manual/parts/interceptors_overview.txt
+- doc/manual/parts/libraries_creating.txt
+- doc/manual/parts/libraries_overview.txt
+- doc/manual/parts/libraries_using.txt
+- doc/manual/parts/logging_configuration.txt
+- doc/manual/parts/logging_logfactory.txt
+- doc/manual/parts/logging_overview.txt
+- doc/manual/parts/models_models.txt
+- doc/manual/parts/models_overview.txt
+- doc/manual/parts/models_pipelines.txt
+- doc/manual/stylesheets/manual.css
+- doc/manual/stylesheets/ruby.css
+- doc/manual-html/chapter-1.html
+- doc/manual-html/chapter-2.html
+- doc/manual-html/chapter-3.html
+- doc/manual-html/chapter-4.html
+- doc/manual-html/chapter-5.html
+- doc/manual-html/chapter-6.html
+- doc/manual-html/chapter-7.html
+- doc/manual-html/chapter-8.html
+- doc/manual-html/chapter-9.html
+- doc/manual-html/index.html
+- doc/manual-html/needle.png
+- doc/manual-html/stylesheets
+- doc/manual-html/stylesheets/manual.css
+- doc/manual-html/stylesheets/ruby.css
+- lib/needle
+- lib/needle.rb
+- lib/needle/container.rb
+- lib/needle/definition-context.rb
+- lib/needle/errors.rb
+- lib/needle/include-exclude.rb
+- lib/needle/interceptor-chain.rb
+- lib/needle/interceptor.rb
+- lib/needle/lifecycle
+- lib/needle/log-factory.rb
+- lib/needle/logger.rb
+- lib/needle/logging-interceptor.rb
+- lib/needle/pipeline
+- lib/needle/registry.rb
+- lib/needle/service-point.rb
+- lib/needle/thread.rb
+- lib/needle/version.rb
+- lib/needle/lifecycle/deferred.rb
+- lib/needle/lifecycle/initialize.rb
+- lib/needle/lifecycle/multiton.rb
+- lib/needle/lifecycle/proxy.rb
+- lib/needle/lifecycle/singleton.rb
+- lib/needle/lifecycle/threaded.rb
+- lib/needle/pipeline/collection.rb
+- lib/needle/pipeline/element.rb
+- lib/needle/pipeline/interceptor.rb
+- test/ALL-TESTS.rb
+- test/lifecycle
+- test/models
+- test/pipeline
+- test/services.rb
+- test/tc_container.rb
+- test/tc_definition_context.rb
+- test/tc_interceptor.rb
+- test/tc_interceptor_chain.rb
+- test/tc_logger.rb
+- test/tc_registry.rb
+- test/tc_service_point.rb
+- test/lifecycle/tc_deferred.rb
+- test/lifecycle/tc_initialize.rb
+- test/lifecycle/tc_multiton.rb
+- test/lifecycle/tc_proxy.rb
+- test/lifecycle/tc_singleton.rb
+- test/lifecycle/tc_threaded.rb
+- test/models/model_test.rb
+- test/models/tc_prototype.rb
+- test/models/tc_prototype_deferred.rb
+- test/models/tc_prototype_deferred_initialize.rb
+- test/models/tc_prototype_initialize.rb
+- test/models/tc_singleton.rb
+- test/models/tc_singleton_deferred.rb
+- test/models/tc_singleton_deferred_initialize.rb
+- test/models/tc_singleton_initialize.rb
+- test/models/tc_threaded.rb
+- test/models/tc_threaded_deferred.rb
+- test/models/tc_threaded_deferred_initialize.rb
+- test/models/tc_threaded_initialize.rb
+- test/pipeline/tc_collection.rb
+- test/pipeline/tc_element.rb
 test_files: 
-  - test/ALL-TESTS.rb
+- test/ALL-TESTS.rb
 rdoc_options: 
-  - "--title"
-  - "Needle -- Dependency Injection for Ruby"
-  - "--main"
-  - doc/README
+- --title
+- Needle -- Dependency Injection for Ruby
+- --main
+- doc/README
 extra_rdoc_files: 
-  - doc/README
+- doc/README
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+