awestruct 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbfde0af291abd73352c5250d0d43fb1ba1a0e90ddd97bd697ed5ed24072b435
-  data.tar.gz: b4f5566a1d739e41614ebe9f13836deb69d384f921f9c644f080865fcf472f78
+  metadata.gz: 6d9ed4c5741b5bac0a846e405a6a66ae1ec44f2c4218c0fcc893a32cfff96d89
+  data.tar.gz: b24ddb3bfdb28018415263f098c5f4351f3005f5720db6a4990939a6ab980573
 SHA512:
-  metadata.gz: db3fa768353f108cf524fe7db7527ff997e5ce545228cd2c12ec859f07be1a98f5c8c5e8d6f675b530b3c24a358b214e9e924e00a6a14fc1fdf3155228f210a1
-  data.tar.gz: c06a668a66477b7826546cf61a8963bc8ddb65ec1601555e38c12c61247eea53f7fd1fd65806e4b36f8412640037b8030223a005d5fe676ce20ec781110586b3
+  metadata.gz: 06d02941fd58c618e4c4924fc1dd4cc86f7be9eaf73e010af6217f35b770d821817e351555c8295cc4589da0644329f38f8cfb77a8a61e048235501963df546f
+  data.tar.gz: 7f318704c90d81440d7748d3210e3e62fe8651761ac25fceac50433acac2dcc987d1be5d303525430d48e18da2052c987e5fd01e0949ee3689e103a40098edf2

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-25'
 
   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').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.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 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-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml