diplomat 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bae583f9421ac7bbb79234002855e0d8c88c322
-  data.tar.gz: 2dbabe8e600b42ab651a81f34d72430e27c8818f
+  metadata.gz: 29561e5c607d45e0a6339e2cead4c2721dc5d90e
+  data.tar.gz: b82255ac4419a411300b22b0e76cc37546065da9
 SHA512:
-  metadata.gz: 161b7548c9caf5354480dafad55110a15a7fa07afb4d3d58b41681eb12b1e22780a67259d3eee17c9308cae5466b8f9a69eca6cc1bbfb989f07d1977acb8ba66
-  data.tar.gz: b08de784d1e1b3a81a3f5f89d4554ffb38ca45642fc4e2ed39242730492daec6c729176b6047a1213d4b3b86d2317cc624b05916f55b532f1390460ff61370db
+  metadata.gz: e9e71c7eb3886233575aa00184f13179c190fa86d6ae34b1896e453ab354783132bdbbb6940f32aa3c388e53f123ada0aa258e2a5b97e7f76220ad4be413d7ba
+  data.tar.gz: b12d5ee9ac1ded146904fea9594e7736dc4ba3233dd521c9067c20cd15d4aebf8436814c156ef616aac4f7b014bca1aef048d884f12230ac567c611a9c90eb18

data/lib/diplomat/configuration.rb

@@ -1,11 +1,12 @@
 module Diplomat
   class Configuration
     attr_accessor :middleware
-    attr_accessor :url
+    attr_accessor :url, :acl_token
 
-    def initialize
+    def initialize(url="http://localhost:8500", acl_token=nil)
       @middleware = []
-      @url = "http://localhost:8500"
+      @url = url
+      @acl_token = acl_token
     end
 
     def middleware=(middleware)

data/lib/diplomat/kv.rb

@@ -11,7 +11,9 @@ module Diplomat
     # @return [String] The base64-decoded value associated with the key
     def get key
       @key = key
-      @raw = @conn.get "/v1/kv/#{@key}"
+      args = ["/v1/kv/#{@key}"]
+      args += check_acl_token unless check_acl_token.nil?
+      @raw = @conn.get args.join
       parse_body
       return_value
     end
@@ -24,18 +26,20 @@ module Diplomat
     # @return [String] The base64-decoded value associated with the key
     def put key, value, options=nil
       qs = ""
-
-      if options and options[:cas]
-        qs = "?cas=#{options[:cas]}"
+      @options = options
+      @raw = @conn.put do |req|
+        args = ["/v1/kv/#{key}"]
+        args += check_acl_token unless check_acl_token.nil?
+        args += use_cas(@options) unless use_cas(@options).nil?
+        req.url args.join
+        req.body = value
       end
-
-      @raw = @conn.put("/v1/kv/#{key}#{qs}", value)
-
       if @raw.body == "true\n"
         @key   = key
         @value = value
+      else
+        @raw.body
       end
-      return @value
     end
 
     # Delete a value by it's key
@@ -43,9 +47,11 @@ module Diplomat
     # @return [nil]
     def delete key
       @key = key
-      @raw = @conn.delete "/v1/kv/#{@key}"
-      return_key
-      return_value
+      args = ["/v1/kv/#{@key}"]
+      args += check_acl_token unless check_acl_token.nil?
+      @raw = @conn.delete args.join
+      # return_key
+      # return_value
     end
 
     # @note This is sugar, see (#get)
@@ -81,5 +87,12 @@ module Diplomat
       @value = Base64.decode64(@value) unless @value.nil?
     end
 
+    def check_acl_token
+      ["?token=#{Diplomat.configuration.acl_token}"] if Diplomat.configuration.acl_token
+    end
+
+    def use_cas(options)
+      ["&cas=#{options[:cas]}"] if options && options[:cas]
+    end
   end
 end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

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