bridgetown-core 0.19.2 → 0.21.0.beta3

data/lib/bridgetown-core/resource/transformer.rb

@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Resource
+    class Transformer
+      # @return [Array<Hash>]
+      attr_reader :conversions
+
+      # @return [Bridgetown::Resource::Base]
+      attr_reader :resource
+
+      # @return [Bridgetown::Site]
+      attr_reader :site
+
+      def initialize(resource)
+        @resource = resource
+        @site = resource.site
+        @conversions = []
+      end
+
+      # @return [String]
+      def output_ext
+        @output_ext ||= output_ext_from_converters
+      end
+
+      # @return [String]
+      def final_ext
+        output_ext # we always need this to get run
+
+        permalink_ext || output_ext
+      end
+
+      def process!
+        Bridgetown.logger.debug "Transforming:", resource.relative_path
+        resource.around_hook :render do
+          run_conversions
+          resource.place_in_layout? ? place_into_layouts : resource.output = resource.content.dup
+        end
+      end
+
+      def execute_inline_ruby!
+        return unless site.config.should_execute_inline_ruby?
+
+        Bridgetown::Utils::RubyExec.search_data_for_ruby_code(resource, self)
+      end
+
+      def inspect
+        "#<#{self.class} Conversion Steps: #{conversions.length}>"
+      end
+
+      private
+
+      ### Utilities
+
+      def permalink_ext
+        resource_permalink = resource.permalink
+        if resource_permalink &&
+            !resource_permalink.end_with?("/") &&
+            !resource_permalink.end_with?(".*")
+          permalink_ext = File.extname(resource_permalink)
+          permalink_ext unless permalink_ext.empty?
+        end
+      end
+
+      # @return [Array<Bridgetown::Converter>]
+      def converters
+        @converters ||= site.matched_converters_for_convertible(resource)
+      end
+
+      # @return [String]
+      def output_ext_from_converters
+        @conversions = converters.map do |converter|
+          {
+            converter: converter,
+            output_ext: converter.output_ext(resource.extname),
+          }
+        end
+
+        conversions
+          .reverse
+          .find do |conversion|
+            conversions.length == 1 ||
+              !conversion[:converter].is_a?(Bridgetown::Converters::Identity)
+          end
+          .fetch(:output_ext)
+      end
+
+      # @return [Array<Bridgetown::Layout>]
+      def validated_layouts
+        layout = site.layouts[resource.data.layout]
+        warn_on_missing_layout layout, resource.data.layout
+
+        layout_list = Set.new([layout])
+        while layout
+          layout_name = layout.data.layout
+          layout = site.layouts[layout_name]
+          warn_on_missing_layout layout, layout_name
+
+          layout_list << layout
+        end
+
+        layout_list.to_a.compact
+      end
+
+      def warn_on_missing_layout(layout, layout_name)
+        if layout.nil? && layout_name
+          Bridgetown.logger.warn "Build Warning:", "Layout '#{layout_name}' " \
+          "requested via #{resource.relative_path} does not exist."
+        end
+      end
+
+      ### Transformation Actions
+
+      def run_conversions # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        input = resource.content.to_s
+
+        # @param content [String]
+        # @param converter [Bridgetown::Converter]
+        resource.content = converters.each_with_index.inject(input) do |content, (converter, index)|
+          output = if converter.method(:convert).arity == 1
+                     converter.convert content
+                   else
+                     converter.convert content, resource
+                   end
+          conversions[index] = {
+            type: :content,
+            converter: converter,
+            output: Bridgetown.env.production? ? nil : output,
+            output_ext: conversions[index]&.dig(:output_ext) ||
+              converter.output_ext(resource.extname),
+          }
+          output.html_safe
+        rescue StandardError => e
+          Bridgetown.logger.error "Conversion error:",
+                                  "#{converter.class} encountered an error while "\
+                                  "converting `#{resource.relative_path}'"
+          raise e
+        end
+      end
+
+      def place_into_layouts
+        Bridgetown.logger.debug "Placing in Layouts:", resource.relative_path
+        output = resource.content.dup
+        validated_layouts.each do |layout|
+          output = run_layout_conversions layout, output
+        end
+        resource.output = output
+      end
+
+      def run_layout_conversions(layout, output)
+        layout_converters = site.matched_converters_for_convertible(layout)
+        layout_input = layout.content.dup
+
+        layout_converters.inject(layout_input) do |content, converter|
+          next(content) unless [2, -2].include?(converter.method(:convert).arity)
+
+          layout.current_document = resource
+          layout.current_document_output = output
+          layout_output = converter.convert content, layout
+
+          conversions << {
+            type: :layout,
+            layout: layout,
+            converter: converter,
+            output: Bridgetown.env.production? ? nil : layout_output,
+          }
+          layout_output
+        rescue StandardError => e
+          Bridgetown.logger.error "Conversion error:",
+                                  "#{converter.class} encountered an error while "\
+                                  "converting `#{resource.relative_path}'"
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/bridgetown-core/ruby_template_view.rb

@@ -7,6 +7,7 @@ module Bridgetown
     require "bridgetown-core/helpers"
 
     attr_reader :layout, :page, :paginator, :site, :content
+    alias_method :resource, :page
 
     def initialize(convertible)
       if convertible.is_a?(Layout)
@@ -27,20 +28,17 @@ module Bridgetown
 
     def render(item, options = {}, &block)
       if item.respond_to?(:render_in)
-        previous_buffer_state = @_erbout
-        @_erbout = Bridgetown::ERBBuffer.new
-
-        @in_view_component ||= defined?(::ViewComponent::Base) && item.is_a?(::ViewComponent::Base)
         result = item.render_in(self, &block)
-        @in_view_component = false
-
-        @_erbout = previous_buffer_state
-        result
+        result&.html_safe
       else
-        partial(item, options, &block)
+        partial(item, options, &block)&.html_safe
       end
     end
 
+    def collections
+      site.collections
+    end
+
     def site_drop
       site.site_payload.site
     end
@@ -56,14 +54,15 @@ module Bridgetown
         Bridgetown.logger.warn "Liquid Warning:",
                                LiquidRenderer.format_error(e, path || document.relative_path)
       end
-      template.render!(options.deep_stringify_keys, _liquid_context)
+      template.render!(options.deep_stringify_keys, _liquid_context).html_safe
     end
 
     def helpers
       @helpers ||= Helpers.new(self, site)
     end
 
-    def method_missing(method, *args, &block)
+    # rubocop:disable Style/MissingRespondToMissing
+    ruby2_keywords def method_missing(method, *args, &block)
       if helpers.respond_to?(method.to_sym)
         helpers.send method.to_sym, *args, &block
       else
@@ -74,6 +73,7 @@ module Bridgetown
     def respond_to_missing?(method, include_private = false)
       helpers.respond_to?(method.to_sym, include_private) || super
     end
+    # rubocop:enable Style/MissingRespondToMissing
 
     private
 

data/lib/bridgetown-core/site.rb

@@ -26,12 +26,15 @@ module Bridgetown
     # @return [Array<Page>]
     attr_accessor :pages
 
-    attr_accessor :exclude, :include, :lsi, :highlighter, :permalink_style,
-                  :time, :future, :unpublished, :limit_posts,
-                  :keep_files, :baseurl, :data, :file_read_opts,
-                  :plugin_manager, :converters, :generators, :reader
+    # NOTE: Eventually pages will be deprecated once the Resource content engine
+    # is default
+    alias_method :generated_pages, :pages
 
-    # Public: Initialize a new Site.
+    attr_accessor :permalink_style, :time, :baseurl, :data,
+                  :file_read_opts, :plugin_manager, :converters,
+                  :generators, :reader
+
+    # Initialize a new Site.
     #
     # config - A Hash containing site configuration details.
     def initialize(config)
@@ -46,7 +49,7 @@ module Bridgetown
 
       ensure_not_in_dest
 
-      Bridgetown.sites << self
+      Bridgetown::Current.site = self
       Bridgetown::Hooks.trigger :site, :after_init, self
 
       reset   # Processable
@@ -64,5 +67,9 @@ module Bridgetown
         end
       end
     end
+
+    def inspect
+      "#<Bridgetown::Site #{metadata.inspect.delete_prefix("{").delete_suffix("}")}>"
+    end
   end
 end

data/lib/bridgetown-core/static_file.rb

@@ -4,7 +4,7 @@ module Bridgetown
   class StaticFile
     extend Forwardable
 
-    attr_reader :relative_path, :extname, :name, :data
+    attr_reader :relative_path, :extname, :name, :data, :site, :collection
 
     def_delegator :to_liquid, :to_json, :to_json
 
@@ -25,8 +25,7 @@ module Bridgetown
     # base - The String path to the <source>.
     # dir  - The String path between <source> and the file.
     # name - The String filename of the file.
-    # rubocop: disable Metrics/ParameterLists
-    def initialize(site, base, dir, name, collection = nil)
+    def initialize(site, base, dir, name, collection = nil) # rubocop:disable Metrics/ParameterLists
       @site = site
       @base = base
       @dir  = dir
@@ -34,9 +33,15 @@ module Bridgetown
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
-      @data = @site.frontmatter_defaults.all(relative_path, type)
+      @data = @site.frontmatter_defaults.all(relative_path, type).with_dot_access
+      if site.uses_resource? && !data.permalink
+        data.permalink = if collection && !collection.builtin?
+                           "/:collection/:path.*"
+                         else
+                           "/:path.*"
+                         end
+      end
     end
-    # rubocop: enable Metrics/ParameterLists
 
     # Returns source file path.
     def path
@@ -51,8 +56,11 @@ module Bridgetown
     #
     # Returns destination file path.
     def destination(dest)
-      dest = @site.in_dest_dir(dest)
-      @site.in_dest_dir(dest, Bridgetown::URL.unescape_path(url))
+      dest = site.in_dest_dir(dest)
+      dest_url = url
+      dest_url = dest_url.delete_prefix(site.baseurl) if site.uses_resource? &&
+        site.baseurl.present? && collection
+      site.in_dest_dir(dest, Bridgetown::URL.unescape_path(dest_url))
     end
 
     def destination_rel_dir
@@ -118,6 +126,15 @@ module Bridgetown
       @basename ||= File.basename(name, extname).gsub(%r!\.*\z!, "")
     end
 
+    def relative_path_basename_without_prefix
+      return_path = Pathname.new("")
+      Pathname.new(cleaned_relative_path).each_filename do |filename|
+        return_path += filename unless filename.starts_with?("_")
+      end
+
+      (return_path.dirname + return_path.basename(".*")).to_s
+    end
+
     def placeholders
       {
         collection: @collection.label,
@@ -154,15 +171,21 @@ module Bridgetown
     # be overriden in the collection's configuration in bridgetown.config.yml.
     def url
       @url ||= begin
-        base = if @collection.nil? || @collection.label == "posts"
+        newly_processed = false
+        special_posts_case = @collection&.label == "posts" &&
+          site.config.content_engine != "resource"
+        base = if @collection.nil? || special_posts_case
                  cleaned_relative_path
+               elsif site.uses_resource?
+                 newly_processed = true
+                 Bridgetown::Resource::PermalinkProcessor.new(self).transform
                else
                  Bridgetown::URL.new(
                    template: @collection.url_template,
                    placeholders: placeholders
                  )
                end.to_s.chomp("/")
-        base << extname
+        newly_processed ? base : "#{base}#{extname}"
       end
     end
 
@@ -174,7 +197,7 @@ module Bridgetown
     # Returns the front matter defaults defined for the file's URL and/or type
     # as defined in bridgetown.config.yml.
     def defaults
-      @defaults ||= @site.frontmatter_defaults.all url, type
+      @defaults ||= site.frontmatter_defaults.all url, type
     end
 
     # Returns a debug string on inspecting the static file.

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

@@ -36,13 +36,11 @@ module Bridgetown
         code = super.to_s.gsub(LEADING_OR_TRAILING_LINE_TERMINATORS, "")
 
         output =
-          case context.registers[:site].highlighter
+          case context.registers[:site].config.highlighter
           when "rouge"
             render_rouge(code)
-          when "pygments"
-            render_pygments(code, context)
           else
-            render_codehighlighter(code)
+            h(code).strip
           end
 
         rendered_output = add_code_tag(output)
@@ -72,13 +70,6 @@ module Bridgetown
         options
       end
 
-      def render_pygments(code, _context)
-        Bridgetown.logger.warn "Warning:", "Highlight Tag no longer supports" \
-                                " rendering with Pygments."
-        Bridgetown.logger.warn "", "Using the default highlighter, Rouge, instead."
-        render_rouge(code)
-      end
-
       def render_rouge(code)
         require "rouge"
         formatter = ::Rouge::Formatters::HTMLLegacy.new(
@@ -92,10 +83,6 @@ module Bridgetown
         formatter.format(lexer.lex(code))
       end
 
-      def render_codehighlighter(code)
-        h(code).strip
-      end
-
       def add_code_tag(code)
         code_attributes = [
           "class=\"language-#{@lang.to_s.tr("+", "-")}\"",

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

@@ -112,7 +112,7 @@ module Bridgetown
       def locate_include_file(context, file)
         includes_dirs = tag_includes_dirs(context)
         includes_dirs.each do |dir|
-          path = PathManager.join(dir, file)
+          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)

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

@@ -77,14 +77,14 @@ module Bridgetown
         @context = context
         site = context.registers[:site]
 
-        site.posts.docs.each do |document|
+        site.collections.posts.docs.each do |document|
           return relative_url(document) if @post == document
         end
 
         # New matching method did not match, fall back to old method
         # with deprecation warning if this matches
 
-        site.posts.docs.each do |document|
+        site.collections.posts.docs.each do |document|
           next unless @post.deprecated_equality document
 
           Bridgetown::Deprecator.deprecation_message "A call to "\

data/lib/bridgetown-core/url.rb

@@ -129,6 +129,7 @@ module Bridgetown
     #
     # Returns the escaped path.
     def self.escape_path(path)
+      path = path.to_s
       return path if path.empty? || %r!^[a-zA-Z0-9./-]+$!.match?(path)
 
       # Because URI.escape doesn't escape "?", "[" and "]" by default,