bridgetown-core 1.0.0.alpha2 → 1.0.0.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a735962a1880837aa59641e65afa3985f0ebb091861ae32972d0b875229cfc7d
-  data.tar.gz: a64d7710c18a4c80805bd7196eacd07387fa1b3061616e8ed2b4de8b9a228871
+  metadata.gz: 2dd8600eb037c6f3841fdbc7a9175ecccd0ab4e3c7d1814e914b6954ad4fb832
+  data.tar.gz: ca457af17e62de5d71a441b90d9aa8d97136fcd4cc9ecd65a855d8a78bab53b3
 SHA512:
-  metadata.gz: 7c136fee524ff82c30ceedcc8ef0ef11fc877ac82066c6bd1d16e0d55cc47391b2b211b72c9f2229d7d83685edb98968e516d2eea09510a1c7c3c4ab0466e6e9
-  data.tar.gz: 05b65d5c57dfdbd0dcea25ab15875b637868ecd4c69a76a288fe23dd64dc06eb2c3ee6ec980f30b3957888859fbed2e7771a007cf7188cf7572808a17a5c9372
+  metadata.gz: 594d6e6de4a514e3eeb439a1ebc3d8936d4bb5027a78063db12c503072fe1c8b6db9d8f3ce6568a95781375d2e0c59dc32faf83fc333e8e9dcd3e95c140e7287
+  data.tar.gz: fa2ad70a10323054e8f9ab646dfb92cc37457b53427907888dd8bc47589046feafcdc29730c3d4e6d3eb81cf8cd0be6cebbb692a32d8c3ec200c7a8c7fb80693

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

@@ -138,7 +138,7 @@ module Bridgetown
 
         if @skipped_bundle
           logger.info "Bundle install skipped.".yellow
-          logger.info "You will need to run #{"bundle binstub bridgetown-core".cyan} manually."
+          logger.info "You will need to run #{"bundle binstubs bridgetown-core".cyan} manually."
         end
 
         logger.info "Yarn install skipped.".yellow if @skipped_yarn
@@ -152,7 +152,7 @@ module Bridgetown
           Bridgetown.with_unbundled_env do
             inside(path) do
               run "bundle install", abort_on_failure: true
-              run "bundle binstub bridgetown-core"
+              run "bundle binstubs bridgetown-core"
             end
           end
         end

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

@@ -30,8 +30,10 @@ module Bridgetown
         Bridgetown::Commands::Build.print_startup_message
         sleep 0.25
 
-        unless Bundler.definition.specs.find { |s| s.name == "puma" }
-          raise "** No Rack-compatible server found **"
+        begin
+          require("puma/detect")
+        rescue LoadError
+          raise "** Puma server gem not found. Check your Gemfile and Bundler env? **"
         end
 
         options = Thor::CoreExt::HashWithIndifferentAccess.new(self.options)
@@ -40,6 +42,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 +91,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/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,

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
@@ -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/configuration.rb

@@ -20,7 +20,6 @@ module Bridgetown
       "layouts_dir"          => "_layouts",
       "data_dir"             => "_data",
       "components_dir"       => "_components",
-      "includes_dir"         => "_includes",
       "partials_dir"         => "_partials",
       "collections"          => {},
       "taxonomies"           => {

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

@@ -1,5 +1,5 @@
 [build]
-  command = "yarn deploy && ./bin/netlify.sh"
+  command = "bin/bridgetown deploy && bin/netlify.sh"
   publish = "output"
 
 [build.environment]
@@ -41,4 +41,4 @@
 [[headers]]
   for = "/*.(png|jpg|js|css|svg|woff|ttf|eot|ico|woff2)"
   [headers.values]
-    Cache-Control = "public, max-age=31536000, s-max-age=31536000"
+    Cache-Control = "public, max-age=31536000, s-max-age=31536000"

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

@@ -110,7 +110,7 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
-        return content if convertible.data[:template_engine] != "erb"
+        return content if convertible.data[:template_engine].to_s != "erb"
 
         erb_view = Bridgetown::ERBView.new(convertible)
 
@@ -131,10 +131,12 @@ module Bridgetown
         end
       end
 
+      # @param ext [String]
+      # @param convertible [Bridgetown::Resource::Base, Bridgetown::GeneratedPage]
       def matches(ext, convertible)
-        if convertible.data[:template_engine] == "erb" ||
+        if convertible.data[:template_engine].to_s == "erb" ||
             (convertible.data[:template_engine].nil? &&
-              @config[:template_engine] == "erb")
+             @config[:template_engine].to_s == "erb")
           convertible.data[:template_engine] = "erb"
           return true
         end

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

@@ -56,6 +56,8 @@ module Bridgetown
       # rubocop: enable Metrics/MethodLength
       # rubocop: enable Metrics/AbcSize
 
+      # @param ext [String]
+      # @param convertible [Bridgetown::Resource::Base, Bridgetown::GeneratedPage]
       def matches(ext, convertible)
         if convertible.render_with_liquid?
           convertible.data[:template_engine] = "liquid"

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

@@ -38,9 +38,9 @@ module Bridgetown
 
       def read_data_from_builder
         builder = Kernel.const_get(url.host.gsub(".", "::"))
-        raise NameError unless builder.respond_to?(:resource_data_for_id)
+        raise NameError unless builder.instance_methods.include?(:resource_data_for_id)
 
-        builder.resource_data_for_id(id)
+        builder.new.resource_data_for_id(id) || raise(NameError)
       rescue NameError
         raise(
           Bridgetown::Errors::FatalException,

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

@@ -17,6 +17,14 @@ module Bridgetown
     def self.boot
       autoload_server_folder(root: Dir.pwd)
       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,
+              "The Roda sessions plugin can't find a valid secret. Run `bin/bridgetown secret'" \
+              " and put the key in a ENV var you can use to configure the session in `roda_app.rb'"
+      end
+
+      raise e
     end
 
     def self.autoload_server_folder(root:)

data/lib/bridgetown-core/tasks/bridgetown_tasks.rake

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+desc "Generate a secret key for use in sessions, token generation, and beyond"
+task :secret do
+  require "securerandom"
+  puts SecureRandom.hex(64) # rubocop:disable Bridgetown/NoPutsAllowed
+end
+
 namespace :frontend do
   desc "Run frontend bundler independently"
   task :watcher, :sidecar do |_task, args|

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.0.0.alpha2"
+  VERSION = "1.0.0.alpha6"
   CODE_NAME = "Pearl"
 end

data/lib/site_template/src/_layouts/default.liquid

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="{{ site.locale }}">
   <head>
     {% render "head", metadata: site.metadata, title: page.title %}
   </head>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha2
+  version: 1.0.0.alpha6
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -476,7 +476,6 @@ files:
 - lib/bridgetown-core/tags/class_map.rb
 - lib/bridgetown-core/tags/find.rb
 - lib/bridgetown-core/tags/highlight.rb
-- lib/bridgetown-core/tags/include.rb
 - lib/bridgetown-core/tags/link.rb
 - lib/bridgetown-core/tags/live_reload_dev_js.rb
 - lib/bridgetown-core/tags/post_url.rb

data/lib/bridgetown-core/tags/include.rb

@@ -1,216 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  module Tags
-    class IncludeTag < Liquid::Tag
-      class << self
-        attr_accessor :deprecation_message_shown
-      end
-
-      VALID_SYNTAX = %r!
-        ([\w-]+)\s*=\s*
-        (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w.-]+))
-      !x.freeze
-
-      # rubocop:disable Lint/MixedRegexpCaptureTypes
-      VARIABLE_SYNTAX = %r!
-        (?<variable>[^{]*(\{\{\s*[\w\-.]+\s*(\|.*)?\}\}[^\s{}]*)+)
-        (?<params>.*)
-      !mx.freeze
-      # rubocop:enable Lint/MixedRegexpCaptureTypes
-
-      FULL_VALID_SYNTAX = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!.freeze
-      VALID_FILENAME_CHARS = %r!^[\w/.-]+$!.freeze
-      INVALID_SEQUENCES = %r![./]{2,}!.freeze
-
-      def initialize(tag_name, markup, tokens)
-        super
-
-        unless self.class.deprecation_message_shown
-          Bridgetown.logger.warn "NOTICE: the {% include %} tag is deprecated and" \
-                                 " will be removed in Bridgetown 1.0. You should" \
-                                 " use the {% render %} tag instead."
-          self.class.deprecation_message_shown = true
-        end
-
-        matched = markup.strip.match(VARIABLE_SYNTAX)
-        if matched
-          @file = matched["variable"].strip
-          @params = matched["params"].strip
-        else
-          @file, @params = markup.strip.split(%r!\s+!, 2)
-        end
-        validate_params if @params
-        @tag_name = tag_name
-      end
-
-      def syntax_example
-        "{% #{@tag_name} file.ext param='value' param2='value' %}"
-      end
-
-      def parse_params(context)
-        params = {}
-        markup = @params
-
-        while (match = VALID_SYNTAX.match(markup))
-          markup = markup[match.end(0)..-1]
-
-          value = if match[2]
-                    match[2].gsub('\\"', '"')
-                  elsif match[3]
-                    match[3].gsub("\\'", "'")
-                  elsif match[4]
-                    context[match[4]]
-                  end
-
-          params[match[1]] = value
-        end
-        params
-      end
-
-      def validate_file_name(file)
-        return unless INVALID_SEQUENCES.match?(file) || !VALID_FILENAME_CHARS.match?(file)
-
-        raise ArgumentError, <<~MSG
-          Invalid syntax for include tag. File contains invalid characters or sequences:
-
-            #{file}
-
-          Valid syntax:
-
-            #{syntax_example}
-
-        MSG
-      end
-
-      def validate_params
-        return if FULL_VALID_SYNTAX.match?(@params)
-
-        raise ArgumentError, <<~MSG
-          Invalid syntax for include tag:
-
-          #{@params}
-
-          Valid syntax:
-
-          #{syntax_example}
-
-        MSG
-      end
-
-      # Grab file read opts in the context
-      def file_read_opts(context)
-        context.registers[:site].file_read_opts
-      end
-
-      # Render the variable if required
-      def render_variable(context)
-        Liquid::Template.parse(@file).render(context) if VARIABLE_SYNTAX.match?(@file)
-      end
-
-      def tag_includes_dirs(context)
-        context.registers[:site].includes_load_paths.freeze
-      end
-
-      def locate_include_file(context, file)
-        includes_dirs = tag_includes_dirs(context)
-        includes_dirs.each do |dir|
-          path = File.join(dir, file)
-          return path if valid_include_file?(path, dir.to_s)
-        end
-        raise IOError, could_not_locate_message(file, includes_dirs)
-      end
-
-      def render(context)
-        file = render_variable(context) || @file
-        validate_file_name(file)
-
-        path = locate_include_file(context, file)
-        return unless path
-
-        partial = load_cached_partial(path, context)
-
-        context.stack do
-          context["include"] = parse_params(context) if @params
-          begin
-            partial.render!(context)
-          rescue Liquid::Error => e
-            e.template_name = path
-            e.markup_context = "included " if e.markup_context.nil?
-            raise e
-          end
-        end
-      end
-
-      def load_cached_partial(path, context)
-        context.registers[:cached_partials] ||= {}
-        cached_partial = context.registers[:cached_partials]
-
-        if cached_partial.key?(path)
-          cached_partial[path]
-        else
-          unparsed_file = context.registers[:site]
-            .liquid_renderer
-            .file(path)
-          begin
-            cached_partial[path] = unparsed_file.parse(read_file(path, context))
-          rescue Liquid::Error => e
-            e.template_name = path
-            e.markup_context = "included " if e.markup_context.nil?
-            raise e
-          end
-        end
-      end
-
-      def valid_include_file?(path, _dir)
-        File.file?(path)
-      end
-
-      def realpath_prefixed_with?(path, dir)
-        File.exist?(path) && File.realpath(path).start_with?(dir)
-      rescue StandardError
-        false
-      end
-
-      # This method allows to modify the file content by inheriting from the class.
-      def read_file(file, context)
-        File.read(file, **file_read_opts(context))
-      end
-
-      private
-
-      def could_not_locate_message(file, includes_dirs)
-        "Could not locate the included file '#{file}' in any of #{includes_dirs}." \
-          " Ensure it exists in one of those directories."
-      end
-    end
-
-    class IncludeRelativeTag < IncludeTag
-      def tag_includes_dirs(context)
-        Array(page_path(context)).freeze
-      end
-
-      def page_path(context)
-        if context.registers[:page].nil?
-          context.registers[:site].source
-        else
-          site = context.registers[:site]
-          page_payload = context.registers[:page]
-          resource_path = \
-            if page_payload["collection"].nil?
-              page_payload["path"]
-            else
-              File.join(site.config["collections_dir"], page_payload["path"])
-            end
-          # rubocop:disable Performance/DeleteSuffix
-          resource_path.sub!(%r!/#excerpt\z!, "")
-          # rubocop:enable Performance/DeleteSuffix
-          site.in_source_dir File.dirname(resource_path)
-        end
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag("include", Bridgetown::Tags::IncludeTag)
-Liquid::Template.register_tag("include_relative", Bridgetown::Tags::IncludeRelativeTag)