dimples 11.2.0 → 11.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53b0d98c918f5d4860900213f9797177cc07a801464911856127d8f3bb4e6ac0
-  data.tar.gz: c48d064da98832cfda7d8a878929dcfa1914e584521bc9cd2eab62f2c9245012
+  metadata.gz: ddce87571299076f5a160fc4dfd24bc5e0c8f7dd1fba61beebdb122908a76bda
+  data.tar.gz: adae9cec213ce2acf89e4a8d3bcb204298b0cba9fafccabe46f0f712361041b5
 SHA512:
-  metadata.gz: 99fe1fdcdd089fa248708aace30b3593ca4935e344206bc37118e20c8421992fe0acf8c10c0b32a713c1b71533b2612f59fd1b089491fa2a5fe4dfb57a4b7abf
-  data.tar.gz: 1d0a41b232f0f6caacaba68ed9ec39013e40a75812564c6391f7b2120f6cc2556b329cc774cdf6816ac9ac0b1df89059ae8229ca592a5bbd21211fd4991b54d9
+  metadata.gz: 6b9c4c7d622e7a9bb25164505b70427b1a03a843aba9ef7475408d941e9b0d0d55d9df88105b4e87c383035cbab5a4f11a79c64853f352ad777c8efdcd96c64b
+  data.tar.gz: 5f0b4b7bc39c3ded428d2a9643c5244d926b66dcc0524405210192ba77713867994e1b6bc717060f1eca2933385af38df1ccf2b686f51cbe89ec56edca806493

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,6 +37,41 @@ module Dimples
       end
     end
 
+    def template
+      return nil if layout.nil?
+
+      @site.templates[layout.to_sym]
+    end
+
+    def generate(output_path:, context: nil)
+      context ||= {}
+
+      unless context[:url]
+        url = output_path.gsub(@site.config.build_paths[:root], '')
+        url = File.join(url, filename) unless filename == DEFAULT_FILENAME
+
+        context[:url] = url
+      end
+
+      context = { page: Context.from_hash(@metadata.merge(context)), site: @site }
+      body = render(context:)
+      template = self.template
+
+      loop do
+        break if template.nil?
+
+        body = template.render(context:) { 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(context: nil)
       contents
     end

data/lib/dimples/post.rb

@@ -11,8 +11,8 @@ 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
@@ -22,7 +22,7 @@ module Dimples
     def render(context: 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,13 @@ 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)]
+        [File.basename(path, '.erb').to_sym, Dimples::Template.new(site: self, path: path)]
       end
     end
 
@@ -71,8 +71,7 @@ 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],
+        templates[:posts].generate(
           output_path: File.join(@config.build_paths[:root], url),
           context: page_context
         )
@@ -87,7 +86,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,7 +99,7 @@ module Dimples
         @config.build_paths[:root]
       ).concat('/')
 
-      generate_entry(entry: page, output_path: path)
+      page.generate(output_path: path)
     end
 
     def generate_categories
@@ -113,8 +112,7 @@ module Dimples
           context: context,
           options: @config.pagination
         ) do |url, page_context|
-          generate_entry(
-            entry: templates[:posts],
+          templates[:posts].generate(
             output_path: File.join(@config.build_paths[:root], url),
             context: page_context
           )
@@ -129,37 +127,12 @@ module Dimples
     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) }
       )
     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]

data/lib/dimples/template.rb

@@ -5,13 +5,15 @@ 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)
+    def render(context: nil)
+      unless context.nil?
+        context.merge(metadata).each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
 
       ERB.new(contents).result(binding)

data/lib/dimples/version.rb

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

metadata

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