diplomat 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2244d84cc7a0fe952223ad6001d8f473be47a024
-  data.tar.gz: b86af2a9b85baadf3d45382a55ad25a12c1e70d5
+  metadata.gz: 2c7efb343599818bf0533dcb8695aa0283ab59aa
+  data.tar.gz: 000d4c18b30c36c3739ad0d1deda567eebe00cb2
 SHA512:
-  metadata.gz: e176ec9e8b1e1eebb570c8c0698d38eadab706654ceaba1d8d0f981cd8c046aad6f70cbb9772a8562e2ece337ff02c11417829425af2b142d16d4445d6147ec1
-  data.tar.gz: 3faa78e2307bb3c0bb00e4722adfc8eb3bedd1e2afd5f5f98d0ae4efd6f919ec03f3e5d59087e17ade656b762c06b273416f2a44fc096343802754545a263f14
+  metadata.gz: f6aaea91e904df541b9f5a275e2450072411a488522c8748705a826f8d0725ac15c1c2d6d16cb9c037e963853801eb25ff4bf70363bf56dbf9d97069c0ac76b4
+  data.tar.gz: f2e2c8d09390bb45c9fbd4f3779516edefb8921962e3a7f01944c7fbd1037be738bde86d0bdef3d4262c79c52b7a46ad80ccca25ebe42d5ab66a2d8183a0b3f5

data/lib/diplomat/kv.rb

@@ -6,52 +6,48 @@ module Diplomat
 
     attr_reader :key, :value, :raw
 
-    # Get a value by it's key
+    # Get a value by its key
     # @param key [String] the key
     # @return [String] The base64-decoded value associated with the key
     def get key
       @key = key
-      args = ["/v1/kv/#{@key}"]
-      args += check_acl_token unless check_acl_token.nil?
-      @raw = @conn.get args.join
+      url = ["/v1/kv/#{@key}"]
+      url += check_acl_token unless check_acl_token.nil?
+      @raw = @conn.get concat_url url
       parse_body
       return_value
     end
 
-    # Get a value by it's key
+    # Associate a value with a key
     # @param key [String] the key
     # @param value [String] the value
     # @param options [Hash] the query params
     # @option options [Integer] :cas The modify index
-    # @return [String] The base64-decoded value associated with the key
+    # @return [Bool] Success or failure of the write (can fail in c-a-s mode)
     def put key, value, options=nil
-      qs = ""
       @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
+        url = ["/v1/kv/#{key}"]
+        url += check_acl_token unless check_acl_token.nil?
+        url += use_cas(@options) unless use_cas(@options).nil?
+        req.url concat_url url
         req.body = value
       end
-      if @raw.body == "true\n"
+      if @raw.body == "true"
         @key   = key
         @value = value
-      else
-        @raw.body
       end
+      @raw.body == "true"
     end
 
-    # Delete a value by it's key
+    # Delete a value by its key
     # @param key [String] the key
-    # @return [nil]
+    # @return [OpenStruct]
     def delete key
       @key = key
-      args = ["/v1/kv/#{@key}"]
-      args += check_acl_token unless check_acl_token.nil?
-      @raw = @conn.delete args.join
-      # return_key
-      # return_value
+      url = ["/v1/kv/#{@key}"]
+      url += check_acl_token unless check_acl_token.nil?
+      @raw = @conn.delete concat_url url
     end
 
     # @note This is sugar, see (#get)
@@ -88,11 +84,11 @@ module Diplomat
     end
 
     def check_acl_token
-      ["?token=#{Diplomat.configuration.acl_token}"] if Diplomat.configuration.acl_token
+      ["token=#{Diplomat.configuration.acl_token}"] if Diplomat.configuration.acl_token
     end
 
     def use_cas(options)
-      ["&cas=#{options[:cas]}"] if options && options[:cas]
+      ["cas=#{options[:cas]}"] if options && options[:cas]
     end
   end
 end

data/lib/diplomat/rest_client.rb

@@ -8,6 +8,14 @@ module Diplomat
       start_connection api_connection
     end
 
+    def concat_url parts
+        if parts.length > 1 then
+            parts.first << '?' << parts.drop(1).join('&')
+        else
+            parts.first
+        end
+    end
+
     private
 
     # Build the API Client

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler