ettin 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aaec313791d211b54f6d3de30fe5d9d127a6d42
-  data.tar.gz: 5af07746b3df038a85257d488e7329604e4d4422
+  metadata.gz: 17fdcd8956f8975bcd9410dc6d8f1981fe456c36
+  data.tar.gz: 154504874c1efc6d60f045376b05e15962208813
 SHA512:
-  metadata.gz: 493d1629489226bdfd70425c9bf8cfdc3bad7e2e45957c5619b44c12bb442b053433dcabd438e9a97d9d72a09adb541714bdc35a8b801c45f4fd01f84f48eb22
-  data.tar.gz: d9571bf717edcd772070b15d0e97904da2f2fe8cf499f9b9c806aca41c5997c10de15ba580e73c2a7d5cdcc78013aebec8dcd5a156f01dc4430b823e37d123f2
+  metadata.gz: 7ce4768cef0f9cc3dae5f8babf451b5688e7298ffd8e66ef31ea87f1830400aa1c8a2155e71d7158726502c65ec85297e77035f5983543566577bdc955337206
+  data.tar.gz: 9bdcd9fe40a892fcad2c86e04090ce8e408a4236d3cc3b98f6567fe7ec3b23e9ef3feaab191558751861d0ceb1aef58f8d72771a846ed615cc6de1a71821c169

data/lib/ettin/hash_factory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "deep_merge"
+require "deep_merge/rails_compat"
 require "ettin/deep_transform"
 require "ettin/source"
 require "ettin/key"
@@ -16,7 +16,7 @@ module Ettin
         .map {|target| Source.for(target) }
         .map(&:load)
         .map {|h| h.deep_transform_keys {|key| Key.new(key) } }
-        .each {|h| hash.deep_merge!(h, overwrite_arrays: true) }
+        .each {|h| hash.deeper_merge!(h, overwrite_arrays: true) }
       hash
     end
   end

data/lib/ettin/options.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "ettin/key"
+require "deep_merge/rails_compat"
 
 module Ettin
 
@@ -43,7 +44,7 @@ module Ettin
     alias_method :has_key?, :key?
 
     def merge!(other)
-      hash.deep_merge!(other.to_h, overwrite_arrays: true)
+      hash.deeper_merge!(other.to_h, overwrite_arrays: true)
     end
 
     def [](key)

data/lib/ettin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ettin
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ettin
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Bryan Hockey