hiera-ic-yaml 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8afa30ea53e7318522401e865f873b6e5f7521c3
-  data.tar.gz: b318416caa3d9ad03b276bf41724e2dd28871b26
+  metadata.gz: a2eb8fc26221b717523240df9a5ce580512d3833
+  data.tar.gz: fa8dcce2e04c09b7a0a77399465627cf094b0888
 SHA512:
-  metadata.gz: 1b49bdec58d6947c60beeec490e81db85fc61992a18f76a3bb6212bfc7b314240d7fc66ad5a97d6de8a4ef80507da11f2339f2ce197476aba7868a5cbfb9ea73
-  data.tar.gz: bea5f636ba512aa6541180d23eee899a4ae1d9a7f8c0e03a313edecb033043c3b076d0d2972913450c431f8c6cb70c2380788d7ba7d7e1d3c06eeff1c511117e
+  metadata.gz: f70bd0b711ba80a5798fe684df940ec7760818fa1d4af1a7d07baf9e4a8b19aeb71841c5f24bbf74d46842bc4ae7900c2f219189167a1466929a53937d2a8649
+  data.tar.gz: 1d46def3c92544684ba0b04d9f17c5972ae5228594010237f81918220eb07f8585d048c00cad953f45d440d3be8a9fa4df66f45d6c3b256428b1ef687402744a

data/lib/hiera/backend/ic_yaml_backend.rb

@@ -1,3 +1,6 @@
+require 'hiera/filenocache'
+require 'hiera/filecache'
+
 class Hiera
   module Backend
     class Ic_yaml_backend
@@ -5,7 +8,7 @@ class Hiera
         require 'yaml'
         Hiera.debug("Hiera IC YAML backend starting")
 
-        @cache = cache || Filecache.new
+        @cache = cache || create_filecache()
       end
 
       def ic_yaml_config()
@@ -62,6 +65,20 @@ class Hiera
         return '__imports__'
       end
 
+      def create_filecache()
+        config = ic_yaml_config()
+
+        if !config.has_key?('cacheable') && !config.has_key?(:cacheable)
+            return Hiera::Filecache.new
+        end
+
+        if config[:cacheable] || config[:cacheable]
+            return Hiera::Filecache.new
+        end
+
+        return Hiera::Filenocache.new
+      end
+
       def parameters_key()
         config = ic_yaml_config()
 

data/lib/hiera/filenocache.rb

@@ -0,0 +1,30 @@
+class Hiera
+  class Filenocache
+
+    def read(path, expected_type = Object, default=nil, &block)
+      read_file(path, expected_type, &block)
+    rescue TypeError => detail
+      Hiera.debug("#{detail.message}, setting defaults")
+      default
+    rescue => detail
+      error = "Reading data from #{path} failed: #{detail.class}: #{detail}"
+      if default.nil?
+        raise detail
+      else
+        Hiera.debug(error)
+        default
+      end
+    end
+
+    def read_file(path, expected_type = Object)
+      data   = File.read(path)
+      result = block_given? ? yield(data) : data
+
+      if !result.is_a?(expected_type)
+        raise TypeError, "Data retrieved from #{path} is #{data.class} not #{expected_type}"
+      end
+
+      result
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-ic-yaml
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Fabio B. Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies: []
 description: Hiera yaml backend that support imports and parameters
 email: fabio.bat.silva@gmail.com
@@ -17,6 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/hiera/backend/ic_yaml_backend.rb
+- lib/hiera/filenocache.rb
 homepage: http://github.com/instaclick/hiera-ic-yaml
 licenses: []
 metadata: {}