dimples 11.1.0 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460c9cb2f4d18fb2857e20558f9c376934d3e24bace8be2854bf9b4f0367ea7b
-  data.tar.gz: 26192c3c2a912ca0dc7a66f61e6881e1fc8cfa8103322c1780620e1453e49078
+  metadata.gz: 53b0d98c918f5d4860900213f9797177cc07a801464911856127d8f3bb4e6ac0
+  data.tar.gz: c48d064da98832cfda7d8a878929dcfa1914e584521bc9cd2eab62f2c9245012
 SHA512:
-  metadata.gz: c0f4473b95bb948c8b58733a53cfdcaf995c66804a93a632f7cf4bfbad6f66b38b4ed179a5fd520b9bcbbb6b08aad2f4f3c4f4f7e6584634801ff3ba42631f94
-  data.tar.gz: bd3ce7b193fccabf55425531d388afc4bc049969512d0c674a5411d0a8e9ce942dd518ed3d2c9c743de0ad083417caac973f05b52bd796f3d87052d284fefd50
+  metadata.gz: 99fe1fdcdd089fa248708aace30b3593ca4935e344206bc37118e20c8421992fe0acf8c10c0b32a713c1b71533b2612f59fd1b089491fa2a5fe4dfb57a4b7abf
+  data.tar.gz: 1d0a41b232f0f6caacaba68ed9ec39013e40a75812564c6391f7b2120f6cc2556b329cc774cdf6816ac9ac0b1df89059ae8229ca592a5bbd21211fd4991b54d9

data/lib/dimples/post.rb

@@ -9,6 +9,8 @@ module Dimples
       attr_reader :markdown
     end
 
+    attr_reader :rendered_contents
+
     def initialize(path:)
       super(source: Pathname.new(path))
     end

data/lib/dimples/site.rb

@@ -145,16 +145,19 @@ module Dimples
       end
 
       context = { page: Context.from_hash(entry.metadata.merge(context)), site: self }
-      body = entry.contents
       full_path = File.join(output_path, entry.filename)
 
-      until entry.nil?
-        body = entry.render(context: context) { body }
-        entry = templates[entry.layout&.to_sym]
-      end
-
       FileUtils.mkdir_p(output_path) unless File.directory?(output_path)
-      File.write(full_path, body)
+      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

data/lib/dimples/version.rb

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

metadata

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