bridgetown-core 1.2.0.beta4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e8af225c97352ea9bcd919e789a97324fb28e6b2db3c6b48855f9a28cc3174'
-  data.tar.gz: 6919f66af92cccfac42de96d715a5607be949d8718cbb1d445525a305fd9c337
+  metadata.gz: 599f0ff57d4bac2146e5cacb12ccb8f2e7e02026815447c2db9cbf914ed9d3a2
+  data.tar.gz: be29cede2daa248b4db41bb6a7eaeebb7d3533b54a5cf891922b0762a6ca47e0
 SHA512:
-  metadata.gz: 6ff56bf0f74c78ca29f34f975ef53b21c3ca909dfd3089a73e83765cd573d9d330c7434f17192088d1ee009e60d39b52312de43758de061139e3f0e606bc9f82
-  data.tar.gz: 00ddd1d66a630f5e9ba30d693fc5df8feefaa455343bbb6c13100e87f0428b1ea33d2ff50b160ae1f1857294aebdf594d26111feb815d4f9249d00737c0cfe0e
+  metadata.gz: 739ed852e60fabf0b6b2d352c8ce8993d4751a1f6cfec67c0bb7ed4cc5f0af41bb82fb8dc3eb34f5806a421bcec38e9050cd0fbcb50249a0482f5804e19a1d27
+  data.tar.gz: 97eea9cb28095624a8d47821f754df39790d8db46e62d79774371113c875fd914a796f3e445ad982e6f8de8e94d5babf7b8be1736c4bc93f3a9fe0a0f6862433

data/bridgetown-core.gemspec

@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("roda",                  "~> 3.46")
   s.add_runtime_dependency("rouge",                 "~> 3.0")
   s.add_runtime_dependency("serbea",                "~> 1.0")
-  s.add_runtime_dependency("terminal-table",        "~> 1.8")
   s.add_runtime_dependency("thor",                  "~> 1.1")
   s.add_runtime_dependency("tilt",                  "~> 2.0")
   s.add_runtime_dependency("webrick",               "~> 1.7")

data/lib/bridgetown-core/collection.rb

@@ -285,7 +285,7 @@ module Bridgetown
         locales = model.locales || site.config.available_locales
 
         locales.each do |locale|
-          model.locale = locale
+          model.locale = locale.to_sym
           add_resource_from_model model
         end
 

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

@@ -27,7 +27,7 @@ module Bridgetown
 
       def javascript_import(data = nil, filename: "index.js") # rubocop:todo Metrics/PerceivedComplexity
         data ||= yield if block_given?
-        data += "\n" unless data.chars.last == "\n"
+        data += "\n" unless data[-1] == "\n"
 
         say_status :javascript_import, filename
 
@@ -56,8 +56,9 @@ module Bridgetown
         options = +""
         options += " -v \"#{version}\"" if version
         options += " -g #{group}" if group
+        # in_bundle? returns the path to the gemfile
         run "bundle add #{gemname}#{options}",
-            env: { "BUNDLE_GEMFILE" => File.join(destination_root, "Gemfile") }
+            env: { "BUNDLE_GEMFILE" => Bundler::SharedHelpers.in_bundle? }
       rescue SystemExit
         say_status :run, "Gem not added due to bundler error", :red
       end
@@ -68,7 +69,7 @@ module Bridgetown
         data = yield if block_given?
         data = data.indent(2).lstrip
         data = " #{data}" unless data.start_with?(",")
-        data += "\n" unless data.chars.last == "\n"
+        data += "\n" unless data[-1] == "\n"
 
         init_file = File.join("config", "initializers.rb")
         unless File.exist?(init_file)
@@ -85,7 +86,7 @@ module Bridgetown
         say_status :configure, name
         data = yield if block_given?
         data = data.indent(2)
-        data += "\n" unless data.chars.last == "\n"
+        data += "\n" unless data[-1] == "\n"
 
         init_file = File.join("config", "initializers.rb")
         unless File.exist?(init_file)

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

@@ -126,7 +126,7 @@ module Bridgetown
         Layouts, you'd run:\n
         bridgetown plugins cd SamplePlugin/Layouts
       DOC
-      desc "cd <origin/dir>", "Open folder (content, layouts, etc.) within the plugin origin"
+      desc "cd <origin/dir>", "Open content folder within the plugin origin"
 
       # This is super useful if you want to copy files out of plugins to override.
       #
@@ -177,38 +177,43 @@ module Bridgetown
         end
       end
 
-      desc "new NAME", "Create a new plugin NAME by cloning the sample plugin repo"
+      desc "new NAME", "Create a new plugin NAME (snake_case_name_preferred)"
       def new(name)
         folder_name = name.underscore
         module_name = folder_name.camelize
 
-        run "git clone -b v1.2-initializer https://github.com/bridgetownrb/bridgetown-sample-plugin #{name}"
-        new_gemspec = "#{name}.gemspec"
+        run "git clone https://github.com/bridgetownrb/bridgetown-sample-plugin #{name}"
+        new_gemspec = "#{folder_name}.gemspec"
 
         inside name do # rubocop:todo Metrics/BlockLength
           destroy_existing_repo
           initialize_new_repo
 
-          FileUtils.mv "bridgetown-sample-plugin.gemspec", new_gemspec.to_s
+          FileUtils.mv "sample_plugin.gemspec", new_gemspec
           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
+          gsub_file new_gemspec, "sample_plugin", folder_name
           gsub_file new_gemspec, "SamplePlugin", module_name
 
           gsub_file "package.json", "https://github.com/bridgetownrb/bridgetown-sample-plugin", "https://github.com/username/#{name}"
           gsub_file "package.json", "bridgetown-sample-plugin", name
+          gsub_file "package.json", "sample_plugin", folder_name
 
           FileUtils.mv "lib/sample_plugin.rb", "lib/#{folder_name}.rb"
-          gsub_file "lib/#{name}.rb", "sample_plugin", folder_name
-          gsub_file "lib/#{name}.rb", "SamplePlugin", module_name
+          gsub_file "lib/#{folder_name}.rb", "sample_plugin", folder_name
+          gsub_file "lib/#{folder_name}.rb", "SamplePlugin", module_name
 
           FileUtils.mv "lib/sample_plugin", "lib/#{folder_name}"
-          gsub_file "lib/#{name}/builder.rb", "SamplePlugin", module_name
-          gsub_file "lib/#{name}/version.rb", "SamplePlugin", module_name
+          gsub_file "lib/#{folder_name}/builder.rb", "SamplePlugin", module_name
+          gsub_file "lib/#{folder_name}/builder.rb", "sample_plugin", folder_name
+          gsub_file "lib/#{folder_name}/version.rb", "SamplePlugin", module_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
+          gsub_file "test/test_#{folder_name}.rb", "sample plugin", module_name
+          gsub_file "test/helper.rb", "sample_plugin", folder_name
+          gsub_file "test/fixtures/src/index.html", "sample_plugin", folder_name
+          gsub_file "test/fixtures/config/initializers.rb", "sample_plugin", folder_name
 
           FileUtils.mv "components/sample_plugin", "components/#{folder_name}"
           FileUtils.mv "content/sample_plugin", "content/#{folder_name}"
@@ -220,14 +225,15 @@ module Bridgetown
 
           gsub_file "components/#{folder_name}/plugin_component.rb", "SamplePlugin", module_name
 
-          gsub_file "frontend/javascript/index.js", "bridgetown-sample-plugin", name
+          gsub_file "frontend/javascript/index.js", "sample_plugin", folder_name
           gsub_file "frontend/javascript/index.js", "SamplePlugin", module_name
+          gsub_file "frontend/styles/index.css", "sample_plugin", folder_name
         end
         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" \
+                                " identifier, as well as update your README" \
                                 " and CHANGELOG files as necessary."
       end
 

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

@@ -42,6 +42,7 @@ module Bridgetown
         # Load Bridgetown configuration into thread memory
         bt_options = configuration_with_overrides(options)
 
+        # Set a local site URL in the config if one is not available
         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

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

@@ -9,9 +9,9 @@ module Bridgetown
 
     YAML_HEADER = %r!\A---\s*\n!.freeze
     YAML_BLOCK = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
-    RUBY_HEADER = %r!\A[~`#\-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
+    RUBY_HEADER = %r!\A[~`#-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
     RUBY_BLOCK =
-      %r!#{RUBY_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#\-]{3,}\s*$\n?)!m.freeze
+      %r!#{RUBY_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#-]{3,}\s*$\n?)!m.freeze
 
     def read_front_matter(file_path) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
       file_contents = File.read(

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

@@ -12,7 +12,11 @@ module Bridgetown
                      []
                    end
 
-      result_set.select { |item| item.data.slug == data.slug }.sort_by do |item|
+      matching_resources = result_set.select do |item|
+        item.relative_path.parent == relative_path.parent && item.data.slug == data.slug
+      end
+
+      matching_resources.sort_by do |item|
         site.config.available_locales.index item.data.locale
       end
     end

data/lib/bridgetown-core/configuration/configuration_dsl.rb

@@ -72,8 +72,12 @@ module Bridgetown
         @scope.roda_initializers << block
       end
 
+      def timezone(tz) # rubocop:disable Naming/MethodParameterName
+        Bridgetown.set_timezone(tz)
+      end
+
       def method_missing(key, *value, &block) # rubocop:disable Style/MissingRespondToMissing
-        return get(key) if value.length.zero? && block.nil?
+        return get(key) if value.empty? && block.nil?
 
         set(key, value[0], &block)
       end
@@ -132,7 +136,7 @@ module Bridgetown
 
         if require_initializer
           init_file_name = File.join(@scope.root_dir, "config", "#{name}.rb")
-          require(init_file_name) if File.exist?(init_file_name)
+          load(init_file_name) if File.exist?(init_file_name)
         end
 
         @scope.initializers[name.to_sym]

data/lib/bridgetown-core/configuration.rb

@@ -130,11 +130,11 @@ module Bridgetown
       end
     end
 
-    def run_initializers!(context:)
+    def run_initializers!(context:) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity
       initializers_file = File.join(root_dir, "config", "initializers.rb")
       return unless File.file?(initializers_file)
 
-      require initializers_file
+      load initializers_file
 
       return unless initializers # no initializers have been set up
 
@@ -144,9 +144,11 @@ module Bridgetown
       Bridgetown.logger.debug "Initializing:", "Running initializers with `#{context}' context in:"
       Bridgetown.logger.debug "", initializers_file
       self.init_params = {}
+      cached_url = url&.include?("//localhost") ? url : nil
       dsl = ConfigurationDSL.new(scope: self, data: self)
       dsl.instance_variable_set(:@context, context)
       dsl.instance_exec(dsl, &init_init.block)
+      self.url = cached_url if cached_url # restore local development URL if need be
 
       setup_load_paths! appending: true
 
@@ -308,7 +310,8 @@ module Bridgetown
       next_config
     rescue SystemCallError
       if @default_config_file ||= nil
-        Bridgetown.logger.warn "Configuration file:", "none"
+        initializers_file = File.join(root_dir, "config", "initializers.rb")
+        Bridgetown.logger.warn "Configuration file:", "none" unless File.file?(initializers_file)
         {}
       else
         Bridgetown.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
@@ -400,7 +403,7 @@ module Bridgetown
 
     DEFAULT_EXCLUDES = %w(
       .sass-cache .bridgetown-cache
-      gemfiles Gemfile Gemfile.lock
+      gemfiles Gemfile Gemfile.lock gems.rb gems.locked
       node_modules
       vendor/bundle/ vendor/cache/ vendor/gems/ vendor/ruby/
     ).freeze

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

@@ -4,7 +4,7 @@ module Bridgetown
   module Drops
     class StaticFileDrop < Drop
       extend Forwardable
-      def_delegators :@obj, :name, :extname, :modified_time, :basename
+      def_delegators :@obj, :name, :extname, :date, :modified_time, :basename
       def_delegator :@obj, :relative_path, :path
       def_delegator :@obj, :type, :collection
 

data/lib/bridgetown-core/helpers.rb

@@ -59,7 +59,7 @@ module Bridgetown
       #   `url` or `relative_url`
       # @return [String] the permalink URL for the file
       def url_for(relative_path)
-        if relative_path.respond_to?(:relative_url) # rubocop:disable Style/GuardClause
+        if relative_path.respond_to?(:relative_url)
           return safe(relative_path.relative_url) # new resource engine
         elsif relative_path.respond_to?(:url)
           return safe(relative_url(relative_path.url)) # old legacy engine

data/lib/bridgetown-core/liquid_renderer/table.rb

@@ -17,7 +17,9 @@ module Bridgetown
       private
 
       def tabulate(data)
-        require "terminal-table"
+        unless defined?(Terminal::Table)
+          Bridgetown::Utils::RequireGems.require_with_graceful_fail "terminal-table"
+        end
 
         header = data.shift
         footer = data.pop

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

@@ -7,9 +7,9 @@ module Bridgetown
       include Bridgetown::Utils::RubyFrontMatterDSL
 
       YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
-      RUBY_FRONT_MATTER_HEADER = %r!\A[~`#\-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
+      RUBY_FRONT_MATTER_HEADER = %r!\A[~`#-]{3,}(?:ruby|<%|{%)\s*\n!.freeze
       RUBY_FRONT_MATTER_REGEXP =
-        %r!#{RUBY_FRONT_MATTER_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#\-]{3,}\s*$\n?)!m.freeze
+        %r!#{RUBY_FRONT_MATTER_HEADER.source}(.*?\n?)^((?:%>|%})?[~`#-]{3,}\s*$\n?)!m.freeze
 
       # @return [String]
       attr_accessor :content

data/lib/bridgetown-core/plugin_manager.rb

@@ -61,7 +61,8 @@ module Bridgetown
     end
 
     def self.setup_bundler(skip_yarn: false)
-      if !ENV["BRIDGETOWN_NO_BUNDLER_REQUIRE"] && (File.file?("Gemfile") || Bridgetown.env.test?)
+      if !ENV["BRIDGETOWN_NO_BUNDLER_REQUIRE"] &&
+          (Bundler::SharedHelpers.in_bundle? || Bridgetown.env.test?)
         require "bundler"
 
         require_relative "utils/initializers"

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

@@ -14,10 +14,10 @@ Roda::RodaPlugins::Public::RequestMethods.module_eval do
       seg == ".." ? segments.pop : segments << seg
     end
 
-    path = ::File.join(roda_class.opts[:public_root], *segments)
-    unless ::File.file?(path)
-      path = ::File.join(path, "index.html")
-      if ::File.file?(path)
+    path = File.join(roda_class.opts[:public_root], *segments)
+    unless File.file?(path)
+      path = File.join(path, "index.html")
+      if File.file?(path)
         segments << "index.html"
       else
         segments[segments.size - 1] = "#{segments.last}.html"

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

@@ -373,7 +373,7 @@ module Bridgetown
         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
+        found_locale.to_sym
       end
 
       def format_url(url)

data/lib/bridgetown-core/static_file.rb

@@ -73,6 +73,8 @@ module Bridgetown
       @modified_time ||= File.stat(path).mtime
     end
 
+    alias_method :date, :modified_time
+
     # Returns last modification time for this file.
     def mtime
       modified_time.to_i
@@ -119,12 +121,12 @@ module Bridgetown
       @to_liquid ||= Drops::StaticFileDrop.new(self)
     end
 
-    # Generate "basename without extension" and strip away any trailing periods.
-    # NOTE: `String#gsub` removes all trailing periods (in comparison to `String#chomp`)
     def basename
-      @basename ||= File.basename(name, extname).gsub(%r!\.*\z!, "")
+      @basename ||= File.basename(name, ".*")
     end
 
+    alias_method :basename_without_ext, :basename
+
     def relative_path_basename_without_prefix
       return_path = Pathname.new("")
       Pathname.new(cleaned_relative_path).each_filename do |filename|
@@ -185,7 +187,7 @@ module Bridgetown
 
     # Returns the type of the collection if present, nil otherwise.
     def type
-      @type ||= @collection.nil? ? nil : @collection.label.to_sym
+      @type ||= @collection&.label&.to_sym
     end
 
     # Returns the front matter defaults defined for the file's URL and/or type

data/lib/bridgetown-core/utils/ruby_front_matter.rb

@@ -14,9 +14,9 @@ module Bridgetown
       end
 
       def method_missing(key, *value, &block) # rubocop:disable Metrics/CyclomaticComplexity, Style/MissingRespondToMissing
-        return super if respond_to?(key) || (value.length.zero? && block.nil? && !@data.key?(key))
+        return super if respond_to?(key) || (value.empty? && block.nil? && !@data.key?(key))
 
-        return get(key) if value.length.zero? && block.nil? && @data.key?(key)
+        return get(key) if value.empty? && block.nil? && @data.key?(key)
 
         set(key, value[0], &block)
       end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.2.0.beta4"
+  VERSION = "1.2.0"
   CODE_NAME = "Bonny Slope"
 end

data/lib/bridgetown-core.rb

@@ -16,6 +16,7 @@ end
 
 # rubygems
 require "rubygems"
+require "bundler/shared_helpers"
 
 # stdlib
 require "find"
@@ -135,6 +136,8 @@ module Bridgetown
     end
     alias_method :env, :environment
 
+    # Set up the Bridgetown execution environment before attempting to load any
+    # plugins or gems prior to a site build
     def begin!
       ENV["RACK_ENV"] ||= environment
 
@@ -177,6 +180,38 @@ module Bridgetown
       end
     end
 
+    # Initialize a preflight configuration object, copying initializers and
+    # source manifests from a previous standard configuration if necessary.
+    # Typically only needed in test suites to reset before a new test.
+    #
+    # @return [Bridgetown::Configuration::Preflight]
+    def reset_configuration! # rubocop:disable Metrics/AbcSize
+      if Bridgetown::Current.preloaded_configuration.nil?
+        return Bridgetown::Current.preloaded_configuration =
+                 Bridgetown::Configuration::Preflight.new
+      end
+
+      return unless Bridgetown::Current.preloaded_configuration.is_a?(Bridgetown::Configuration)
+
+      previous_config = Bridgetown::Current.preloaded_configuration
+      new_config = Bridgetown::Configuration::Preflight.new
+      new_config.initializers = previous_config.initializers
+      new_config.source_manifests = previous_config.source_manifests
+      if new_config.initializers
+        new_config.initializers.delete(:init)
+        new_config.initializers.select! do |_k, initializer|
+          next false if initializer.block.source_location[0].start_with?(
+            File.join(previous_config.root_dir, "config")
+          )
+
+          initializer.completed = false
+          true
+        end
+      end
+
+      Bridgetown::Current.preloaded_configuration = new_config
+    end
+
     def initializer(name, prepend: false, replace: false, &block) # rubocop:todo Metrics
       unless Bridgetown::Current.preloaded_configuration
         raise "The `#{name}' initializer in #{block.source_location[0]} was called " \
@@ -275,6 +310,14 @@ module Bridgetown
     def set_timezone(timezone)
       ENV["TZ"] = timezone
     end
+
+    # Get the current TZ environment variable
+    #
+    # @return [String]
+    def timezone
+      ENV["TZ"]
+    end
+
     # rubocop:enable Naming/AccessorMethodName
 
     # Fetch the logger instance for this Bridgetown process.

data/lib/site_template/config/puma.rb

@@ -1,6 +1,10 @@
 # Puma is a fast, concurrent web server for Ruby & Rack
 #
 # Learn more at: https://puma.io
+# Bridgetown configuration documentation:
+# https://edge.bridgetownrb.com/docs/configuration/puma
+
+# This port number can be overriden by a bind configuration option
 #
 port ENV.fetch("BRIDGETOWN_PORT") { 4000 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta4
+  version: 1.2.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -274,20 +274,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -615,9 +601,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: