dimples 13.0.0 → 13.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1507135dbcefde4af262ac48bc5b5fb34fb70d6ee8907f79fd65c53baccf37
-  data.tar.gz: e78540206127d0891cbbb3d6c04f21cf9ebbd98205f7c742feb8a0ee337245ed
+  metadata.gz: 820b81c83ff8701c08520801dd39dc165578fbaa4e994699c2a3c3c5f8fe6a73
+  data.tar.gz: 3de38112fe45ea95eed771573c06401dbe6899dfd1883443fd20debfe64a6f5e
 SHA512:
-  metadata.gz: 5bb98fd65d3c953670d26c2b932d295c7ac478b77c1fa12f655104acc5350c51f8b85daa83efadc64fadf5a2c1f4cf3606a9b9ef80bdb2cd4ee3fc657e2420d1
-  data.tar.gz: ad6d763c238811a49d755b69d23fbbdf3f332b08594602fbc3fbf7bc0b468346720bf01dee04e00241178d052d8ba57e0f8a147742bb04ba19c76e0ef6511cad
+  metadata.gz: 7676867a9acd8b29cc96e67c9396597e49ee8ae9e038e18087bfced6deca8a914a588c4fccf4e7c10e1fd11177af5a89b4c800d2a9ade78bc8860ded74a098bf
+  data.tar.gz: c86035f512c293e338468d4fd944eb046a1e4023fd9294758f30985f4ea380c49cf3279fbf37b24a03c2d5e935845768c9b36274c8738980edcbc17602057ef8

data/lib/dimples/config.rb

@@ -4,10 +4,11 @@ module Dimples
   # Configuration settings for a site.
   class Config
     SOURCE_PATHS = {
+      data: 'data',
       pages: 'pages',
       posts: 'posts',
-      templates: 'templates',
-      static: 'static'
+      static: 'static',
+      templates: 'templates'
     }.freeze
 
     attr_accessor :source_paths, :build_paths, :site, :pagination, :generation

data/lib/dimples/context.rb

@@ -4,9 +4,18 @@ module Dimples
   # Context used when rendering an item in a template
   class Context
     def self.from_hash(hash)
-      hash.transform_values! { |value| value.is_a?(Hash) ? Context.from_hash(value) : value }
+      hash.transform_values! do |value|
+        case value
+        when Hash
+          Context.from_hash(value)
+        when Array
+          value.map { |item| item.is_a?(Hash) ? Context.from_hash(item) : item }
+        else
+          value
+        end
+      end
 
-      Struct.new(*hash.keys) do |_klass|
+      Struct.new(*hash.keys.map(&:to_sym)) do |_klass|
         def method_missing(_method_name, *_args)
           nil
         end

data/lib/dimples/site.rb

@@ -29,7 +29,7 @@ module Dimples
     end
 
     def posts
-      @posts ||= source_files(path: :posts, extension: 'markdown').map do |path|
+      @posts ||= source_files(key: :posts, extension: 'markdown').map do |path|
         Dimples::Post.new(site: self, path: path)
       end
         .sort_by!(&:date)
@@ -37,19 +37,28 @@ module Dimples
     end
 
     def pages
-      @pages ||= source_files(path: :pages, extension: 'erb').map do |path|
+      @pages ||= source_files(key: :pages, extension: 'erb').map do |path|
         Dimples::Template.new(site: self, path: path)
       end
     end
 
     def templates
-      @templates ||= source_files(path: :templates, extension: 'erb').to_h do |path|
-        key = File.basename(
-          path.gsub(@config.source_paths[:templates] + File::SEPARATOR, '').tr(File::SEPARATOR, '_'),
-          '.erb'
-        )
+      @templates ||= source_files(key: :templates, extension: 'erb').to_h do |path|
+        key = File.basename(flatten_source_path(path:, key: :templates), '.erb').to_sym
+        [key, Dimples::Template.new(site: self, path: path)]
+      end
+    end
 
-        [key.to_sym, Dimples::Template.new(site: self, path: path)]
+    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]
       end
     end
 
@@ -66,8 +75,12 @@ module Dimples
 
     private
 
-    def source_files(path:, extension:)
-      Dir.glob(File.join(@config.source_paths[path], '**', "*.#{extension}"))
+    def source_files(key:, extension:)
+      Dir.glob(File.join(@config.source_paths[key], '**', "*.#{extension}"))
+    end
+
+    def flatten_source_path(path:, key:)
+      path.gsub(@config.source_paths[key] + File::SEPARATOR, '').tr(File::SEPARATOR, '_')
     end
 
     def generate_posts

data/lib/dimples/version.rb

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

metadata

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