bridgetown-core 0.18.1 → 0.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d25b97e8914ef6cab51dcd4de4c2f17f8ba44fa27acf05ed87ef205785a440f
-  data.tar.gz: 556ab43a620ac12adf2d9e68abf42cb0a0143abc513dc2f579b8ee030103cf9b
+  metadata.gz: fad1c759bc15d188091ea79b5da7beee2b1b2f41c0bdac3d6196b4066a376379
+  data.tar.gz: 9dc54e1b1f2563bfeaf3e9cbb51cc0ca48bbf2f713aa030d027a34d3c7388b0f
 SHA512:
-  metadata.gz: cc580ed174c76f365c6b15fff1dbf7927c1b94735833496f5397dff564688e5c132f120320158fc201cbc9b2f8fb25724b428cc99ed7021d9c1a478d860cecb9
-  data.tar.gz: 50ba14145c5e255e3a0c10c22ea067fe655fd97b47596359a13762fc33dd323c7183015b1908106a21a7387064f181bba3f880f1520ea33104c2baa153d96b53
+  metadata.gz: 3c7ff76d444621a53ec11a7cb47df4a84012aea31318b821ab2446add1eb187ce306c0623fa55cb8c790a35817da0e73c4eb69cd8caed979c3acbcdb295ce866
+  data.tar.gz: 89708630ae7ced2085ba9577cd23d2d434230d79410eaeabc396483b86c041bbac78bec7fdb0ffb6ff45ff886e69dd4a9ca13d0719c04be96397288498b0d5e0

data/lib/bridgetown-core.rb

@@ -44,6 +44,14 @@ require "i18n"
 require "faraday"
 require "thor"
 
+module HashWithDotAccess
+  class Hash # :nodoc:
+    def to_liquid
+      to_h.to_liquid
+    end
+  end
+end
+
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 # Create our little String subclass for Ruby Front Matter

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/filters.rb

@@ -127,7 +127,7 @@ module Bridgetown
     def obfuscate_link(input, prefix = "mailto")
       link = "<a href=\"#{prefix}:#{input}\">#{input}</a>"
       script = "<script type=\"text/javascript\">document.currentScript.insertAdjacentHTML("
-      script += "beforebegin', '#{rot47(link)}'.replace(/[!-~]/g,"
+      script += "beforebegin', '#{rot47(link).gsub(%r!\\!, '\\\\\\')}'.replace(/[!-~]/g,"
       script += "function(c){{var j=c.charCodeAt(0);if((j>=33)&&(j<=126)){"
       script += "return String.fromCharCode(33+((j+ 14)%94));}"
       script += "else{return String.fromCharCode(j);}}}));</script>"

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/utils/ruby_exec.rb

@@ -20,14 +20,14 @@ module Bridgetown
             v.each do |nested_k, nested_v|
               next unless nested_v.is_a?(Rb)
 
-              Bridgetown.logger.warn("Executing inline Ruby…", convertible.relative_path)
+              Bridgetown.logger.debug("Executing inline Ruby…", convertible.relative_path)
               convertible.data[k][nested_k] = run(nested_v, convertible, renderer)
-              Bridgetown.logger.warn("Inline Ruby completed!", convertible.relative_path)
+              Bridgetown.logger.debug("Inline Ruby completed!", convertible.relative_path)
             end
           else
-            Bridgetown.logger.warn("Executing inline Ruby…", convertible.relative_path)
+            Bridgetown.logger.debug("Executing inline Ruby…", convertible.relative_path)
             convertible.data[k] = run(v, convertible, renderer)
-            Bridgetown.logger.warn("Inline Ruby completed!", convertible.relative_path)
+            Bridgetown.logger.debug("Inline Ruby completed!", convertible.relative_path)
           end
         end
       end

data/lib/bridgetown-core/version.rb

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

data/lib/site_template/package.json

@@ -5,9 +5,10 @@
   "scripts": {
     "build": "bundle exec bridgetown build",
     "serve": "bundle exec bridgetown serve",
+    "clean": "bundle exec bridgetown clean",
     "webpack-build": "webpack --mode production",
     "webpack-dev": "webpack --mode development -w",
-    "deploy": "yarn webpack-build && yarn build",
+    "deploy": "yarn clean && yarn webpack-build && yarn build",
     "sync": "node sync.js",
     "start": "node start.js"
   },

metadata

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