yaml_extend 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e05fc2afe5d8f44419bf0c3d7a2fc801ab04e81864114b000080f6beea8337fd
-  data.tar.gz: 46ac756ebcb6b620930eeda313673c2a5990d6e78f8fe7bf4c609576664429a3
+  metadata.gz: de7c8e1e42f819845db2863a976d76033d253d3583f1e7b3e5930cf9220b06f3
+  data.tar.gz: c8d249f5c81a4cadd8212b97a94349cceb0dbd595ab232e71617af2f7f9189ef
 SHA512:
-  metadata.gz: 87f97749740b0954e62bf184418950f57d19612fdead49ae1cc7afb4ce6291f842bff5a887d3b4ba8fda1e2d512a61eb6a9eddf17737fe45136615138ddec27b
-  data.tar.gz: a922bc2aa0479db54e03bda900535bad1abfb23a03360f1024aa0caea3a7a0d478c6a6861a8c8af775f9e4df63dc8b88bac93f6e755cb8fd66fd90fe941e5c45
+  metadata.gz: 0fa220727bf30320588fa080b4ea55455317b981ce87d9bafb9ec3262014fe243a600d9b08e5d20cb827991041c35993df52f5aea6f11441080b086551407cbb
+  data.tar.gz: 115fabe9445d7ad15566760e5c5d1190bf40f5fc5f8183f88b1069fe43360ff83754c861bd37db796a5bab0ef15b56cdd093084ee247bea86b761cb6ca6c1c98

data/README.md

@@ -1,7 +1,8 @@
 # yaml_extend
 
-Extends YAML to support file based inheritance,
-to e.g. to build a configuration hierachy.
+Extends YAML to support file based inheritance.
+
+That can be very handy to build a configuration hierachy.
 
 ## Installation
 

data/Rakefile

@@ -1,6 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+#
+# run default task to see tasks to build and publish gem
+#
 task :default do
   system 'rake --tasks'
 end

data/lib/yaml_extend.rb

@@ -3,6 +3,8 @@ require 'yaml_extend/version'
 require 'yaml'
 require 'deep_merge/rails_compat'
 
+require_relative 'yaml_extend/yaml_extend_helper'
+
 require_relative 'custom_errors/invalid_key_type_error'
 
 #
@@ -49,7 +51,7 @@ module YAML
     end
     total_config ||= {}
     yaml_path = YAML.make_absolute_path yaml_path
-    super_config = YAML.load_file(File.open(yaml_path))
+    super_config = YamlExtendHelper.encode_booleans YAML.load_file(File.open(yaml_path))
     super_inheritance_files = yaml_value_by_key inheritance_key, super_config
     delete_yaml_key inheritance_key, super_config # we don't merge the super inheritance keys into the base yaml
     merged_config = config.clone.deeper_merge(super_config, extend_existing_arrays: extend_existing_arrays)
@@ -57,12 +59,12 @@ module YAML
       super_inheritance_files = [super_inheritance_files] unless super_inheritance_files.is_a? Array # we support strings as well as arrays of type string to extend from
       super_inheritance_files.each_with_index do |super_inheritance_file, index|
         super_config_path = File.dirname(yaml_path) + '/' + super_inheritance_file
-        total_config = YAML.ext_load_file super_config_path, inheritance_key, extend_existing_arrays, total_config.deeper_merge(merged_config, extend_existing_arrays: extend_existing_arrays)
+        total_config = YamlExtendHelper.encode_booleans YAML.ext_load_file(super_config_path, inheritance_key, extend_existing_arrays, total_config.deeper_merge(merged_config, extend_existing_arrays: extend_existing_arrays))
       end
-      total_config
+      YamlExtendHelper.decode_booleans total_config
     else
       delete_yaml_key inheritance_key, merged_config
-      merged_config
+      YamlExtendHelper.decode_booleans merged_config
     end
   end
 

data/lib/yaml_extend/version.rb

@@ -1,3 +1,3 @@
 module YamlExtend
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/yaml_extend/yaml_extend_helper.rb

@@ -0,0 +1,68 @@
+
+#
+# This class includes a workaround patch, providing a solution of the unaccepted pull request
+# 'false is not overriden by true if preserve_unmergeables'
+# https://github.com/danielsdeleo/deep_merge/pull/28
+#
+# It ensures, that booleans can be merged correctly, by en- and decoding them to strings, before and after merging
+# see #encode_boolens and #decode_booleans
+#
+
+class YamlExtendHelper
+
+  TRUE_CLASS_ENCODED = '#={TrueClass}=#'
+  FALSE_CLASS_ENCODED = '#={FalseClass}=#'
+
+  def self.encode_booleans(hash)
+    hash.each_with_object({}) do |(k,v),g|
+      g[k] = if v.is_a? Hash
+               YamlExtendHelper.encode_booleans(v)
+             elsif v.is_a? Array
+               v.each_with_index do |av, ai|
+                  v[ai] = if av.is_a? Hash
+                            YamlExtendHelper.encode_booleans(av)
+                          elsif av.is_a? TrueClass
+                            TRUE_CLASS_ENCODED
+                          elsif av.is_a? FalseClass
+                            FALSE_CLASS_ENCODED
+                          else
+                            av
+                          end
+               end
+             elsif v.is_a? TrueClass
+               TRUE_CLASS_ENCODED
+             elsif v.is_a? FalseClass
+               FALSE_CLASS_ENCODED
+             else
+               v
+             end
+    end
+  end
+
+  def self.decode_booleans(hash)
+    hash.each_with_object({}) do |(k,v),g|
+      g[k] = if v.is_a? Hash
+               YamlExtendHelper.decode_booleans(v)
+             elsif v.is_a? Array
+               v.each_with_index do |av, ai|
+                 v[ai] = if av.is_a? Hash
+                           YamlExtendHelper.decode_booleans(av)
+                         elsif av === TRUE_CLASS_ENCODED
+                           true
+                         elsif av === FALSE_CLASS_ENCODED
+                           false
+                         else
+                           av
+                         end
+               end
+             elsif v === TRUE_CLASS_ENCODED
+               true
+             elsif v === FALSE_CLASS_ENCODED
+               false
+             else
+               v
+             end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_extend
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Matthäus Beyrle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -86,6 +86,7 @@ files:
 - lib/custom_errors/invalid_key_type_error.rb
 - lib/yaml_extend.rb
 - lib/yaml_extend/version.rb
+- lib/yaml_extend/yaml_extend_helper.rb
 - yaml_extend.gemspec
 homepage: https://github.com/entwanderer/yaml_extend
 licenses:
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Extends YAML to support file based inheritance