bridgetown-core 0.21.0.beta2 → 0.21.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5271d5bbaf78f54da137c78c0885ca8ca7b66787ea432c362bd1c51416a39c2
-  data.tar.gz: 440500addaa640424b810080179b9e20b22bf9f2936605c77635563c0f102cd1
+  metadata.gz: fc153d4826e8e0678bea76a9e2c251040123418ab9cfe0b1243b7f38cb8f1ec5
+  data.tar.gz: '08d6c10878993b10963dc1a89058c8b0a9dbd57a5ed2b399963a68ea537ea5f8'
 SHA512:
-  metadata.gz: 375d68544812f8238a226aa6a9986baa74bf08a19d674f1290729ffe556c9a9af29887ef215acd219e6a7e2c0f29fa90c4832afe72c8c37425e3746fa6367531
-  data.tar.gz: 1bc5fcb4c65abf6c394332d891883547106ddb2d233519766578bc33fe1778bd1e97ee830c9dc33f556a7e2486d36f17e6534482b3b51f1af0ca8d463ba6c105
+  metadata.gz: 7151ae352509556c2b6b7e524e56186a3c782746dc1f2090756a37e9325c9153e48a03daf720e64fd0450e472a43b96c3e9b90ec53896d409881ab33b8aabea0
+  data.tar.gz: 42289c4f1da1116e37fa50bdb49345264e2a56a719f1e76691eb294721a1b4c834909ab7dc22691d238bec4df509c6680c479fa7b6fec8831f69d79bee8fef6b

data/bridgetown-core.gemspec

@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("liquid-component",      ">= 0.1")
   s.add_runtime_dependency("listen",                "~> 3.0")
   s.add_runtime_dependency("rouge",                 "~> 3.0")
-  s.add_runtime_dependency("safe_yaml",             "~> 1.0")
   s.add_runtime_dependency("terminal-table",        "~> 1.8")
   s.add_runtime_dependency("thor",                  "~> 1.1")
   s.add_runtime_dependency("tilt",                  "~> 2.0")

data/lib/bridgetown-core.rb

@@ -28,6 +28,7 @@ require "logger"
 require "set"
 require "csv"
 require "json"
+require "yaml"
 
 # 3rd party
 require "active_support"
@@ -44,7 +45,6 @@ require "active_support/current_attributes"
 require "active_support/descendants_tracker"
 require "hash_with_dot_access"
 require "addressable/uri"
-require "safe_yaml/load"
 require "liquid"
 require "liquid-component"
 require "kramdown"
@@ -62,21 +62,8 @@ module HashWithDotAccess
   end
 end
 
-SafeYAML::OPTIONS[:suppress_warnings] = true
-
 # Create our little String subclass for Ruby Front Matter
 class Rb < String; end
-SafeYAML::OPTIONS[:whitelisted_tags] = ["!ruby/string:Rb"]
-
-if RUBY_VERSION.start_with?("3.0")
-  # workaround for Ruby 3 preview 2, maybe can remove later
-  # rubocop:disable Style/GlobalVars
-  old_verbose = $VERBOSE
-  $VERBOSE = nil
-  SafeYAML::SafeToRubyVisitor.const_set(:INITIALIZE_ARITY, 2)
-  $verbose = old_verbose
-  # rubocop:enable Style/GlobalVars
-end
 
 module Bridgetown
   autoload :Cleaner,             "bridgetown-core/cleaner"
@@ -128,6 +115,7 @@ module Bridgetown
   autoload :Validatable,         "bridgetown-core/concerns/validatable"
   autoload :VERSION,             "bridgetown-core/version"
   autoload :Watcher,             "bridgetown-core/watcher"
+  autoload :YAMLParser,          "bridgetown-core/yaml_parser"
 
   # extensions
   require "bridgetown-core/commands/registrations"
@@ -145,6 +133,7 @@ module Bridgetown
   require_all "bridgetown-core/drops"
   require_all "bridgetown-core/generators"
   require_all "bridgetown-core/tags"
+  require_all "bridgetown-core/core_ext"
 
   class << self
     # Tells you which Bridgetown environment you are building in so
@@ -271,6 +260,9 @@ module Bridgetown
   module Resource; end
 end
 
+# This method is available in Ruby 3, monkey patching for older versions
+Psych.extend Bridgetown::CoreExt::Psych::SafeLoadFile unless Psych.respond_to?(:safe_load_file)
+
 loader = Zeitwerk::Loader.new
 loader.push_dir File.join(__dir__, "bridgetown-core/model"), namespace: Bridgetown::Model
 loader.push_dir File.join(__dir__, "bridgetown-core/resource"), namespace: Bridgetown::Resource

data/lib/bridgetown-core/cleaner.rb

@@ -101,7 +101,7 @@ module Bridgetown
     #
     # Returns a Set with the directory paths
     def keep_dirs
-      site.keep_files.flat_map { |file| parent_dirs(site.in_dest_dir(file)) }.to_set
+      site.config.keep_files.flat_map { |file| parent_dirs(site.in_dest_dir(file)) }.to_set
     end
 
     # Private: Creates a regular expression from the config's keep_files array
@@ -112,7 +112,7 @@ module Bridgetown
     #
     # Returns the regular expression
     def keep_file_regex
-      %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})!
+      %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.config.keep_files).source})!
     end
   end
 end

data/lib/bridgetown-core/collection.rb

@@ -287,7 +287,7 @@ module Bridgetown
         Pathname(full_path).relative_path_from(Pathname(site.source)).to_s
       )
       resource = Bridgetown::Model::Base.find(id).to_resource.read!
-      resources << resource if site.unpublished || resource.published?
+      resources << resource if site.config.unpublished || resource.published?
     end
 
     private
@@ -298,7 +298,7 @@ module Bridgetown
 
     def read_document(full_path)
       doc = Document.new(full_path, site: site, collection: self).tap(&:read)
-      docs << doc if site.unpublished || doc.published?
+      docs << doc if site.config.unpublished || doc.published?
     end
 
     def sort_docs!

data/lib/bridgetown-core/commands/concerns/git_helpers.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Commands
+    module GitHelpers
+      def initialize_new_repo
+        run "git init", abort_on_failure: true
+        `git symbolic-ref HEAD refs/heads/main` if user_default_branch.empty?
+      end
+
+      def destroy_existing_repo
+        run "rm -rf .git"
+      end
+
+      def user_default_branch
+        @user_default_branch ||= `git config init.defaultbranch`.strip
+      end
+    end
+  end
+end

data/lib/bridgetown-core/commands/configure.rb

@@ -4,6 +4,7 @@ module Bridgetown
   module Commands
     class Configure < Thor::Group
       include Thor::Actions
+      include Actions
       extend Summarizable
 
       Registrations.register do
@@ -20,13 +21,13 @@ module Bridgetown
       end
 
       def perform_configurations
-        logger = Bridgetown.logger
+        @logger = Bridgetown.logger
         list_configurations if args.empty?
 
         args.each do |configuration|
           configure configuration
         rescue Thor::Error
-          logger.error "Error:".red, "🚨 Configuration doesn't exist: #{configuration}"
+          @logger.error "Error:".red, "🚨 Configuration doesn't exist: #{configuration}"
         end
       end
 
@@ -40,7 +41,7 @@ module Bridgetown
         configuration_file = find_in_source_paths("#{configuration}.rb")
 
         inside(New.created_site_dir || Dir.pwd) do
-          Apply.new.invoke(:apply_automation, [configuration_file])
+          apply configuration_file, verbose: false
         end
       end
 

data/lib/bridgetown-core/commands/new.rb

@@ -4,6 +4,7 @@ module Bridgetown
   module Commands
     class New < Thor::Group
       include Thor::Actions
+      include GitHelpers
       extend Summarizable
 
       Registrations.register do
@@ -157,8 +158,7 @@ module Bridgetown
       def git_init(path)
         unless Bridgetown.environment == "test"
           inside(path) do
-            run "git init", abort_on_failure: true
-            run "if [[ -n $(git status | grep 'On branch master') ]]; then git checkout -b main; fi"
+            initialize_new_repo
           end
         end
       rescue SystemExit

data/lib/bridgetown-core/commands/plugins.rb

@@ -5,6 +5,7 @@ module Bridgetown
     class Plugins < Thor
       include Thor::Actions
       include ConfigurationOverridable
+      include GitHelpers
 
       Registrations.register do
         desc "plugins <command>", "List installed plugins or access plugin content"
@@ -144,15 +145,15 @@ module Bridgetown
         name = folder_name.dasherize
         module_name = folder_name.camelize
 
-        run "git clone https://github.com/bridgetownrb/bridgetown-sample-plugin #{name}"
+        # TODO: upon 0.21 release, remove the explicit branch name!
+        run "git clone -b switch-to-minitest https://github.com/bridgetownrb/bridgetown-sample-plugin #{name}"
         new_gemspec = "#{name}.gemspec"
 
         inside name do # rubocop:todo Metrics/BlockLength
-          run "rm -rf .git"
-          run "git init"
-          run "if [[ -n $(git status | grep 'On branch master') ]]; then git checkout -b main; fi"
+          destroy_existing_repo
+          initialize_new_repo
 
-          run "mv bridgetown-sample-plugin.gemspec #{new_gemspec}"
+          FileUtils.mv "bridgetown-sample-plugin.gemspec", new_gemspec.to_s
           gsub_file new_gemspec, "https://github.com/bridgetownrb/bridgetown-sample-plugin", "https://github.com/username/#{name}"
           gsub_file new_gemspec, "bridgetown-sample-plugin", name
           gsub_file new_gemspec, "sample-plugin", name
@@ -161,21 +162,21 @@ module Bridgetown
           gsub_file "package.json", "https://github.com/bridgetownrb/bridgetown-sample-plugin", "https://github.com/username/#{name}"
           gsub_file "package.json", "bridgetown-sample-plugin", name
 
-          run "mv lib/sample-plugin.rb lib/#{name}.rb"
+          FileUtils.mv "lib/sample-plugin.rb", "lib/#{name}.rb"
           gsub_file "lib/#{name}.rb", "sample-plugin", name
           gsub_file "lib/#{name}.rb", "SamplePlugin", module_name
 
-          run "mv lib/sample-plugin lib/#{name}"
+          FileUtils.mv "lib/sample-plugin", "lib/#{name}"
           gsub_file "lib/#{name}/builder.rb", "SamplePlugin", module_name
           gsub_file "lib/#{name}/version.rb", "SamplePlugin", module_name
 
-          run "mv spec/sample-plugin_spec.rb spec/#{name}_spec.rb"
-          gsub_file "spec/#{name}_spec.rb", "SamplePlugin", module_name
-          gsub_file "spec/spec_helper.rb", "sample-plugin", name
+          FileUtils.mv "test/test_sample_plugin.rb", "test/test_#{folder_name}.rb"
+          gsub_file "test/test_#{folder_name}.rb", "SamplePlugin", module_name
+          gsub_file "test/helper.rb", "sample-plugin", name
 
-          run "mv components/sample_plugin components/#{folder_name}"
-          run "mv content/sample_plugin content/#{folder_name}"
-          run "mv layouts/sample_plugin layouts/#{folder_name}"
+          FileUtils.mv "components/sample_plugin", "components/#{folder_name}"
+          FileUtils.mv "content/sample_plugin", "content/#{folder_name}"
+          FileUtils.mv "layouts/sample_plugin", "layouts/#{folder_name}"
 
           gsub_file "layouts/#{folder_name}/layout.html", "sample_plugin", folder_name
           gsub_file "content/#{folder_name}/example_page.md", "sample_plugin", folder_name

data/lib/bridgetown-core/concerns/front_matter_importer.rb

@@ -25,7 +25,7 @@ module Bridgetown
       if yaml_content
         self.content = yaml_content.post_match
         self.front_matter_line_count = yaml_content[1].lines.size - 1
-        SafeYAML.load(yaml_content[1])
+        YAMLParser.load(yaml_content[1])
       elsif ruby_content
         # rbfm header + content underneath
         self.content = ruby_content.post_match
@@ -37,7 +37,7 @@ module Bridgetown
         self.content = file_contents
         {}
       else
-        yaml_data = SafeYAML.load_file(file_path)
+        yaml_data = YAMLParser.load_file(file_path)
         yaml_data.is_a?(Array) ? { rows: yaml_data } : yaml_data
       end
     end

data/lib/bridgetown-core/concerns/site/configurable.rb

@@ -18,18 +18,13 @@ class Bridgetown::Site
       @root_dir        = File.expand_path(config["root_dir"]).freeze
       @source          = File.expand_path(config["source"]).freeze
       @dest            = File.expand_path(config["destination"]).freeze
-      @cache_dir       = in_root_dir(config["cache_dir"]).freeze
-
-      %w(lsi highlighter baseurl exclude include future unpublished
-         limit_posts keep_files).each do |opt|
-        send("#{opt}=", config[opt])
-      end
 
       configure_cache
       configure_component_paths
       configure_include_paths
       configure_file_read_opts
 
+      self.baseurl = config.baseurl
       self.permalink_style = (config["permalink"] || "pretty").to_sym
 
       @config
@@ -153,7 +148,8 @@ class Bridgetown::Site
 
     # Disable Marshaling cache to disk in Safe Mode
     def configure_cache
-      Bridgetown::Cache.cache_dir = in_root_dir(config["cache_dir"], "Bridgetown/Cache")
+      @cache_dir = in_root_dir(config["cache_dir"]).freeze
+      Bridgetown::Cache.cache_dir = File.join(cache_dir, "Bridgetown/Cache")
       Bridgetown::Cache.disable_disk_cache! if config["disable_disk_cache"]
     end
 

data/lib/bridgetown-core/concerns/site/localizable.rb

@@ -5,13 +5,11 @@ class Bridgetown::Site
     # Returns the current and/or default configured locale
     # @return String
     def locale
-      if @locale
-        @locale
-      else
-        @locale = ENV.fetch("BRIDGETOWN_LOCALE", config[:default_locale]).to_sym
+      @locale ||= begin
+        locale = ENV.fetch("BRIDGETOWN_LOCALE", config[:default_locale]).to_sym
         I18n.load_path << Dir[in_source_dir("_locales") + "/*.yml"]
         I18n.available_locales = config[:available_locales]
-        I18n.default_locale = @locale
+        I18n.default_locale = locale
       end
     end
 

data/lib/bridgetown-core/concerns/site/processable.rb

@@ -42,8 +42,6 @@ class Bridgetown::Site
       @liquid_renderer.reset
       frontmatter_defaults.reset
 
-      raise ArgumentError, "limit_posts must be a non-negative number" if limit_posts.negative?
-
       Bridgetown::Cache.clear_if_config_changed config
       Bridgetown::Hooks.trigger :site, :after_reset, self
     end
@@ -61,8 +59,11 @@ class Bridgetown::Site
 
     # Limits the current posts; removes the posts which exceed the limit_posts
     def limit_posts!
-      if limit_posts.positive?
-        limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
+      if config.limit_posts.positive?
+        Bridgetown::Deprecator.deprecation_message(
+          "The limit_posts config option will be removed prior to Bridgetown 1.0"
+        )
+        limit = posts.docs.length < config.limit_posts ? posts.docs.length : config.limit_posts
         posts.docs = posts.docs[-limit, limit]
       end
     end

data/lib/bridgetown-core/concerns/validatable.rb

@@ -19,7 +19,7 @@ module Bridgetown
                                  **Utils.merged_file_read_opts(site, opts))
         if content =~ Document::YAML_FRONT_MATTER_REGEXP
           self.content = $POSTMATCH
-          self.data = SafeYAML.load(Regexp.last_match(1))&.with_dot_access
+          self.data = YAMLParser.load(Regexp.last_match(1))&.with_dot_access
         end
       rescue Psych::SyntaxError => e
         Bridgetown.logger.warn "YAML Exception reading #{filename}: #{e.message}"

data/lib/bridgetown-core/configuration.rb

@@ -147,7 +147,7 @@ module Bridgetown
         Bridgetown::Utils::RequireGems.require_with_graceful_fail("tomlrb") unless defined?(Tomlrb)
         Tomlrb.load_file(filename)
       when %r!\.ya?ml!i
-        SafeYAML.load_file(filename) || {}
+        YAMLParser.load_file(filename) || {}
       else
         raise ArgumentError,
               "No parser for '#{filename}' is available. Use a .y(a)ml or .toml file instead."

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

@@ -4,9 +4,7 @@
 
 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}"

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,9 +4,7 @@
 
 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}"

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/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/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/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/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}")
             {}

data/lib/bridgetown-core/related_posts.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Bridgetown
+  # TODO: to be retired once the Resource engine is made official
   class RelatedPosts
     class << self
       attr_accessor :lsi
@@ -11,13 +12,15 @@ module Bridgetown
     def initialize(post)
       @post = post
       @site = post.site
-      Bridgetown::Utils::RequireGems.require_with_graceful_fail("classifier-reborn") if site.lsi
+      if site.config.lsi
+        Bridgetown::Utils::RequireGems.require_with_graceful_fail("classifier-reborn")
+      end
     end
 
     def build
       return [] unless site.collections.posts.docs.size > 1
 
-      if site.lsi
+      if site.config.lsi
         build_index
         lsi_related_posts
       else

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

@@ -98,7 +98,7 @@ module Bridgetown
       alias_method :read, :read! # TODO: eventually use the bang version only
 
       def transform!
-        transformer.process! if output_allowed?
+        transformer.process! unless collection.data?
       end
 
       def trigger_hooks(hook_name, *args)
@@ -178,12 +178,8 @@ module Bridgetown
         end
       end
 
-      def output_allowed?
-        !collection.data? && data.config&.output != false
-      end
-
       def requires_destination?
-        collection.write? && output_allowed?
+        collection.write? && data.config&.output != false
       end
 
       def write?
@@ -262,7 +258,7 @@ module Bridgetown
       alias_method :next_doc, :next_resource
 
       def previous_resource
-        pos = collection.docs.index { |item| item.equal?(self) }
+        pos = collection.resources.index { |item| item.equal?(self) }
         collection.resources[pos - 1] if pos&.positive?
       end
       alias_method :previous_doc, :previous_resource

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

@@ -15,6 +15,7 @@ module Bridgetown
       def initialize(resource)
         @resource = resource
         @site = resource.site
+        @conversions = []
       end
 
       # @return [String]
@@ -110,7 +111,7 @@ module Bridgetown
 
       ### Transformation Actions
 
-      def run_conversions # rubocop:disable Metrics/AbcSize
+      def run_conversions # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         input = resource.content.to_s
 
         # @param content [String]
@@ -125,7 +126,8 @@ module Bridgetown
             type: :content,
             converter: converter,
             output: Bridgetown.env.production? ? nil : output,
-            output_ext: conversions[index][:output_ext],
+            output_ext: conversions[index]&.dig(:output_ext) ||
+              converter.output_ext(resource.extname),
           }
           output.html_safe
         rescue StandardError => e

data/lib/bridgetown-core/site.rb

@@ -30,12 +30,11 @@ module Bridgetown
     # is default
     alias_method :generated_pages, :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
+    attr_accessor :permalink_style, :time, :baseurl, :data,
+                  :file_read_opts, :plugin_manager, :converters,
+                  :generators, :reader
 
-    # Public: Initialize a new Site.
+    # Initialize a new Site.
     #
     # config - A Hash containing site configuration details.
     def initialize(config)

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/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.21.0.beta2"
+  VERSION = "0.21.0.beta3"
   CODE_NAME = "Broughton Beach"
 end

data/lib/bridgetown-core/yaml_parser.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  class YAMLParser
+    PERMITTED_CLASSES = [Date, Time, Rb].freeze
+
+    class << self
+      def load_file(filename, **kwargs)
+        kwargs = { permitted_classes: PERMITTED_CLASSES }.merge(kwargs)
+        YAML.safe_load_file(filename, **kwargs)
+      end
+
+      def load(yaml)
+        if RUBY_VERSION.start_with?("2.5")
+          YAML.safe_load yaml, PERMITTED_CLASSES
+        else
+          YAML.safe_load yaml, permitted_classes: PERMITTED_CLASSES
+        end
+      end
+    end
+  end
+end

data/lib/site_template/plugins/site_builder.rb

@@ -1,4 +1,4 @@
 class SiteBuilder < Bridgetown::Builder
-  # write builders which subclass SiteBuilder in plugins/builder
+  # write builders which subclass SiteBuilder in plugins/builders
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.21.0.beta2
+  version: 0.21.0.beta3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -327,6 +313,7 @@ files:
 - lib/bridgetown-core/commands/concerns/actions.rb
 - lib/bridgetown-core/commands/concerns/build_options.rb
 - lib/bridgetown-core/commands/concerns/configuration_overridable.rb
+- lib/bridgetown-core/commands/concerns/git_helpers.rb
 - lib/bridgetown-core/commands/concerns/summarizable.rb
 - lib/bridgetown-core/commands/configure.rb
 - lib/bridgetown-core/commands/console.rb
@@ -373,6 +360,7 @@ files:
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
 - lib/bridgetown-core/converters/ruby_templates.rb
 - lib/bridgetown-core/converters/smartypants.rb
+- lib/bridgetown-core/core_ext/psych.rb
 - lib/bridgetown-core/current.rb
 - lib/bridgetown-core/deprecator.rb
 - lib/bridgetown-core/document.rb
@@ -457,6 +445,7 @@ files:
 - lib/bridgetown-core/utils/ruby_front_matter.rb
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
+- lib/bridgetown-core/yaml_parser.rb
 - lib/site_template/.gitignore
 - lib/site_template/Gemfile.erb
 - lib/site_template/README.md