mini_hiera 0.1.2 → 0.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e9be79b96a1416956202d0cce8850a22bd61064d2c70ec68c71ba782fe4d00be
-  data.tar.gz: 72afdac7e3e1004680391cb49940936d58e553c0c54ff8733f896cc2ab47d97d
+SHA1:
+  metadata.gz: e18494403a76998e355b030bd2db2a80cbc18175
+  data.tar.gz: c330263d17f7921188ffa40dc650a9f8ce02a035
 SHA512:
-  metadata.gz: b562c8082495933c35417afa39fb1b5a37b52e9e68e089016cda4b4cd7c5fda700f76111f2ef255ebfba58fc7afd1aed905b8792d2d1e045b6604e583045f20a
-  data.tar.gz: 1102a8830f2d7ad29b7c604f134fcda5da9a47b2cfc9714d581607702985b9e150ee5834d55e51bd9d63f518bbfa9b27b4e41cd01a2994de2b19659fe2e72e75
+  metadata.gz: 568a67276ee9b56ce2cf26dba50f3d08a4e025a30c93e7fb019d34db9ef2ed204e0447a5bca849a0ea76f2c3afe6dd639d4ecc803eec25f332119449418e99ca
+  data.tar.gz: 2cc10f45ed391d13a91872aea74af2dc5840ad72b43a768b61d6729bd133195cfedb2b2c616daff831413d2997ae1fd73624a1050e7e0e43ce441558438a0c9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mini_hiera (0.1.2)
+    mini_hiera (0.2.0.pre1)
       deep_merge (~> 1.0)
 
 GEM
@@ -28,10 +28,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler
   mini_hiera!
   rake (~> 10.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.1
+   2.0.1

data/lib/mini_hiera.rb

@@ -12,10 +12,19 @@ class MiniHiera
   CircularReferenceError = Class.new(RuntimeError)
   KeyNotFoundError = Class.new(RuntimeError)
 
-  attr_reader :config, :options
+  attr_reader :config, :options, :context_functions, :value_functions
   def initialize(config, options={})
     @config = config
     @options = options
+    @context_functions = {}
+    @value_functions = {}
+  end
+
+  def context_function(name, &impl)
+    @context_functions[name] = impl
+  end
+  def value_function(name, &impl)
+    @value_functions[name] = impl
   end
 
   class Context
@@ -26,7 +35,19 @@ class MiniHiera
     def postprocess(value)
       if value.is_a?(String)
         value.gsub(/\%\{([^}]+)\}/) do |match|
-          fetch($1)
+          replace = $1
+          _, block = @hiera.value_functions.find { |name, _| replace =~ /^#{name}\((.*)\)$/ }
+          if block
+            argument = $1
+            argument = if argument =~ /^["'](.*)['"]$/
+              $1
+            else
+              fetch(argument)
+            end
+            block.call(argument)
+          else
+            fetch(replace)
+          end
         end
       elsif value.is_a?(Hash)
         Hash[value.map { |k,v| [k, postprocess(v)] }]
@@ -66,22 +87,38 @@ class MiniHiera
 
       default_block_wrapper = lambda { |*_| default_block.arity == 0 ? default_block.call : default_block.call(key) }
 
-      data = hiera_data
+      # is the first key a function that yields a tree?
+      split_key = key.split(".")
+      _, block = @hiera.context_functions.find { |name, block| split_key.first =~ /^#{name}\(([^\)]*)\)$/ }
+      argument = $1
+      
 
-      key.split(".").each do |k|
-        if data.is_a?(Array)
-          raise TypeError, "no implicit conversion of String into Integer" unless k.to_i.to_s == k
-          data = data[k.to_i]
-        elsif data.is_a?(Hash)
-          data = data.fetch(k, &default_block_wrapper)
+      if !!block
+        split_key.shift
+        argument = if argument =~ /^["'](.*)['"]$/
+          $1
         else
-          data = default_block_wrapper.call
-          break
+          fetch(argument)
         end
-      end
 
-      detect_circular_interpolation(key) do
-        postprocess(data)
+        block.call(argument).fetch(split_key.join("."))
+      else
+        data = hiera_data
+        split_key.each do |k|
+          if data.is_a?(Array)
+            raise TypeError, "no implicit conversion of String into Integer" unless k.to_i.to_s == k
+            data = data[k.to_i]
+          elsif data.is_a?(Hash)
+            data = data.fetch(k, &default_block_wrapper)
+          else
+            data = default_block_wrapper.call
+            break
+          end
+        end
+
+        detect_circular_interpolation(key) do
+          postprocess(data)
+        end
       end
     end
 

data/lib/mini_hiera/version.rb

@@ -1,3 +1,3 @@
 class MiniHiera
-  VERSION = "0.1.2"
+  VERSION = "0.2.0.pre1"
 end

data/mini_hiera.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'deep_merge', '~> 1.0'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_hiera
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Thomas Haggett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,12 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Hierarchial key/value configuration