bridgetown-core 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306a26e30d93c885f8e9580f31df3f10757b8d686337ac851a33c354689be225
-  data.tar.gz: 2e258edc76ea89224865c9cbc48d9ae5fcd9dacd2070d99953c6f567644237ac
+  metadata.gz: aff1b7af860afa9442e9a9cc6f34b0dd48fa6677248a118acc794a60de6f6328
+  data.tar.gz: 3cfc657c9c5958cdf45cddf6bac5b1c84de276a8b10000b6b7a4c28d977f4ec1
 SHA512:
-  metadata.gz: 9a03b2aaabcf0066e0cb634c95f9b5819db23b472887e1048b78e589c9815615986ed8bb943b77f8d272221448608a95f489d6db21508703dbf3123ec31623a1
-  data.tar.gz: 2fc8d22203172c03db70520f430292833360c0eb39c91dde1a8d17d498c726295a8bc7183310468f981e5d236fa31a26fc3a564beb6e8179922d3975db6f876e
+  metadata.gz: ab2136623a924cead3223313b7ccd2cf46ffcc3c1c34de6096162d309e7e91ae2e1ce7af61abba4bc564cef67906977efead5780a27e5c4c407f14c2250e591e
+  data.tar.gz: 0a6a770a52c1d23906c5bfbe7fc45a60666dcdb25359eb184585594d94ef4de9ef97c4587b4272a3dc95f1a3a2bdeb8b9327ab92b621a0a9672e3ec33aeb7b83

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,6 +23,8 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
+        return content if convertible.data[:template_engine] != "liquid"
+
         self.class.cached_partials ||= {}
 
         @site = convertible.site
@@ -53,9 +55,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/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.18.2"
+  VERSION = "0.18.3"
   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.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport