collapsium 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99a1088fec0a9bbcf2a9d47fb75e7447076e2c62
-  data.tar.gz: c0c3e428c35090a49f249beadff437fa6bda5bd4
+  metadata.gz: e38a7e5022afa4e3f962c01a7e9c55a416a0d616
+  data.tar.gz: eab2d558811d1cc347684ea3c3754ad7cc00365b
 SHA512:
-  metadata.gz: c3336fb842483ffce622e2db745345cb2c3647fc17ba66d8b09ac7c082f88e4b538fcd72ced6b5c4614746a8a4c8c37b26fa363d07de3f425f9206b9b9434194
-  data.tar.gz: d548be9a8b9a4cf527024ae41e6e8563decebcbd08929137fbb4998bcee40b59c970c2454d18a84474a3de44f5d883d3a8010de5470e049258033fda4e2dbb26
+  metadata.gz: db7393895094ff23e6c43dcc2de37da52f541482494c16d9dffde25205710fb9dccb86ccb9750705bcb395e7b7e43b9dcb2450189b3693751527137bda9adc43
+  data.tar.gz: 1a04a7bc768b18d8f27058005c074c383e65f7950ffe13d1d9245d509b364e6f57bfc26177c63e9e3f16fdcf423e086e5415398725582a4f6475f0f594834ba5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    collapsium (0.8.1)
+    collapsium (0.8.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/collapsium/recursive_merge.rb

@@ -49,6 +49,31 @@ module Collapsium
     end
 
     class << self
+      def merged_keys(the_self, v1, v2)
+        keys = (v1.keys + v2.keys).uniq
+        if the_self.singleton_class.ancestors.include?(IndifferentAccess)
+          # We want to preserve each Hash's key types as much as possible, but
+          # IndifferentAccess doesn't care about types. We can use it to figure out
+          # which unique keys only exist in v2.
+          only_v2 = IndifferentAccess.unique_keys(keys) \
+                    - IndifferentAccess.unique_keys(v1.keys)
+
+          # At this point, IndifferentAccess may have modified the key types
+          # in only_v2. To get back the original types, we can iterate the
+          # Hash and remember all keys that are indifferently contained in
+          # only_v2.
+          original_types = []
+          v2.each do |key, _|
+            unique = IndifferentAccess.unique_keys([key])
+            if only_v2.include?(unique[0])
+              original_types << key
+            end
+          end
+          keys = v1.keys + original_types
+        end
+        return keys
+      end
+
       def merger(the_self, v1, v2, overwrite)
         if v1.is_a? Hash and v2.is_a? Hash
           v1 = ViralCapabilities.enhance_value(the_self, v1)
@@ -56,10 +81,7 @@ module Collapsium
 
           # IndifferentAccess has its own idea of which keys are unique, so if
           # we use it, we must consult it.
-          keys = (v1.keys + v2.keys).uniq
-          if the_self.singleton_class.ancestors.include?(IndifferentAccess)
-            keys = IndifferentAccess.unique_keys(keys)
-          end
+          keys = merged_keys(the_self, v1, v2)
           new_val = ViralCapabilities.enhance_value(the_self, {})
           keys.each do |key|
             v1_inner = v1[key]

data/lib/collapsium/version.rb

@@ -8,5 +8,5 @@
 #
 module Collapsium
   # The current release version
-  VERSION = "0.8.1".freeze
+  VERSION = "0.8.2".freeze
 end

data/spec/recursive_merge_spec.rb

@@ -147,6 +147,27 @@ describe ::Collapsium::RecursiveMerge do
       expect(x[:arr].length).to eql 2
       expect(x[:arr]).to eql [2, 1]
     end
+
+    it "preserves key types, and prefers the first key's type" do
+      tester[:foo] = {
+        bar: 123,
+      }
+      tester[:arr] = [2]
+      other = {
+        "foo" => {
+          "baz asdf" => "quux",
+          "bar" => 42
+        },
+        "arr" => [1],
+        asdf: 42,
+      }
+      x = tester.recursive_merge(other, false)
+
+      expect(x.keys.length).to eql 3
+      expect(x.keys[0].is_a?(Symbol)).to be_truthy
+      expect(x.keys[1].is_a?(Symbol)).to be_truthy
+      expect(x.keys[2].is_a?(Symbol)).to be_truthy
+    end
   end
 
   context "with IndifferentAccess and PathedAccess" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collapsium
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jens Finkhaeuser