yaml_extend 1.0.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515d21e196c6b0077a3f873a04281a0bcbd4d21858acaf64a6a380e75b07eeb5
-  data.tar.gz: 7ca9fbd9d902ee3eabcb81c4547018eb7fe5ffabe506b29dfb0582e54670de5e
+  metadata.gz: 201e99bcd2bf59ad4ce96e1d3e8f33a1146c4bef133152cff94a91a8c61d0448
+  data.tar.gz: 1c80344acb3e7f823259fdfb8c329927ffb4ef7a1166a48f0de27cfe8ab7a6cc
 SHA512:
-  metadata.gz: aa16ed31fce2a1895f60c4871b926ffc8fe8a93af8548a2eee0f63220d2afe2a6f83dd8fd51f7a04e7af7bd4bb90620b7e9fc0bf5fe8d1f347ae5394be017961
-  data.tar.gz: 056f53baa09e83d64ac705811887f72677ce1e18f95441330d0b3fd0accc8cc041598fd6118b90db03e81705ff09173d67b2c70d13d0e6a99ef131ee16f617fc
+  metadata.gz: 492f4243fd80eb5ae57b0824d774a588af5722992171a0e3e732cab7b28c0b771dade6221b50e98050a14153477be0b8304894575ac2871c6b8adae77700e519
+  data.tar.gz: b6c37c0eec5829fa359d9d0abc389f439c2382dc87914b76268a72ecfff4cd8821feefeb8301c35af96bcdc1047de226d06944ebed1ba617aae885e3ad3f6001

data/README.md

@@ -1,8 +1,13 @@
 # yaml_extend
+![Gem](https://img.shields.io/gem/v/yaml_extend?color=default&style=plastic&logo=ruby&logoColor=red)
+![Gem](https://img.shields.io/gem/dt/yaml_extend?color=blue&style=plastic)
+[![License: MIT](https://img.shields.io/badge/License-MIT-gold.svg?style=plastic&logo=mit)](LICENSE)
 
-Extends YAML to support file based inheritance.
+> Extends YAML to support file based inheritance.
 
-That can be very handy to build a configuration hierachy.
+That can be very handy to build a configuration hierarchy.
+
+Basic support for ERB (embedded ruby) is included and automatically applied when config files are named `*.erb` or `*.erb.*`.
 
 ## Installation
 

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
@@ -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}
@@ -105,7 +108,14 @@ module YAML
     total_config = config.clone
 
     yaml_path = YAML.make_absolute_path yaml_path
-    super_config = YAML.load_file(File.open(yaml_path))
+
+    super_config =
+      if yaml_path.match(/(\.erb\.|\.erb$)/)
+        YAML.load(ERB.new(File.read(yaml_path)).result)
+      else
+        YAML.load_file(File.open(yaml_path))
+      end
+
     super_inheritance_files = yaml_value_by_key inheritance_key, super_config
     unless options[:preserve_inheritance_key]
       delete_yaml_key inheritance_key, super_config # we don't merge the super inheritance keys into the base yaml
@@ -136,8 +146,12 @@ module YAML
     # 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}'"

data/lib/yaml_extend/version.rb

@@ -1,3 +1,3 @@
 module YamlExtend
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_extend
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Matthäus Beyrle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-08-04 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.1.4
 signing_key:
 specification_version: 4
 summary: Extends YAML to support file based inheritance