dimples 13.0.2 → 13.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6159d051a362d8cbd0423abe50dda74607b4142e5c7ba0570c20816b46552a28
-  data.tar.gz: b3f8d2cc0af9bc06bdca241065c6e2de5e2f871ffa09a4f7afe3dd4076ebebd1
+  metadata.gz: 0a3a083ef71c4142029367c026394e4d499f4e8760ff3bf54712d3ee319322b8
+  data.tar.gz: c8f2e5ee9b6fbfd7e35a4d496798ebd02cb2773d6f532d12138bf1db21b800fb
 SHA512:
-  metadata.gz: ee08bdba1b9479f7b5cd160474614ff2c87deb5807b05a797aafb65fa2c60650143e8c7c88a2197c234bd320c3f07336de0ba4e36a9492ab190aa50417876dff
-  data.tar.gz: 16005bd967364bd479015766d63806d55e8b11aebad36dd2e4a8f4e7700334704fc5cdd5131cbd018b1324c25cc914fbe957cc71c99e303135e6edb44d4a899e
+  metadata.gz: ebfa89f7de5099291e8416980b7e2fd9f129f2f1c436e1ac1815cd8688bd3eaecc1f7bd8283de1dd7a9b1759c66878337cd9aa8249521d7bb4d2ad18aa457581
+  data.tar.gz: ec7e6e716c5c533e9013d6008deffb11741244963a2cf79869c85a5e2a3fa2e6e75e74ee66d8633fe9cb96b0b5f2e4685329f8f04c9c3ffd88a07d3a9464276d

data/lib/dimples/site.rb

@@ -50,15 +50,8 @@ module Dimples
     end
 
     def data
-      @data ||= source_files(key: :data, extension: 'json').to_h do |path|
-        key = File.basename(flatten_source_path(path:, key: :data), ".json").to_sym
-        value = begin
-                  Context.from_hash(JSON.parse(File.read(path)))
-                rescue JSON::ParserError
-                  nil
-                end
-
-        [key, value]
+      @data ||= scan_path(path: @config.source_paths[:data], extension: 'json') do |path|
+        Context.from_hash(JSON.parse(File.read(path)))
       end
     end
 
@@ -83,6 +76,21 @@ module Dimples
       path.gsub(@config.source_paths[key] + File::SEPARATOR, '').tr(File::SEPARATOR, '_')
     end
 
+    def scan_path(path:, extension:, &block)
+      {}.tap do |data|
+        Dir.children(path).each do |child|
+          child_path = File.join(path, child)
+
+          key = File.basename(child_path, ".#{extension}").to_sym
+          data[key] = if File.directory?(child_path)
+                        scan_path(path: child_path, extension:, &block)
+                      else
+                        yield child_path if block_given?
+                      end
+        end
+      end
+    end
+
     def generate_posts
       posts.each { |post| generate_post(post) }
 

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '13.0.2'
+  VERSION = '13.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 13.0.2
+  version: 13.1.1
 platform: ruby
 authors:
 - Daniel Bogan