extended_yaml 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75375be6f35d137f2c0cc92fcd0a69b8c706ab0f4152566d0b6dc037d0b66204
-  data.tar.gz: 6ea26f239f8a148d5e07c0e20f6e30e734834ffe37953be1e79041b47fd21257
+  metadata.gz: d4ee11f47e33513fd8398d47f605460d2730beea6420340a906d6bf802f35996
+  data.tar.gz: f9e6c2fd5ff1150a9694e871f79d2471680f18d2240eb9df21caf81e0687495f
 SHA512:
-  metadata.gz: 8df1afcc6db22d7a5ce02f67c71839d2e62648af49f0df3532fcec88965506e7a758df286d507720097de766f38f378b060ba1eba350b59ef01729dcbb21b91b
-  data.tar.gz: 91592326390e18c981cf25cd668c63a9727c8b3b9ce067ef9006e112d845fcf6c034e324baf3dc5c1a42070c628c6cf9b89d1ce639a244e78735d169ba2becdd
+  metadata.gz: 1058232576e3c99969dede0083812f3dc566ccf5c9a6d7e293ccc99bc06f4a026cba2d531c79efec16b05e6bee13b85c0b261c10a409968b3d1e893b7d26978d
+  data.tar.gz: b621f31a3c9a4895a2aa1c6cbd823e803a364dffa0113f6329c35b7590f14f373cbad893663fcb37b23c4560c83f18641ec23f65560c31de06d042e1ce95ae38

data/README.md

@@ -2,6 +2,8 @@ Extended YAML
 ==================================================
 
 [![Gem Version](https://badge.fury.io/rb/extended_yaml.svg)](https://badge.fury.io/rb/extended_yaml)
+[![Build Status](https://github.com/DannyBen/extended_yaml/workflows/Test/badge.svg)](https://github.com/DannyBen/extended_yaml/actions?query=workflow%3ATest)
+[![Maintainability](https://api.codeclimate.com/v1/badges/0d162ff84c50abe7c83a/maintainability)](https://codeclimate.com/github/DannyBen/extended_yaml/maintainability)
 
 ---
 
@@ -44,14 +46,14 @@ settings:
   host: example.com
 ```
 
-We can now load the extended YAML file likw this:
+We can now load the extended YAML file like this:
 
 ```ruby
 # Load an extended YAML
 require 'extended_yaml'
 
 p ExtendedYAML.load 'examples/simple.yml'
-#=> {"settings"=>{"host"=>"example.com", "port"=>80}}
+#=> {"settings"=>{"host"=>"localhost", "port"=>80}}
 ```
 
 Notes
@@ -64,14 +66,16 @@ Notes
 4. ERB tags will be evaluated in all YAML files.
 5. The `extends` option can use either a single file string, or an array. 
    Extensions are optional.
-6. If you need to use a key that is named differently, provide it using the
-   `key` keyword argument:
+6. Using `*` anywhere in the `extends` path will load multiple files with one
+   call.
+7. If you need to use a key that is named differently than `extends`, provide
+   it using the `key` keyword argument:
    ```ruby
-   ExtendedYAML.load 'examples/simple.yml, key: 'include'
+   ExtendedYAML.load 'examples/simple.yml', key: 'include'
    ```
 
 See the [examples/master.yml](examples/master.yml) file for additional
 information.
 
 
-[1]: https://github.com/magynhard/yaml_extend
+[1]: https://github.com/magynhard/yaml_extend

data/lib/extended_yaml/version.rb

@@ -1,3 +1,3 @@
 class ExtendedYAML
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

data/lib/extended_yaml.rb

@@ -17,10 +17,17 @@ class ExtendedYAML
     @file, @key = file, key
   end
 
-  # @return [Hash, Array] the parsed YAML
+  # @return [Hash, Array, nil] the parsed YAML
   def result
-    data = ::YAML.load evaluate
-    resolve_extends data
+    # ref: https://bugs.ruby-lang.org/issues/17866
+    begin
+      data = ::YAML.load evaluate, aliases: true
+    rescue ArgumentError
+      # :nocov:
+      data = ::YAML.load evaluate
+      # :nocov:
+    end
+    data ? resolve_extends(data) : nil
   end
 
   # @return [String] the YAML string, with evaluated and ERB
@@ -38,20 +45,45 @@ private
     @base_dir ||= File.dirname file
   end
 
-  # @param [Hash] data structure, possibly with 'extends' array
+  # @param [Hash] data the data structure, possibly with 'extends' array
   # @return [Hash] the merged data
   def resolve_extends(data)
     extra_files = data.delete key
     return data unless extra_files
 
-    extra_files = [extra_files] unless extra_files.is_a? Array
+    extra_files = expand_file_list extra_files
 
-    extra_files.each do |extra_file|
-      extra_file = extra_file + extension unless extra_file.end_with? extension
-      path = File.expand_path extra_file, base_dir
-      data.deep_merge! self.class.new(path).result
+    extra_files.each do |path|
+      data = self.class.new(path, key: key).result.deep_merge data
     end
 
     data
   end
+
+  # Receives a string or an array of strings, each representing an acceptable
+  # path definition. Each definition may be with or without a file etxension,
+  # and may be a glob pattern. The resulting array will be a normalized list
+  # of full paths.
+  #
+  # @param [Array, String] files one or more path definitions
+  # @return [Array] a normalized list of absolute paths
+  def expand_file_list(files)
+    list = []
+    files = [files] unless files.is_a? Array
+
+    files.each do |path|
+      list += expand_path path
+    end
+
+    list
+  end
+
+  # @param [String] path the path to the YAML file, with or without extension.
+  #   May include a glob pattern wildcard.
+  # @return [Array] one or more absolute paths.
+  def expand_path(path)
+    path += extension unless path.end_with? extension
+    path = File.expand_path path, base_dir
+    path.include?('*') ? Dir[path].sort : [path]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extended_yaml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies: []
 description: Load YAML files that deep merge other YAML files
 email: db@dannyben.com
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Load YAML files that merge other YAML files