lib/dim.rb in dim-1.1.0 vs lib/dim.rb in dim-1.2.0

@@ -1,12 +1,12 @@
-#!/usr/bin/env ruby
 #--
-# Copyright 2004, 2005, 2010 by Jim Weirich ([e-mail]).
+# Copyright 2004, 2005, 2010, 2012 by Jim Weirich ([e-mail])
+# and Mike Subelsky ([e-mail])
+#
 # All rights reserved.
 #
-# This software is available under the MIT license.  See the
-# MIT-LICENSE file for details.
+# This software is available under the MIT license.  See the LICENSE file for details.
 #++
 #
 # = Dependency Injection - Minimal (DIM)
 #
 # The DIM module provides a minimal dependency injection framework for
@@ -62,14 +62,20 @@
         fail DuplicateServiceError, "Duplicate Service Name '#{name}'"
       end
       @services[name] = block
     end
 
-    # Lookup a service from ENV variables; fall back to searching the provided hash
-    # if the
-    def register_env(name,default = nil)
-      value = ENV[name.to_s.upcase] || default || raise(EnvironmentVariableNotFound, "Cannot find any ENV variable named #{name}")
-      register(name) { value }
+    # Lookup a service from ENV variables; fall back to searching the container and its parents for a default value
+    def register_env(name)
+      if value = ENV[name.to_s.upcase]
+        register(name) { value }
+      else
+        begin
+          @parent.service_block(name)
+        rescue MissingServiceError
+          raise EnvironmentVariableNotFound, "Could not find an ENV variable named #{name.to_s.upcase} nor could we find a service named #{name} in the parent container"
+        end
+      end
     end
 
     # Lookup a service by name.  Throw an exception if no service is
     # found.
     def [](name)