bridgetown-core 0.19.3 → 0.21.0.beta4

data/lib/bridgetown-core/converters/identity.rb

@@ -25,15 +25,6 @@ module Bridgetown
       def output_ext(ext)
         ext
       end
-
-      # Logic to do the content conversion.
-      #
-      # content - String content of file (without front matter).
-      #
-      # Returns a String of the converted content.
-      def convert(content)
-        content
-      end
     end
   end
 end

data/lib/bridgetown-core/converters/liquid_templates.rb

@@ -18,7 +18,7 @@ module Bridgetown
       # Logic to do the Liquid content conversion.
       #
       # @param content [String] Content of the file (without front matter).
-      # @params convertible [Bridgetown::Page, Bridgetown::Document, Bridgetown::Layout]
+      # @param convertible [Bridgetown::Page, Bridgetown::Document, Bridgetown::Layout]
       #   The instantiated object which is processing the file.
       #
       # @return [String] The converted content.

data/lib/bridgetown-core/converters/markdown.rb

@@ -22,7 +22,9 @@ module Bridgetown
           raise Errors::FatalException, "Invalid Markdown processor given: #{@config["markdown"]}"
         end
 
-        @cache = Bridgetown::Cache.new("Bridgetown::Converters::Markdown")
+        unless @config.cache_markdown == false || @config.kramdown.input == "GFMExtractions"
+          @cache = Bridgetown::Cache.new("Bridgetown::Converters::Markdown")
+        end
         @setup = true
       end
 
@@ -59,10 +61,18 @@ module Bridgetown
       # content - String content of file (without front matter).
       #
       # Returns a String of the converted content.
-      def convert(content)
+      def convert(content, convertible = nil)
         setup
-        @cache.getset(content) do
-          @parser.convert(content)
+        if @cache
+          @cache.getset(content) do
+            @parser.convert(content)
+          end
+        else
+          output = @parser.convert(content)
+          if convertible && @parser.respond_to?(:extractions)
+            convertible.data.markdown_extractions = @parser.extractions
+          end
+          output
         end
       end
 

data/lib/bridgetown-core/converters/markdown/kramdown_parser.rb

@@ -69,22 +69,14 @@ module Bridgetown
   module Converters
     class Markdown
       class KramdownParser
+        attr_reader :extractions
+
         def initialize(config)
-          @main_fallback_highlighter = config["highlighter"] || "rouge"
           @config = config["kramdown"] || {}
-          @highlighter = nil
-          setup
-          load_dependencies
-        end
-
-        # Setup and normalize the configuration:
-        #   * Create Kramdown if it doesn't exist.
-        #   * Set syntax_highlighter
-        #   * Make sure `syntax_highlighter_opts` exists.
-        def setup
-          @config["syntax_highlighter"] ||= highlighter
+          @config["syntax_highlighter"] ||= config["highlighter"] || "rouge"
           @config["syntax_highlighter_opts"] ||= {}
           @config["syntax_highlighter_opts"]["guess_lang"] = @config["guess_lang"]
+          require "kramdown-parser-gfm" if @config["input"] == "GFM"
         end
 
         def convert(content)
@@ -95,34 +87,9 @@ module Bridgetown
               Bridgetown.logger.warn "Kramdown warning:", warning
             end
           end
+          @extractions = document.root.options[:extractions] # could be nil
           html_output
         end
-
-        private
-
-        def load_dependencies
-          require "kramdown-parser-gfm" if @config["input"] == "GFM"
-
-          # `mathjax` emgine is bundled within kramdown-2.x and will be handled by
-          # kramdown itself.
-          if (math_engine = @config["math_engine"]) && math_engine != "mathjax"
-            Bridgetown::External.require_with_graceful_fail("kramdown-math-#{math_engine}")
-          end
-        end
-
-        # config[kramdown][syntax_higlighter] >
-        #   config[highlighter]
-        def highlighter
-          return @highlighter if @highlighter
-
-          if @config["syntax_highlighter"]
-            return @highlighter = @config[
-              "syntax_highlighter"
-            ]
-          end
-
-          @highlighter = @main_fallback_highlighter
-        end
       end
     end
   end

data/lib/bridgetown-core/converters/ruby_templates.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Converters
+    class RubyTemplates < Converter
+      priority :highest
+      input :rb
+
+      def convert(content, convertible)
+        erb_view = Bridgetown::ERBView.new(convertible)
+        erb_view.instance_eval(
+          content, convertible.relative_path.to_s, line_start(convertible)
+        ).to_s
+      end
+    end
+  end
+end

data/lib/bridgetown-core/converters/smartypants.rb

@@ -25,7 +25,9 @@ module Bridgetown
       priority :low
 
       def initialize(config)
-        Bridgetown::External.require_with_graceful_fail "kramdown" unless defined?(Kramdown)
+        unless defined?(Kramdown)
+          Bridgetown::Utils::RequireGems.require_with_graceful_fail "kramdown"
+        end
         @config = config["kramdown"].dup || {}
         @config[:input] = :SmartyPants
       end

data/lib/bridgetown-core/core_ext/psych.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module CoreExt
+    module Psych
+      module SafeLoadFile
+        def safe_load_file(filename, **kwargs)
+          File.open(filename, "r:bom|utf-8") do |f|
+            if RUBY_VERSION.start_with?("2.5")
+              safe_load f, kwargs[:permitted_classes], [], false, filename
+            else
+              safe_load f, filename: filename, **kwargs
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bridgetown-core/current.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  class Current < ActiveSupport::CurrentAttributes
+    # @!method self.site
+    #   @return [Bridgetown::Site]
+
+    attribute :site
+  end
+end

data/lib/bridgetown-core/document.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Bridgetown
+  # TODO: to be retired once the Resource engine is made official
   class Document
     extend Forwardable
     include DataAccessible
@@ -52,7 +53,7 @@ module Bridgetown
       @has_yaml_header = nil
 
       data.default_proc = proc do |_, key|
-        site.frontmatter_defaults.find(relative_path, type, key)
+        site.frontmatter_defaults.find(relative_path, type, key.to_s)
       end
 
       trigger_hooks(:post_init)
@@ -81,7 +82,7 @@ module Bridgetown
     #
     # Return document date string.
     def date
-      data["date"] ||= site.time
+      data["date"] ||= site.time # TODO: this doesn't reflect documented behavior
     end
 
     # Return document file modification time in the form of a Time object.
@@ -223,7 +224,7 @@ module Bridgetown
       Bridgetown.logger.debug "Reading:", relative_path
 
       if yaml_file?
-        @data = SafeYAML.load_file(path)
+        @data = YAMLParser.load_file(path)
       else
         begin
           merge_defaults
@@ -357,7 +358,7 @@ module Bridgetown
       self.content = File.read(path, **Utils.merged_file_read_opts(site, opts))
       if content =~ YAML_FRONT_MATTER_REGEXP
         self.content = $POSTMATCH
-        data_file = SafeYAML.load(Regexp.last_match(1))
+        data_file = YAMLParser.load(Regexp.last_match(1))
         merge_data!(data_file, source: "YAML front matter") if data_file
       end
     end
@@ -402,21 +403,13 @@ module Bridgetown
     end
 
     def populate_categories
-      categories = Array(data["categories"]) + Utils.pluralized_array_from_hash(
-        data, "category", "categories"
-      )
-      categories.map!(&:to_s)
-      categories.flatten!
-      categories.uniq!
-
-      merge_data!({ "categories" => categories })
+      data.categories = Utils.pluralized_array_from_hash(
+        data, :category, :categories
+      ).map(&:to_s)
     end
 
     def populate_tags
-      tags = Utils.pluralized_array_from_hash(data, "tag", "tags")
-      tags.flatten!
-
-      merge_data!({ "tags" => tags })
+      data.tags = Utils.pluralized_array_from_hash(data, :tag, :tags)
     end
 
     def determine_locale

data/lib/bridgetown-core/drops/collection_drop.rb

@@ -8,7 +8,7 @@ module Bridgetown
       mutable false
 
       def_delegator  :@obj, :write?, :output
-      def_delegators :@obj, :label, :docs, :files, :relative_path
+      def_delegators :@obj, :label, :docs, :files, :relative_path, :resources, :static_files
 
       private def_delegator :@obj, :metadata, :fallback_data
 

data/lib/bridgetown-core/drops/page_drop.rb

@@ -9,6 +9,10 @@ module Bridgetown
 
       def_delegators :@obj, :content, :dir, :name, :path, :url, :pager
       private def_delegator :@obj, :data, :fallback_data
+
+      def relative_url
+        @obj.relative_url
+      end
     end
   end
 end

data/lib/bridgetown-core/drops/relations_drop.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Drops
+    class RelationsDrop < Drop
+      mutable false
+
+      def [](type)
+        return nil unless type.to_s.in?(@obj.relation_types)
+
+        @obj.resources_for_type(type)
+      end
+
+      def key?(type)
+        type.to_s.in?(@obj.relation_types)
+      end
+
+      def fallback_data
+        {}
+      end
+    end
+  end
+end

data/lib/bridgetown-core/drops/resource_drop.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Drops
+    class ResourceDrop < Drop
+      extend Forwardable
+
+      NESTED_OBJECT_FIELD_BLACKLIST = %w(
+        content output excerpt next previous
+      ).freeze
+
+      mutable false
+
+      def_delegator :@obj, :relative_path, :path
+      def_delegators :@obj,
+                     :id,
+                     :data,
+                     :output,
+                     :content,
+                     :to_s,
+                     :absolute_url,
+                     :relative_path,
+                     :relative_url,
+                     :date,
+                     :taxonomies,
+                     :relations
+
+      private def_delegator :@obj, :data, :fallback_data
+
+      def collection
+        @collection ||= @obj.collection.to_liquid
+      end
+
+      def excerpt
+        fallback_data["excerpt"].to_s
+      end
+
+      def <=>(other)
+        return nil unless other.is_a? ResourceDrop
+
+        cmp = self["date"] <=> other["date"]
+        cmp = self["path"] <=> other["path"] if cmp.nil? || cmp.zero?
+        cmp
+      end
+
+      def previous
+        @previous ||= @obj.previous_resource.to_liquid
+      end
+
+      def next
+        @next ||= @obj.previous_resource.to_liquid
+      end
+
+      # Generate a Hash for use in generating JSON.
+      # This is useful if fields need to be cleared before the JSON can generate.
+      #
+      # state - the JSON::State object which determines the state of current processing.
+      #
+      # Returns a Hash ready for JSON generation.
+      def hash_for_json(state = nil)
+        to_h.tap do |hash|
+          # use collection label in the hash
+          hash["collection"] = hash["collection"]["label"] if hash["collection"]
+
+          if state && state.depth >= 2
+            hash["previous"] = collapse_document(hash["previous"]) if hash["previous"]
+            hash["next"]     = collapse_document(hash["next"]) if hash["next"]
+          end
+        end
+      end
+
+      # Generate a Hash which breaks the recursive chain.
+      # Certain fields which are normally available are omitted.
+      #
+      # Returns a Hash with only non-recursive fields present.
+      def collapse_document(doc)
+        doc.keys.each_with_object({}) do |(key, _), result|
+          result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key)
+        end
+      end
+    end
+  end
+end

data/lib/bridgetown-core/drops/site_drop.rb

@@ -7,35 +7,53 @@ module Bridgetown
 
       mutable false
 
-      def_delegator  :@obj, :data
-      def_delegators :@obj, :locale, :time, :pages, :static_files, :tags, :categories
+      def_delegators :@obj,
+                     :data,
+                     :locale,
+                     :time,
+                     :pages,
+                     :generated_pages,
+                     :static_files,
+                     :tags,
+                     :categories,
+                     :taxonomies,
+                     :taxonomy_types
 
       private def_delegator :@obj, :config, :fallback_data
 
       attr_writer :current_document
 
       def [](key)
-        if key != "posts" && @obj.collections.key?(key)
-          @obj.collections[key].docs
-        else
-          super(key)
+        if !@obj.uses_resource? && !%w(posts data).freeze.include?(key) &&
+            @obj.collections.key?(key)
+          return @obj.collections[key].docs
         end
+
+        super(key)
       end
 
       def key?(key)
-        (key != "posts" && @obj.collections.key?(key)) || super
+        (!@obj.uses_resource? && key != "posts" && @obj.collections.key?(key)) || super
+      end
+
+      def uses_resource
+        @obj.uses_resource?
       end
 
       def posts
-        @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a }
+        unless @obj.uses_resource?
+          @site_posts ||= @obj.collections.posts.docs.sort { |a, b| b <=> a }
+        end
       end
 
+      # TODO: deprecate before v1.0
       def html_pages
         @site_html_pages ||= @obj.pages.select do |page|
           page.html? || page.url.end_with?("/")
         end
       end
 
+      # TODO: deprecate before v1.0
       def collections
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
@@ -50,6 +68,10 @@ module Bridgetown
         @documents ||= @obj.documents
       end
 
+      def resources
+        @resources ||= @obj.resources
+      end
+
       def contents
         @contents ||= @obj.contents
       end
@@ -58,6 +80,9 @@ module Bridgetown
         @site_metadata ||= @obj.data["site_metadata"]
       end
 
+      # TODO: change this so you *do* use site.config...aka site.config.timezone,
+      # not site.timezone
+      #
       # return nil for `{{ site.config }}` even if --config was passed via CLI
       def config; end
     end