hiera-router 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f008fd079d6bf63f1a897eb53b1d42338152aa6b
-  data.tar.gz: adcbbf85adce23472dc99cfcf36689711a9f26a9
+  metadata.gz: c260f8ab76b316611f8cfc8dd504abd1cc551ef8
+  data.tar.gz: 6243a808c495352baa3ac4fd0df35ddd565b299b
 SHA512:
-  metadata.gz: 7674d2308f350a7a1defddca3acf39025f1faf745dc9a9a18088366e815d25b091016ec20323b7dff84921bceee47f5a9870689e4472c40f548b5ecd4ba5a973
-  data.tar.gz: 4e208e39b5841e419d394ad4df518829a3db737844bd5cca2d878c6445fe1213ebbf04470057601a9eadf79a74a91c01b6703885141bf4fd3314c451ff3d88e9
+  metadata.gz: eaa8cf281a46d1eae42d209a6d7ed52a3f7b94100de324435a6e79f27ea601ce3f0515ead9422aec405e90cd9629f47ec851bc344f6be0168d017bfb4a9b0b63
+  data.tar.gz: a2ae9d18a0f10b8f0b2094cc82494737f34514eb5b7d89af2f1c5b3765cd960d5979e46953629456830bfccfcfc0ff9c602dc4fb1f068415e9ff940de4e25469

data/lib/hiera/backend/router_backend.rb

@@ -67,29 +67,30 @@ class Hiera
 				return answer
 			end
 
-			def hash_key(hash, path)
-				puts hash.inspect
-				puts path.join('>')
-				my_hash = hash
+			def recursive_key_from_hash(hash, path)
+				focus = hash
 				path.each do |key|
-					my_hash = my_hash[key] if my_hash.include?(key)
+					if focus.is_a?(Hash) and focus.include?(key)
+						focus = focus[key]
+					else
+						return nil
+					end
 				end
 
-				puts "result: #{my_hash}"
-				return my_hash
+				return focus
 			end
 
 			def parse_answer(data, scope, options, path = [])
 				if data.is_a?(Numeric) or data.is_a?(TrueClass) or data.is_a?(FalseClass)
 					return data
 				elsif data.is_a?(String)
-					return parse_string(data, scope, options)
+					return parse_string(data, scope, options, path)
 				elsif data.is_a?(Hash)
 					answer = {}
 					data.each_pair do |key, val|
 						interpolated_key = Backend.parse_string(key, scope)
 						subpath = path + [interpolated_key]
-						answer[interpolated_key] = hash_key(parse_answer(val, scope, options, subpath), subpath)
+						answer[interpolated_key] = parse_answer(val, scope, options, subpath)
 					end
 
 					return answer
@@ -103,7 +104,7 @@ class Hiera
 				end
 			end
 
-			def parse_string(data, scope, options)
+			def parse_string(data, scope, options, path = [])
 				if match = data.match(/^backend\[([^,]+)(?:,(.*))?\]$/)
 					backend_name, backend_parameters = match.captures
 					backend_options = options
@@ -116,7 +117,7 @@ class Hiera
 						result = data
 					end
 					Hiera.debug("[hiera-router] Call to '#{backend_name}' finished.")
-					return result
+					return recursive_key_from_hash(result, path)
 				else
 					Backend.parse_string(data, scope)
 				end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-router
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Jo Vandeginste