diplomat 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba37ba0f0744c7b424c81b524cd86c6c14d3284
-  data.tar.gz: a61b033018328f55d8c4ce894c10fe675fbab896
+  metadata.gz: 62862f6656ae4dd60092e29e884c722b22179b01
+  data.tar.gz: 6414b0363e8213a40d4b247b25a301fca3635de4
 SHA512:
-  metadata.gz: 3155ef8a9a9eaad49cfacc57fc2beffc603f73213aa0212576a5b3d77fdc0c73a5722414939a6b82824b7210f06aa3cfa1c531895b2e5565f9c3b7a8811a5599
-  data.tar.gz: d0ec12eb626632ae3135cf795fed79317202820884f1064a74d6c15d065c5af402c31a7d2a8f1436d460b3532c7647c4df5eac7d1f4209f8f88d89561f16228e
+  metadata.gz: d0b382b7644788c012d204e5c666efb53fe493b456234b3f42cc7bfeb72d004b2c54e4f16afc58b176d114278c50973c489fa2e0795608f7dbc8acf17a6cc342
+  data.tar.gz: f6230d83e8c5547eb20e173ceb43de5e6a42ecf6094c49898b51e3b5ada275dfee34f0dc9c671a9d1cec51f775acd3ae647ab18554e77681a962ad4f6b9f78b4

data/lib/diplomat/acl.rb

@@ -21,7 +21,7 @@ module Diplomat
       url += use_consistency(@options)
 
       raw = @conn_no_err.get concat_url url
-      if raw.status == 200 and raw.body
+      if raw.status == 200 and raw.body != "null"
         case found
           when :reject
             raise Diplomat::AclAlreadyExists, @id
@@ -29,7 +29,7 @@ module Diplomat
             @raw = raw
             return parse_body
         end
-      elsif raw.status == 200 and !raw.body
+      elsif raw.status == 200 and raw.body == "null"
         case not_found
           when :reject
             raise Diplomat::AclNotFound, @id

data/lib/diplomat/kv.rb

@@ -20,6 +20,7 @@ module Diplomat
     # @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
+    # @option options [Callable] :transformation funnction to invoke on keys values
     # @param not_found [Symbol] behaviour if the key doesn't exist;
     #   :reject with exception, :return degenerate value, or :wait for it to appear
     # @param found [Symbol] behaviour if the key does exist;
@@ -54,6 +55,7 @@ module Diplomat
       url += separator(@options)
 
       return_nil_values = (@options and @options[:nil_values])
+      transformation = (@options and @options[:transformation] and @options[:transformation].methods.find_index(:call)) ? @options[:transformation] : nil
 
       # 404s OK using this connection
       raw = @conn_no_err.get concat_url url
@@ -79,7 +81,7 @@ module Diplomat
             if @options and @options[:decode_values]
               return decode_values
             end
-            return return_value(return_nil_values)
+            return return_value(return_nil_values, transformation)
           when :wait
             index = raw.headers["x-consul-index"]
         end
@@ -94,7 +96,7 @@ module Diplomat
         req.options.timeout = 86400
       end
       parse_body
-      return_value(return_nil_values)
+      return_value(return_nil_values, transformation)
     end
 
     # Associate a value with a key

data/lib/diplomat/lock.rb

@@ -3,6 +3,8 @@ require 'faraday'
 module Diplomat
   class Lock < Diplomat::RestClient
 
+    include ApiOptions
+
     @access_methods = [ :acquire, :wait_to_acquire, :release ]
 
     # Acquire a lock
@@ -12,7 +14,11 @@ module Diplomat
     # @return [Boolean] If the lock was acquired
     def acquire key, session, value=nil
       raw = @conn.put do |req|
-        req.url "/v1/kv/#{key}?acquire=#{session}"
+        url = ["/v1/kv/#{key}"]
+        url += use_named_parameter('acquire', session)
+        url += check_acl_token
+
+        req.url concat_url url
         req.body = value unless value.nil?
       end
       raw.body == 'true'
@@ -40,7 +46,11 @@ module Diplomat
     # @return [nil]
     def release  key, session
       raw = @conn.put do |req|
-        req.url "/v1/kv/#{key}?release=#{session}"
+        url = ["/v1/kv/#{key}"]
+        url += use_named_parameter('release', session)
+        url += check_acl_token
+
+        req.url concat_url url
       end
       return raw.body
     end

data/lib/diplomat/rest_client.rb

@@ -86,14 +86,17 @@ module Diplomat
     end
 
     # Get the key/value(s) from the raw output
-    def return_value(nil_values=false)
+    def return_value(nil_values=false, transformation=nil)
       @value = decode_values
       if @value.first.is_a? String
         return @value
       elsif @value.count == 1
-        @value.first["Value"]
+        @value = @value.first["Value"]
+        @value = transformation.call(@value) if transformation and not @value.nil?
+        return @value
       else
         @value = @value.map do |el|
+          el["Value"] = transformation.call(el["Value"]) if transformation and not el["Value"].nil?
           { :key => el["Key"], :value => el["Value"] } if el["Value"] or nil_values
         end.compact
       end

data/lib/diplomat/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.0
 platform: ruby
 authors:
 - John Hamelink