diplomat 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7fe7869eadb5b93aa45340e84587d631975b4a90507a05168bea3018670054
-  data.tar.gz: 6e5516f00e6d51bc36cb7ee8abf39d8a4f2c8c4b689ff15b39bbf7586cdb8613
+  metadata.gz: 1f1cb3ae2d7bea15d702357e477052934432379e9b3fdc485626ede61a2f6581
+  data.tar.gz: e06c391b4399377276712b66d85fca0318e7a8a5a693cfa58e0ad2a11bd1ae3c
 SHA512:
-  metadata.gz: 41dc809f1752060d51e33edb6a4989a451ec7690ebb80516906b914ce8fa1b9a2ddee570ee98216ec19ad6921f162e0c8ee732d674f46c7e9bc2f63bbe1077fa
-  data.tar.gz: 1cb32fb53c7e619de9170733918e0e359092ba453c6574277df69ebb63b50bb2027fa0467183cfb1f52046cb974c5e1741a76322539be14ccf02eacfc1da25bd
+  metadata.gz: 1c29f9052f83dc86b2eeb7606e50188972b9ce47f2161ff9b246f4b6d888089662fd08842975d54e50387656abb6aa11f4302de5a52a0d531de19ec21141617f
+  data.tar.gz: 898502913bc50f5ccea0f50f972312c92fad4c0d1ad972e23c183368460f48e74d60b1ad660db42eec6351ea5e13a119b30b9e250350340c2623913b72dbc34b

data/lib/diplomat/rest_client.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'deep_merge'
+require 'deep_merge/core'
 
 module Diplomat
   # Base class for interacting with the Consul RESTful API
@@ -146,9 +146,12 @@ module Diplomat
 
     # Converts k/v data into ruby hash
     def convert_to_hash(data)
-      data.map do |item|
+      data_h = data.map do |item|
         item[:key].split('/').reverse.reduce(item[:value]) { |h, v| { v => h } }
-      end.reduce(:deep_merge)
+      end
+      data_h.reduce({}) do |dest, source|
+        DeepMerge.deep_merge!(source, dest, { preserve_unmergeables: true })
+      end
     end
 
     # Parse the body, apply it to the raw attribute

data/lib/diplomat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diplomat
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - John Hamelink
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -270,8 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul