diplomat 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4c8c4d80b3709be01d325281097f3db8506cb9c
-  data.tar.gz: cb5c77df09a30b802e4a69c7d55c0f634f13d27c
+  metadata.gz: 821e0c50069009a97db9397d14f0c5c4eefba50c
+  data.tar.gz: 0204f17c74c81cc3676ef9332ed5bace9150e5ab
 SHA512:
-  metadata.gz: 58067ecae844fea9ce3e2240847542820c65ff17c49b6e1cd4b7c02a8f2872089f1ddb9c075a824d2265f6c10055a1f669dfeab4612e45ca1389390046ba404f
-  data.tar.gz: 011a2fe3e0a428922e13b595f86f143514227c80a3cf12aa0a17f20b99b3e0bafe20af9982fd70383a697686e874852df6de86bee90e8235e8af0c4bc44106dd
+  metadata.gz: fdf627aad378afb53880105c43ad280d4eb81900f1c1ec82bed4d37abcaff34a9ea17cc7db8e022fb44ea4c4167019d32366687648d4233585645f83d8936788
+  data.tar.gz: 5df07529deabb282661cb8cae6ccd5939685c7a4ab86d60f93306942d562f5301fa41fbd93cbcde9ce8ca5f3630cf21c9596e75d77b492611ec198f3a4036342

data/lib/diplomat/kv.rb

@@ -14,6 +14,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] :session Only return Session 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.
@@ -76,8 +77,9 @@ module Diplomat
           @raw = raw
           @raw = parse_body
           return @raw.first['ModifyIndex'] if @options && @options[:modify_index]
+          return @raw.first['Session'] if @options && @options[:session]
           return decode_values if @options && @options[:decode_values]
-          return convert_to_hash(return_value(return_nil_values, transformation)) if @options && @options[:convert_to_hash]
+          return convert_to_hash(return_value(return_nil_values, transformation, true)) if @options && @options[:convert_to_hash]
           return return_value(return_nil_values, transformation)
         when :wait
           index = raw.headers['x-consul-index']
@@ -103,6 +105,7 @@ module Diplomat
     # @param options [Hash] the query params
     # @option options [Integer] :cas The modify index
     # @option options [String] :dc Target datacenter
+    # @option options [String] :acquire Session to attach to key
     # @return [Bool] Success or failure of the write (can fail in c-a-s mode)
     # rubocop:disable MethodLength, AbcSize
     def put(key, value, options = nil)
@@ -112,6 +115,7 @@ module Diplomat
         url += check_acl_token
         url += use_cas(@options)
         url += dc(@options)
+        url += acquire(@options)
         req.url concat_url url
         req.body = value
       end
@@ -186,6 +190,10 @@ module Diplomat
       options && options[:dc] ? use_named_parameter('dc', options[:dc]) : []
     end
 
+    def acquire(options)
+      options && options[:acquire] ? use_named_parameter('acquire', options[:acquire]) : []
+    end
+
     def keys(options)
       options && options[:keys] ? ['keys'] : []
     end

data/lib/diplomat/rest_client.rb

@@ -148,14 +148,20 @@ module Diplomat
     end
 
     # Get the key/value(s) from the raw output
-    def return_value(nil_values = false, transformation = nil)
+    # rubocop:disable PerceivedComplexity, MethodLength, CyclomaticComplexity, AbcSize
+    def return_value(nil_values = false, transformation = nil, return_hash = false)
       @value = decode_values
       return @value if @value.first.is_a? String
-
-      @value = @value.map do |el|
-        el['Value'] = transformation.call(el['Value']) if transformation && !el['Value'].nil?
-        { key: el['Key'], value: el['Value'] } if el['Value'] || nil_values
-      end.compact
+      if @value.count == 1 && !return_hash
+        @value = @value.first['Value']
+        @value = transformation.call(@value) if transformation && !@value.nil?
+        return @value
+      else
+        @value = @value.map do |el|
+          el['Value'] = transformation.call(el['Value']) if transformation && !el['Value'].nil?
+          { key: el['Key'], value: el['Value'] } if el['Value'] || nil_values
+        end.compact
+      end
     end
     # rubocop:enable PerceivedComplexity, MethodLength, CyclomaticComplexity, AbcSize
 

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - John Hamelink
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler