bridgetown-core 0.21.1 → 1.0.0.alpha1

data/lib/bridgetown-core/configuration.rb

@@ -34,32 +34,28 @@ module Bridgetown
       "encoding"             => "utf-8",
       "markdown_ext"         => "markdown,mkdown,mkdn,mkd,md",
       "strict_front_matter"  => false,
-      "slugify_categories"   => true,
       "slugify_mode"         => "pretty",
 
       # Filtering Content
-      "limit_posts"          => 0,
       "future"               => false,
       "unpublished"          => false,
       "ruby_in_front_matter" => true,
 
       # Conversion
+      "content_engine"       => "resource",
       "markdown"             => "kramdown",
       "highlighter"          => "rouge",
-      "lsi"                  => false,
       "excerpt_separator"    => "\n\n",
-      "incremental"          => false,
 
       # Serving
-      "detach"               => false, # default to not detaching the server
       "port"                 => "4000",
       "host"                 => "127.0.0.1",
       "base_path"            => "/",
       "show_dir_listing"     => false,
 
       # Output Configuration
-      "available_locales"    => ["en"],
-      "default_locale"       => "en",
+      "available_locales"    => [:en],
+      "default_locale"       => :en,
       "permalink"            => nil, # default is set according to content engine
       "timezone"             => nil, # use the local timezone
 
@@ -103,6 +99,7 @@ module Bridgetown
       def from(user_config, starting_defaults = DEFAULTS)
         Utils.deep_merge_hashes(starting_defaults.deep_dup, Configuration[user_config])
           .merge_environment_specific_options!
+          .setup_locales
           .add_default_collections
           .add_default_excludes
           .check_include_exclude
@@ -247,6 +244,12 @@ module Bridgetown
       self
     end
 
+    def setup_locales
+      self.default_locale = default_locale.to_sym
+      available_locales.map!(&:to_sym)
+      self
+    end
+
     def add_default_collections # rubocop:todo all
       # It defaults to `{}`, so this is only if someone sets it to null manually.
       return self if self[:collections].nil?
@@ -263,23 +266,16 @@ module Bridgetown
       self[:collections][:posts][:output] = true
       self[:collections][:posts][:sort_direction] ||= "descending"
 
-      if self[:content_engine] == "resource"
-        self[:permalink] = "pretty" if self[:permalink].blank?
-        self[:collections][:pages] = {} unless self[:collections][:pages]
-        self[:collections][:pages][:output] = true
-        self[:collections][:pages][:permalink] ||= "/:path/"
+      self[:permalink] = "pretty" if self[:permalink].blank?
+      self[:collections][:pages] = {} unless self[:collections][:pages]
+      self[:collections][:pages][:output] = true
+      self[:collections][:pages][:permalink] ||= "/:locale/:path/"
 
-        self[:collections][:data] = {} unless self[:collections][:data]
-        self[:collections][:data][:output] = false
+      self[:collections][:data] = {} unless self[:collections][:data]
+      self[:collections][:data][:output] = false
 
-        unless self[:collections][:posts][:permalink]
-          self[:collections][:posts][:permalink] = self[:permalink]
-        end
-      else
-        self[:permalink] = "date" if self[:permalink].blank?
-        unless self[:collections][:posts][:permalink]
-          self[:collections][:posts][:permalink] = style_to_permalink(self[:permalink])
-        end
+      unless self[:collections][:posts][:permalink]
+        self[:collections][:posts][:permalink] = self[:permalink]
       end
 
       self
@@ -304,26 +300,6 @@ module Bridgetown
         self["ruby_in_front_matter"]
     end
 
-    # Deprecated, to be removed when Bridgetown goes Resource-only
-    def style_to_permalink(permalink_style) # rubocop:todo Metrics/CyclomaticComplexity
-      case permalink_style.to_s.to_sym
-      when :pretty
-        "/:categories/:year/:month/:day/:title/"
-      when :simple
-        "/:categories/:title/"
-      when :none
-        "/:categories/:title:output_ext"
-      when :date
-        "/:categories/:year/:month/:day/:title:output_ext"
-      when :ordinal
-        "/:categories/:year/:y_day/:title:output_ext"
-      when :weekdate
-        "/:categories/:year/W:week/:short_day/:title:output_ext"
-      else
-        permalink_style.to_s
-      end
-    end
-
     def check_include_exclude
       %w(include exclude).each do |option|
         next unless key?(option)
@@ -333,11 +309,6 @@ module Bridgetown
               "'#{option}' should be set as an array, but was: #{self[option].inspect}."
       end
 
-      unless self[:include].include?("_pages") || self[:content_engine] == "resource"
-        # add _pages to includes set
-        self[:include] << "_pages"
-      end
-
       self
     end
 

data/lib/bridgetown-core/configurations/minitesting.rb

@@ -65,7 +65,7 @@ create_file "test/test_homepage.rb" do
     class TestHomepage < Minitest::Test
       context "homepage" do
         setup do
-          page = site.pages.find { |doc| doc.url == "/" }
+          page = site.collections.pages.resources.find { |doc| doc.relative_url == "/" }
           document_root page
         end
         should "exist" do

data/lib/bridgetown-core/configurations/turbo.rb

@@ -13,4 +13,4 @@ javascript_import do
 end
 
 say "Turbo successfully added", :green
-say 'For further reading, check out "https://turbo.hotwire.dev/"', :blue
+say 'For further reading, check out "https://turbo.hotwired.dev/"', :blue

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

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

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

@@ -18,7 +18,8 @@ module Bridgetown
       # Logic to do the Liquid content conversion.
       #
       # @param content [String] Content of the file (without front matter).
-      # @param convertible [Bridgetown::Page, Bridgetown::Document, Bridgetown::Layout]
+      # @param convertible [
+      #   Bridgetown::GeneratedPage, Bridgetown::Resource::Base, Bridgetown::Layout]
       #   The instantiated object which is processing the file.
       #
       # @return [String] The converted content.
@@ -84,7 +85,7 @@ module Bridgetown
       def configure_payload(content = nil)
         payload["page"] = document.to_liquid
         payload["paginator"] = document.respond_to?(:paginator) ? document.paginator.to_liquid : nil
-        payload["layout"] = @layout ? @layout.data : {}
+        payload["layout"] = @layout ? @layout.to_liquid.merge({ data: @layout.data }) : {}
         payload["content"] = content
       end
 

data/lib/bridgetown-core/current.rb

@@ -6,5 +6,9 @@ module Bridgetown
     #   @return [Bridgetown::Site]
 
     attribute :site
+
+    # @!method self.preloaded_configuration
+    #   @return [Bridgetown::Configuration]
+    attribute :preloaded_configuration
   end
 end

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, :resources, :static_files
+      def_delegators :@obj, :label, :files, :relative_path, :resources, :static_files
 
       private def_delegator :@obj, :metadata, :fallback_data
 

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Drops
+    class GeneratedPageDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      def_delegators :@obj,
+                     :data,
+                     :content,
+                     :dir,
+                     :name,
+                     :path,
+                     :url,
+                     :relative_url,
+                     :relative_path
+
+      private def_delegator :@obj, :data, :fallback_data
+    end
+  end
+end

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

@@ -11,7 +11,6 @@ module Bridgetown
 
       mutable false
 
-      def_delegator :@obj, :relative_path, :path
       def_delegators :@obj,
                      :id,
                      :data,
@@ -20,6 +19,7 @@ module Bridgetown
                      :summary,
                      :to_s,
                      :absolute_url,
+                     :path,
                      :relative_path,
                      :relative_url,
                      :date,
@@ -32,8 +32,8 @@ module Bridgetown
         @collection ||= @obj.collection.to_liquid
       end
 
-      def excerpt
-        fallback_data["excerpt"].to_s
+      def relative_path
+        @relative_path ||= @obj.relative_path.to_s
       end
 
       def <=>(other)

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

@@ -13,7 +13,6 @@ module Bridgetown
                      :data,
                      :locale,
                      :time,
-                     :pages,
                      :generated_pages,
                      :static_files,
                      :tags,
@@ -25,51 +24,10 @@ module Bridgetown
 
       attr_writer :current_document
 
-      def [](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)
-        (!@obj.uses_resource? && key != "posts" && @obj.collections.key?(key)) || super
-      end
-
       def uses_resource
         @obj.uses_resource?
       end
 
-      def posts
-        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
-
-      # `Site#documents` cannot be memoized so that `Site#docs_to_write` can access the
-      # latest state of the attribute.
-      #
-      # Since this method will be called after `Site#pre_render` hook, the `Site#documents`
-      # array shouldn't thereafter change and can therefore be safely memoized to prevent
-      # additional computation of `Site#documents`.
-      def documents
-        @documents ||= @obj.documents
-      end
-
       def resources
         @resources ||= @obj.resources
       end
@@ -82,11 +40,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
+      def config
+        @obj.config
+      end
     end
   end
 end

data/lib/bridgetown-core/errors.rb

@@ -14,7 +14,5 @@ module Bridgetown
     PostURLError                = Class.new(FatalException)
     InvalidURLError             = Class.new(FatalException)
     InvalidConfigurationError   = Class.new(FatalException)
-
-    WebpackAssetError           = Class.new(FatalException)
   end
 end

data/lib/bridgetown-core/filters/url_filters.rb

@@ -49,8 +49,9 @@ module Bridgetown
 
       private
 
-      def compute_absolute_url(input)
+      def compute_absolute_url(input) # rubocop:todo Metrics/CyclomaticComplexity
         return if input.nil?
+        return input.absolute_url if input.respond_to?(:absolute_url)
 
         input = input.url if input.respond_to?(:url)
         return input if Addressable::URI.parse(input.to_s).absolute?
@@ -66,6 +67,7 @@ module Bridgetown
 
       def compute_relative_url(input)
         return if input.nil?
+        return input.relative_url if input.respond_to?(:relative_url)
 
         input = input.url if input.respond_to?(:url)
         return input if Addressable::URI.parse(input.to_s).absolute?

data/lib/bridgetown-core/frontmatter_defaults.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  # This class handles custom defaults for YAML frontmatter settings.
-  # These are set in bridgetown.config.yml and apply both to internal use (e.g. layout)
-  # and the data available to liquid.
-  #
+  # This class handles custom defaults for front matter settings.
   # It is exposed via the frontmatter_defaults method on the site class.
   class FrontmatterDefaults
-    # Initializes a new instance.
+    # @return [Bridgetown::Site]
+    attr_reader :site
+
     def initialize(site)
       @site = site
     end
@@ -16,24 +15,6 @@ module Bridgetown
       @glob_cache = {}
     end
 
-    def update_deprecated_types(set)
-      return set unless set.key?("scope") && set["scope"].key?("type")
-
-      set["scope"]["type"] =
-        case set["scope"]["type"]
-        when "page"
-          Deprecator.defaults_deprecate_type("page", "pages")
-          "pages"
-        when "post"
-          Deprecator.defaults_deprecate_type("post", "posts")
-          "posts"
-        else
-          set["scope"]["type"]
-        end
-
-      set
-    end
-
     def ensure_time!(set)
       return set unless set.key?("values") && set["values"].key?("date")
       return set if set["values"]["date"].is_a?(Time)
@@ -45,44 +26,19 @@ module Bridgetown
       set
     end
 
-    # Finds a default value for a given setting, filtered by path and type
-    #
-    # path - the path (relative to the source) of the page or
-    # post the default is used in
-    # type - a symbol indicating whether a :page,
-    # a :post calls this method
-    #
-    # Returns the default value or nil if none was found
-    def find(path, type, setting)
-      merged_data = {}
-      merge_data_cascade_for_path(path, merged_data)
-      return merged_data[setting] if merged_data.key?(setting)
-
-      value = nil
-      old_scope = nil
-
-      matching_sets(path, type).each do |set|
-        if set["values"].key?(setting) && has_precedence?(old_scope, set["scope"])
-          value = set["values"][setting]
-          old_scope = set["scope"]
-        end
-      end
-      value
-    end
-
-    # Collects a hash with all default values for a page or post
+    # Collects a hash with all default values for a resource
     #
-    # path - the relative path of the page or post
-    # type - a symbol indicating the type (:post or :page)
+    # @param path [String] the relative path of the resource
+    # @param collection [Symbol] :posts, :pages, etc.
     #
-    # Returns a hash with all default values (an empty hash if there are none)
-    def all(path, type)
+    # @returns [Hash] all default values (an empty hash if there are none)
+    def all(path, collection)
       defaults = {}
 
       merge_data_cascade_for_path(path, defaults)
 
       old_scope = nil
-      matching_sets(path, type).each do |set|
+      matching_sets(path, collection).each do |set|
         if has_precedence?(old_scope, set["scope"])
           defaults = Utils.deep_merge_hashes(defaults, set["values"])
           old_scope = set["scope"]
@@ -96,8 +52,8 @@ module Bridgetown
     private
 
     def merge_data_cascade_for_path(path, merged_data)
-      absolute_path = @site.in_source_dir(path)
-      @site.defaults_reader.path_defaults
+      absolute_path = site.in_source_dir(path)
+      site.defaults_reader.path_defaults
         .select { |k, _v| absolute_path.include? k }
         .sort_by { |k, _v| k.length }
         .each do |defaults|
@@ -105,22 +61,22 @@ module Bridgetown
         end
     end
 
-    # Checks if a given default setting scope matches the given path and type
+    # Checks if a given default setting scope matches the given path and collection
     #
     # scope - the hash indicating the scope, as defined in bridgetown.config.yml
     # path - the path to check for
-    # type - the type (:post or :page) to check for
+    # collection - the collection (:posts or :pages) to check for
     #
-    # Returns true if the scope applies to the given type and path
-    def applies?(scope, path, type)
-      applies_type?(scope, type) && applies_path?(scope, path)
+    # Returns true if the scope applies to the given collection and path
+    def applies?(scope, path, collection)
+      applies_collection?(scope, collection) && applies_path?(scope, path)
     end
 
     def applies_path?(scope, path)
       rel_scope_path = scope["path"]
       return true if !rel_scope_path.is_a?(String) || rel_scope_path.empty?
 
-      sanitized_path = sanitize_path(path)
+      sanitized_path = strip_collections_dir(sanitize_path(path))
 
       if rel_scope_path.include?("*")
         glob_scope(sanitized_path, rel_scope_path)
@@ -130,7 +86,7 @@ module Bridgetown
     end
 
     def glob_scope(sanitized_path, rel_scope_path)
-      site_source    = Pathname.new(@site.source)
+      site_source    = Pathname.new(site.source)
       abs_scope_path = site_source.join(rel_scope_path).to_s
 
       glob_cache(abs_scope_path).each do |scope_path|
@@ -152,33 +108,31 @@ module Bridgetown
     end
 
     def strip_collections_dir(path)
-      collections_dir  = @site.config["collections_dir"]
+      collections_dir  = site.config["collections_dir"]
       slashed_coll_dir = collections_dir.empty? ? "/" : "#{collections_dir}/"
       return path if collections_dir.empty? || !path.to_s.start_with?(slashed_coll_dir)
 
       path.sub(slashed_coll_dir, "")
     end
 
-    # Determines whether the scope applies to type.
-    # The scope applies to the type if:
-    #   1. no 'type' is specified
-    #   2. the 'type' in the scope is the same as the type asked about
+    # Determines whether the scope applies to collection.
+    # The scope applies to the collection if:
+    #   1. no 'collection' is specified
+    #   2. the 'collection' in the scope is the same as the collection asked about
     #
-    # scope - the Hash defaults set being asked about application
-    # type  - the type of the document being processed / asked about
-    #         its defaults.
+    # @param scope [Hash] the defaults set being asked about
+    # @param collection [Symbol] the collection of the resource being processed
     #
-    # Returns true if either of the above conditions are satisfied,
-    #   otherwise returns false
-    def applies_type?(scope, type)
-      !scope.key?("type") || scope["type"].eql?(type.to_s)
+    # @returns [Boolean] whether either of the above conditions are satisfied
+    def applies_collection?(scope, collection)
+      !scope.key?("collection") || scope["collection"].eql?(collection.to_s)
     end
 
     # Checks if a given set of default values is valid
     #
-    # set - the default value hash, as defined in bridgetown.config.yml
+    # @param set [Hash] the default value hash as defined in bridgetown.config.yml
     #
-    # Returns true if the set is valid and can be used in this class
+    # @returns [Boolean] if the set is valid and can be used
     def valid?(set)
       set.is_a?(Hash) && set["values"].is_a?(Hash)
     end
@@ -198,23 +152,23 @@ module Bridgetown
 
       if new_path.length != old_path.length
         new_path.length >= old_path.length
-      elsif new_scope.key?("type")
+      elsif new_scope.key?("collection")
         true
       else
-        !old_scope.key? "type"
+        !old_scope.key? "collection"
       end
     end
     # rubocop: enable Naming/PredicateName
 
-    # Collects a list of sets that match the given path and type
+    # Collects a list of sets that match the given path and collection
     #
-    # Returns an array of hashes
-    def matching_sets(path, type)
+    # @return [Array<Hash>]
+    def matching_sets(path, collection)
       @matched_set_cache ||= {}
       @matched_set_cache[path] ||= {}
-      @matched_set_cache[path][type] ||= begin
+      @matched_set_cache[path][collection] ||= begin
         valid_sets.select do |set|
-          !set.key?("scope") || applies?(set["scope"], path, type)
+          !set.key?("scope") || applies?(set["scope"], path, collection)
         end
       end
     end
@@ -224,14 +178,16 @@ module Bridgetown
     # This is not cached to allow plugins to modify the configuration
     # and have their changes take effect
     #
-    # Returns an array of hashes
+    # @return [Array<Hash>]
     def valid_sets
-      sets = @site.config["defaults"]
+      sets = site.config["defaults"]
       return [] unless sets.is_a?(Array)
 
       sets.map do |set|
         if valid?(set)
-          ensure_time!(update_deprecated_types(set))
+          massage_scope!(set)
+          # TODO: is this trip really necessary?
+          ensure_time!(set)
         else
           Bridgetown.logger.warn "Defaults:", "An invalid front-matter default set was found:"
           Bridgetown.logger.warn set.to_s
@@ -240,10 +196,18 @@ module Bridgetown
       end.compact
     end
 
-    # Sanitizes the given path by removing a leading and adding a trailing slash
+    # Set path to blank if not specified and alias older type to collection
+    def massage_scope!(set)
+      set["scope"] ||= {}
+      set["scope"]["path"] ||= ""
+      if set["scope"]["type"] && !set["scope"]["collection"]
+        set["scope"]["collection"] = set["scope"]["type"]
+      end
+    end
 
     SANITIZATION_REGEX = %r!\A/|(?<=[^/])\z!.freeze
 
+    # Sanitizes the given path by removing a leading and adding a trailing slash
     def sanitize_path(path)
       if path.nil? || path.empty?
         ""