dimples 12.0.0 → 13.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fcf6e00b6b3aa4b7096a9d7e52d403b5bc6bdd0f4564139d1d625fc6a95f7f6
-  data.tar.gz: 7f794a7c556717f7096e18cc82b5d4c0fb64ae36c426c0720bf10dff7538c6c5
+  metadata.gz: 820b81c83ff8701c08520801dd39dc165578fbaa4e994699c2a3c3c5f8fe6a73
+  data.tar.gz: 3de38112fe45ea95eed771573c06401dbe6899dfd1883443fd20debfe64a6f5e
 SHA512:
-  metadata.gz: 15291e14e987e06abd9d4ff514eef20129b7f177f7d3b7016238739060b1de8d33f314cbf02a171974cc43fe2fbbbfd85dcdb478b9bdd868d88132dc998a5033
-  data.tar.gz: f7e89be6177ecd1464258e7414445caf79e609c55ca74ddc8458165a53d2008b61b1da49a3d6ff25b105229a8685b80d6d9020999df832d4eacb866edea6c457
+  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/entry.rb

@@ -31,6 +31,10 @@ module Dimples
       matches = contents.match(FRONT_MATTER_PATTERN)
       if matches
         @metadata.merge!(YAML.safe_load(matches[1], symbolize_names: true, permitted_classes: [Date]))
+        @metadata.transform_values! do |value|
+          value.is_a?(Hash) ? Context.from_hash(value) : value
+        end
+
         @contents = matches.post_match.strip
       else
         @contents = contents
@@ -56,7 +60,7 @@ module Dimples
       type = self.class.to_s.split('::')[-1].downcase.to_sym
 
       payload[:site] ||= site
-      payload[type] = @metadata
+      payload[type] = self
 
       body = render(payload: payload)
       template = self.template

data/lib/dimples/pager.rb

@@ -53,7 +53,7 @@ module Dimples
     end
 
     def current_page_path
-      @current_page == 1 ? @url : File.join(@url, "page_#{@current_page}")
+      @current_page == 1 ? @url : File.join(@url, "pages", current_page.to_s)
     end
 
     def current_page_url
@@ -91,14 +91,14 @@ module Dimples
     def metadata
       {
         posts: posts_at(current_page),
-        pagination: {
+        pagination: Context.from_hash(
           current_page: @current_page,
           page_count: @page_count,
           post_count: @posts.count,
           previous_page: @previous_page,
           next_page: @next_page,
           urls: urls
-        }
+        )
       }
     end
   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/template.rb

@@ -12,7 +12,16 @@ module Dimples
     def render(payload: nil)
       payload ||= {}
 
-      instance_variable_set("@this", Context.from_hash(payload.merge(metadata)))
+      @entries.each { |key| remove_instance_variable(key) } unless @entries.nil?
+      @entries = []
+
+      payload.each do |key, value|
+        key = "@#{key}".to_sym
+
+        instance_variable_set(key, value)
+        @entries.append(key)
+      end
+
       ERB.new(contents).result(binding)
     end
   end

data/lib/dimples/version.rb

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

metadata

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