dimples 11.3.0 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddce87571299076f5a160fc4dfd24bc5e0c8f7dd1fba61beebdb122908a76bda
-  data.tar.gz: adae9cec213ce2acf89e4a8d3bcb204298b0cba9fafccabe46f0f712361041b5
+  metadata.gz: 3b1507135dbcefde4af262ac48bc5b5fb34fb70d6ee8907f79fd65c53baccf37
+  data.tar.gz: e78540206127d0891cbbb3d6c04f21cf9ebbd98205f7c742feb8a0ee337245ed
 SHA512:
-  metadata.gz: 6b9c4c7d622e7a9bb25164505b70427b1a03a843aba9ef7475408d941e9b0d0d55d9df88105b4e87c383035cbab5a4f11a79c64853f352ad777c8efdcd96c64b
-  data.tar.gz: 5f0b4b7bc39c3ded428d2a9643c5244d926b66dcc0524405210192ba77713867994e1b6bc717060f1eca2933385af38df1ccf2b686f51cbe89ec56edca806493
+  metadata.gz: 5bb98fd65d3c953670d26c2b932d295c7ac478b77c1fa12f655104acc5350c51f8b85daa83efadc64fadf5a2c1f4cf3606a9b9ef80bdb2cd4ee3fc657e2420d1
+  data.tar.gz: ad6d763c238811a49d755b69d23fbbdf3f332b08594602fbc3fbf7bc0b468346720bf01dee04e00241178d052d8ba57e0f8a147742bb04ba19c76e0ef6511cad

data/lib/dimples/config.rb

@@ -47,7 +47,16 @@ module Dimples
     def expand_paths(root, paths)
       root = File.expand_path(root)
 
-      paths.transform_values! { |value| File.expand_path(File.join(root, value)) }
+      paths = paths.to_h do |key, value|
+        expanded_path = if value.is_a?(Hash)
+                          expand_paths(File.join(root, key.to_s), value)
+                        else
+                          File.expand_path(File.join(root, value))
+                        end
+
+        [key, expanded_path]
+      end
+
       paths.tap { |expanded_paths| expanded_paths[:root] = root }
     end
   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
@@ -43,24 +47,28 @@ module Dimples
       @site.templates[layout.to_sym]
     end
 
-    def generate(output_path:, context: nil)
-      context ||= {}
+    def generate(output_path:, payload: nil)
+      payload ||= {}
 
-      unless context[:url]
+      unless payload[:url]
         url = output_path.gsub(@site.config.build_paths[:root], '')
-        url = File.join(url, filename) unless filename == DEFAULT_FILENAME
+        url = File.join(url, filename) unless filename.start_with?('index.')
 
-        context[:url] = url
+        payload[:url] = url
       end
 
-      context = { page: Context.from_hash(@metadata.merge(context)), site: @site }
-      body = render(context:)
+      type = self.class.to_s.split('::')[-1].downcase.to_sym
+
+      payload[:site] ||= site
+      payload[type] = self
+
+      body = render(payload: payload)
       template = self.template
 
       loop do
         break if template.nil?
 
-        body = template.render(context:) { body }.strip
+        body = template.render(payload: payload) { body }.strip
         template = template.template
       end
 
@@ -72,7 +80,7 @@ module Dimples
       full_path
     end
 
-    def render(context: nil)
+    def render(payload: nil)
       contents
     end
 

data/lib/dimples/pager.rb

@@ -9,8 +9,8 @@ module Dimples
 
     attr_reader :current_page, :previous_page, :next_page, :page_count
 
-    def self.paginate(url:, posts:, options: {}, context: {}, &block)
-      new(url: url, posts: posts, options: options).paginate(context: context, &block)
+    def self.paginate(url:, posts:, options: {}, payload: {}, &block)
+      new(url: url, posts: posts, options: options).paginate(payload: payload, &block)
     end
 
     def initialize(url:, posts:, options: {})
@@ -24,11 +24,11 @@ module Dimples
       step_to(1)
     end
 
-    def paginate(context: {})
+    def paginate(payload: {})
       (1..@page_count).each do |index|
         step_to(index)
 
-        yield(current_page_path, context.merge(metadata)) if block_given?
+        yield(current_page_path, payload.merge(metadata)) if block_given?
       end
     end
 
@@ -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/post.rb

@@ -19,7 +19,7 @@ module Dimples
       File.basename(path, File.extname(path))&.downcase
     end
 
-    def render(context: nil)
+    def render(payload: nil)
       @rendered_contents ||= Redcarpet::Render::SmartyPants.render(
         Dimples::Post.markdown.render(contents)
       ).strip

data/lib/dimples/site.rb

@@ -44,7 +44,12 @@ module Dimples
 
     def templates
       @templates ||= source_files(path: :templates, extension: 'erb').to_h do |path|
-        [File.basename(path, '.erb').to_sym, Dimples::Template.new(site: self, path: path)]
+        key = File.basename(
+          path.gsub(@config.source_paths[:templates] + File::SEPARATOR, '').tr(File::SEPARATOR, '_'),
+          '.erb'
+        )
+
+        [key.to_sym, Dimples::Template.new(site: self, path: path)]
       end
     end
 
@@ -70,14 +75,16 @@ module Dimples
 
       url = @config.build_paths[:posts].gsub(@config.build_paths[:root], '').concat('/')
 
-      Pager.paginate(url: url, posts: posts, options: @config.pagination) do |url, page_context|
+      Pager.paginate(url: url, posts: posts, options: @config.pagination) do |url, payload|
         templates[:posts].generate(
           output_path: File.join(@config.build_paths[:root], url),
-          context: page_context
+          payload: payload
         )
       end
 
-      generate_feed(output_path: @config.build_paths[:root], posts: posts) if @config.generation[:main_feed]
+      return unless @config.generation[:main_feed]
+
+      generate_feed(output_path: @config.build_paths[:root], posts: posts)
     end
 
     def generate_post(post)
@@ -104,23 +111,24 @@ module Dimples
 
     def generate_categories
       categories.each do |category, posts|
-        context = { title: category.capitalize, category: category }
-
         Pager.paginate(
           url: "/categories/#{category}/",
           posts: posts,
-          context: context,
+          payload: { title: category.capitalize, category: category },
           options: @config.pagination
-        ) do |url, page_context|
+        ) do |url, payload|
           templates[:posts].generate(
             output_path: File.join(@config.build_paths[:root], url),
-            context: page_context
+            payload: payload
           )
         end
 
-        if @config.generation[:category_feeds]
-          generate_feed(output_path: File.join(@config.build_paths[:root], 'categories', category), posts: posts)
-        end
+        return unless @config.generation[:category_feeds]
+
+        generate_feed(
+          output_path: File.join(@config.build_paths[:root], 'categories', category),
+          posts: posts
+        )
       end
     end
 
@@ -129,7 +137,7 @@ module Dimples
 
       templates[:feed].generate(
         output_path: output_path,
-        context: { posts: posts.slice(0, 10) }
+        payload: { posts: posts.slice(0, 10) }
       )
     end
 
@@ -139,9 +147,19 @@ module Dimples
           raise "The site directory (#{@config.build_paths[:root]}) already exists."
         end
 
-        FileUtils.rm_rf(File.join(@config.build_paths[:root], '**', '*'), secure: true)
-      else
-        Dir.mkdir(@config.build_paths[:root])
+        FileUtils.rm_rf(@config.build_paths[:root], secure: true)
+      end
+
+      create_build_paths(@config.build_paths)
+    end
+
+    def create_build_paths(paths)
+      paths.except(:root).each_value do |path|
+        if path.is_a?(Hash)
+          create_build_paths(path)
+        else
+          FileUtils.mkdir_p(path) unless Dir.exist?(path)
+        end
       end
     end
 

data/lib/dimples/template.rb

@@ -9,11 +9,17 @@ module Dimples
       super(site:, source: Pathname.new(path))
     end
 
-    def render(context: nil)
-      unless context.nil?
-        context.merge(metadata).each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
+    def render(payload: nil)
+      payload ||= {}
+
+      @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)

data/lib/dimples/version.rb

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

metadata

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