hiera-mysql-json-backend 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf488a487e7f43f77fe5cc3e65b271357f8873a
-  data.tar.gz: 6f004a40633fb221a64b84e9386b3c1ddd60b56d
+  metadata.gz: 7089e8b0947896353a2650c6e40859181b27daef
+  data.tar.gz: 15a1065f32602bc4f9b40655744e5b67a26a4e77
 SHA512:
-  metadata.gz: f13c4d437856a299310f2cfe73628c0ba36bcf641e391a1944f6191430608a9d38ee08bf753a1e200a86438f687bf832d6f84bc7245bdabed4c85b71781d5471
-  data.tar.gz: 9e9b07cd44462189aca7901898ba82ae12b3dcde7dc35d285baa4cf735d211d65bfb8f75c9073def41af8fc13dc114216f51814a54121923aed37b23d66c6d74
+  metadata.gz: 8ef7562939428dc62bd2696d331593c7f2098420920ecd1cd0cfad919c2a87f325bb548fb9a8a18056f61fe9b40c97ca94196fcbf2e53d9c2cb0ababf1fc95a1
+  data.tar.gz: 8ac1c9fef7bfd2c670ec9a2cf679a0b516d11c76553bde7592150b965be005424d592bc8098e1eb7b5d2c855501b8f7476d16834359d4a0d28d9ae34494d18e4

data/.gitignore

@@ -16,3 +16,5 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+.ruby-version

data/CHANGELOG.md

@@ -14,4 +14,9 @@
 
 - Made improvements to the connection Hash
 - Fixed an issue where if no port was defined nill would be passed
-- Added defaults for hostname and port, hostname will default to `localhost` port to `3306`
+- Added defaults for hostname and port, hostname will default to `localhost` port to `3306`
+
+### 2.0.0
+
+- If we cannot parse JSON as json, do something nasty to try if the value is a
+  boolean

data/hiera-mysql-json-backend-puppetserver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-json-backend-jruby"
-  gem.version       = "1.1.2"
+  gem.version       = "2.0.0"
   gem.authors       = ["Hostnet"]
   gem.email         = ["opensource@hostnet.nl"]
   gem.description   = %q{Alternative MySQL backend with json support for hiera}

data/hiera-mysql-json-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-json-backend"
-  gem.version       = "1.1.2"
+  gem.version       = "2.0.0"
   gem.authors       = ["Hostnet"]
   gem.email         = ["opensource@hostnet.nl"]
   gem.description   = %q{Alternative MySQL backend with json support for hiera}

data/lib/hiera/backend/mysql_json_backend.rb

@@ -82,16 +82,34 @@ class Hiera
 
           Hiera.debug("Found #{key} in #{source}")
 
-          new_answer = Backend.parse_answer(data[key], scope)
+          query = Backend.parse_answer(data[key], scope)
 
-          sql_results = query(connection_hash, new_answer)
+          sql_results = query(connection_hash, query)
           # TODO: make sure we fail if we have more than 1 result, skip if less than 1.
           next if sql_results.length != 1
+
+          new_answer = nil
+          sqlvalue = sql_results[0]['value']
+
           begin
-            new_answer = JSON.parse(sql_results[0]['value'])
+            new_answer = JSON.parse(sqlvalue)
           rescue
-            raise Exception, "JSON parse error for key '#{key}'. Offending data: #{sql_results[0]['value']}." unless Config[:mysql_json][:ignore_json_parse_errors]
-            Hiera.debug("Miserable failure while looking for #{key}.")
+            Hiera.debug("Miserable failure while parsing #{key} as JSON.")
+          end
+
+          if new_answer.nil?
+            case sqlvalue
+            when /^(true|t|yes|y|1)$/i
+              new_answer = true
+            when /^(false|f|no|n|0)$/i
+              new_answer = false
+            else
+              Hiera.debug("Miserable failure while parsing #{key} as boolean.")
+            end
+          end
+
+          if new_answer.nil?
+            raise Exception, "Parse error for key '#{key}'. Offending data: #{sql_results[0]['value']}." unless Config[:mysql_json][:ignore_json_parse_errors]
             next
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-json-backend
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Hostnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2