isomer 0.1.1 → 0.1.2

data/README.md

@@ -75,7 +75,7 @@ You can also specify a number of parameters:
 #### Options
 
 * `file`: Path to the YAML file (required)
-* `root`: If there are multiple configurations (eg. for different environments), you can specify which one to use
+* `base`: If there are multiple configurations (eg. for different environments), you can specify which one to use
 * `required`: If the configuration file is required
 
 

data/lib/isomer/sources/yaml.rb

@@ -21,6 +21,8 @@ class Isomer::Sources::Yaml < Isomer::Sources::Base
       else
         @configuration = values
       end
+
+      @configuration ||= {}
     else
       raise Isomer::Error, "Missing required configuration file '#{file}'" if required
       @configuration = {}

data/lib/isomer/version.rb

@@ -1,3 +1,3 @@
 module Isomer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/isomer/sources/yaml_spec.rb

@@ -25,6 +25,16 @@ describe Isomer::Sources::Yaml do
       source.configuration.should == {'foo' => 'bar'}
     end
 
+    it 'returns an empty hash if the content is nil' do
+      File.stub(:exists?).and_return(true)
+      YAML.stub(:load_file).and_return(nil)
+
+      source = Isomer::Sources::Yaml.new(anything, file: 'anything.yml')
+      source.load
+
+      source.configuration.should == {}
+    end
+
     context 'when the file does not exist' do
       context 'when it is not required' do
         it 'does not blow up' do
@@ -59,6 +69,16 @@ describe Isomer::Sources::Yaml do
 
         source.configuration.should == {'limit' => 100}
       end
+
+      it 'returns an empty hash if the content is nil' do
+        File.stub(:exists?).and_return(true)
+        YAML.stub(:load_file).and_return( 'production' => nil )
+
+        source = Isomer::Sources::Yaml.new(anything, file: 'filish.yml', base: 'production')
+        source.load
+
+        source.configuration.should == {}
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2110058437799830098
+      hash: 2295132044477336041
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2110058437799830098
+      hash: 2295132044477336041
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25