yaml_extend 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 260457e93f7baaedfbc284c732e7b3efbd34ba57c4d4e7d8bfeae0112bb464c4
-  data.tar.gz: 39ee43948691830d4c3e241a7bad1aaae0586fa36eb91f0b120d72800657fe30
+  metadata.gz: 053aef54e93b410f7b2eb373834abff17b4f1a2627d292f2eacb479fb78d4d9b
+  data.tar.gz: 70dd53ab46254a6dfed23530c74e3668d14a81844792ac980d4c03b0fb141d24
 SHA512:
-  metadata.gz: 5ee160e95852303ad939d92666c480e89b292da689d4bb054256374919be77a66ca4baf28228044d6630b4b840db3cd46b66a53e2647a1569950451f0e8540bb
-  data.tar.gz: d9ed54ef19a39c9c6bc2838b162e2eeb0dbb162833780d38566403d706bdf24cf985e0d9b8df49a4ac84147323c51e7aadde7ae6d3d5ed304ee02b80ad145317
+  metadata.gz: 390f032971732ece98f75c58bf471da9ce8085918cbedcf40fd840087a30e45da8a0db7df2fc06030d965ac9b0dae170f2745cdcacb09cf30b2acbcfe9d4118a
+  data.tar.gz: de9bfd1e7e9e2bf45f6783f387284720fdc54db997a6ba9f0eacf4b03a57f6fd2deb9c3596b868e81695da39873c277beefaee3d99ad7b31ffee103d4e208cfd

data/lib/yaml_extend/version.rb

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

data/lib/yaml_extend.rb

@@ -50,7 +50,7 @@ module YAML
   # Extended variant of the YAML.load_file method by providing the
   # ability to inherit from other YAML file(s)
   #
-  # @param [String] yaml_path the path to the yaml file to be loaded
+  # @param [String|Pathname] yaml_path the path to the yaml file to be loaded
   # @param [String|Array] inheritance_key The key used in the yaml file to extend from another YAML file. Use an Array if you want to use a tree structure key like "options.extends" => ['options','extends']
   # @param [Hash] options to pass, including deep_merge options as well as
   # @option options [Boolean] :preserve_inheritance_key Preserve inheritance key(s) from resulting yaml, does most time not make sense especially in multiple inheritance - DEFAULT: false
@@ -69,7 +69,7 @@ module YAML
   # @option options [Boolean] :merge_debug Set to true to get console output of merge process for debugging - DEFAULT: false
   #
   # @param  [Boolean] options Fallback for backward compatiblity: extend existing arrays instead of replacing them (deep_merge)
-  # @return [Hash] the resulting yaml config 
+  # @return [Hash] the resulting yaml config
   #
   def self.ext_load_file(yaml_path, inheritance_key = nil, options = {})
     YAML.ext_load_file_recursive(yaml_path, inheritance_key, options, {})
@@ -77,10 +77,13 @@ module YAML
 
   private
 
+  # Same doc as ext_load_file, but extended by additional parameter 'config'
   #
-  # @param config [Hash] a hash to be merged into the result, usually only recursivly called by the method itself
+  # @param [Hash] config a hash to be merged into the result, usually only recursively called by the method itself
   #
   def self.ext_load_file_recursive(yaml_path, inheritance_key, options = {}, config)
+    # Allow also class Pathname instead of class String
+    yaml_path = yaml_path.to_s
     # backward compatibility to 1.0.1
     if options == true || options == false
       options = {extend_existing_arrays: options}
@@ -108,9 +111,9 @@ module YAML
 
     super_config =
       if yaml_path.match(/(\.erb\.|\.erb$)/)
-        YAML.load(ERB.new(File.read(yaml_path)).result)
+        YAML.unsafe_load(ERB.new(File.read(yaml_path)).result)
       else
-        YAML.load_file(File.open(yaml_path))
+        YAML.unsafe_load_file(File.open(yaml_path))
       end
 
     super_inheritance_files = yaml_value_by_key inheritance_key, super_config
@@ -135,16 +138,20 @@ module YAML
     total_config.deeper_merge!(super_config, deep_merge_options)
   end
 
-  # some logic to ensure absolute file inheritance as well as 
-  # relative file inheritance in yaml files  
+  # some logic to ensure absolute file inheritance as well as
+  # relative file inheritance in yaml files
   def self.make_absolute_path(file_path)
     private_class_method
     return file_path if YAML.absolute_path?(file_path) && File.exist?(file_path)
     # caller_locations returns the current execution stack
     #   [0] is the call from ext_load_file_recursive,
     #   [1] is inside ext_load_file,
-    #   [2] is the exteranl caller of YAML.ext_load_file
-    base_path = File.dirname(caller_locations[2].path)
+    #   [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
+                  File.dirname(caller[2])
+                end
     return base_path + '/' + file_path if File.exist? base_path + '/' + file_path # relative path from yaml file
     return Dir.pwd + '/' + file_path if File.exist? Dir.pwd + '/' + file_path # relative path from project
     error_message = "Can not find absolute path of '#{file_path}'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_extend
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Matthäus Beyrle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Extends YAML to support file based inheritance