bridgetown-core 1.0.0.alpha1 → 1.0.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835cfe03f425b73a33a5086c3d36a343c81bad231d31bf01049a4f7dd0d6cea5
-  data.tar.gz: 9c9a1a226a5ec9f40ad74203d8b692c4d4c126b3e35ab672893f69bea71dc79b
+  metadata.gz: 1e1d25e217de2040b4951a2143b0968808ebcd755055351f1745579d362d57df
+  data.tar.gz: 61f132206080c941392bcd1f0bb995f349cadea050dba16b6c02753471e48706
 SHA512:
-  metadata.gz: ad5c876760ccc74c3662b989e682e7aa774fa91fb55e616ecc88d9237b37fede1edb0b5e2a48eccb9d9ecf5880cef46d5c8357ec4fb8550f4cad48c88c4b66b7
-  data.tar.gz: fa62ec5bbb0b5a121a1f0d0d68e11a562dba1a6714539c1a29802994722b9c783722313bc43248b99b75f87e979d9d74a7e84a40e11da567e9555dd3ae4b295c
+  metadata.gz: 0ff3379e1bf073afd9fd9d5d882cea276c3130fa527e64586faba1c91f8e4d5563b8b59f8d4d3f78abe9589f59511d2c68e824803ba314bbf50a1270df07dfd2
+  data.tar.gz: 7a2afb73e70f34cc0e1e68ee0304c2973b760530ae51f4a6700caad90a897e9c636be4216653b6c08d43accaf9c47380f0217805c7e25c5527ccfafb09510d80

data/.rubocop.yml

@@ -0,0 +1,35 @@
+---
+inherit_from: ../.rubocop.yml
+
+AllCops:
+  Exclude:
+    - "*.gemspec"
+    - bin/**/*
+    - exe/**/*
+    - benchmark/**/*
+    - script/**/*
+    - vendor/**/*
+    - tmp/**/*
+    - test/source/**/*
+    - lib/site_template/Rakefile
+    - lib/site_template/config.ru
+    - lib/site_template/config/**/*
+    - lib/site_template/plugins/site_builder.rb
+
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - test/test_filters.rb
+    - test/test_liquid_extensions.rb
+    - test/test_site.rb
+
+Lint/MissingSuper:
+  Exclude:
+    - test/test_liquid_extensions.rb
+
+Performance/CollectionLiteralInLoop:
+  Exclude:
+    - test/test_filters.rb
+
+Style/StringConcatenation:
+  Exclude:
+    - test/test_apply_command.rb

data/Rakefile

@@ -13,16 +13,16 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'yard'
+require "yard"
 YARD::Rake::YardocTask.new(:yard) do |t|
- t.files   = ['lib/**/*.rb']
- t.options = ['--no-output']
- t.stats_options = ['--list-undoc']
+  t.files = ["lib/**/*.rb"]
+  t.options = ["--no-output"]
+  t.stats_options = ["--list-undoc"]
 end
 
 namespace :yard do
   task :serve do
-    port = ENV['YARD_PORT'] || "8808"
+    port = ENV["YARD_PORT"] || "8808"
     sh("yard server --reload -p #{port}")
   end
 end

data/lib/bridgetown-core/cache.rb

@@ -82,11 +82,9 @@ module Bridgetown
       return @cache[key] if @cache.key?(key)
 
       path = path_to(hash(key))
-      if disk_cache_enabled? && File.file?(path) && File.readable?(path)
-        @cache[key] = load(path)
-      else
-        raise
-      end
+      raise unless disk_cache_enabled? && File.file?(path) && File.readable?(path)
+
+      @cache[key] = load(path)
     end
 
     # Add an item to cache

data/lib/bridgetown-core/cleaner.rb

@@ -3,7 +3,7 @@
 module Bridgetown
   # Handles the cleanup of a site's destination before it is built.
   class Cleaner
-    HIDDEN_FILE_REGEX = %r!\/\.{1,2}$!.freeze
+    HIDDEN_FILE_REGEX = %r!/\.{1,2}$!.freeze
     attr_reader :site
 
     def initialize(site)
@@ -104,7 +104,7 @@ module Bridgetown
     #
     # Returns the regular expression
     def keep_file_regex
-      %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.config.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

@@ -190,7 +190,7 @@ module Bridgetown
     # @param label [String] the possibly-unsafe label
     # @return [String] sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(%r![^a-z0-9_\-\.]!i, "")
+      label.gsub(%r![^a-z0-9_\-.]!i, "")
     end
 
     # Produce a representation of this Collection for use in Liquid.
@@ -215,9 +215,7 @@ module Bridgetown
     # Used by Resource's permalink processor
     # @return [String]
     def default_permalink
-      metadata.fetch("permalink") do
-        "/:collection/:path/"
-      end
+      metadata.fetch("permalink", "/:collection/:path/")
     end
 
     # Extract options for this collection from the site configuration.
@@ -227,7 +225,7 @@ module Bridgetown
       site.config.collections[label] || HashWithDotAccess::Hash.new
     end
 
-    def merge_data_resources # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+    def merge_data_resources # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       data_contents = {}
 
       sanitize_filename = ->(name) do
@@ -349,7 +347,7 @@ module Bridgetown
 
     def order_with_warning(sort_key, resource, order)
       Bridgetown.logger.warn "Sort warning:", "'#{sort_key}' not defined in" \
-                              " #{resource.relative_path}"
+                                              " #{resource.relative_path}"
       order
     end
 

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

@@ -17,9 +17,10 @@ module Bridgetown
       class << self
         # Override single character commands if necessary
         def find_command_possibilities(subcommand)
-          if subcommand == "c"
+          case subcommand
+          when "c"
             ["console"]
-          elsif subcommand == "s"
+          when "s"
             ["start"]
           else
             super
@@ -53,7 +54,7 @@ module Bridgetown
             cmd = cmd.split("[")
             args = []
             if cmd[1]
-              args = cmd[1].gsub('\,', "__COMMA__").delete_suffix!("]").split(",").map do |item|
+              args = cmd[1].gsub("\\,", "__COMMA__").delete_suffix!("]").split(",").map do |item|
                 item.gsub("__COMMA__", ",")
               end
             end

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

@@ -23,7 +23,7 @@ module Bridgetown
 
       def self.print_startup_message
         Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
-                               " (codename \"#{Bridgetown::CODE_NAME.yellow}\")"
+                                            " (codename \"#{Bridgetown::CODE_NAME.yellow}\")"
       end
 
       # Build your bridgetown site
@@ -46,7 +46,7 @@ module Bridgetown
 
         if config_options.fetch("skip_initial_build", false)
           Bridgetown.logger.warn "Build Warning:", "Skipping the initial build." \
-                                 " This may result in an out-of-date site."
+                                                   " This may result in an out-of-date site."
         else
           build_site(config_options)
         end
@@ -78,19 +78,20 @@ module Bridgetown
         Bridgetown.logger.info "Generating…"
         @site.process
         Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
-                                " #{(Time.now - t).ceil(2)} seconds."
-        if config_options[:using_puma]
-          require "socket"
-          external_ip = Socket.ip_address_list.find do |ai|
-            ai.ipv4? && !ai.ipv4_loopback?
-          end&.ip_address
-          scheme = config_options.bind&.split("://")&.first == "ssl" ? "https" : "http"
-          port = config_options.bind&.split(":")&.last || ENV["BRIDGETOWN_PORT"] || 4000
-          Bridgetown.logger.info ""
-          Bridgetown.logger.info "Now serving at:", "#{scheme}://localhost:#{port}".magenta
-          Bridgetown.logger.info "", "#{scheme}://#{external_ip}:#{port}".magenta if external_ip
-          Bridgetown.logger.info ""
-        end
+                                          " #{(Time.now - t).ceil(2)} seconds."
+
+        return unless config_options[:using_puma]
+
+        require "socket"
+        external_ip = Socket.ip_address_list.find do |ai|
+          ai.ipv4? && !ai.ipv4_loopback?
+        end&.ip_address
+        scheme = config_options.bind&.split("://")&.first == "ssl" ? "https" : "http"
+        port = config_options.bind&.split(":")&.last || ENV["BRIDGETOWN_PORT"] || 4000
+        Bridgetown.logger.info ""
+        Bridgetown.logger.info "Now serving at:", "#{scheme}://localhost:#{port}".magenta
+        Bridgetown.logger.info "", "#{scheme}://#{external_ip}:#{port}".magenta if external_ip
+        Bridgetown.logger.info ""
       end
 
       # Watch for file changes and rebuild the site.
@@ -114,10 +115,10 @@ module Bridgetown
         Bridgetown.logger.info "Source:", source
         Bridgetown.logger.info "Destination:", destination
         # TODO: work with arrays
-        if config_options["plugins_dir"].is_a?(String)
-          plugins_dir = File.expand_path(config_options["plugins_dir"])
-          Bridgetown.logger.info "Custom Plugins:", plugins_dir if Dir.exist?(plugins_dir)
-        end
+        return unless config_options["plugins_dir"].is_a?(String)
+
+        plugins_dir = File.expand_path(config_options["plugins_dir"])
+        Bridgetown.logger.info "Custom Plugins:", plugins_dir if Dir.exist?(plugins_dir)
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Bridgetown
         create_file("plugins/builders/#{filename}", data, verbose: false)
       end
 
-      def javascript_import(data = nil, filename: "index.js")
+      def javascript_import(data = nil, filename: "index.js") # rubocop:todo Metrics/PerceivedComplexity
         data ||= yield if block_given?
         data += "\n" unless data.chars.last == "\n"
 
@@ -97,7 +97,7 @@ module Bridgetown
         github_match = GITHUB_REGEX.match(arg)
 
         arg = if arg.start_with?("https://gist.github.com")
-                arg.sub(
+                arg.sub( # rubocop:disable Style/StringConcatenation
                   "https://gist.github.com", "https://gist.githubusercontent.com"
                 ) + "/raw"
               elsif github_match

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

@@ -32,8 +32,8 @@ module Bridgetown
         require "amazing_print" unless options[:"bypass-ap"]
 
         Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
-                                    " (codename \"#{Bridgetown::CODE_NAME.yellow}\")" \
-                                    " console…"
+                                            " (codename \"#{Bridgetown::CODE_NAME.yellow}\")" \
+                                            " console…"
         Bridgetown.logger.info "Environment:", Bridgetown.environment.cyan
         site = Bridgetown::Site.new(configuration_with_overrides(options))
 
@@ -54,7 +54,7 @@ module Bridgetown
         IRB.conf[:IRB_RC]&.call(irb.context)
         IRB.conf[:MAIN_CONTEXT] = irb.context
         eval("site = $BRIDGETOWN_SITE", workspace.binding, __FILE__, __LINE__)
-        Bridgetown.logger.info "Console:", "Now loaded as " + "site".cyan + " variable."
+        Bridgetown.logger.info "Console:", "Now loaded as #{"site".cyan} variable."
 
         trap("SIGINT") do
           irb.signal_handle

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

@@ -50,7 +50,7 @@ module Bridgetown
                                "Detected '_posts' directory outside custom `collections_dir`!"
         Bridgetown.logger.warn "",
                                "Please move '#{posts_at_root}' into the custom directory at " \
-              "'#{site.in_source_dir(site.config["collections_dir"])}'"
+                               "'#{site.in_source_dir(site.config["collections_dir"])}'"
         false
       end
 
@@ -64,7 +64,7 @@ module Bridgetown
 
           conflicting_urls = true
           Bridgetown.logger.warn "Conflict:", "The URL '#{url}' is the destination" \
-            " for the following pages: #{paths.join(", ")}"
+                                              " for the following pages: #{paths.join(", ")}"
         end
         conflicting_urls
       end
@@ -76,9 +76,11 @@ module Bridgetown
           next unless real_urls.uniq.size > 1
 
           urls_only_differ_by_case = true
-          Bridgetown.logger.warn "Warning:", "The following URLs only differ" \
-            " by case. On a case-insensitive file system one of the URLs" \
-            " will be overwritten by the other: #{real_urls.join(", ")}"
+          Bridgetown.logger.warn(
+            "Warning:",
+            "The following URLs only differ by case. On a case-insensitive file system one of the" \
+            " URLs will be overwritten by the other: #{real_urls.join(", ")}"
+          )
         end
         urls_only_differ_by_case
       end
@@ -117,7 +119,7 @@ module Bridgetown
         return true unless url.nil? || url.empty?
 
         Bridgetown.logger.warn "Warning:", "You didn't set an URL in the config file, "\
-            "you may encounter problems with some plugins."
+                                           "you may encounter problems with some plugins."
         false
       end
 
@@ -128,7 +130,7 @@ module Bridgetown
       # https://git.io/vFfbx
       rescue TypeError
         Bridgetown.logger.warn "Warning:", "The site URL does not seem to be valid, "\
-            "check the value of `url` in your config file."
+                                           "check the value of `url` in your config file."
         false
       end
 
@@ -136,7 +138,7 @@ module Bridgetown
         return true if url.is_a?(String) && Addressable::URI.parse(url).absolute?
 
         Bridgetown.logger.warn "Warning:", "Your site URL does not seem to be absolute, "\
-            "check the value of `url` in your config file."
+                                           "check the value of `url` in your config file."
         false
       end
     end

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

@@ -59,8 +59,10 @@ module Bridgetown
 
         if preserve_source_location?(new_site_path, options)
           say_status :conflict, "#{new_site_path} exists and is not empty.", :red
-          Bridgetown.logger.abort_with "Ensure #{new_site_path} is empty or else " \
-                    "try again with `--force` to proceed and overwrite any files."
+          Bridgetown.logger.abort_with(
+            "Ensure #{new_site_path} is empty or else try again with `--force` to proceed and" \
+            " overwrite any files."
+          )
         end
 
         self.destination_root = self.class.created_site_dir = new_site_path
@@ -122,7 +124,7 @@ module Bridgetown
         bt_start = "bin/bridgetown start"
         logger.info ""
         logger.info "Success!".green, "🎉 Your new Bridgetown site was" \
-                    " generated in #{cli_path.cyan}."
+                                      " generated in #{cli_path.cyan}."
         if options["skip-yarn"]
           logger.info "You can now #{"cd".cyan} #{cli_path.cyan} to get started."
           logger.info "You'll probably also want to #{"yarn install".cyan}" \

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

@@ -112,12 +112,12 @@ module Bridgetown
           source_manifest.origin.to_s == directive[0]
         end
 
-        if manifest&.respond_to?(directive[1].downcase)
+        if manifest.respond_to?(directive[1].downcase)
           dir = manifest.send(directive[1].downcase)
           Bridgetown.logger.info("Opening the #{dir.green} folder for" \
-                                  " #{manifest.origin.to_s.cyan}…")
+                                 " #{manifest.origin.to_s.cyan}…")
           Bridgetown.logger.info("Type #{"exit".yellow} when you're done to" \
-                                  " return to your site root.")
+                                 " return to your site root.")
           puts
 
           Dir.chdir dir do
@@ -133,13 +133,12 @@ module Bridgetown
           Bridgetown.logger.info("Done!", "You're back in #{Dir.pwd.green}")
         else
           Bridgetown.logger.warn("Oops!", "I wasn't able to find the" \
-                                  " #{directive[1]} folder for #{directive[0]}")
+                                          " #{directive[1]} folder for #{directive[0]}")
         end
       end
 
       desc "new NAME", "Create a new plugin NAME (please-use-dashes) by" \
                        " cloning the sample plugin repo"
-      # rubocop:disable Layout/LineLength
       def new(plugin_name)
         folder_name = plugin_name.underscore
         name = folder_name.dasherize
@@ -187,11 +186,10 @@ module Bridgetown
         say ""
         say_status "Done!", "Have fun writing your new #{name} plugin :)"
         say_status "Remember:", "Don't forget to rename the SamplePlugin" \
-                               " code identifiers and paths to your own" \
-                               " indentifer, as well as update your README " \
-                               " and CHANGELOG files as necessary."
+                                " code identifiers and paths to your own" \
+                                " indentifer, as well as update your README " \
+                                " and CHANGELOG files as necessary."
       end
-      # rubocop:enable Layout/LineLength
 
       protected
 

data/lib/bridgetown-core/commands/serve/servlet.rb

@@ -8,7 +8,7 @@ module Bridgetown
       class Servlet < WEBrick::HTTPServlet::FileHandler
         DEFAULTS = {
           "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
-            "no-store, no-cache, must-revalidate",
+                             "no-store, no-cache, must-revalidate",
         }.freeze
 
         def initialize(server, root, callbacks)
@@ -51,9 +51,9 @@ module Bridgetown
           key = res.header.keys.grep(%r!content-type!i).first
           typ = res.header[key]
 
-          unless %r!;\s*charset=!.match?(typ)
-            res.header[key] = "#{typ}; charset=#{@bridgetown_opts["encoding"]}"
-          end
+          return if %r!;\s*charset=!.match?(typ)
+
+          res.header[key] = "#{typ}; charset=#{@bridgetown_opts["encoding"]}"
         end
 
         def set_defaults

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

@@ -48,8 +48,9 @@ module Bridgetown
       ).freeze
 
       def serve
-        Bridgetown::Deprecator.deprecation_message "The serve command will be " \
-          "removed in favor of using Puma in the next major release of Bridgetown"
+        Bridgetown::Deprecator.deprecation_message(
+          "WEBrick (serve) will be removed in favor of Puma (start) in the next Bridgetown release"
+        )
 
         @mutex = Mutex.new
         @run_cond = ConditionVariable.new
@@ -58,7 +59,6 @@ module Bridgetown
         no_watch = options["watch"] == false
 
         options = Thor::CoreExt::HashWithIndifferentAccess.new(self.options)
-
         options["serving"] = true
         options["watch"] = true unless no_watch
 
@@ -88,12 +88,12 @@ module Bridgetown
         require_relative "serve/servlet"
 
         FileUtils.mkdir_p(destination)
-        if File.exist?(File.join(destination, "404.html"))
-          WEBrick::HTTPResponse.class_eval do
-            def create_error_page
-              @header["Content-Type"] = "text/html; charset=UTF-8"
-              @body = IO.read(File.join(@config[:DocumentRoot], "404.html"))
-            end
+        return unless File.exist?(File.join(destination, "404.html"))
+
+        WEBrick::HTTPResponse.class_eval do
+          def create_error_page
+            @header["Content-Type"] = "text/html; charset=UTF-8"
+            @body = File.read(File.join(@config[:DocumentRoot], "404.html"))
           end
         end
       end
@@ -211,34 +211,32 @@ module Bridgetown
         begin
           opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(read_file(src, key))
         rescue StandardError
-          if defined?(OpenSSL::PKey::EC)
-            opts[:SSLPrivateKey] = OpenSSL::PKey::EC.new(read_file(src, key))
-          else
-            raise
-          end
+          raise unless defined?(OpenSSL::PKey::EC)
+
+          opts[:SSLPrivateKey] = OpenSSL::PKey::EC.new(read_file(src, key))
         end
         opts[:SSLEnable] = true
       end
 
       def start_callback(detached)
-        unless detached
-          proc do
-            @mutex.synchronize do
-              @running = true
-              Bridgetown.logger.info("Server running…", "press ctrl-c to stop.")
-              @run_cond.broadcast
-            end
+        return if detached
+
+        proc do
+          @mutex.synchronize do
+            @running = true
+            Bridgetown.logger.info("Server running…", "press ctrl-c to stop.")
+            @run_cond.broadcast
           end
         end
       end
 
       def stop_callback(detached)
-        unless detached
-          proc do
-            @mutex.synchronize do
-              @running = false
-              @run_cond.broadcast
-            end
+        return if detached
+
+        proc do
+          @mutex.synchronize do
+            @running = false
+            @run_cond.broadcast
           end
         end
       end

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

@@ -40,6 +40,12 @@ module Bridgetown
         # Load Bridgetown configuration into thread memory
         bt_options = configuration_with_overrides(options)
 
+        if Bridgetown.env.development? && !options["url"]
+          scheme = bt_options.bind&.split("://")&.first == "ssl" ? "https" : "http"
+          port = bt_options.bind&.split(":")&.last || ENV["BRIDGETOWN_PORT"] || 4000
+          bt_options.url = "#{scheme}://localhost:#{port}"
+        end
+
         puma_pid =
           Process.fork do
             require "puma/cli"
@@ -83,12 +89,6 @@ module Bridgetown
           Process.setproctitle("bridgetown #{Bridgetown::VERSION} [#{File.basename(Dir.pwd)}]")
 
           build_args = ["-w"] + ARGV.reject { |arg| arg == "start" }
-          if Bridgetown.env.development? && !options["url"]
-            scheme = bt_options.bind&.split("://")&.first == "ssl" ? "https" : "http"
-            port = bt_options.bind&.split(":")&.last || ENV["BRIDGETOWN_PORT"] || 4000
-            build_args << "--url"
-            build_args << "#{scheme}://localhost:#{port}"
-          end
           Bridgetown::Commands::Build.start(build_args)
         rescue StandardError => e
           Process.kill "SIGINT", puma_pid

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

@@ -66,7 +66,7 @@ module Bridgetown
 
         longest_action = supported_actions.keys.max_by(&:size).size
         supported_actions.each do |action, description|
-          say action.ljust(longest_action).to_s.bold.blue + "\t" + "# #{description}"
+          say "#{action.ljust(longest_action).to_s.bold.blue}\t# #{description}"
         end
       end
 

data/lib/bridgetown-core/component.rb

@@ -30,7 +30,7 @@ module Bridgetown
       #
       # @param ext [String] erb, slim, etc.
       def renderer_for_ext(ext, &block)
-        @_tmpl ||= case ext
+        @_tmpl ||= case ext.to_s
                    when "erb"
                      include ERBCapture
                      Tilt::ErubiTemplate.new(component_template_path,
@@ -97,9 +97,7 @@ module Bridgetown
     #
     # @return [String] or nil
     def content
-      @_content ||= begin
-        view_context.capture(self, &@_content_block) if @_content_block
-      end
+      @_content ||= (view_context.capture(self, &@_content_block) if @_content_block)
     end
 
     # Provide a render helper for evaluation within the component context.
@@ -166,7 +164,6 @@ module Bridgetown
       end
     end
 
-    # rubocop:disable Style/MissingRespondToMissing
     ruby2_keywords def method_missing(method, *args, &block)
       if helpers.respond_to?(method.to_sym)
         helpers.send method.to_sym, *args, &block
@@ -178,6 +175,5 @@ module Bridgetown
     def respond_to_missing?(method, include_private = false)
       helpers.respond_to?(method.to_sym, include_private) || super
     end
-    # rubocop:enable Style/MissingRespondToMissing
   end
 end

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

@@ -14,10 +14,10 @@ module Bridgetown
     end
 
     def liquid_engine_configured?
-      data["template_engine"] == "liquid" ||
+      data["template_engine"].to_s == "liquid" ||
         (
           data["template_engine"].nil? && (
-            site.config[:template_engine].nil? || site.config[:template_engine] == "liquid"
+            site.config[:template_engine].nil? || site.config[:template_engine].to_s == "liquid"
           )
         )
     end

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

@@ -21,7 +21,6 @@ class Bridgetown::Site
 
       configure_cache
       configure_component_paths
-      configure_include_paths
       configure_file_read_opts
 
       self.permalink_style = (config["permalink"] || "pretty").to_sym
@@ -165,7 +164,7 @@ class Bridgetown::Site
         dir.is_a?(Array) ? dir : [dir]
       end
       local_components_load_paths.map! do |dir|
-        if !!(dir =~ %r!^\.\.?\/!)
+        if !!(dir =~ %r!^\.\.?/!)
           # allow ./dir or ../../dir type options
           File.expand_path(dir.to_s, root_dir)
         else
@@ -176,10 +175,6 @@ class Bridgetown::Site
       @components_load_paths = plugin_components_load_paths + local_components_load_paths
     end
 
-    def configure_include_paths
-      @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-    end
-
     def configure_file_read_opts
       self.file_read_opts = {}
       file_read_opts[:encoding] = config["encoding"] if config["encoding"]

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

@@ -5,8 +5,8 @@ class Bridgetown::Site
   module Content
     def resources_grouped_by_taxonomy(taxonomy)
       data.site_taxonomies_hash ||= {}
-      data.site_taxonomies_hash[taxonomy.label] ||= begin
-        taxonomy.terms.transform_values { |terms| terms.map(&:resource).sort.reverse }
+      data.site_taxonomies_hash[taxonomy.label] ||= taxonomy.terms.transform_values do |terms|
+        terms.map(&:resource).sort.reverse
       end
     end