hiera-postgres-backend 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eacb72b445dfb8adefd228f0cc498b468dce0d0
-  data.tar.gz: 8af58504dbf9e51b877c802031f636a565ea89f9
+  metadata.gz: 579e8f9d6c45cca95af59718d95f56e5fe6837d7
+  data.tar.gz: 9207ad3377c7710fa02dc28cb356afa4e073f115
 SHA512:
-  metadata.gz: 7fc5c0a6200499f6455851b54b857b02c3e6cd5cb295d4b181d5e1ee0c5fed343ed3029e2b2de4ed79a9d0b7c72d50c9d3cf2d2c025d1d33bbf6019ca81d9c44
-  data.tar.gz: 9ea9a6b178b309410a319397373b17a22e4eda7b31b95f42a125cc90b01f70c2ab6d96b737b999d29a8b14bdacd0ff6046f207a2b78530a645f4fa404794389a
+  metadata.gz: c9c9e91a44f9827794064ecc797c99d85b09cb20943122d1d5f28415deb4f4b19657d486cc405f3ea6d671026a1008134d4760819f52a5809b8e14fdae2ea350
+  data.tar.gz: 608cb8a8ce53224f2ce9690fcc4217d6bce406e3d390e2440a0f33e9bab98642366eb6bf96c55ba763d3d5c2e0f0b70fa51679f814ad39a8cea03b5fe5e8498f

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/
+vendor/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hiera-postgres-backend (0.0.2)
+    hiera-postgres-backend (0.0.3)
       pg
 
 GEM

data/hiera-postgres-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-postgres-backend"
-  gem.version       = "0.0.2"
+  gem.version       = "0.0.3"
   gem.authors       = ["Adrian"]
   gem.email         = ["adrianlzt@gmail.com"]
   gem.description   = %q{Alternative PostgreSQL backend for hiera}

data/lib/hiera/backend/postgres_backend.rb

@@ -20,7 +20,7 @@ class Hiera
         # an Array of nils and causing a Puppet::Parser::AST::Resource failed with error ArgumentError
         # for any other lookup because their default value is overwriten by [nil,nil,nil,nil]
         # so hiera('myvalue', 'test1') returns [nil,nil,nil,nil]
-      	results = nil
+      	answer = nil
 
         Hiera.debug("looking up #{key} in PostgreSQL Backend")
         Hiera.debug("resolution type is #{resolution_type}")
@@ -41,10 +41,22 @@ class Hiera
           Hiera.debug("Found #{key} in #{source}")
 
           new_answer = Backend.parse_answer(data[key], scope)
-          results = query(new_answer)
+          case resolution_type
+          when :array
+            raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
+            answer ||= []
+            answer << query(new_answer)
+          when :hash
+            raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
+            answer ||= {}
+            answer = Backend.merge_answer(query(new_answer),answer)
+          else
+            answer = query(new_answer)
+            break
+          end
 
         end
-          return results
+          return answer
       end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-postgres-backend
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Adrian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE