dim 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dim (1.0.0)
+    dim (1.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.markdown

@@ -54,8 +54,9 @@ The following could be in a "lib.init.rb" file or in a Rails app, "config/initia
       Logger.new(c.log_file_path)
     end
 
-    # attempts to read ENV["API_PASSWORD"], returns "FAKE_PASSWORD" if it can't be found
-    ServerContainer.register_env(:api_password,"FAKE_PASSWORD")
+    # attempts to read ENV["API_PASSWORD"], otherwise makes sure that the parent container has
+    # a service named api_password registered
+    ServerContainer.register_env(:api_password)
 
 Using the above code elsewhere in the app, when you want a reference to the app's logger object:
 

data/lib/dim.rb

@@ -1,10 +1,10 @@
-#!/usr/bin/env ruby
 #--
-# Copyright 2004, 2005, 2010 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2004, 2005, 2010, 2012 by Jim Weirich (jim.weirich@gmail.com)
+# and Mike Subelsky (mike@subelsky.com)
+#
 # 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)
@@ -64,11 +64,17 @@ module Dim
       @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

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dim
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/dim_spec.rb

@@ -170,9 +170,13 @@ describe Dim::Container do
     end
 
     Scenario "which exist in optional hash" do
-      Given { ENV["SHAZ"] = nil }
-      Given { container.register_env(:shaz,"test-bot") }
-      Then  { container.shaz.should == "test-bot" }
+      Given(:parent) { container }
+      Given { parent.register(:foo) { "bar" } }
+      Given(:child) { Dim::Container.new(parent) }
+
+      Given { ENV["FOO"] = nil }
+      Given { child.register_env(:foo) }
+      Then  { container.foo.should == "bar" }
     end
 
     Scenario "which don't exist in optional hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dim
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors: