yaml_extend 1.3.2 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3521ed653597acc21b56291da2d6d9da902ec64bc2d3f1d23cd01115e55ee5b
-  data.tar.gz: e8b491f5b356dfaee5415d07528f01bd8fbe754871826e0b7cba47c434a85c6a
+  metadata.gz: 03e4778ee1f4118a06fce7dcbc7bbd0a6defae359b04341f5632e1a414c2eb6e
+  data.tar.gz: 49ad4cfd28f6ce2d13aa66ad4c4cafe740a5f110ae1ac79f8c492fd7726c23b1
 SHA512:
-  metadata.gz: 86dd20e904e8dcbdb5f6a5250da9b39f39aef36cabef1cfdebc8efbc1f8926ff059586d6478d24d783ca0fc8c258af8098eed765d362934fe3e68e0d9b008cb3
-  data.tar.gz: 1a1c25d6699a920ae2d834fd2d87fda9bf4bd1e6d6736057ca80237f4aa74b9a1f8621a8ae23e9461b3e2cd857dc6ff2db46b12db604e9eca4d28bd6ba6a29ab
+  metadata.gz: 1b13ee198ddd926ec4569a826f12ca13229a5b574ccfede3fe4c0bf66eb8f586e6574f2d7ea91e45fc2b0e769c5002215c6b4c7333887a74efe0a37b980762e7
+  data.tar.gz: 20cb5a6bf6831df937dc2d68106250e7a10ead10ddfc1afb5673481afc13974234b2f7cd8144280c00f1e9b81d31992eb3716db7e65ce4cf79dfc03f44ee609b

data/.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

data/README.md

@@ -15,7 +15,7 @@ If you are just doing administration without knowing ruby, you can also just use
 * [Common information](#common-information)
 * [Installation](#installation)
 * [Usage](#usage)
-* [Command line](#command-line)
+* [Command line](#command-line-usage)
 * [Documentation](#documentation)
 * [Contributing](#contributing)
 
@@ -63,12 +63,12 @@ gem 'yaml_extend'
 
 And then execute:
 
-    $ bundle install
+    bundle install
 
 ### Command line
 If you just want to use the command line then run
 
-    $ gem install yaml_extend
+    gem install yaml_extend
 
 
 
@@ -86,11 +86,13 @@ This method works like the original YAML.load_file, by extending it with file in
 Given the following both files are defined:
 
 ```yaml
-# start.yml
+# start.erb.yml
 extends: 'super.yml'
 data:
     name: 'Mr. Superman'
-    age: 134    
+    age: 134
+    # using ERB templating with ruby code 
+    foo: '<%= 'bar' %>'
     favorites:
         - 'Raspberrys'
 ```
@@ -108,7 +110,7 @@ data:
 When you then call `ext_load_file`
 
 ```ruby
-config = YAML.ext_load_file 'start.yml'
+config = YAML.ext_load_file 'start.erb.yml'
 ```
 
 the returned YAML value results in
@@ -117,6 +119,7 @@ the returned YAML value results in
 data:
     name: 'Mr. Superman'
     age: 134
+    foo: 'bar'
     power: 2000
     favorites:
         - 'Bananas'
@@ -180,7 +183,7 @@ config = YAML.ext_load_file 'custom2.yml', ['options','extend_file']
 
 
 
-<a name="command-line"></a>
+<a name="command-line-usage"></a>
 ## Command line
 
 `yaml_extend` is also available on the command line after installation.
@@ -198,6 +201,7 @@ Usually you might want to put the result into resulting YAML file. So just use t
 yaml_extend path/to/my/yaml_file.yml > combined_yaml.yml
 ```
 
+Default options are used, custom options are not yet supported as parameters.
 
 
 <a name="documentation"></a>
@@ -220,6 +224,7 @@ YAML.ext_load_file(yaml_path, inheritance_key='extends', options = {})
   - `:extend_existing_arrays` (Boolean) Set to true to extend existing arrays, instead of overwriting them - DEFAULT: true
   - `:merge_nil_values` (Boolean) Set to true to merge nil hash values, overwriting a possibly non-nil value - DEFAULT: false
   - `:merge_debug` (Boolean) Set to true to get console output of merge process for debugging - DEFAULT: false
+  - `:force_erb` (Boolean) Set to true to force ERB processing on all inherited files, even if they do not end with `.erb` - DEFAULT: false
 
 See also rubydoc at [https://www.rubydoc.info/gems/yaml_extend](https://www.rubydoc.info/gems/yaml_extend)
 

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 #
 # run default task to see tasks to build and publish gem

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "yaml_extend"
+require 'bundler/setup'
+require_relative '../lib/yaml_extend'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/yaml_extend

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'yaml_extend'
+require_relative '../lib/yaml_extend'
 
 arg = ARGV[0]
 

data/lib/yaml_extend/version.rb

@@ -1,3 +1,3 @@
 module YamlExtend
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.5'.freeze
 end

data/lib/yaml_extend.rb

@@ -1,9 +1,8 @@
-require 'yaml_extend/version'
-
 require 'yaml'
 require 'erb'
 require 'deep_merge/rails_compat'
 
+require_relative 'yaml_extend/version'
 require_relative 'custom_errors/invalid_key_type_error'
 
 #
@@ -68,6 +67,7 @@ module YAML
   # @option options [Boolean] :extend_existing_arrays Set to true to extend existing arrays, instead of overwriting them - DEFAULT: true
   # @option options [Boolean] :merge_nil_values Set to true to merge nil hash values, overwriting a possibly non-nil value - DEFAULT: false
   # @option options [Boolean] :merge_debug Set to true to get console output of merge process for debugging - DEFAULT: false
+  # @option options [Boolean] :force_erb Set to true to force ERB processing of the yaml file, even if it does not end with '.erb' or include '.erb.' in the file name - DEFAULT: false
   #
   # @param  [Boolean] options Fallback for backward compatiblity: extend existing arrays instead of replacing them (deep_merge)
   # @return [Hash] the resulting yaml config
@@ -100,6 +100,7 @@ module YAML
       extend_existing_arrays: true,
       merge_nil_values: false,
       merge_debug: false,
+      force_erb: false,
     }
     options = default_options.merge options
     private_class_method
@@ -111,7 +112,7 @@ module YAML
     yaml_path = YAML.make_absolute_path yaml_path
 
     super_config =
-      if yaml_path.match(/(\.erb\.|\.erb$)/)
+      if options[:force_erb] || yaml_path.match(/(\.erb\.|\.erb$)/)
         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
@@ -181,6 +182,7 @@ module YAML
   # Return the value of the corresponding key
   # @param key [String|Array]
   def self.yaml_value_by_key(key, config)
+    return nil if config.nil? # config is nil, if the yaml file is empty
     return config[key] if key.is_a? String
     if valid_key_type? key
       cfg_copy = config.clone

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_extend
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.5
 platform: ruby
 authors:
 - Matthäus Beyrle
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2025-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"