dimples 11.2.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53b0d98c918f5d4860900213f9797177cc07a801464911856127d8f3bb4e6ac0
-  data.tar.gz: c48d064da98832cfda7d8a878929dcfa1914e584521bc9cd2eab62f2c9245012
+  metadata.gz: 0fcf6e00b6b3aa4b7096a9d7e52d403b5bc6bdd0f4564139d1d625fc6a95f7f6
+  data.tar.gz: 7f794a7c556717f7096e18cc82b5d4c0fb64ae36c426c0720bf10dff7538c6c5
 SHA512:
-  metadata.gz: 99fe1fdcdd089fa248708aace30b3593ca4935e344206bc37118e20c8421992fe0acf8c10c0b32a713c1b71533b2612f59fd1b089491fa2a5fe4dfb57a4b7abf
-  data.tar.gz: 1d0a41b232f0f6caacaba68ed9ec39013e40a75812564c6391f7b2120f6cc2556b329cc774cdf6816ac9ac0b1df89059ae8229ca592a5bbd21211fd4991b54d9
+  metadata.gz: 15291e14e987e06abd9d4ff514eef20129b7f177f7d3b7016238739060b1de8d33f314cbf02a171974cc43fe2fbbbfd85dcdb478b9bdd868d88132dc998a5033
+  data.tar.gz: f7e89be6177ecd1464258e7414445caf79e609c55ca74ddc8458165a53d2008b61b1da49a3d6ff25b105229a8685b80d6d9020999df832d4eacb866edea6c457

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

@@ -9,9 +9,11 @@ module Dimples
     FRONT_MATTER_PATTERN = /^(-{3}\n.*?\n?)^(-{3}*$\n?)/m
     DEFAULT_FILENAME = 'index.html'
 
-    attr_reader :path, :contents, :metadata
+    attr_reader :site, :path, :contents, :metadata
+
+    def initialize(site:, source:)
+      @site = site
 
-    def initialize(source:)
       contents = case source
                  when Pathname
                    @path = File.expand_path(source)
@@ -35,7 +37,46 @@ module Dimples
       end
     end
 
-    def render(context: nil)
+    def template
+      return nil if layout.nil?
+
+      @site.templates[layout.to_sym]
+    end
+
+    def generate(output_path:, payload: nil)
+      payload ||= {}
+
+      unless payload[:url]
+        url = output_path.gsub(@site.config.build_paths[:root], '')
+        url = File.join(url, filename) unless filename.start_with?('index.')
+
+        payload[:url] = url
+      end
+
+      type = self.class.to_s.split('::')[-1].downcase.to_sym
+
+      payload[:site] ||= site
+      payload[type] = @metadata
+
+      body = render(payload: payload)
+      template = self.template
+
+      loop do
+        break if template.nil?
+
+        body = template.render(payload: payload) { body }.strip
+        template = template.template
+      end
+
+      full_path = File.join(output_path, filename)
+
+      FileUtils.mkdir_p(output_path) unless File.directory?(output_path)
+      File.write(full_path, body)
+
+      full_path
+    end
+
+    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
 

data/lib/dimples/post.rb

@@ -11,18 +11,18 @@ module Dimples
 
     attr_reader :rendered_contents
 
-    def initialize(path:)
-      super(source: Pathname.new(path))
+    def initialize(site:, path:)
+      super(site:, source: Pathname.new(path))
     end
 
     def slug
       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
     end
 
     private

data/lib/dimples/site.rb

@@ -30,7 +30,7 @@ module Dimples
 
     def posts
       @posts ||= source_files(path: :posts, extension: 'markdown').map do |path|
-        Dimples::Post.new(path: path)
+        Dimples::Post.new(site: self, path: path)
       end
         .sort_by!(&:date)
         .reverse!
@@ -38,13 +38,18 @@ module Dimples
 
     def pages
       @pages ||= source_files(path: :pages, extension: 'erb').map do |path|
-        Dimples::Template.new(path: path)
+        Dimples::Template.new(site: self, path: path)
       end
     end
 
     def templates
       @templates ||= source_files(path: :templates, extension: 'erb').to_h do |path|
-        [File.basename(path, '.erb').to_sym, Dimples::Template.new(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,15 +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|
-        generate_entry(
-          entry: templates[:posts],
+      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)
@@ -87,7 +93,7 @@ module Dimples
         @config.build_paths[:posts]
       ).concat("/#{post.slug}/")
 
-      generate_entry(entry: post, output_path: path)
+      post.generate(output_path: path)
     end
 
     def generate_pages
@@ -100,75 +106,60 @@ module Dimples
         @config.build_paths[:root]
       ).concat('/')
 
-      generate_entry(entry: page, output_path: path)
+      page.generate(output_path: path)
     end
 
     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|
-          generate_entry(
-            entry: templates[:posts],
+        ) 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
 
     def generate_feed(output_path:, posts:)
       return if templates[:feed].nil?
 
-      generate_entry(
-        entry: templates[:feed],
+      templates[:feed].generate(
         output_path: output_path,
-        context: { posts: posts.slice(0, 10) }
+        payload: { posts: posts.slice(0, 10) }
       )
     end
 
-    def generate_entry(entry:, output_path:, context: {})
-      unless context[:url]
-        url = output_path.gsub(@config.build_paths[:root], '')
-        url = File.join(url, entry.filename) unless entry.filename == Dimples::Entry::DEFAULT_FILENAME
-
-        context[:url] = url
-      end
-
-      context = { page: Context.from_hash(entry.metadata.merge(context)), site: self }
-      full_path = File.join(output_path, entry.filename)
-
-      FileUtils.mkdir_p(output_path) unless File.directory?(output_path)
-      File.write(full_path, render_entry(entry: entry, context: context, body: entry.contents))
-    end
-
-    def render_entry(entry:, context: {}, body: nil)
-      rendered_body = entry.render(context: context) { body }.strip
-
-      template = templates[entry.layout&.to_sym]
-      return rendered_body if template.nil?
-
-      render_entry(entry: template, context:, body: rendered_body)
-    end
-
     def prepare_output_directory
       if Dir.exist?(@config.build_paths[:root])
         unless @config.generation[:overwrite_existing_site]
           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

@@ -5,15 +5,14 @@ require 'erb'
 module Dimples
   # A class for a single ERB template file used on a site.
   class Template < Entry
-    def initialize(path:)
-      super(source: Pathname.new(path))
+    def initialize(site:, path:)
+      super(site:, source: Pathname.new(path))
     end
 
-    def render(context:)
-      context.merge(metadata).each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
+    def render(payload: nil)
+      payload ||= {}
 
+      instance_variable_set("@this", Context.from_hash(payload.merge(metadata)))
       ERB.new(contents).result(binding)
     end
   end

data/lib/dimples/version.rb

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

metadata

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