diplomat 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7f8b9cd84e6a867eb7f9649a92696084b4f686
-  data.tar.gz: afdf5eb047658186b9c412a60526c14514a61bd4
+  metadata.gz: 0ba37ba0f0744c7b424c81b524cd86c6c14d3284
+  data.tar.gz: a61b033018328f55d8c4ce894c10fe675fbab896
 SHA512:
-  metadata.gz: fc79a1d5e95146919ebd39cb75d336906bc365af0c5b68acf874306ffa3a3a75976e0c1ffcf5ab3e9385ce272d80c15dc1b701e74700ca84e6a976bb4807822c
-  data.tar.gz: c8b793b3f7d57e3f14c39c40ca22d805807e5f5d0afa4372e6ab57264b731e803c2f2a7fb661320bf39e2118b877799018d8b2cf2568d6473dd50e8d0d82cd08
+  metadata.gz: 3155ef8a9a9eaad49cfacc57fc2beffc603f73213aa0212576a5b3d77fdc0c73a5722414939a6b82824b7210f06aa3cfa1c531895b2e5565f9c3b7a8811a5599
+  data.tar.gz: d0ec12eb626632ae3135cf795fed79317202820884f1064a74d6c15d065c5af402c31a7d2a8f1436d460b3532c7647c4df5eac7d1f4209f8f88d89561f16228e

data/lib/diplomat/kv.rb

@@ -17,6 +17,7 @@ module Diplomat
     # @option options [String] :dc Target datacenter
     # @option options [Boolean] :keys Only return key names.
     # @option options [Boolean] :modify_index Only return ModifyIndex value.
+    # @option options [Boolean] :decode_values Return consul response with decoded values.
     # @option options [String] :separator List only up to a given separator. Only applies when combined with :keys option.
     # @option options [Boolean] :nil_values If to return keys/dirs with nil values
     # @param not_found [Symbol] behaviour if the key doesn't exist;
@@ -75,6 +76,9 @@ module Diplomat
             if @options and @options[:modify_index]
               return @raw.first['ModifyIndex']
             end
+            if @options and @options[:decode_values]
+              return decode_values
+            end
             return return_value(return_nil_values)
           when :wait
             index = raw.headers["x-consul-index"]

data/lib/diplomat/rest_client.rb

@@ -74,21 +74,28 @@ module Diplomat
       @raw = JSON.parse(@raw.body)
     end
 
+    # Return @raw with Value fields decoded
+    def decode_values
+      return @raw if @raw.first.is_a? String
+      @raw.inject([]) do |acc, el|
+        new_el = el.dup
+        new_el["Value"] = (Base64.decode64(el["Value"]) rescue nil)
+        acc << new_el
+        acc
+      end
+    end
+
     # Get the key/value(s) from the raw output
     def return_value(nil_values=false)
-      return @value = @raw if @raw.first.is_a? String
-      if @raw.count == 1
-        @value = @raw.first["Value"]
-        @value = Base64.decode64(@value) unless @value.nil?
+      @value = decode_values
+      if @value.first.is_a? String
+        return @value
+      elsif @value.count == 1
+        @value.first["Value"]
       else
-        @value = @raw.reduce([]) do |acc, e|
-          val = e["Value"].nil? ? nil : Base64.decode64(e["Value"])
-          acc << {
-            :key => e["Key"],
-            :value => val
-          } if val or nil_values
-          acc
-        end
+        @value = @value.map do |el|
+          { :key => el["Key"], :value => el["Value"] } if el["Value"] or nil_values
+        end.compact
       end
     end
 

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.16.1"
+  VERSION = "0.16.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement