diplomat 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac09c50fba20a1d2d81202396ec7ff4e22ad8012e1fed38e24d163352567cda
-  data.tar.gz: 3d4f798107ce788f6e0ab82cb3660ebe3b44a79f9642ff7d1ae51d2a10cbbc38
+  metadata.gz: c437150fe2670860ab730944e2ff4fd3327e09a4a9632ef97b7f535d4b23966a
+  data.tar.gz: e52f850967bf6dd29e4e11a48e893e06f9f4552f3045ad8e2892592a38e26307
 SHA512:
-  metadata.gz: 9e75c18e604a9b2974fc81f633b33b9620ea6e30d79a2eab59d7c9c664b49ec43e5131efeab5d904cdb881eb39b790481b544fbe88b032aa322051264237861e
-  data.tar.gz: 7691606b247688cf9691ffc75c7eec665c5bac8af53de5037df7832dbd42b31876f9741f4e9ffc8da5425ea1ac36c7760965b6d1225c7a689c9846719d81c090
+  metadata.gz: 9fd3a079a14e539c70260f602ff29b2a9004ca306ae0e158b0316ef8d787daafa4a91991221fbfc9d987495f5e8b1b2650fc8772c9e32348f3ed2da12e93ecb6
+  data.tar.gz: f0e510ec423c65a22e10671a3b4744f696700d8745ff43da81fb7b549b3081ee2c4ee50bf7c8c1905bceaca49046965e1383a599b38cc168da1e82b24388cc9c

data/lib/diplomat/acl.rb

@@ -54,7 +54,7 @@ module Diplomat
       raise Diplomat::IdParameterRequired unless value['ID'] || value[:ID]
 
       custom_params = use_cas(@options)
-      @raw = send_put_request(@conn, ['/v1/acl/update'], options, value.to_json, custom_params)
+      @raw = send_put_request(@conn, ['/v1/acl/update'], options, value, custom_params)
       parse_body
     end
 
@@ -64,7 +64,7 @@ module Diplomat
     # @return [Hash] The result Acl
     def create(value, options = {})
       custom_params = use_cas(@options)
-      @raw = send_put_request(@conn, ['/v1/acl/create'], options, value.to_json, custom_params)
+      @raw = send_put_request(@conn, ['/v1/acl/create'], options, value, custom_params)
       parse_body
     end
 

data/lib/diplomat/kv.rb

@@ -116,7 +116,8 @@ module Diplomat
       custom_params << use_cas(@options)
       custom_params << dc(@options)
       custom_params << acquire(@options)
-      @raw = send_put_request(@conn, ["/v1/kv/#{key}"], options, value, custom_params)
+      @raw = send_put_request(@conn, ["/v1/kv/#{key}"], options, value, custom_params,
+                              'application/x-www-form-urlencoded')
       if @raw.body.chomp == 'true'
         @key = key
         @value = value
@@ -167,7 +168,7 @@ module Diplomat
       custom_params = []
       custom_params << dc(options)
       custom_params << transaction_consistency(options)
-      raw = send_put_request(@conn_no_err, ['/v1/txn'], options, JSON.generate(value), custom_params)
+      raw = send_put_request(@conn_no_err, ['/v1/txn'], options, value, custom_params)
       transaction_return JSON.parse(raw.body), options
     end
 

data/lib/diplomat/node.rb

@@ -27,7 +27,7 @@ module Diplomat
     # @param options [Hash] options parameter hash
     # @return [Boolean]
     def register(definition, options = {})
-      register = send_put_request(@conn, ['/v1/catalog/register'], options, JSON.dump(definition))
+      register = send_put_request(@conn, ['/v1/catalog/register'], options, definition)
       register.status == 200
     end
 
@@ -36,7 +36,7 @@ module Diplomat
     # @param options [Hash] options parameter hash
     # @return [Boolean]
     def deregister(definition, options = {})
-      deregister = send_put_request(@conn, ['/v1/catalog/deregister'], options, JSON.dump(definition))
+      deregister = send_put_request(@conn, ['/v1/catalog/deregister'], options, definition)
       deregister.status == 200
     end
   end

data/lib/diplomat/query.rb

@@ -51,7 +51,7 @@ module Diplomat
     # @return [Boolean]
     def update(key, definition, options = {})
       custom_params = options[:dc] ? use_named_parameter('dc', options[:dc]) : nil
-      ret = send_put_request(@conn, ["/v1/query/#{key}"], options, JSON.dump(definition), custom_params)
+      ret = send_put_request(@conn, ["/v1/query/#{key}"], options, definition, custom_params)
       ret.status == 200
     end
 

data/lib/diplomat/rest_client.rb

@@ -207,14 +207,21 @@ module Diplomat
       end
     end
 
-    def send_put_request(connection, url, options, data, custom_params = nil)
+    def send_put_request(connection, url, options, data, custom_params = nil, mime = 'application/json')
       rest_options = parse_options(options)
       url += rest_options[:query_params]
       url += custom_params unless custom_params.nil?
       connection.put do |req|
         req.url rest_options[:url_prefix] ? rest_options[:url_prefix] + concat_url(url) : concat_url(url)
         rest_options[:headers].map { |k, v| req.headers[k.to_sym] = v } unless rest_options[:headers].nil?
-        req.body = data unless data.nil?
+        unless data.nil?
+          (req.headers || {})['Content-Type'] = mime
+          req.body = if mime == 'application/json' && !data.is_a?(String)
+                       data.to_json
+                     else
+                       data
+                     end
+        end
       end
     end
 

data/lib/diplomat/service.rb

@@ -47,7 +47,7 @@ module Diplomat
     # @return [Boolean]
     def register(definition, options = {})
       url = options[:path] || ['/v1/agent/service/register']
-      register = send_put_request(@conn, url, options, JSON.dump(definition))
+      register = send_put_request(@conn, url, options, definition)
       register.status == 200
     end
 
@@ -74,7 +74,7 @@ module Diplomat
     # @param options [Hash] options parameter hash
     # @return [Boolean]
     def deregister_external(definition, options = {})
-      deregister = send_put_request(@conn, ['/v1/catalog/deregister'], options, JSON.dump(definition))
+      deregister = send_put_request(@conn, ['/v1/catalog/deregister'], options, definition)
       deregister.status == 200
     end
 

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - John Hamelink
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler