bridgetown-core 1.0.0.alpha6 → 1.0.0.alpha7

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-TEMPLATE_PATH = File.expand_path("./netlify", __dir__)
-
-copy_file "#{TEMPLATE_PATH}/netlify.toml", "netlify.toml"
-copy_file "#{TEMPLATE_PATH}/netlify.sh", "bin/netlify.sh"
+copy_file in_templates_dir("netlify.toml"), "netlify.toml"
+copy_file in_templates_dir("netlify.sh"), "bin/netlify.sh"
 `chmod a+x ./bin/netlify.sh`

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

@@ -6,9 +6,9 @@ say_status :purgecss, "Installing PurgeCSS"
 
 run "yarn add -D purgecss"
 
-create_builder "purgecss_builder.rb" do
+create_builder "purgecss.rb" do
   <<~RUBY
-    class PurgeCSS < SiteBuilder
+    class Builders::Purgecss < SiteBuilder
       def build
         unless config[:watch] # don't run in "watch mode"
           hook :site, :post_write do

data/lib/bridgetown-core/configurations/render/render.yaml.erb

@@ -0,0 +1,26 @@
+services:
+  - type: web
+    name: <%= @render_service_name %>
+    env: static
+    buildCommand: bin/bridgetown deploy
+    staticPublishPath: ./output
+    pullRequestPreviewsEnabled: true
+    headers:
+      - path: /*
+        name: X-Frame-Options
+        value: DENY
+      - path: /*
+        name: X-XSS-Protection
+        value: "1; mode=block"
+      - path: /*
+        name: X-Content-Type-Options
+        value: "nosniff"
+      - path: /*
+        name: Strict-Transport-Security
+        value: "max-age=15552000; includeSubDomains"
+      - path: /*
+        name: Referrer-Policy
+        value: "no-referrer-when-downgrade"
+      - path: /*
+        name: Cache-Control
+        value: "public, max-age=86400, s-max-age=86400"

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

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+@render_service_name = ask "What would like to call your Render service?"
+template in_templates_dir("render.yaml.erb"), "render.yaml"
+
+say "All done. Just create a new blueprint from the Render dashboard and connect this repo."

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

@@ -2,8 +2,6 @@
 
 # rubocop:disable all
 
-TEMPLATE_PATH = File.expand_path("./tailwindcss", __dir__)
-
 unless File.exist?("postcss.config.js")
   error_message = "#{"postcss.config.js".bold} not found. Please configure postcss in your project."
 
@@ -19,16 +17,16 @@ return unless confirm.casecmp?("Y")
 run "yarn add -D tailwindcss"
 run "npx tailwindcss init"
 
-copy_file "#{TEMPLATE_PATH}/postcss.config.js", "postcss.config.js", force: true
+copy_file in_templates_dir("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")
+                  File.read(in_templates_dir("css_imports.css"))
 else
   say "\nPlease add the following lines to your CSS index file:"
-  say File.read("#{TEMPLATE_PATH}/css_imports.css")
+  say File.read(in_templates_dir("/css_imports.css"))
 end
 
 # rubocop:enable all

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

@@ -23,7 +23,7 @@ module Kramdown
         @options ||= Options.merge(options).freeze
         @parser  ||= begin
           parser_name = (@options[:input] || "kramdown").to_s
-          parser_name = parser_name[0..0].upcase + parser_name[1..-1]
+          parser_name = parser_name[0..0].upcase + parser_name[1..]
           try_require("parser", parser_name)
 
           if Parser.const_defined?(parser_name)

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

@@ -6,11 +6,7 @@ module Bridgetown
       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
+            safe_load f, filename: filename, **kwargs
           end
         end
       end

data/lib/bridgetown-core/frontmatter_defaults.rb

@@ -181,7 +181,7 @@ module Bridgetown
       sets = site.config["defaults"]
       return [] unless sets.is_a?(Array)
 
-      sets.map do |set|
+      sets.filter_map do |set|
         if valid?(set)
           massage_scope!(set)
           # TODO: is this trip really necessary?
@@ -191,7 +191,7 @@ module Bridgetown
           Bridgetown.logger.warn set.to_s
           nil
         end
-      end.compact
+      end
     end
 
     # Set path to blank if not specified and alias older type to collection

data/lib/bridgetown-core/liquid_renderer.rb

@@ -15,7 +15,7 @@ module Bridgetown
 
       # Set up Liquid file system access to components for the Render tag
       Liquid::Template.file_system = LiquidRenderer::FileSystem.new(
-        @site.components_load_paths, "%s.liquid"
+        @site.config.components_load_paths, "%s.liquid"
       )
       Liquid::Template.file_system.site = site
 

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

@@ -9,40 +9,37 @@ module Bridgetown
       extend ActiveModel::Callbacks # also extends with DescendantsTracker
       define_model_callbacks :load, :save, :destroy
 
-      def self.loads_id?(id)
-        name == ActiveSupport::Inflector.classify(
-          URI.parse(id).host.chomp(".collection")
-        )
-      end
+      class << self
+        def find(id)
+          unless Bridgetown::Current.site
+            raise "A Bridgetown site must be initialized and added to Current"
+          end
 
-      def self.find(id)
-        unless Bridgetown::Current.site
-          raise "A Bridgetown site must be initialized and added to Current"
+          origin = origin_for_id(id)
+          klass_for_id(id, origin: origin).new(origin.read)
         end
 
-        model_klass = klass_for_id(id)
-        model_klass.new(read_data_for_id(id))
-      end
-
-      def self.klass_for_id(id)
-        descendants.find do |klass|
-          klass.loads_id?(id)
-        end || self
-      end
+        def origin_for_id(id)
+          scheme = URI.parse(id).scheme
+          origin_klass = Origin.descendants.find do |klass|
+            klass.handle_scheme?(scheme)
+          end
 
-      def self.read_data_for_id(id)
-        origin_for_id(id).read
-      end
+          raise "No origin could be found for #{id}" unless origin_klass
 
-      def self.origin_for_id(id)
-        scheme = URI.parse(id).scheme
-        origin_klass = Origin.descendants.find do |klass|
-          klass.handle_scheme?(scheme)
+          origin_klass.new(id)
         end
 
-        raise "No origin could be found for #{id}" unless origin_klass
+        def klass_for_id(id, origin: nil)
+          Bridgetown::Model::Base.descendants.find do |klass|
+            klass.will_load_id?(id, origin: origin)
+          end || Bridgetown::Model::Base
+        end
 
-        origin_klass.new(id)
+        def will_load_id?(id, origin: nil)
+          origin ||= origin_for_id(id)
+          origin.verify_model?(self)
+        end
       end
 
       class << self

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

@@ -6,12 +6,14 @@ module Bridgetown
       # @return [Pathname]
       attr_reader :relative_path
 
-      def self.handle_scheme?(scheme)
-        scheme == "builder"
-      end
-
-      def self.id_for_builder_path(builder, path)
-        "builder://#{builder.class.name.gsub("::", ".")}/#{path}"
+      class << self
+        def handle_scheme?(scheme)
+          scheme == "builder"
+        end
+
+        def id_for_builder_path(builder, path)
+          "builder://#{builder.class.name.gsub("::", ".")}/#{path}"
+        end
       end
 
       def initialize(id)

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

@@ -11,7 +11,7 @@ module Bridgetown
       # @return [String]
       attr_accessor :id
 
-      # Override in subclass
+      # You must implement in subclasses
       def self.handle_scheme?(_scheme)
         false
       end
@@ -20,6 +20,15 @@ module Bridgetown
         self.id = id
       end
 
+      # You can override in subclass
+      def verify_model?(klass)
+        collection_name = URI.parse(id).host.chomp(".collection")
+
+        return klass.collection_name.to_s == collection_name if klass.respond_to?(:collection_name)
+
+        klass.name == ActiveSupport::Inflector.classify(collection_name)
+      end
+
       def read
         raise "Implement #read in a subclass of Bridgetown::Model::Origin"
       end

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

@@ -22,7 +22,7 @@ module Bridgetown
 
       def relative_path
         @relative_path ||= Pathname.new(
-          Addressable::URI.unescape(url.path.delete_prefix("/")).split("/")[1..-1].join("/")
+          Addressable::URI.unescape(url.path.delete_prefix("/")).split("/")[1..].join("/")
         )
       end
 

data/lib/bridgetown-core/plugin_manager.rb

@@ -5,7 +5,7 @@ module Bridgetown
     PLUGINS_GROUP = :bridgetown_plugins
     YARN_DEPENDENCY_REGEXP = %r!(.+)@([^@]*)$!.freeze
 
-    attr_reader :site, :component_loaders
+    attr_reader :site, :loaders_manager
 
     @source_manifests = Set.new
     @registered_plugins = Set.new
@@ -37,15 +37,14 @@ module Bridgetown
     # Returns nothing
     def initialize(site)
       @site = site
-      @component_loaders = {}
+      @loaders_manager = Bridgetown::Utils::LoadersManager.new(site.config)
     end
 
     def self.require_from_bundler
       if !ENV["BRIDGETOWN_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
         require "bundler"
 
-        required_gems = Bundler.require PLUGINS_GROUP
-        required_gems.select! do |dep|
+        required_gems = Bundler.require(PLUGINS_GROUP).select do |dep|
           (dep.groups & [PLUGINS_GROUP]).any? && dep.should_include?
         end
 
@@ -133,12 +132,16 @@ module Bridgetown
         sorted_plugin_files.each do |plugin_file|
           self.class.add_registered_plugin plugin_file
         end
+        next if site.config[:plugins_use_zeitwerk]
+
         Bridgetown::Utils::RequireGems.require_with_graceful_fail(sorted_plugin_files)
       end
     end
 
     # Reload .rb plugin files via the watcher
     def reload_plugin_files
+      return if site.config[:plugins_use_zeitwerk]
+
       plugins_path.each do |plugin_search_path|
         plugin_files = Utils.safe_glob(plugin_search_path, File.join("**", "*.rb"))
         Array(plugin_files).each do |name|
@@ -159,35 +162,5 @@ module Bridgetown
         Array(site.config["plugins_dir"]).map { |d| File.expand_path(d) }
       end
     end
-
-    def setup_component_loaders
-      unless @component_loaders.keys.empty?
-        @component_loaders.each do |_path, loader|
-          loader.unload
-        end
-        @component_loaders = {}
-      end
-
-      # Because "first constant wins" in Zeitwerk, we need to load the local
-      # source components _before_ we load any from plugins
-      site.components_load_paths.reverse_each do |load_path|
-        next unless Dir.exist? load_path
-
-        begin
-          @component_loaders[load_path] = Zeitwerk::Loader.new
-          @component_loaders[load_path].push_dir(load_path)
-          @component_loaders[load_path].enable_reloading if load_path.start_with?(site.root_dir)
-          @component_loaders[load_path].ignore(File.join(load_path, "**", "*.js.rb"))
-          @component_loaders[load_path].setup
-        rescue Zeitwerk::Error # rubocop:disable Lint/SuppressedException
-        end
-      end
-    end
-
-    def reload_component_loaders
-      @component_loaders.each do |path, loader|
-        loader.reload if path.start_with?(site.root_dir)
-      end
-    end
   end
 end

data/lib/bridgetown-core/rack/boot.rb

@@ -14,9 +14,17 @@ require_relative "static_indexes"
 
 module Bridgetown
   module Rack
-    def self.boot
-      autoload_server_folder(root: Dir.pwd)
-      RodaApp.opts[:bridgetown_preloaded_config] = Bridgetown::Current.preloaded_configuration
+    class << self
+      # @return [Bridgetown::Utils::LoadersManager]
+      attr_accessor :loaders_manager
+    end
+
+    def self.boot(roda_app = nil)
+      self.loaders_manager =
+        Bridgetown::Utils::LoadersManager.new(Bridgetown::Current.preloaded_configuration)
+      autoload_server_folder
+      (roda_app || RodaApp).opts[:bridgetown_preloaded_config] =
+        Bridgetown::Current.preloaded_configuration
     rescue Roda::RodaError => e
       if e.message.include?("sessions plugin :secret option")
         raise Bridgetown::Errors::InvalidConfigurationError,
@@ -27,29 +35,44 @@ module Bridgetown
       raise e
     end
 
-    def self.autoload_server_folder(root:)
+    # @param root [String] root of Bridgetown site, defaults to config value
+    def self.autoload_server_folder( # rubocop:todo Metrics/MethodLength
+      root: Bridgetown::Current.preloaded_configuration.root_dir
+    )
       server_folder = File.join(root, "server")
-      loader = Zeitwerk::Loader.new
-      loader.push_dir server_folder
-      loader.enable_reloading unless ENV["BRIDGETOWN_ENV"] == "production"
-      loader.setup
-      loader.eager_load
-      loader.do_not_eager_load(File.join(server_folder, "roda_app.rb"))
-
-      unless ENV["BRIDGETOWN_ENV"] == "production"
-        begin
-          Listen.to(server_folder) do |_modified, _added, _removed|
-            loader.reload
-            loader.eager_load
-            Bridgetown::Rack::Routes.reload_subclasses
-          end.start
-        # interrupt isn't handled well by the listener
-        rescue ThreadError # rubocop:disable Lint/SuppressedException
+      #      Bridgetown::Current.preloaded_configuration.autoload_paths << server_folder
+
+      Bridgetown::Hooks.register_one(
+        :loader, :post_setup, reloadable: false
+      ) do |loader, load_path|
+        next unless load_path == server_folder
+
+        loader.eager_load
+        loader.do_not_eager_load(File.join(server_folder, "roda_app.rb"))
+
+        unless ENV["BRIDGETOWN_ENV"] == "production"
+          begin
+            Listen.to(server_folder) do |_modified, _added, _removed|
+              loader.reload
+              loader.eager_load
+              Bridgetown::Rack::Routes.reload_subclasses
+            end.start
+          # interrupt isn't handled well by the listener
+          rescue ThreadError # rubocop:disable Lint/SuppressedException
+          end
         end
       end
-    rescue Zeitwerk::Error
-      # We assume if there's an error it's because Zeitwerk already registered this folder,
-      # so it's fine to swallow the error
+
+      Bridgetown::Hooks.register_one(
+        :loader, :post_reload, reloadable: false
+      ) do |loader, load_path|
+        next unless load_path == server_folder
+
+        loader.eager_load
+        Bridgetown::Rack::Routes.reload_subclasses
+      end
+
+      loaders_manager.setup_loaders([server_folder])
     end
   end
 end

data/lib/bridgetown-core/rack/roda.rb

@@ -6,7 +6,8 @@ class Roda
   module RodaPlugins
     module BridgetownSSR
       def self.configure(app, _opts = {}, &block)
-        app.opts[:bridgetown_site] = Bridgetown::Site.start_ssr!(&block)
+        app.opts[:bridgetown_site] =
+          Bridgetown::Site.start_ssr!(loaders_manager: Bridgetown::Rack.loaders_manager, &block)
       end
     end
 

data/lib/bridgetown-core/rack/routes.rb

@@ -72,9 +72,9 @@ module Bridgetown
         instance_exec(@_roda_app.request, &self.class.router_block)
       end
 
-      ruby2_keywords def method_missing(method_name, *args, &block)
+      def method_missing(method_name, *args, **kwargs, &block)
         if @_roda_app.respond_to?(method_name.to_sym)
-          @_roda_app.send method_name.to_sym, *args, &block
+          @_roda_app.send method_name.to_sym, *args, **kwargs, &block
         else
           super
         end

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

@@ -15,7 +15,7 @@ module Bridgetown
           Layout.new(site, layout_directory, layout_file)
       end
 
-      Bridgetown::PluginManager.source_manifests.map(&:layouts).compact.each do |plugin_layouts|
+      Bridgetown::PluginManager.source_manifests.filter_map(&:layouts).each do |plugin_layouts|
         layout_entries(plugin_layouts).each do |layout_file|
           @layouts[layout_name(layout_file)] ||= \
             Layout.new(site, plugin_layouts, layout_file, from_plugin: true)

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

@@ -40,7 +40,7 @@ module Bridgetown
     end
 
     def add_to(content_type, klass)
-      existing_paths = content_type.map(&:relative_path).compact
+      existing_paths = content_type.filter_map(&:relative_path)
       @content_files.select { |item| item.is_a?(klass) }.each do |item|
         content_type << item unless existing_paths.include?(item.relative_path)
       end

data/lib/bridgetown-core/renderer.rb

@@ -161,9 +161,9 @@ module Bridgetown
     end
 
     def output_exts
-      @output_exts ||= converters.map do |c|
+      @output_exts ||= converters.filter_map do |c|
         c.output_ext(document.extname)
-      end.compact
+      end
     end
   end
 end

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

@@ -255,8 +255,8 @@ module Bridgetown
         to_h
       end
 
-      ruby2_keywords def to_json(*options)
-        as_json(*options).to_json(*options)
+      def to_json(...)
+        as_json(...).to_json(...)
       end
 
       def inspect
@@ -349,7 +349,7 @@ module Bridgetown
 
       # Look for alternative front matter or look at the filename pattern: slug.locale.ext
       def locale_from_alt_data_or_filename
-        found_locale = data.language || data.lang || basename_without_ext.split(".")[1..-1].last
+        found_locale = data.language || data.lang || basename_without_ext.split(".")[1..].last
         return unless found_locale && site.config.available_locales.include?(found_locale.to_sym)
 
         found_locale

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

@@ -95,7 +95,7 @@ module Bridgetown
       def belongs_to_relation_for_type(type)
         if resource.data[type].is_a?(Array)
           other_slugs = other_collection_for_type(type).resources_by_slug
-          resource.data[type].map { |slug| other_slugs[slug] }.compact
+          resource.data[type].filter_map { |slug| other_slugs[slug] }
         else
           other_collection_for_type(type).resources.find do |other_resource|
             other_resource.data.slug == resource.data[type]

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

@@ -22,8 +22,8 @@ module Bridgetown
         to_h
       end
 
-      ruby2_keywords def to_json(*options)
-        as_json(*options).to_json(*options)
+      def to_json(...)
+        as_json(...).to_json(...)
       end
     end
   end

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

@@ -48,8 +48,8 @@ module Bridgetown
         to_h
       end
 
-      ruby2_keywords def to_json(*options)
-        as_json(*options).to_json(*options)
+      def to_json(...)
+        as_json(...).to_json(...)
       end
     end
   end

data/lib/bridgetown-core/ruby_template_view.rb

@@ -61,9 +61,9 @@ module Bridgetown
       @helpers ||= Helpers.new(self, site)
     end
 
-    ruby2_keywords def method_missing(method_name, *args, &block)
+    def method_missing(method_name, *args, **kwargs, &block)
       if helpers.respond_to?(method_name.to_sym)
-        helpers.send method_name.to_sym, *args, &block
+        helpers.send method_name.to_sym, *args, **kwargs, &block
       else
         super
       end

data/lib/bridgetown-core/site.rb

@@ -13,9 +13,10 @@ module Bridgetown
     include SSR
     include Writable
 
-    attr_reader   :root_dir, :source, :dest, :cache_dir, :config,
-                  :liquid_renderer, :components_load_paths,
-                  :includes_load_paths
+    attr_reader :root_dir, :source, :dest, :cache_dir, :config, :liquid_renderer
+
+    # @return [Bridgetown::Utils::LoadersManager]
+    attr_reader :loaders_manager
 
     # All files not pages/documents or structured data in the source folder
     # @return [Array<StaticFile>]
@@ -33,11 +34,20 @@ module Bridgetown
 
     # Initialize a new Site.
     #
-    # config - A Hash containing site configuration details.
-    def initialize(config)
+    # @param config [Bridgetown::Configuration]
+    # @param loaders_manager [Bridgetown::Utils::LoadersManager] initialized if none provided
+    def initialize(config, loaders_manager: nil)
       self.config = config
       locale
 
+      loaders_manager = if loaders_manager
+                          loaders_manager.config = self.config
+                          loaders_manager
+                        else
+                          Bridgetown::Utils::LoadersManager.new(self.config)
+                        end
+      @loaders_manager = loaders_manager
+
       @plugin_manager  = PluginManager.new(self)
       @cleaner         = Cleaner.new(self)
       @reader          = Reader.new(self)