hiera 1.3.0 → 1.3.1.rc1

data/lib/hiera/backend/yaml_backend.rb

@@ -17,10 +17,10 @@ class Hiera
           Hiera.debug("Looking for data source #{source}")
           yamlfile = Backend.datafile(:yaml, scope, source, "yaml") || next
 
-          next unless File.exist?(yamlfile)
+          next unless file_exists?(yamlfile)
 
           data = @cache.read_file(yamlfile, Hash) do |data|
-            YAML.load(data)
+            YAML.load(data) || {}
           end
 
           next if data.empty?
@@ -55,6 +55,12 @@ class Hiera
 
         return answer
       end
+
+      private
+
+      def file_exists?(path)
+        File.exist? path
+      end
     end
   end
 end

data/lib/hiera/version.rb

@@ -7,7 +7,7 @@
 
 
 class Hiera
-  VERSION = "1.3.0"
+  VERSION = "1.3.1-rc1"
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/backend/yaml_backend_spec.rb

@@ -3,12 +3,29 @@ require 'hiera/backend/yaml_backend'
 
 class Hiera
   module Backend
+    class FakeCache
+      attr_accessor :value
+      def read(path, expected_type, default, &block)
+        read_file(path, expected_type, &block)
+      rescue => e
+        default
+      end
+
+      def read_file(path, expected_type, &block)
+        output = block.call(@value)
+        if !output.is_a? expected_type
+          raise TypeError
+        end
+        output
+      end
+    end
+
     describe Yaml_backend do
       before do
         Config.load({})
         Hiera.stubs(:debug)
         Hiera.stubs(:warn)
-        @cache = mock
+        @cache = FakeCache.new
         @backend = Yaml_backend.new(@cache)
       end
 
@@ -32,8 +49,9 @@ class Hiera
           Backend.expects(:datasources).multiple_yields(["one"], ["two"])
           Backend.expects(:datafile).with(:yaml, {}, "one", "yaml").returns("/nonexisting/one.yaml")
           Backend.expects(:datafile).with(:yaml, {}, "two", "yaml").returns(nil).never
-          @cache.expects(:read_file).with("/nonexisting/one.yaml", Hash).returns({"key"=>"answer"})
-          File.stubs(:exist?).with("/nonexisting/one.yaml").returns(true)
+
+          @backend.stubs(:file_exists?).with("/nonexisting/one.yaml").returns(true)
+          @cache.value = "---\nkey: answer"
 
           @backend.lookup("key", {}, nil, :priority).should == "answer"
         end
@@ -46,13 +64,27 @@ class Hiera
           @backend.lookup("key", {}, nil, :priority)
         end
 
-        it "should return nil for empty data files" do
-          Backend.expects(:datasources).multiple_yields(["one"])
-          Backend.expects(:datafile).with(:yaml, {}, "one", "yaml").returns("/nonexisting/one.yaml")
-          File.stubs(:exist?).with("/nonexisting/one.yaml").returns(true)
-          @cache.expects(:read_file).with("/nonexisting/one.yaml", Hash).returns({})
-
-          @backend.lookup("key", {}, nil, :priority).should be_nil
+        describe "handling unexpected YAML values" do
+          before do
+            Backend.expects(:datasources).multiple_yields(["one"])
+            Backend.expects(:datafile).with(:yaml, {}, "one", "yaml").returns("/nonexisting/one.yaml")
+            @backend.stubs(:file_exists?).with("/nonexisting/one.yaml").returns(true)
+          end
+
+          it "returns nil when the YAML value is nil" do
+            @cache.value = "---\n"
+            @backend.lookup("key", {}, nil, :priority).should be_nil
+          end
+
+          it "returns nil when the YAML file is false" do
+            @cache.value = ""
+            @backend.lookup("key", {}, nil, :priority).should be_nil
+          end
+
+          it "raises a TypeError when the YAML value is not a hash" do
+            @cache.value = "---\n[one, two, three]"
+            expect { @backend.lookup("key", {}, nil, :priority) }.to raise_error(TypeError)
+          end
         end
 
         it "should build an array of all data sources for array searches" do
@@ -135,9 +167,8 @@ class Hiera
           Backend.expects(:datafile).with(:yaml, {}, "one", "yaml").returns("/nonexisting/one.yaml").times(3)
           File.stubs(:exist?).with("/nonexisting/one.yaml").returns(true)
 
-          yaml = "---\nstringval: 'string'\nboolval: true\nnumericval: 1"
 
-          @cache.expects(:read_file).with("/nonexisting/one.yaml", Hash).times(3).returns({"boolval"=>true, "numericval"=>1, "stringval"=>"string"})
+          @cache.value = "---\nstringval: 'string'\nboolval: true\nnumericval: 1"
 
           @backend.lookup("stringval", {}, nil, :priority).should == "string"
           @backend.lookup("boolval", {}, nil, :priority).should == true

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hiera
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.3.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -35,35 +35,35 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/hiera
-- lib/hiera/puppet_logger.rb
+- lib/hiera.rb
 - lib/hiera/console_logger.rb
+- lib/hiera/noop_logger.rb
+- lib/hiera/backend/yaml_backend.rb
+- lib/hiera/backend/json_backend.rb
+- lib/hiera/fallback_logger.rb
 - lib/hiera/filecache.rb
 - lib/hiera/version.rb
-- lib/hiera/fallback_logger.rb
-- lib/hiera/error.rb
+- lib/hiera/config.rb
 - lib/hiera/interpolate.rb
-- lib/hiera/util.rb
 - lib/hiera/recursive_guard.rb
+- lib/hiera/util.rb
 - lib/hiera/backend.rb
-- lib/hiera/noop_logger.rb
-- lib/hiera/config.rb
-- lib/hiera/backend/yaml_backend.rb
-- lib/hiera/backend/json_backend.rb
-- lib/hiera.rb
+- lib/hiera/puppet_logger.rb
+- lib/hiera/error.rb
 - COPYING
 - README.md
 - LICENSE
-- spec/unit/util_spec.rb
-- spec/unit/puppet_logger_spec.rb
-- spec/unit/version_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/backend_spec.rb
-- spec/unit/filecache_spec.rb
 - spec/unit/hiera_spec.rb
-- spec/unit/console_logger_spec.rb
+- spec/unit/filecache_spec.rb
 - spec/unit/backend/yaml_backend_spec.rb
 - spec/unit/backend/json_backend_spec.rb
+- spec/unit/console_logger_spec.rb
+- spec/unit/backend_spec.rb
+- spec/unit/version_spec.rb
+- spec/unit/puppet_logger_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/fallback_logger_spec.rb
+- spec/unit/util_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/hiera
 licenses: []
@@ -80,9 +80,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -90,15 +90,15 @@ signing_key:
 specification_version: 3
 summary: Light weight hierarchical data store
 test_files:
-- spec/unit/util_spec.rb
-- spec/unit/puppet_logger_spec.rb
-- spec/unit/version_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/backend_spec.rb
-- spec/unit/filecache_spec.rb
 - spec/unit/hiera_spec.rb
-- spec/unit/console_logger_spec.rb
+- spec/unit/filecache_spec.rb
 - spec/unit/backend/yaml_backend_spec.rb
 - spec/unit/backend/json_backend_spec.rb
+- spec/unit/console_logger_spec.rb
+- spec/unit/backend_spec.rb
+- spec/unit/version_spec.rb
+- spec/unit/puppet_logger_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/fallback_logger_spec.rb
+- spec/unit/util_spec.rb
 - spec/spec_helper.rb