constantinople 0.1.0 → 0.2.0

data/lib/constantinople.rb

@@ -22,9 +22,14 @@ module Constantinople
     ['.yml.default', '.yml', '.yml.override'].each do |ext|
       Dir.glob(File.join(dir,"*#{ext}")) do |path|
         filename = File.basename(path,ext)
-        result.deeper_merge!(filename => YAML.load_file(path))
-        sub = result[filename]
-        sub.deeper_merge!(sub[env]) if sub.include?(env)
+        sub = YAML.load_file(path)
+        if sub
+          sub = Map.new(sub)
+          sub.deeper_merge!(sub[env]) if sub.include?(env)
+        else
+          sub = {}
+        end
+        result.deeper_merge!(filename => sub)
       end
     end
     result

data/lib/constantinople/version.rb

@@ -1,3 +1,3 @@
 module Constantinople
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/config/spec.yml

@@ -1,6 +1,7 @@
 b: standard
 c: standard
 animal: unicorn
+monkey: banana
 development:
   animal: dolphin
 test:

data/spec/config/spec.yml.default

@@ -1,3 +1,10 @@
 a: default
 b: default
-c: default
+c: default
+
+development:
+  monkey: development-banana
+test:
+  monkey: test-banana
+production:
+  monkey: production-banana

data/spec/config/spec.yml.override

@@ -1 +1 @@
-c: override
+c: override

data/spec/lib/constantinople_spec.rb

@@ -13,6 +13,9 @@ describe Constantinople do
     CONFIG.spec.a.should == 'default'
     CONFIG.spec.b.should == 'standard'
     CONFIG.spec.c.should == 'override'
+    CONFIG.spec.monkey.should == 'banana'
+    CONFIG.spec.test.monkey.should == 'test-banana'
     CONFIG.spec.animal.should == 'turtle' # from test environment
+    CONFIG.empty.should be_empty
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: constantinople
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Johnson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 -05:00
+date: 2011-09-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,6 +158,7 @@ files:
 - lib/constantinople.rb
 - lib/constantinople/deep_merge_map.rb
 - lib/constantinople/version.rb
+- spec/config/empty.yml
 - spec/config/spec.yml
 - spec/config/spec.yml.default
 - spec/config/spec.yml.override
@@ -198,6 +199,7 @@ signing_key:
 specification_version: 3
 summary: Load all your config/*.yml files
 test_files: 
+- spec/config/empty.yml
 - spec/config/spec.yml
 - spec/config/spec.yml.default
 - spec/config/spec.yml.override