hiera-http 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 620ef8615d2e8ace93c078b216dae1b4cedd37e0
-  metadata.gz: 99c301ebac50f12262c7e480816ee2402ad3fea2
-SHA512: 
-  data.tar.gz: 414d0646b8aa2b45d04cf0614099615c281b6ffb8d947444a782a85eb5a8222733af46eed7f875f84220dec6ff7bfb63ec327ee742964859343a8eb85c62349b
-  metadata.gz: 4be252eab56b83a9f9bb530fa749db584af51e9febd1f8bfad28d262b7c80d98cdd2a841b4a5d86835ca2d9797941fd2a19df2a447cb8624751e6aa6b0ac2c66
+---
+SHA1:
+  metadata.gz: 63ab1df0ab23f968b79343ec215cffc367e0769d
+  data.tar.gz: 7da4074c7417b661010bb7986b9788dbf7b3fd3a
+SHA512:
+  metadata.gz: 2a87f6180b5712df95d7d54a91c11ee50b90a5df488fc0840decd6a59de30d5886afb0ea2182335d6be53bbde17677c369eccdc13abb92ebae4f2d3d286f8081
+  data.tar.gz: ef924a36d8c2b836b656b1be962ff5ec360b2c1543609f08f9560da090776ad3f8a4f7cd72fac1305a1d9da712e5112687e4b482450c003eb47e49f1e3608eb1

data/lib/hiera/backend/http_backend.rb

@@ -15,6 +15,14 @@ class Hiera
         @cache_timeout = @config[:cache_timeout] || 10
         @cache_clean_interval = @config[:cache_clean_interval] || 3600
 
+        @regex_key_match = nil
+
+        if confine_keys = @config[:confine_to_keys]
+          confine_keys.map! { |r| Regexp.new(r) }
+          @regex_key_match = Regexp.union(confine_keys)
+        end
+
+
         if @config[:use_ssl]
           @http.use_ssl = true
 
@@ -38,6 +46,15 @@ class Hiera
       end
 
       def lookup(key, scope, order_override, resolution_type)
+
+        # if confine_to_keys is configured, then only proceed if one of the
+        # regexes matches the lookup key
+        #
+        if @regex_key_match
+          return nil unless key[@regex_key_match] == key
+        end
+
+
         answer = nil
 
         paths = @config[:paths].map { |p| Backend.parse_string(p, scope, { 'key' => key }) }
@@ -100,22 +117,22 @@ class Hiera
 
       def parse_yaml(answer)
         require 'yaml'
-        YAML.parse(answer)
+        YAML.load(answer)
       end
 
       def http_get_and_parse_with_cache(path)
-        return http_get(path) if @cache_timeout <= 0
+        return http_get_and_parse(path) if @cache_timeout <= 0
 
         now = Time.now.to_i
         expired_at = now + @cache_timeout
 
         # Deleting all stale cache entries can be expensive. Do not do it every time
-        periodically_clean_cache(now, expired_at) unless @cache_clean_interval == 0
+        periodically_clean_cache(now) unless @cache_clean_interval == 0
 
         # Just refresh the entry being requested for performance
-        unless @cache[path] && @cache[path][:created_at] < expired_at
+        if !@cache[path] || @cache[path][:expired_at] < now
           @cache[path] = {
-            :created_at => now,
+            :expired_at => expired_at,
             :result => http_get_and_parse(path)
           }
         end
@@ -150,12 +167,12 @@ class Hiera
       end
 
 
-      def periodically_clean_cache(now, expired_at)
+      def periodically_clean_cache(now)
         return if now < @clean_cache_at.to_i
 
         @clean_cache_at = now + @cache_clean_interval
         @cache.delete_if do |_, entry|
-          entry[:created_at] > expired_at
+          entry[:expired_at] < now
         end
       end
     end

metadata

@@ -1,61 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hiera-http
-version: !ruby/object:Gem::Version 
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-03-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+date: 2015-07-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.1.1
-  version_requirements: *id001
-  prerelease: false
   type: :runtime
-  name: json
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: Hiera backend for looking up data over HTTP APIs
 email: craig@craigdunn.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/hiera/backend/http_backend.rb
 homepage: http://github.com/crayfishx/hiera-http
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id002 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: HTTP backend for Hiera
 test_files: []
-