hiera-browser 1.0.0.pre → 1.1.0.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTMzYmYyODE0OWJlOTE5MjczNDYyNGVhNWQ0M2M2OWRkZmFmZGNjNQ==
+    YjgzNTg0MzE2ZjQzNTNhMjgxMWVlZjA3NTU4NDhkMzgyMmJmMWRhZA==
   data.tar.gz: !binary |-
-    Yjg4ODRjZTBkZTdmY2U5MGQ3NjNiZGQ1MGJjMDliYTQ4YTVkNDgxNw==
+    NDUwNjA5ZDZmYzY5NTBlNjljNWQ1MTU5ZjZmMDJiYjRjODc5YzQ1OA==
 SHA512:
   metadata.gz: !binary |-
-    M2Q5MTI3NjAyMGUwNDFjOWY3NDY2YmUxNzU4ODQ2NTgwZjEzNGM5ODQyMGIz
-    OWYyZGRhYTM3YmU4OWQ2NGZjOWYzMzQ4NGU5MzYzZjE0N2JiNTgwMmVjZDA2
-    OTc2NGQ4OGMzZTcwZmE4NDBhN2E5YWVkNjY3Njk3M2VmMDEwMjI=
+    OTAxZTJmYWM1ODgxZGNjM2E2NjA4MDI3ODRmNTQ3NTJiNjhmNmM0OGFmMTk3
+    ZGQ4YTk1ZDhmM2Q2M2E3OTBhY2E0MmExMWVhNzRkMGEwOGU3MjMyNzc5YTU1
+    OTg2MmE4N2UxODI1YzNiOTBlMDdkZjcwN2Y0OTcyNjdhOGUxOWI=
   data.tar.gz: !binary |-
-    YWJhZjdjNWIzZTMzYTBkMTljZmMwYTcxNjAwMmE2YjcxMzNhYzdkZGEyNTBm
-    MDg2Yzg4ZTE2MWI0YWNkODA2ZTZlYmU1N2MxN2VlNTgzYTdjMDg1OGVmZGQz
-    NGM0NWQxZTZhZmNkMzk4MjZhYzQ5ODNiNmNmMmZjZWE4ODIxZmY=
+    NTI1MTNkMzdhZjJkNjY5MmQxODllOGE2OGQwY2IyMWFiY2FjZDAyYzg1MWQy
+    MTNjYzlmZmM4YTI4NTFhMzdkNWRiMjY4OTM3Mjc3ZmI3MmE4NjMyMzRlMGFl
+    NzIzNTA5MTQ5YjBiNmQ4ZmY1ZDI5MmU1MmMwM2YxYjA4MDQwMWY=

data/lib/hiera_browser/hiera_controller.rb

@@ -35,9 +35,29 @@ class HieraController
     config[:hierarchy]
   end
 
+  def top_scopify(args)
+    scope = args[:scope]
+    fix_keys = hierarchy.map{|datasource|
+      begin
+        datasource.match(/\%\{([\:a-z_]+)\}/)[1]
+      rescue NoMethodError
+        datasource
+      end
+    }
+    fix_keys.select!{|datasource| datasource.start_with?("::")} unless fix_keys.empty?
+    scope.inject({}){|a,fact|
+      if fix_keys.include?("::#{fact.first}")
+        a["::#{fact.first}"] = fact.last
+      else
+        a[fact.first] = fact.last
+      end
+      a
+    }
+  end
+
   def lookup(args)
     key = args[:key]
-    scope = args[:scope]
+    scope = top_scopify(:scope => args[:scope])
     resolution_type = args[:resolution_type] || :priority
     Hash[*[key,hiera.lookup(key, nil, scope, nil, resolution_type)]]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-browser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - David Gwilliam