bridgetown-core 0.18.0 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36f73b0c33a2bf052be5e78359a241dce3034f144f9ff12bdd37515ba008f5a
-  data.tar.gz: fb6296ecf818c0fe40244359672babde4f4353549b4972ca5c112ff8ed8579bf
+  metadata.gz: 3016411256a8728e60755c9309a5b7ccd47a12a06e6c0e8a712d41052e0136eb
+  data.tar.gz: 3c29c8e06af9898d864f2b4157d25335e2225aca6539034b8fb013970414045b
 SHA512:
-  metadata.gz: 52c7d713936d04fbcd76e0605d0eaf022800c3ca0ce3e5424630ff12486fa0cfdf786c693099211e2e2a5b2fe483a8eb1ab80a96eef92552397eaef348579ee8
-  data.tar.gz: 76d621f1fc7779830b15768ae21c37e95c5baf0a0949deb59d5d6677a35d68519d12a1bb05299c292420ca1062d73267acb944e77d88ae45b1a57499361c90b2
+  metadata.gz: a0b79bd8f47b5c27d4332c2bb523b79680fe2fba04082c329e83e7d13a9f5749b004195f65098d92e9b85f5834749011d63ec346e2f564a08bb26d03d4bfc1f3
+  data.tar.gz: db88b4119f7679277736d40f1b43f015c501e0b3729c043de1fc2f707904ac917dc1231d9124ee46b96f25226dec7589441d75cab2e5563977eb55bed0549b76

data/lib/bridgetown-core/concerns/site/processable.rb

@@ -20,8 +20,6 @@ class Bridgetown::Site
       print_stats if config["profile"]
     end
 
-    # rubocop:disable Metrics/AbcSize
-
     # Reset all in-memory data and content.
     # @return [void]
     def reset
@@ -49,8 +47,6 @@ class Bridgetown::Site
       Bridgetown::Hooks.trigger :site, :after_reset, self
     end
 
-    # rubocop:enable Metrics/AbcSize
-
     # Read data from disk and load it into internal memory.
     # @return [void]
     def read

data/lib/bridgetown-core/converters/erb_templates.rb

@@ -101,6 +101,8 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
+        return content if convertible.data[:template_engine] != "erb"
+
         erb_view = Bridgetown::ERBView.new(convertible)
 
         erb_renderer = Tilt::ErubiTemplate.new(
@@ -123,10 +125,13 @@ module Bridgetown
         if convertible.data[:template_engine] == "erb" ||
             (convertible.data[:template_engine].nil? &&
               @config[:template_engine] == "erb")
+          convertible.data[:template_engine] = "erb"
           return true
         end
 
-        super(ext)
+        super(ext).tap do |ext_matches|
+          convertible.data[:template_engine] = "erb" if ext_matches
+        end
       end
 
       def output_ext(ext)

data/lib/bridgetown-core/converters/liquid_templates.rb

@@ -23,7 +23,10 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
+        return content if convertible.data[:template_engine] != "liquid"
+
         self.class.cached_partials ||= {}
+        @payload = nil
 
         @site = convertible.site
         if convertible.is_a?(Bridgetown::Layout)
@@ -53,9 +56,14 @@ module Bridgetown
       # rubocop: enable Metrics/AbcSize
 
       def matches(ext, convertible)
-        return true if convertible.render_with_liquid?
+        if convertible.render_with_liquid?
+          convertible.data[:template_engine] = "liquid"
+          return true
+        end
 
-        super(ext)
+        super(ext).tap do |ext_matches|
+          convertible.data[:template_engine] = "liquid" if ext_matches
+        end
       end
 
       def output_ext(ext)

data/lib/bridgetown-core/readers/layout_reader.rb

@@ -6,7 +6,7 @@ module Bridgetown
 
     def initialize(site)
       @site = site
-      @layouts = {}
+      @layouts = HashWithDotAccess::Hash.new
     end
 
     def read

data/lib/bridgetown-core/renderer.rb

@@ -79,8 +79,7 @@ module Bridgetown
       rescue StandardError => e
         Bridgetown.logger.error "Conversion error:",
                                 "#{converter.class} encountered an error while "\
-                                "converting '#{document.relative_path}':"
-        Bridgetown.logger.error("", e.to_s)
+                                "converting `#{document.relative_path}'"
         raise e
       end
     end
@@ -145,13 +144,12 @@ module Bridgetown
         layout.current_document = document
         layout.current_document_output = output
         converter.convert layout_output, layout
+      rescue StandardError => e
+        Bridgetown.logger.error "Conversion error:",
+                                "#{converter.class} encountered an error while "\
+                                "converting `#{document.relative_path}'"
+        raise e
       end
-    rescue StandardError => e
-      Bridgetown.logger.error "Conversion error:",
-                              "#{converter.class} encountered an error while "\
-                              "converting '#{document.relative_path}':"
-      Bridgetown.logger.error("", e.to_s)
-      raise e
     end
 
     def add_regenerator_dependencies(layout)

data/lib/bridgetown-core/ruby_template_view.rb

@@ -38,8 +38,8 @@ module Bridgetown
       site.site_payload.site
     end
 
-    def liquid_render(component, options = {})
-      options[:_block_content] = yield if block_given?
+    def liquid_render(component, options = {}, &block)
+      options[:_block_content] = capture(&block) if block && respond_to?(:capture)
       render_statement = _render_statement(component, options)
 
       template = site.liquid_renderer.file(

data/lib/bridgetown-core/tags/render_content.rb

@@ -3,7 +3,7 @@
 module Bridgetown
   module Tags
     class BlockRenderTag < Liquid::Block
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
       def render(context)
         context.stack({}) do
           # unindent the incoming text
@@ -37,7 +37,7 @@ module Bridgetown
             .render_tag(context, +"")
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength
 
       private
 

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.18.0"
+  VERSION = "0.18.5"
   CODE_NAME = "Taylor Street"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.5
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport