Merge branch 'main' into yaml_remove

Signed-off-by: Derek Hower <[email protected]>

Author: dhower-qc

lib/test/test_yaml_loader.rb

@@ -7,6 +7,7 @@
 
 class TestYamlLoader < Minitest::Test
 
+
   def test_remove
     yaml = <<~YAML
       base:
@@ -41,7 +42,7 @@ def test_multiple_remove
         - key3
         key4: value4
     YAML
-
+    
     f = Tempfile.new("yml")
     f.write(yaml)
     f.flush
@@ -50,6 +51,37 @@ def test_multiple_remove
     assert_equal({ "key1" => "value1", "key4" => "value4" }, doc["child"])
   end
 
+  def test_that_mref_with_nested_replace_works
+    yaml = <<~YAML
+      base:
+        key1:
+          sub_key1: value1
+        key2: value2
+
+      middle:
+        $mref: "#/base"
+        key3: value3
+        key4: value4
+
+      bottom:
+        $mref:
+        - "#/base"
+        - "#/middle"
+        key1:
+          sub_key6: value6
+        key2: value2_new
+        key4: value4_new
+        key5: value5
+    YAML
+
+    f = Tempfile.new("yml")
+    f.write(yaml)
+    f.flush
+
+    doc = YamlLoader.load(f.path)
+    assert_equal({ "key1" => {"sub_key1" => "value1", "sub_key6" => "value6"}, "key2" => "value2_new", "key3" => "value3", "key4" => "value4_new", "key5" => "value5" }, doc["bottom"])
+  end
+
   def test_that_spurious_recursive_mref_works
     yaml = <<~YAML
       base:

lib/yaml_loader.rb

@@ -75,19 +75,38 @@ def self.expand(filename, obj, yaml_opts = {})
 
         target_obj = expand(filename, target_obj, yaml_opts)
         target_obj.each do |target_key, target_value|
-          new_obj[target_key] = target_value
+          if (new_obj[target_key].is_a?(Hash))
+            raise "Should be a hash" unless target_value.is_a?(Hash)
+            new_obj[target_key] = target_value.merge(new_obj[target_key])
+          else
+            new_obj[target_key] = target_value
+          end
         end
       end
 
       obj.delete("$mref")
-      obj_keys = obj.keys
-      obj_keys.each do |key|
-        value = obj[key]
-
-        new_obj[key] = expand(filename, value, yaml_opts)
+      # now merge target_obj and obj
+      keys = (obj.keys + new_obj.keys).uniq
+      final_obj = {}
+      keys.each do |key|
+        if !obj.key?(key)
+          final_obj[key] = new_obj[key]
+        elsif !new_obj.key?(key)
+          final_obj[key] = expand(filename, obj[key], yaml_opts)
+        else
+          value = obj[key]
+
+          if new_obj[key].is_a?(Hash)
+            raise "should be a hash" unless new_obj[key].is_a?(Hash)
+            final_obj[key] = new_obj[key].merge(obj[key])
+          else
+            final_obj[key] = expand(filename, obj[key], yaml_opts)
+          end
+        end
       end
 
-      new_obj
+      final_obj
+
     else
       obj_keys = obj.keys
       obj_keys.each do |key|