dim 1.2.3 → 1.2.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDkyMTNkMjcyOTcyMTBiMmI5MTVlMDgwMDEwNGMxZWJkYmMxN2MzOA==
+  data.tar.gz: !binary |-
+    OWZhZjY2MDhjYjc1MjMzZDgxYjRmZjMxM2RmNWNhZTExYzFlMTEwYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NzZlNmQzMzhkYzg2ZWZjNTVjYjhjYTI1MDRkNTU0MzMxMjJjNWFhZjdiMmQx
+    N2I4OTMzYTdiOGE5ZDUyNjBhNDRjNjdjNzE1Y2MyNGE0ZjBiYzY4YThhY2I2
+    ODQ5MTlkZjE2ZGFiNDhhY2M3ZmI3MWMxOWU4ZDlmOTk3MzkyYmY=
+  data.tar.gz: !binary |-
+    N2E2NDYzYTY2NmJiODVhOWUyMWYxMTZlNGNlMjAxZDJiZTc3YjE0YmI3ODIz
+    ZThjMTJhZTY3Yzc0Njg1YjRlMWQ2YmFiOTczNjI3NDViYmIxZDc0OTAyNTY4
+    ODQyMTJlMzI2ODYxMjAwNjYyMzliZGMyODIzNzcwNTZhYzVmZjU=

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3

data/Gemfile.lock

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

data/lib/dim.rb

@@ -68,15 +68,17 @@ module Dim
       end
     end
 
-    # Lookup a service from ENV variables; fall back to searching the container and its parents for a default value
-    def register_env(name)
+    # Lookup a service from ENV variables, or use a default if given; fall back to searching the container and its parents for a default value
+    def register_env(name,default = nil)
       if value = ENV[name.to_s.upcase]
         register(name) { value }
+      elsif default
+        register(name) { default }
       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"
+          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

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dim
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/dim_spec.rb

@@ -177,7 +177,7 @@ describe Dim::Container do
       Then  { container.shaz.should == "bot" }
     end
 
-    Scenario "which exist in optional hash" do
+    Scenario "which only exist in parent" do
       Given(:parent) { container }
       Given { parent.register(:foo) { "bar" } }
       Given(:child) { Dim::Container.new(parent) }
@@ -187,6 +187,11 @@ describe Dim::Container do
       Then  { container.foo.should == "bar" }
     end
 
+    Scenario "which don't exist in ENV but have a default" do
+      Given { container.register_env(:abc,"123") }
+      Then  { container.abc.should == "123" }
+    end
+
     Scenario "which don't exist in optional hash" do
       Then {
         lambda {

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dim
 version: !ruby/object:Gem::Version
-  version: 1.2.3
-  prerelease: 
+  version: 1.2.4
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +49,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -67,28 +62,28 @@ files:
 homepage: http://github.com/subelsky/dim
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Minimalistic dependency injection framework
 test_files:
 - spec/dim_spec.rb
+has_rdoc: 

data/.rvmrc

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p194"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.13.4 ()" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi