hiera-mysql-json-backend-jruby 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb11facf052d04d437f3581fd57567c65d5a43c4
-  data.tar.gz: 12469fcb7ae7efaafabab674a0cce399b6e5b911
+  metadata.gz: 151c57260b48d8af84d39031c757f8b1293f3a8b
+  data.tar.gz: 12c880b1473bf097e8c6a475e1c0af1e585d4c02
 SHA512:
-  metadata.gz: bb789c536cb19f5a19b8ef0a883ff32768103f5540301250b43cab9ca71d3982d690e0616a8f4aa6db67a3762064c448e06dd330189fd556af1d579aec6c6a6c
-  data.tar.gz: 2624b89efbe176b7e45953776630e6cb66f7dea19f6347c1a8fe9cadf3ca65724702dd87c33e7c3ff23bbdcf21b94cd1bc3a22b08ed525a8a855ee3d432e5e67
+  metadata.gz: fecc0d05fa3d06d01e927465202722d2e6d5fa32d2c4cf898206ca52715fe1b3287178b2cb58d33d477be7714bc6601c759194bc7c5828d853aac80d5fd942bf
+  data.tar.gz: 54d0875399ed79f101908c764ada9734bcc8b6baade41f372175c710dd5edc72cc08c7a9c183b4cbc558b4ede861d0e13c0540cced1a64ea06973fe4fc13a8e6

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-jruby
 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: jdbc-mysql