hiera-dyml 0.0.2 → 0.0.3

data/lib/hiera/backend/dyml_backend.rb

@@ -1,43 +1,52 @@
 class Hiera
-    module Backend
-        class Dyml_backend
-            #based on the original Hiera Yaml backend, modified to use the deep_merge hash function to merge the hiera yaml files.
+  module Backend
+    class Dyml_backend
+      #based on the original Hiera Yaml backend, modified to use the deep_merge hash function to merge the hiera yaml files.
 
-            def initialize
-                require 'yaml'
-                require 'deep_merge'
-                Hiera.debug("Hiera Dyml backend starting")
-            end
+      def initialize
+        require 'yaml'
+        require 'deep_merge'
+        Hiera.debug("Hiera Dyml backend starting")
+      end
 
-            def lookup(key, scope, order_override, resolution_type)
-                answer = Backend.empty_answer(resolution_type)
-                Hiera.debug("Looking up #{key} in DYML backend")
-                files = []
-                data = {}
-                Backend.datasources(scope, order_override) do |source|
-                  Hiera.debug("Looking for data source #{source}")
-                  yamlfile = Backend.datafile(:dyml, scope, source, "yaml") || next
-                  files << yamlfile 
-                end
+      def deep_merge_options
+        @options ||= {}.tap do |options|
+          backend_options = Hiera::Config[:dyml]
+          [:knockout_prefix, :preserve_unmergeables, :sort_merged_arrays, :unpack_arrays].each do |key|
+            options[key] = backend_options[key] if backend_options.include?(key)
+          end
+        end
+      end
 
-                files.reverse.each {|f| data.deep_merge!(YAML.load_file(f))} unless files.empty?
+      def lookup(key, scope, order_override, resolution_type)
+        answer = nil
+        Hiera.debug("Looking up #{key} in DYML backend")
+        files = []
+        data = {}
+        Backend.datasources(scope, order_override) do |source|
+          Hiera.debug("Looking for data source #{source}")
+          yamlfile = Backend.datafile(:dyml, scope, source, "yaml") || next
+          files << yamlfile 
+        end
 
-                if data.include?(key)
-                    new_answer = Backend.parse_answer(data[key], scope)
-                    case resolution_type
-                    when :array
-                        raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
-                        answer << new_answer
-                    when :hash
-                        raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
-                        answer = new_answer.merge answer
-                    else
-                        answer = new_answer
-                    end
-                end
+        files.reverse.each { |f| data.deep_merge!(YAML.load_file(f), deep_merge_options) } unless files.empty?
 
-                return answer
-            end
+        if data.include?(key)
+          new_answer = Backend.parse_answer(data[key], scope)
+          case resolution_type
+          when :array
+            raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
+            answer << new_answer
+          when :hash
+            raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
+            answer = new_answer.merge answer
+          else
+            answer = new_answer
+          end
         end
+
+        return answer
+      end
     end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-dyml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement