bridgetown-core 0.21.0.beta2 → 0.21.1

data/lib/bridgetown-core/configurations/bt-postcss.rb

@@ -4,23 +4,23 @@
 
 TEMPLATE_PATH = File.expand_path("./bt-postcss", __dir__)
 
-begin
-  find_in_source_paths("postcss.config.js")
-rescue Thor::Error
+unless File.exist?("postcss.config.js")
   error_message = "#{"postcss.config.js".bold} not found. Please configure postcss in your project."
 
   @logger.error "\nError:".red, "🚨 #{error_message}"
-  @logger.info "\nFor new projects, you can use #{"bridgetown new my_project --use-postcss".bold.blue}\n"
+  @logger.info "\nRun #{"bridgetown webpack enable-postcss".bold.blue} to set it up.\n"
 
   return
 end
 
+confirm = ask "This configuration will ovewrite your existing #{"postcss.config.js".bold.white}. Would you like to continue? [Yn]"
+return unless confirm.casecmp?("Y")
+
 plugins = %w(postcss-easy-import postcss-mixins postcss-color-function cssnano)
 
 say "Adding the following PostCSS plugins: #{plugins.join(' | ')}", :green
 run "yarn add -D #{plugins.join(' ')}"
 
-remove_file "postcss.config.js"
-copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js"
+copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js", force: true
 
 # rubocop:enable all

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

@@ -4,3 +4,4 @@ TEMPLATE_PATH = File.expand_path("./netlify", __dir__)
 
 copy_file "#{TEMPLATE_PATH}/netlify.toml", "netlify.toml"
 copy_file "#{TEMPLATE_PATH}/netlify.sh", "bin/netlify.sh"
+`chmod a+x ./bin/netlify.sh`

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

@@ -4,26 +4,31 @@
 
 TEMPLATE_PATH = File.expand_path("./tailwindcss", __dir__)
 
-begin
-  find_in_source_paths("postcss.config.js")
-rescue Thor::Error
+unless File.exist?("postcss.config.js")
   error_message = "#{"postcss.config.js".bold} not found. Please configure postcss in your project."
 
   @logger.error "\nError:".red, "🚨 #{error_message}"
-  @logger.info "\nFor new projects, you can use #{"bridgetown new my_project --use-postcss".bold.blue}\n"
+  @logger.info "\nRun #{"bridgetown webpack enable-postcss".bold.blue} to set it up.\n"
 
   return
 end
 
+confirm = ask "This configuration will ovewrite your existing #{"postcss.config.js".bold.white}. Would you like to continue? [Yn]"
+return unless confirm.casecmp?("Y")
+
 run "yarn add -D tailwindcss"
 run "npx tailwindcss init"
 
-remove_file "postcss.config.js"
-copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js"
-
-prepend_to_file "frontend/styles/index.css",
-                File.read("#{TEMPLATE_PATH}/css_imports.css")
+copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js", force: true
 
 run "bundle exec bridgetown configure purgecss"
 
+if File.exist?("frontend/styles/index.css")
+  prepend_to_file "frontend/styles/index.css",
+                  File.read("#{TEMPLATE_PATH}/css_imports.css")
+else
+  say "\nPlease add the following lines to your CSS index file:"
+  say File.read("#{TEMPLATE_PATH}/css_imports.css")
+end
+
 # rubocop:enable all

data/lib/bridgetown-core/configurations/tailwindcss/postcss.config.js

@@ -6,7 +6,7 @@ module.exports = {
       autoprefixer: {
         flexbox: 'no-2009'
       },
-      stage: 3
+      stage: 2
     }
   }
-}
+}

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

@@ -104,7 +104,7 @@ module Bridgetown
       # Logic to do the ERB 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/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/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/document.rb

@@ -224,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
@@ -358,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

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

@@ -17,6 +17,7 @@ module Bridgetown
                      :data,
                      :output,
                      :content,
+                     :summary,
                      :to_s,
                      :absolute_url,
                      :relative_path,
@@ -48,7 +49,7 @@ module Bridgetown
       end
 
       def next
-        @next ||= @obj.previous_resource.to_liquid
+        @next ||= @obj.next_resource.to_liquid
       end
 
       # Generate a Hash for use in generating JSON.

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

@@ -8,6 +8,8 @@ module Bridgetown
       mutable false
 
       def_delegators :@obj,
+                     :baseurl, # deprecated
+                     :base_path,
                      :data,
                      :locale,
                      :time,

data/lib/bridgetown-core/entry_filter.rb

@@ -43,8 +43,8 @@ module Bridgetown
     end
 
     def included?(entry)
-      glob_include?(site.include, entry) ||
-        glob_include?(site.include, File.basename(entry))
+      glob_include?(site.config.include, entry) ||
+        glob_include?(site.config.include, File.basename(entry))
     end
 
     def special?(entry)
@@ -62,7 +62,9 @@ module Bridgetown
     end
 
     def excluded?(entry)
-      glob_include?(site.exclude - site.include, relative_to_source(entry)).tap do |excluded|
+      glob_include?(
+        site.config.exclude - site.config.include, relative_to_source(entry)
+      ).tap do |excluded|
         if excluded
           Bridgetown.logger.debug(
             "EntryFilter:",

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

@@ -5,7 +5,7 @@ module Bridgetown
     module URLFilters
       extend self
 
-      # Produces an absolute URL based on site.url and site.baseurl.
+      # Produces an absolute URL based on site.url and site.base_path.
       #
       # input - the URL to make absolute.
       #
@@ -15,7 +15,7 @@ module Bridgetown
         cache[input] ||= compute_absolute_url(input)
       end
 
-      # Produces a URL relative to the domain root based on site.baseurl
+      # Produces a URL relative to the domain root based on site.base_path
       # unless it is already an absolute url with an authority (host).
       #
       # input - the URL to make relative to the domain root
@@ -70,17 +70,13 @@ module Bridgetown
         input = input.url if input.respond_to?(:url)
         return input if Addressable::URI.parse(input.to_s).absolute?
 
-        parts = [sanitized_baseurl, input]
+        site = @context.registers[:site]
+        parts = [site.base_path.chomp("/"), input]
         Addressable::URI.parse(
           parts.compact.map { |part| ensure_leading_slash(part.to_s) }.join
         ).normalize.to_s
       end
 
-      def sanitized_baseurl
-        site = @context.registers[:site]
-        site.config["baseurl"].to_s.chomp("/")
-      end
-
       def ensure_leading_slash(input)
         return input if input.nil? || input.empty? || input.start_with?("/")
 

data/lib/bridgetown-core/frontmatter_defaults.rb

@@ -13,7 +13,7 @@ module Bridgetown
     end
 
     def reset
-      @glob_cache = {} if @glob_cache
+      @glob_cache = {}
     end
 
     def update_deprecated_types(set)

data/lib/bridgetown-core/generators/prototype_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Handles Legacy Pages
+# Handles Generated Pages
 Bridgetown::Hooks.register :pages, :post_init, reloadable: false do |page|
   if page.class != Bridgetown::PrototypePage && page.data["prototype"].is_a?(Hash)
     Bridgetown::PrototypeGenerator.add_matching_template(page)
@@ -14,6 +14,11 @@ Bridgetown::Hooks.register :resources, :post_read, reloadable: false do |resourc
   end
 end
 
+# Ensure sites clear out templates before rebuild
+Bridgetown::Hooks.register :site, :after_reset, reloadable: false do |_site|
+  Bridgetown::PrototypeGenerator.matching_templates.clear
+end
+
 module Bridgetown
   class PrototypeGenerator < Generator
     priority :low
@@ -21,9 +26,9 @@ module Bridgetown
     # @return [Bridgetown::Site]
     attr_reader :site
 
-    # @return [Array<Bridgetown::Page, Bridgetown::Resource::Base>]
+    # @return [Set<Bridgetown::Page, Bridgetown::Resource::Base>]
     def self.matching_templates
-      @matching_templates ||= []
+      @matching_templates ||= Set.new
     end
 
     def self.add_matching_template(template)
@@ -41,6 +46,8 @@ module Bridgetown
       end
 
       if prototype_pages.length.positive?
+        ensure_pagination_enabled
+
         page_list.reject! do |page|
           prototype_pages.include? page
         end
@@ -56,6 +63,15 @@ module Bridgetown
       end
     end
 
+    def ensure_pagination_enabled
+      unless @site.config.dig(:pagination, :enabled)
+        Bridgetown.logger.warn(
+          "Pagination:",
+          "Must be enabled for prototype pages to contain matches"
+        )
+      end
+    end
+
     # Check incoming prototype configuration and normalize options.
     #
     # @param prototype_page [Bridgetown::Page, Bridgetown::Resource::Base]
@@ -70,7 +86,12 @@ module Bridgetown
         @configured_collection = prototype_page.data["prototype"]["collection"]
       end
 
-      return nil unless site.collections[@configured_collection]
+      unless site.collections[@configured_collection]
+        Bridgetown.logger.warn(
+          "No collection specified for prototype page #{prototype_page.relative_path}"
+        )
+        return nil
+      end
 
       # Categories and Tags are unique in that singular and plural front matter
       # can be present for each

data/lib/bridgetown-core/layout.rb

@@ -39,12 +39,22 @@ module Bridgetown
     # Gets/Sets the document output (for layout-compatible converters)
     attr_accessor :current_document_output
 
+    # Determines the label a layout should use based on its filename
+    #
+    # @param file [String]
+    # @return [String]
+    def self.label_for_file(file)
+      # TODO: refactor this so multi-extension layout filenames don't leak
+      # middle extensions into layout label
+      file.split(".")[0..-2].join(".")
+    end
+
     # Initialize a new Layout.
     #
-    # site - The Site.
-    # base - The String path to the source.
-    # name - The String filename of the layout file.
-    # from_plugin - true if the layout comes from a Gem-based plugin folder.
+    # @param site [Bridgetown::Site]
+    # @param base [String] The path to the source.
+    # @param name [String] The filename of the layout file.
+    # @param from_plugin [Boolean] if the layout comes from a Gem-based plugin folder.
     def initialize(site, base, name, from_plugin: false)
       @site = site
       @base = base
@@ -83,17 +93,24 @@ module Bridgetown
       end
     end
 
-    # The inspect string for this document.
-    # Includes the relative path and the collection label.
+    # The label of the layout (should match what would used in front matter
+    # references).
     #
-    # Returns the inspect string for this document.
+    # @return [String]
+    def label
+      @label ||= self.class.label_for_file(name)
+    end
+
+    # The inspect string for this layout. Includes the relative path.
+    #
+    # @return [String]
     def inspect
-      "#<#{self.class} #{@path}>"
+      "#<#{self.class} #{relative_path}>"
     end
 
-    # Provide this Layout's data to a Hash suitable for use by Liquid.
+    # Provide this Layout's data for use by Liquid.
     #
-    # Returns the Hash representation of this Layout.
+    # @return [HashWithDotAccess::Hash]
     def to_liquid
       data
     end

data/lib/bridgetown-core/model/repo_origin.rb

@@ -102,7 +102,7 @@ module Bridgetown
         when ".rb"
           process_ruby_data(File.read(original_path), original_path, 1)
         else
-          yaml_data = SafeYAML.load_file(original_path)
+          yaml_data = YAMLParser.load_file(original_path)
           yaml_data.is_a?(Array) ? { rows: yaml_data } : yaml_data
         end
       end

data/lib/bridgetown-core/publisher.rb

@@ -15,7 +15,7 @@ module Bridgetown
       return false unless thing.respond_to?(:date)
 
       future_allowed =
-        thing.respond_to?(:collection) && thing.collection.metadata.future || @site.future
+        thing.respond_to?(:collection) && thing.collection.metadata.future || @site.config.future
       thing_time = thing.date.is_a?(Date) ? thing.date.to_time.to_i : thing.date.to_i
       !future_allowed && thing_time > @site.time.to_i
     end
@@ -23,7 +23,7 @@ module Bridgetown
     private
 
     def can_be_published?(thing)
-      thing.data.fetch("published", true) || @site.unpublished
+      thing.data.fetch("published", true) || @site.config.unpublished
     end
   end
 end

data/lib/bridgetown-core/reader.rb

@@ -183,7 +183,7 @@ module Bridgetown
     end
 
     def read_included_excludes
-      site.include.each do |entry|
+      site.config.include.each do |entry|
         next if entry == ".htaccess"
 
         entry_path = site.in_source_dir(entry)

data/lib/bridgetown-core/readers/data_reader.rb

@@ -68,7 +68,7 @@ module Bridgetown
                  headers: true,
                  encoding: site.config["encoding"]).map(&:to_hash)
       else
-        SafeYAML.load_file(path)
+        YAMLParser.load_file(path)
       end
     end
 

data/lib/bridgetown-core/readers/defaults_reader.rb

@@ -18,7 +18,7 @@ module Bridgetown
 
       entries.each do |entry|
         path = @site.in_source_dir(entry)
-        @path_defaults[File.dirname(path) + File::SEPARATOR] = SafeYAML.load_file(path)
+        @path_defaults[File.dirname(path) + File::SEPARATOR] = YAMLParser.load_file(path)
       end
 
       @path_defaults

data/lib/bridgetown-core/readers/layout_reader.rb

@@ -44,7 +44,7 @@ module Bridgetown
     end
 
     def layout_name(file)
-      file.split(".")[0..-2].join(".")
+      Layout.label_for_file(file)
     end
 
     def within(directory)

data/lib/bridgetown-core/regenerator.rb

@@ -154,7 +154,7 @@ module Bridgetown
           begin
             Marshal.load(content)
           rescue TypeError
-            SafeYAML.load(content)
+            YAMLParser.load(content)
           rescue ArgumentError => e
             Bridgetown.logger.warn("Failed to load #{metadata_file}: #{e}")
             {}