isomer 0.1.2 → 0.1.3

data/lib/isomer/sources/yaml.rb

@@ -16,13 +16,13 @@ class Isomer::Sources::Yaml < Isomer::Sources::Base
   def load
     if File.exists?(file)
       values = YAML.load_file(file)
-      if base && values.has_key?(base)
-        @configuration = values[base]
+      if !values.is_a?(Hash)
+        @configuration = {}
+      elsif base && values.has_key?(base)
+        @configuration = values[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.2"
+  VERSION = "0.1.3"
 end

data/spec/isomer/sources/yaml_spec.rb

@@ -15,24 +15,52 @@ describe Isomer::Sources::Yaml do
   end
 
   describe '#load' do
-    it 'loads the YAML file configuration file' do
-      File.stub(:exists?).and_return(true)
-      YAML.should_receive(:load_file).with('/home/configuration.yml').and_return({'foo' => 'bar'})
+    context 'when the file exists' do
+      context 'when the configuration values are a hash' do
+        it 'sets the configuration to the YAML file contents' do
+          File.stub(:exists?).and_return(true)
+          YAML.should_receive(:load_file).with('/home/configuration.yml').and_return({'foo' => 'bar'})
 
-      source = Isomer::Sources::Yaml.new(anything, file: '/home/configuration.yml')
-      source.load
+          source = Isomer::Sources::Yaml.new(anything, file: '/home/configuration.yml')
+          source.load
 
-      source.configuration.should == {'foo' => 'bar'}
-    end
+          source.configuration.should == {'foo' => 'bar'}
+        end
+      end
+
+      context 'when the configuration values are not a hash' do
+        it 'sets the configuration to an empty hash' do
+          File.stub(:exists?).and_return(true)
+          YAML.stub(:load_file).and_return('string value')
+
+          source = Isomer::Sources::Yaml.new(anything, file: 'anything.yml')
+          source.load
+
+          source.configuration.should == {}
+        end
+      end
+
+      context 'with a base' do
+        it 'returns the configuration under the base node' do
+          File.stub(:exists?).and_return(true)
+          YAML.stub(:load_file).and_return( 'production' => {'limit' => 100} )
 
-    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: 'filish.yml', base: 'production')
+          source.load
 
-      source = Isomer::Sources::Yaml.new(anything, file: 'anything.yml')
-      source.load
+          source.configuration.should == {'limit' => 100}
+        end
 
-      source.configuration.should == {}
+        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
 
     context 'when the file does not exist' do
@@ -58,27 +86,5 @@ describe Isomer::Sources::Yaml do
         end
       end
     end
-
-    context 'with a base' do
-      it 'returns the configuration under the base node' do
-        File.stub(:exists?).and_return(true)
-        YAML.stub(:load_file).and_return( 'production' => {'limit' => 100} )
-
-        source = Isomer::Sources::Yaml.new(anything, file: 'filish.yml', base: 'production')
-        source.load
-
-        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.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2295132044477336041
+      hash: -2110743002867033305
 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: 2295132044477336041
+      hash: -2110743002867033305
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25