yaml_extend 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 053aef54e93b410f7b2eb373834abff17b4f1a2627d292f2eacb479fb78d4d9b
-  data.tar.gz: 70dd53ab46254a6dfed23530c74e3668d14a81844792ac980d4c03b0fb141d24
+  metadata.gz: ec1808b7abe4ba5c1873c8936f54f3e046b8b8e0d95fccc224012bec384d6e29
+  data.tar.gz: 4c5193ab9b82cf6c4c75e8bbbf6f22ed86548aa219e4fc7c6d2693c531906e9c
 SHA512:
-  metadata.gz: 390f032971732ece98f75c58bf471da9ce8085918cbedcf40fd840087a30e45da8a0db7df2fc06030d965ac9b0dae170f2745cdcacb09cf30b2acbcfe9d4118a
-  data.tar.gz: de9bfd1e7e9e2bf45f6783f387284720fdc54db997a6ba9f0eacf4b03a57f6fd2deb9c3596b868e81695da39873c277beefaee3d99ad7b31ffee103d4e208cfd
+  metadata.gz: 7fd78eca7e2fccc281470237a99660cd7a20115789d2d2ee735167b9f62920c57b3240950d0ecceb472e39a4af9248298e5f13d0ea2b8db380fa5e50780a9a71
+  data.tar.gz: 7002a22e0128f7a8f255a3d0d56e66bf09d084f5b0abdf0d49844e49c93ada8fd747f03b1df7950dd731b40aca6b6ff6e496034239b3f74324ba2b495e998500

data/lib/yaml_extend/version.rb

@@ -1,3 +1,3 @@
 module YamlExtend
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/lib/yaml_extend.rb

@@ -15,15 +15,15 @@ module YAML
   @@ext_load_key = nil
 
   DEEP_MERGE_OPTIONS = [
-      :preserve_unmergeables,
-      :knockout_prefix,
-      :overwrite_arrays,
-      :sort_merged_arrays,
-      :unpack_arrays,
-      :merge_hash_arrays,
-      :extend_existing_arrays,
-      :merge_nil_values,
-      :merge_debug,
+    :preserve_unmergeables,
+    :knockout_prefix,
+    :overwrite_arrays,
+    :sort_merged_arrays,
+    :unpack_arrays,
+    :merge_hash_arrays,
+    :extend_existing_arrays,
+    :merge_nil_values,
+    :merge_debug,
   ]
 
   #
@@ -86,19 +86,19 @@ module YAML
     yaml_path = yaml_path.to_s
     # backward compatibility to 1.0.1
     if options == true || options == false
-      options = {extend_existing_arrays: options}
+      options = { extend_existing_arrays: options }
     end
     default_options = {
-        preserve_inheritance_key: false,
-        preserve_unmergeables: false,
-        knockout_prefix: nil,
-        overwrite_arrays: false,
-        sort_merged_arrays: false,
-        unpack_arrays: nil,
-        merge_hash_arrays: false,
-        extend_existing_arrays: true,
-        merge_nil_values: false,
-        merge_debug: false,
+      preserve_inheritance_key: false,
+      preserve_unmergeables: false,
+      knockout_prefix: nil,
+      overwrite_arrays: false,
+      sort_merged_arrays: false,
+      unpack_arrays: nil,
+      merge_hash_arrays: false,
+      extend_existing_arrays: true,
+      merge_nil_values: false,
+      merge_debug: false,
     }
     options = default_options.merge options
     private_class_method
@@ -111,9 +111,17 @@ module YAML
 
     super_config =
       if yaml_path.match(/(\.erb\.|\.erb$)/)
-        YAML.unsafe_load(ERB.new(File.read(yaml_path)).result)
+        if YAML.respond_to? :unsafe_load # backward compatibility for Ruby 3.1 / Psych 4
+          YAML.unsafe_load(ERB.new(File.read(yaml_path)).result)
+        else
+          YAML.load(ERB.new(File.read(yaml_path)).result)
+        end
       else
-        YAML.unsafe_load_file(File.open(yaml_path))
+        if YAML.respond_to? :unsafe_load_file # backward compatibility for Ruby 3.1 / Psych 4
+          YAML.unsafe_load_file(File.open(yaml_path))
+        else
+          YAML.load_file(File.open(yaml_path))
+        end
       end
 
     super_inheritance_files = yaml_value_by_key inheritance_key, super_config
@@ -149,7 +157,8 @@ module YAML
     #   [2] is the external caller of YAML.ext_load_file
     base_path = if defined?(caller_locations)
                   File.dirname(caller_locations[2].path)
-                else # Fallback for ruby < 2.1.10
+                else
+                  # Fallback for ruby < 2.1.10
                   File.dirname(caller[2])
                 end
     return base_path + '/' + file_path if File.exist? base_path + '/' + file_path # relative path from yaml file
@@ -165,7 +174,7 @@ module YAML
   def self.absolute_path?(path)
     private_class_method
     path.start_with?('/') || # unix like
-        (path.length >= 3 && path[1] == ':') # ms windows
+      (path.length >= 3 && path[1] == ':') # ms windows
   end
 
   # Return the value of the corresponding key
@@ -187,7 +196,7 @@ module YAML
 
   def self.valid_key_type?(key)
     key.is_a?(Array) || key.is_a?(String) ||
-        raise(InvalidKeyTypeError, "Invalid key of type '#{key.class.name}'. Valid types are String and Array.")
+      raise(InvalidKeyTypeError, "Invalid key of type '#{key.class.name}'. Valid types are String and Array.")
   end
 
   def self.delete_yaml_key(key, config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_extend
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Matthäus Beyrle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge