bridgetown-core 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54c0a2a041830e819a8f60b45164f00fa833bc5d795941599969bb967e550ae
-  data.tar.gz: 81bf01e9efec7ea134d9c76de18a0b19bdd4d9addc7d0011a03fc038d18890f3
+  metadata.gz: 9ceaadbfc504f5ac87f7ffbca7b5b87ed2967f564a12ca69f577f9d3a5216cf4
+  data.tar.gz: be1d543b08eb98d7e02f7f0eb00d0e31d112363601f716956e140e1949f09d8e
 SHA512:
-  metadata.gz: 8746742cc41353b34c8f91549b1981034014fb35cb23ea4b3077b96c9c41ca10470e688c78b106b1d7b1655ca0503e01e9095bcc0f17ac3afdc8aadd891f49f9
-  data.tar.gz: 50c6e804f3712ab3a30fafddbde9c5a0c9c04487b8a3f671fb9bc8cdd1d5fb14b64913b0f048672592ef15fad8d2c5aad1e0f3c348c6fce5479fdfa13f718aa2
+  metadata.gz: 9e7b7feb4ee52314b2ca52893c22484e2419f0af871519e8f5417b04cc8dce91bf1b65931a993b0ae46c7c62a7ee77fabd8c210ec2f1cac4b21af6ce6d14a22e
+  data.tar.gz: c4e9971e2887f3c2490c21a7207d684fa6c8194e5c27b7a375f81a7aca79d0b42632f96b7a6762e25c6749be22976cba84c234d2b176d92082f342c5e8465369

data/lib/bridgetown-core/commands/new.rb

@@ -69,6 +69,9 @@ module Bridgetown
             #
             # Happy Bridgetowning!
 
+            # Pull in latest Liquid from Shopify with new Render tag
+            gem 'liquid', "> 4.0.3", github: "jaredcwhite/liquid"
+
             gem "bridgetown", "~> #{Bridgetown::VERSION}"
 
           RUBY

data/lib/bridgetown-core/configuration.rb

@@ -14,6 +14,7 @@ module Bridgetown
       "cache_dir"           => ".bridgetown-cache",
       "layouts_dir"         => "_layouts",
       "data_dir"            => "_data",
+      "components_dir"      => "_components",
       "includes_dir"        => "_includes",
       "collections"         => {},
 

data/lib/bridgetown-core/liquid_renderer.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "liquid_renderer/file_system"
 require_relative "liquid_renderer/file"
 require_relative "liquid_renderer/table"
 
@@ -11,6 +12,12 @@ module Bridgetown
 
     def initialize(site)
       @site = site
+
+      # Set up Liquid file system access to components for the Render tag
+      Liquid::Template.file_system = LiquidRenderer::FileSystem.new(
+        @site.components_load_paths, "%s.liquid"
+      )
+
       Liquid::Template.error_mode = @site.config["liquid"]["error_mode"].to_sym
       reset
     end

data/lib/bridgetown-core/liquid_renderer/file.rb

@@ -10,7 +10,12 @@ module Bridgetown
 
       def parse(content)
         measure_time do
-          @renderer.cache[@filename] ||= Liquid::Template.parse(content, line_numbers: true)
+          # Remove extraneous indentation for rendercontent tags
+          processed_content = content.gsub(%r!^[ \t]+{%-? rendercontent!, "{% rendercontent")
+
+          @renderer.cache[@filename] ||= Liquid::Template.parse(
+            processed_content, line_numbers: true
+          )
         end
         @template = @renderer.cache[@filename]
 

data/lib/bridgetown-core/liquid_renderer/file_system.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  class LiquidRenderer
+    class FileSystem < Liquid::LocalFileSystem
+      def read_template_file(template_path)
+        load_paths = root
+        found_paths = []
+
+        load_paths.each do |load_path|
+          # Use Liquid's gut checks to verify template pathname
+          self.root = load_path
+          full_template_path = full_path(template_path)
+
+          # Look for .liquid as well as .html extensions
+          path_variants = [
+            Pathname.new(full_template_path),
+            Pathname.new(full_template_path).sub_ext(".html"),
+          ]
+
+          found_paths << path_variants.find(&:exist?)
+        end
+
+        # Restore pristine state
+        self.root = load_paths
+
+        found_paths.compact!
+
+        raise Liquid::FileSystemError, "No such template '#{template_path}'" if found_paths.empty?
+
+        # Last path in the list wins
+        ::File.read(found_paths.last)
+      end
+    end
+  end
+end

data/lib/bridgetown-core/site.rb

@@ -10,7 +10,8 @@ module Bridgetown
                   :plugin_manager
 
     attr_accessor :converters, :generators, :reader
-    attr_reader   :regenerator, :liquid_renderer, :includes_load_paths
+    attr_reader   :regenerator, :liquid_renderer, :components_load_paths,
+                  :includes_load_paths
 
     # Public: Initialize a new Site.
     #
@@ -52,6 +53,7 @@ module Bridgetown
 
       configure_cache
       configure_plugins
+      configure_component_paths
       configure_include_paths
       configure_file_read_opts
 
@@ -435,6 +437,20 @@ module Bridgetown
       self.plugins        = plugin_manager.plugins_path
     end
 
+    def configure_component_paths
+      @components_load_paths = config["components_dir"].then do |dir|
+        dir.is_a?(Array) ? dir : [dir]
+      end
+      @components_load_paths.map! do |dir|
+        if !!(dir =~ %r!^\.\.?\/!)
+          # allow ./dir or ../../dir type options
+          File.expand_path(dir.to_s, root_dir)
+        else
+          in_source_dir(dir.to_s)
+        end
+      end
+    end
+
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
     end

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

@@ -99,16 +99,9 @@ module Bridgetown
 
       def locate_include_file(context, file)
         includes_dirs = tag_includes_dirs(context)
-        # TODO: component folder should be configured separately
-        if file.start_with?("_components")
-          first_dir = includes_dirs.first
-          path = PathManager.join(first_dir.sub(%r!/_includes$!, ""), file)
-          return path if valid_include_file?(path, first_dir.to_s)
-        else
-          includes_dirs.each do |dir|
-            path = PathManager.join(dir, file)
-            return path if valid_include_file?(path, dir.to_s)
-          end
+        includes_dirs.each do |dir|
+          path = PathManager.join(dir, file)
+          return path if valid_include_file?(path, dir.to_s)
         end
         raise IOError, could_not_locate_message(file, includes_dirs)
       end
@@ -184,7 +177,6 @@ module Bridgetown
 
       private
 
-      # TODO: update this to support components as well
       def could_not_locate_message(file, includes_dirs)
         "Could not locate the included file '#{file}' in any of #{includes_dirs}." \
           " Ensure it exists in one of those directories."

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class BlockRenderTag < Liquid::Block
+      def initialize(tag_name, markup, options)
+        super
+
+        @tag = tag_name
+        @markup = markup
+        @options = options
+      end
+
+      def render(context)
+        content = super.gsub(%r!^[ \t]+!, "") # unindent the incoming text
+
+        site = context.registers[:site]
+        converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
+        markdownified_content = converter.convert(content)
+
+        context.stack do
+          context["componentcontent"] = markdownified_content
+          render_params = "#{@markup}, content: componentcontent"
+          render_tag = Liquid::Render.parse("render", render_params, @options, @parse_context)
+          render_tag.render_tag(context, +"")
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("rendercontent", Bridgetown::Tags::BlockRenderTag)

data/lib/bridgetown-core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -236,6 +236,7 @@ files:
 - lib/bridgetown-core/liquid_extensions.rb
 - lib/bridgetown-core/liquid_renderer.rb
 - lib/bridgetown-core/liquid_renderer/file.rb
+- lib/bridgetown-core/liquid_renderer/file_system.rb
 - lib/bridgetown-core/liquid_renderer/table.rb
 - lib/bridgetown-core/log_adapter.rb
 - lib/bridgetown-core/log_writer.rb
@@ -258,11 +259,11 @@ files:
 - lib/bridgetown-core/renderer.rb
 - lib/bridgetown-core/site.rb
 - lib/bridgetown-core/static_file.rb
-- lib/bridgetown-core/tags/component.rb
 - lib/bridgetown-core/tags/highlight.rb
 - lib/bridgetown-core/tags/include.rb
 - lib/bridgetown-core/tags/link.rb
 - lib/bridgetown-core/tags/post_url.rb
+- lib/bridgetown-core/tags/render_content.rb
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb

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

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  module Tags
-    class BlockComponentTag < Liquid::Block
-      def initialize(tag_name, markup, tokens)
-        super
-
-        filename, @extra_params = markup.strip.split(" ", 2)
-        @component_path = "_components/#{filename.strip}.html"
-
-        @tag_name = tag_name
-      end
-
-      def render(context)
-        markdown_content = super
-
-        site = context.registers[:site]
-        converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
-        markdownified_content = converter.convert(markdown_content)
-
-        context.stack do
-          context["componentcontent"] = markdownified_content
-          include_params = "#{@component_path} content=componentcontent"
-          include_params = "#{include_params} #{@extra_params}" if @extra_params
-          include_tag = IncludeTag.parse("include", include_params, [], @parse_context)
-          include_tag.render(context)
-        end
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag("component", Bridgetown::Tags::BlockComponentTag)