dim 1.0.0 → 1.1.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2-p136@dim --create
+rvm use 1.9.3

data/Gemfile

@@ -1,2 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in ..gemspec
 gemspec

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dim (0.9.1)
+    dim (1.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.2)
     rspec (2.5.0)

data/{MIT-LICENSE → LICENSE}

@@ -1,4 +1,6 @@
-Copyright (c) 2004, 2010 Jim Weirich
+Copyright (c) 2012 Mike Subelsky
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,5 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,6 +1,6 @@
 # DIM: Dependency Injection - Minimal
 
-DIM is [Jim Weirich's](http://onestepback.org) minimalistic dependency injection framework, maintained in 
+DIM is [Jim Weirich's](http://onestepback.org) minimalistic dependency injection framework, maintained in
 gem form by [Mike Subelsky](http://subelsky.com).
 
 Dependency injection lets you organize all of your app's object setup code in one place by creating a
@@ -33,7 +33,7 @@ The following could be in a "lib.init.rb" file or in a Rails app, "config/initia
     ServerContainer.register(:listening_host) { "0.0.0.0" }
     ServerContainer.register(:listening_port) { "8080" }
 
-    ServerContainer.register(:game) do |c| 
+    ServerContainer.register(:game) do |c|
       game = Game.new
       game.logger = c.logger
       game.event_handler = c.event_handler
@@ -54,6 +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")
+
 Using the above code elsewhere in the app, when you want a reference to the app's logger object:
 
     ServerContainer.logger.info("I didn't have to setup my own logger")
@@ -62,11 +65,11 @@ Or if you wanted access to the game instance created during setup (which already
 
     current_game = ServerContainer.game
 
-If you don't like creating even the one dependency on the global constant ServerContainer, you could 
+If you don't like creating even the one dependency on the global constant ServerContainer, you could
 inject ServerContainer itself into your objects like so:
-    
+
     World.new(GameContainer)
-    
+
 ## More Background
 
 Jim wrote a [nice article](http://onestepback.org/index.cgi/Tech/Ruby/DependencyInjectionInRuby.rdoc) explaining
@@ -74,4 +77,4 @@ the rationale for this code and how it works. Also check out [his slides](http:/
 
 # License
 
-DIM is available under the MIT license (see the file MIT-LICENSE for details).
+Dim is available under the MIT license (see the file LICENSE for details).

data/Rakefile

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby"
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require 'rake/clean'
 require 'rake/testtask'

data/dim.gemspec

@@ -1,5 +1,5 @@
 $:.unshift(File.dirname(__FILE__))
-require 'lib/dim/version'
+require 'lib/version'
 
 Gem::Specification.new do |s|
   s.name = %q{dim}
@@ -17,4 +17,5 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files spec`.split("\n")
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-given'
+  s.license = "MIT"
 end

data/lib/dim.rb

@@ -29,10 +29,13 @@
 #
 module Dim
   # Thrown when a service cannot be located by name.
-  class MissingServiceError < StandardError; end
+  MissingServiceError = Class.new(StandardError)
 
   # Thrown when a duplicate service is registered.
-  class DuplicateServiceError < StandardError; end
+  DuplicateServiceError = Class.new(StandardError)
+
+  # Thrown by register_env when a suitable ENV variable can't be found
+  EnvironmentVariableNotFound = Class.new(StandardError)
 
   # Dim::Container is the central data store for registering services
   # used for dependency injuction.  Users register services by
@@ -61,6 +64,13 @@ 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 }
+    end
+
     # Lookup a service by name.  Throw an exception if no service is
     # found.
     def [](name)

data/lib/version.rb

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

data/spec/dim_spec.rb

@@ -162,4 +162,25 @@ describe Dim::Container do
     end
   end
 
+  describe "Registering env variables" do
+    Scenario "which exist in ENV" do
+      Given { ENV["SHAZ"] = "bot" }
+      Given { container.register_env(:shaz) }
+      Then  { container.shaz.should == "bot" }
+    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" }
+    end
+
+    Scenario "which don't exist in optional hash" do
+      Then {
+        lambda {
+          container.register_env(:dont_exist_in_env_or_optional_hash)
+        }.should raise_error(Dim::EnvironmentVariableNotFound)
+      }
+    end
+  end
 end

metadata

@@ -1,87 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dim
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Jim Weirich
 - Mike Subelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-given
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-given
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Minimalistic dependency injection framework keeps all of your object setup code in one place.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Minimalistic dependency injection framework keeps all of your object
+  setup code in one place.
 email: mike@subelsky.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- MIT-LICENSE
+- LICENSE
 - README.markdown
 - Rakefile
 - dim.gemspec
 - lib/dim.rb
-- lib/dim/version.rb
+- lib/version.rb
 - spec/dim_spec.rb
 homepage: http://github.com/subelsky/dim
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Minimalistic dependency injection framework
-test_files: 
+test_files:
 - spec/dim_spec.rb

data/lib/dim/version.rb

@@ -1,3 +0,0 @@
-module Dim
-  VERSION = "1.0.0"
-end