bridgetown-core 1.0.0.alpha4 → 1.0.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27c0421da5ef9512cd562b25dc8a8362ce5ec3b1a5f2421f03272218f5e7ba5d
-  data.tar.gz: d7456c59fe166e34360267efb6d4320ac1632aeb2acdc81235273178bd4fe4a5
+  metadata.gz: 1e1d25e217de2040b4951a2143b0968808ebcd755055351f1745579d362d57df
+  data.tar.gz: 61f132206080c941392bcd1f0bb995f349cadea050dba16b6c02753471e48706
 SHA512:
-  metadata.gz: 5ca5bce5112a869e3520c3662e221b21af7f64b0146cc879157a3dd720ffea2f9abd95f5dc704d9f5239ca941d143aa08882090edcbfb4d3d44301821029e313
-  data.tar.gz: a0236293b0e7342bcfe864497fac47cd270541ae3c97fc19d6edb6d50d4fe730d0b030bc1cb06e9647b763280e5929119cffc444e663c0fe00b3cf08b4f4af58
+  metadata.gz: 0ff3379e1bf073afd9fd9d5d882cea276c3130fa527e64586faba1c91f8e4d5563b8b59f8d4d3f78abe9589f59511d2c68e824803ba314bbf50a1270df07dfd2
+  data.tar.gz: 7a2afb73e70f34cc0e1e68ee0304c2973b760530ae51f4a6700caad90a897e9c636be4216653b6c08d43accaf9c47380f0217805c7e25c5527ccfafb09510d80

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

@@ -21,7 +21,6 @@ class Bridgetown::Site
 
       configure_cache
       configure_component_paths
-      configure_include_paths
       configure_file_read_opts
 
       self.permalink_style = (config["permalink"] || "pretty").to_sym
@@ -176,10 +175,6 @@ class Bridgetown::Site
       @components_load_paths = plugin_components_load_paths + local_components_load_paths
     end
 
-    def configure_include_paths
-      @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-    end
-
     def configure_file_read_opts
       self.file_read_opts = {}
       file_read_opts[:encoding] = config["encoding"] if config["encoding"]

data/lib/bridgetown-core/configuration.rb

@@ -20,7 +20,6 @@ module Bridgetown
       "layouts_dir"          => "_layouts",
       "data_dir"             => "_data",
       "components_dir"       => "_components",
-      "includes_dir"         => "_includes",
       "partials_dir"         => "_partials",
       "collections"          => {},
       "taxonomies"           => {

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.0.0.alpha4"
+  VERSION = "1.0.0.alpha5"
   CODE_NAME = "Pearl"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha4
+  version: 1.0.0.alpha5
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -476,7 +476,6 @@ files:
 - lib/bridgetown-core/tags/class_map.rb
 - lib/bridgetown-core/tags/find.rb
 - lib/bridgetown-core/tags/highlight.rb
-- lib/bridgetown-core/tags/include.rb
 - lib/bridgetown-core/tags/link.rb
 - lib/bridgetown-core/tags/live_reload_dev_js.rb
 - lib/bridgetown-core/tags/post_url.rb

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

@@ -1,216 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  module Tags
-    class IncludeTag < Liquid::Tag
-      class << self
-        attr_accessor :deprecation_message_shown
-      end
-
-      VALID_SYNTAX = %r!
-        ([\w-]+)\s*=\s*
-        (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w.-]+))
-      !x.freeze
-
-      # rubocop:disable Lint/MixedRegexpCaptureTypes
-      VARIABLE_SYNTAX = %r!
-        (?<variable>[^{]*(\{\{\s*[\w\-.]+\s*(\|.*)?\}\}[^\s{}]*)+)
-        (?<params>.*)
-      !mx.freeze
-      # rubocop:enable Lint/MixedRegexpCaptureTypes
-
-      FULL_VALID_SYNTAX = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!.freeze
-      VALID_FILENAME_CHARS = %r!^[\w/.-]+$!.freeze
-      INVALID_SEQUENCES = %r![./]{2,}!.freeze
-
-      def initialize(tag_name, markup, tokens)
-        super
-
-        unless self.class.deprecation_message_shown
-          Bridgetown.logger.warn "NOTICE: the {% include %} tag is deprecated and" \
-                                 " will be removed in Bridgetown 1.0. You should" \
-                                 " use the {% render %} tag instead."
-          self.class.deprecation_message_shown = true
-        end
-
-        matched = markup.strip.match(VARIABLE_SYNTAX)
-        if matched
-          @file = matched["variable"].strip
-          @params = matched["params"].strip
-        else
-          @file, @params = markup.strip.split(%r!\s+!, 2)
-        end
-        validate_params if @params
-        @tag_name = tag_name
-      end
-
-      def syntax_example
-        "{% #{@tag_name} file.ext param='value' param2='value' %}"
-      end
-
-      def parse_params(context)
-        params = {}
-        markup = @params
-
-        while (match = VALID_SYNTAX.match(markup))
-          markup = markup[match.end(0)..-1]
-
-          value = if match[2]
-                    match[2].gsub('\\"', '"')
-                  elsif match[3]
-                    match[3].gsub("\\'", "'")
-                  elsif match[4]
-                    context[match[4]]
-                  end
-
-          params[match[1]] = value
-        end
-        params
-      end
-
-      def validate_file_name(file)
-        return unless INVALID_SEQUENCES.match?(file) || !VALID_FILENAME_CHARS.match?(file)
-
-        raise ArgumentError, <<~MSG
-          Invalid syntax for include tag. File contains invalid characters or sequences:
-
-            #{file}
-
-          Valid syntax:
-
-            #{syntax_example}
-
-        MSG
-      end
-
-      def validate_params
-        return if FULL_VALID_SYNTAX.match?(@params)
-
-        raise ArgumentError, <<~MSG
-          Invalid syntax for include tag:
-
-          #{@params}
-
-          Valid syntax:
-
-          #{syntax_example}
-
-        MSG
-      end
-
-      # Grab file read opts in the context
-      def file_read_opts(context)
-        context.registers[:site].file_read_opts
-      end
-
-      # Render the variable if required
-      def render_variable(context)
-        Liquid::Template.parse(@file).render(context) if VARIABLE_SYNTAX.match?(@file)
-      end
-
-      def tag_includes_dirs(context)
-        context.registers[:site].includes_load_paths.freeze
-      end
-
-      def locate_include_file(context, file)
-        includes_dirs = tag_includes_dirs(context)
-        includes_dirs.each do |dir|
-          path = File.join(dir, file)
-          return path if valid_include_file?(path, dir.to_s)
-        end
-        raise IOError, could_not_locate_message(file, includes_dirs)
-      end
-
-      def render(context)
-        file = render_variable(context) || @file
-        validate_file_name(file)
-
-        path = locate_include_file(context, file)
-        return unless path
-
-        partial = load_cached_partial(path, context)
-
-        context.stack do
-          context["include"] = parse_params(context) if @params
-          begin
-            partial.render!(context)
-          rescue Liquid::Error => e
-            e.template_name = path
-            e.markup_context = "included " if e.markup_context.nil?
-            raise e
-          end
-        end
-      end
-
-      def load_cached_partial(path, context)
-        context.registers[:cached_partials] ||= {}
-        cached_partial = context.registers[:cached_partials]
-
-        if cached_partial.key?(path)
-          cached_partial[path]
-        else
-          unparsed_file = context.registers[:site]
-            .liquid_renderer
-            .file(path)
-          begin
-            cached_partial[path] = unparsed_file.parse(read_file(path, context))
-          rescue Liquid::Error => e
-            e.template_name = path
-            e.markup_context = "included " if e.markup_context.nil?
-            raise e
-          end
-        end
-      end
-
-      def valid_include_file?(path, _dir)
-        File.file?(path)
-      end
-
-      def realpath_prefixed_with?(path, dir)
-        File.exist?(path) && File.realpath(path).start_with?(dir)
-      rescue StandardError
-        false
-      end
-
-      # This method allows to modify the file content by inheriting from the class.
-      def read_file(file, context)
-        File.read(file, **file_read_opts(context))
-      end
-
-      private
-
-      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."
-      end
-    end
-
-    class IncludeRelativeTag < IncludeTag
-      def tag_includes_dirs(context)
-        Array(page_path(context)).freeze
-      end
-
-      def page_path(context)
-        if context.registers[:page].nil?
-          context.registers[:site].source
-        else
-          site = context.registers[:site]
-          page_payload = context.registers[:page]
-          resource_path = \
-            if page_payload["collection"].nil?
-              page_payload["path"]
-            else
-              File.join(site.config["collections_dir"], page_payload["path"])
-            end
-          # rubocop:disable Performance/DeleteSuffix
-          resource_path.sub!(%r!/#excerpt\z!, "")
-          # rubocop:enable Performance/DeleteSuffix
-          site.in_source_dir File.dirname(resource_path)
-        end
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag("include", Bridgetown::Tags::IncludeTag)
-Liquid::Template.register_tag("include_relative", Bridgetown::Tags::IncludeRelativeTag)