awestruct 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbfde0af291abd73352c5250d0d43fb1ba1a0e90ddd97bd697ed5ed24072b435
-  data.tar.gz: b4f5566a1d739e41614ebe9f13836deb69d384f921f9c644f080865fcf472f78
+  metadata.gz: 87462b3b89d000f6d65eed4d9c92c31376177bb611ae7a206f33bbd23d6739a2
+  data.tar.gz: 0d7820bf17266c7733102ad1d89407f71f580a74bbfedd8f39851a175bed98b9
 SHA512:
-  metadata.gz: db3fa768353f108cf524fe7db7527ff997e5ce545228cd2c12ec859f07be1a98f5c8c5e8d6f675b530b3c24a358b214e9e924e00a6a14fc1fdf3155228f210a1
-  data.tar.gz: c06a668a66477b7826546cf61a8963bc8ddb65ec1601555e38c12c61247eea53f7fd1fd65806e4b36f8412640037b8030223a005d5fe676ce20ec781110586b3
+  metadata.gz: f45baef6a198a33465c0359e01338af16bfa854f39a2e10227aa6db740fff14e67f6b40c93de9685dc33eea4d546f0847bbafafdb562a7f2bcc10b81a5f42014
+  data.tar.gz: 8ab966c3a10df83a9844454adc0428f22050fa331676c94081be64b2a119927d324775d89a506d638b62091ae56d09238333466089dfbfe25e37e5bdacac97c7

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2023-01-21'
+  s.date          = '2023-01-24'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']

data/lib/awestruct/extensions/data_dir.rb

@@ -1,3 +1,5 @@
+require 'awestruct/util/yaml_load'
+
 module Awestruct
   module Extensions
     class DataDir
@@ -11,18 +13,22 @@ module Awestruct
       end
 
       def execute(site)
-        Dir[ "#{site.dir}/#{@data_dir}/*" ].each do |entry|
-          if ( File.directory?( entry ) )
-            data_key = File.basename( entry )
-            data_map = {}
-            Dir[ "#{entry}/*" ].each do |chunk|
-              File.basename( chunk ) =~ /^([^\.]+)/
-              key = $1.to_sym
-              chunk_page = site.engine.load_page( chunk )
-              data_map[ key ] = chunk_page
+        Dir.glob(File.join(site.dir, @data_dir, '*')).each do |entry|
+          next unless File.directory? entry
+          data_key = File.basename(entry)
+          data_map = {}
+          Dir.glob(File.join(entry, '*')).each do |chunk|
+            File.basename(chunk) =~ /^([^\.]+)/
+            key = $1.to_sym
+            chunk_page = nil
+            if chunk.end_with?('.yml')
+              chunk_page = Awestruct.yaml_load_file(chunk)
+            else
+              chunk_page = site.engine.load_page(chunk)
             end
-            site.send( "#{data_key}=", data_map )
+            data_map[key] = chunk_page
           end
+          site.send("#{data_key}=", data_map)
         end
       end
 

data/lib/awestruct/util/yaml_load.rb

@@ -5,4 +5,10 @@ module Awestruct
     return YAML.load(str) unless YAML.method('load').parameters.any? {|k,v| v == :permitted_classes}
     YAML.load(str, permitted_classes: [Date, Symbol])  
   end
+
+  def self.yaml_load_file(str)
+    return YAML.load_file(str) unless YAML.method('load_file').parameters.any? {|k,v| v == :permitted_classes}
+    YAML.load_file(str, permitted_classes: [Date, Symbol])
+  end
+
 end

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml