bridgetown-core 0.21.1 → 1.0.0.alpha1

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

@@ -119,16 +119,12 @@ module Bridgetown
       end
 
       def render(context)
-        site = context.registers[:site]
-
         file = render_variable(context) || @file
         validate_file_name(file)
 
         path = locate_include_file(context, file)
         return unless path
 
-        add_include_to_dependency(site, path, context)
-
         partial = load_cached_partial(path, context)
 
         context.stack do
@@ -143,15 +139,6 @@ module Bridgetown
         end
       end
 
-      def add_include_to_dependency(site, path, context)
-        if context.registers[:page]&.key?("path")
-          site.regenerator.add_dependency(
-            site.in_source_dir(context.registers[:page]["path"]),
-            path
-          )
-        end
-      end
-
       def load_cached_partial(path, context)
         context.registers[:cached_partials] ||= {}
         cached_partial = context.registers[:cached_partials]

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

@@ -23,6 +23,10 @@ module Bridgetown
         relative_path = Liquid::Template.parse(@relative_path).render(context)
 
         site.each_site_file do |item|
+          # Resource engine:
+          if item.respond_to?(:relative_url) && item.relative_path.to_s == relative_path
+            return item.relative_url
+          end
           return relative_url(item) if item.relative_path == relative_path
           # This takes care of the case for static files that have a leading /
           return relative_url(item) if item.relative_path == "/#{relative_path}"

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class LiveReloadJsTag < Liquid::Tag
+      def render(context)
+        Bridgetown::Utils.live_reload_js(context.registers[:site])
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("live_reload_dev_js", Bridgetown::Tags::LiveReloadJsTag)

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

@@ -29,7 +29,7 @@ module Bridgetown
       end
 
       def ==(other)
-        other.relative_path.match(@name_regex)
+        other.relative_path.to_s.match(@name_regex)
       end
 
       def deprecated_equality(other)
@@ -47,12 +47,7 @@ module Bridgetown
       #
       # Returns the post slug with the subdirectory (relative to _posts)
       def post_slug(other)
-        path = other.basename.split("/")[0...-1].join("/")
-        if path.nil? || path == ""
-          other.data["slug"]
-        else
-          path + "/" + other.data["slug"]
-        end
+        other.data.slug
       end
     end
 
@@ -77,14 +72,14 @@ module Bridgetown
         @context = context
         site = context.registers[:site]
 
-        site.collections.posts.docs.each do |document|
+        site.collections.posts.resources.each do |document|
           return relative_url(document) if @post == document
         end
 
         # New matching method did not match, fall back to old method
         # with deprecation warning if this matches
 
-        site.collections.posts.docs.each do |document|
+        site.collections.posts.resources.each do |document|
           next unless @post.deprecated_equality document
 
           Bridgetown::Deprecator.deprecation_message "A call to "\

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+namespace :frontend do
+  desc "Run frontend bundler independently"
+  task :watcher, :sidecar do |_task, args|
+    # sidecar is when the task is running alongside the start command
+    sidecar = args[:sidecar] == true
+    Bridgetown::Utils::Aux.group do
+      run_process "Frontend", :yellow, "bundle exec bridgetown frontend:dev"
+    end
+    if sidecar
+      sleep 4 # give Webpack time to boot before returning control to the start command
+    else
+      trap("INT") do
+        Bridgetown::Utils::Aux.kill_processes
+        sleep 0.5
+        exit(0)
+      end
+      loop { sleep 1000 }
+    end
+  end
+end
+
+desc "Prerequisite task which loads site and provides automation"
+task :environment do
+  class HammerActions < Thor
+    include Thor::Actions
+    include Bridgetown::Commands::Actions
+
+    def self.source_root
+      Dir.pwd
+    end
+
+    def self.exit_on_failure?
+      true
+    end
+
+    private
+
+    def site
+      @site ||= Bridgetown::Site.new(Bridgetown.configuration)
+    end
+  end
+
+  define_singleton_method :automation do |*args, &block|
+    @hammer ||= HammerActions.new
+    @hammer.instance_exec(*args, &block)
+  end
+
+  define_singleton_method :site do
+    @hammer ||= HammerActions.new
+    @hammer.send(:site)
+  end
+end

data/lib/bridgetown-core/url.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Public: Methods that generate a URL for a resource such as a Post or a Page.
+# Public: Methods that generate a URL for GeneratedPage.
 #
 # Examples
 #
@@ -10,6 +10,7 @@
 #   }).to_s
 #
 module Bridgetown
+  # TODO: remove this class in favor of the new Resource permalink processor
   class URL
     # options - One of :permalink or :template must be supplied.
     #           :template     - The String used as template for URL generation,

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Utils
+    module Aux
+      def self.with_color(name, message)
+        return message unless !name.nil? && Bridgetown::Utils::Ansi::COLORS[name.to_sym]
+
+        Bridgetown::Utils::Ansi.send(name, message)
+      end
+
+      def self.running_pids
+        @running_pids ||= []
+      end
+
+      def self.add_pid(pid)
+        running_pids << pid
+      end
+
+      def self.run_process(name, color, cmd)
+        Thread.new do
+          rd, wr = IO.pipe("BINARY")
+          pid = Process.spawn(cmd, out: wr, err: wr, pgroup: true)
+          @mutex.synchronize do
+            add_pid pid
+          end
+
+          loop do
+            line = rd.gets
+            line.to_s.lines.map(&:chomp).each do |message|
+              output = +""
+              output << with_color(color, "[#{name}] ") if color
+              output << message
+              @mutex.synchronize do
+                $stdout.puts output
+                $stdout.flush
+              end
+            end
+          end
+        end
+      end
+
+      def self.group(&block)
+        @mutex = Thread::Mutex.new
+        instance_exec(&block)
+      end
+
+      def self.kill_processes
+        Bridgetown.logger.info "Stopping auxiliary processes..."
+        running_pids.each do |pid|
+          Process.kill("SIGTERM", -Process.getpgid(pid))
+        rescue Errno::ESRCH, Errno::EPERM, Errno::ECHILD # rubocop:disable Lint/SuppressedException
+        end
+      end
+    end
+  end
+end

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

@@ -3,10 +3,7 @@
 module Bridgetown
   module Utils
     module RubyExec
-      extend self
-
-      # TODO: Deprecate storing Ruby code in YAML, Rb, etc. and just use native Ruby Front Matter
-      def search_data_for_ruby_code(convertible, renderer) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def self.search_data_for_ruby_code(convertible)
         return if convertible.data.empty?
 
         # Iterate using `keys` here so inline Ruby script can add new data keys
@@ -14,49 +11,10 @@ module Bridgetown
         data_keys = convertible.data.keys
         data_keys.each do |k|
           v = convertible.data[k]
-          next unless v.is_a?(Rb) || v.is_a?(Hash) || v.is_a?(Proc)
-
-          if v.is_a?(Proc)
-            convertible.data[k] = convertible.instance_exec(&v)
-          elsif v.is_a?(Hash)
-            v.each do |nested_k, nested_v|
-              next unless nested_v.is_a?(Rb)
-
-              convertible.data[k][nested_k] = run(nested_v, convertible, renderer)
-            end
-          else
-            convertible.data[k] = run(v, convertible, renderer)
-          end
-        end
-      end
-
-      # Sets up a new context in which to eval Ruby coming from front matter.
-      #
-      # ruby_code - a string of code
-      # convertible - the Document/Page/Layout with the Ruby front matter
-      # renderer - the Renderer instance that's processing the document (optional)
-      #
-      # Returns the transformed output of the code
-      def run(ruby_code, convertible, renderer)
-        return unless ruby_code.is_a?(Rb)
+          next unless v.is_a?(Proc)
 
-        klass = Class.new
-        obj = klass.new
-
-        if convertible.is_a?(Layout)
-          klass.attr_accessor :layout, :site, :data
-          obj.layout = convertible
-        else
-          klass.attr_accessor :document, :page, :renderer, :site, :data
-          obj.document = obj.page = convertible
-          obj.renderer = renderer
+          convertible.data[k] = convertible.instance_exec(&v)
         end
-        obj.site = convertible.site
-        obj.data = convertible.data
-
-        # This is where the magic happens! DON'T BE EVIL!!! ;-)
-        output = obj.instance_eval(ruby_code)
-        output.is_a?(Hash) ? output.with_dot_access : output
       end
     end
   end

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

@@ -3,20 +3,23 @@
 module Bridgetown
   module Utils
     module RubyFrontMatterDSL
-      def front_matter(&block)
-        RubyFrontMatter.new.tap { |fm| fm.instance_exec(&block) }
+      def front_matter(scope: nil, &block)
+        RubyFrontMatter.new(scope: scope).tap { |fm| fm.instance_exec(&block) }
       end
     end
 
     class RubyFrontMatter
-      def initialize
+      def initialize(scope: nil)
         @data = {}
+        @scope = scope
       end
 
-      def method_missing(key, value) # rubocop:disable Style/MissingRespondToMissing
-        return super if respond_to?(key)
+      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))
 
-        set(key, value)
+        return get(key) if value.length.zero? && block.nil? && @data.key?(key)
+
+        set(key, value[0], &block)
       end
 
       def each(&block)
@@ -27,7 +30,19 @@ module Bridgetown
         @data[key]
       end
 
-      def set(key, value)
+      def set(key, value = nil, &block)
+        # Handle nested data within a block
+        if block
+          value = self.class.new(scope: @scope).tap do |fm|
+            fm.instance_exec(&block)
+          end.to_h
+        end
+
+        # Execute lambda value within the resolver
+        if @scope && value.is_a?(Hash) && value[:from].is_a?(Proc)
+          value = @scope.instance_exec(&value[:from])
+        end
+
         @data[key] = value
       end
 

data/lib/bridgetown-core/utils.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  module Utils
+  module Utils # rubocop:todo Metrics/ModuleLength
     extend self
     autoload :Ansi, "bridgetown-core/utils/ansi"
+    autoload :Aux, "bridgetown-core/utils/aux"
     autoload :RequireGems, "bridgetown-core/utils/require_gems"
     autoload :RubyExec, "bridgetown-core/utils/ruby_exec"
+    autoload :RubyFrontMatter, "bridgetown-core/utils/ruby_front_matter"
     autoload :RubyFrontMatterDSL, "bridgetown-core/utils/ruby_front_matter"
 
     # Constants for use in #slugify
@@ -354,28 +356,19 @@ module Bridgetown
     # @raise [WebpackAssetError] if unable to find css or js in the manifest
     # file
     def parse_webpack_manifest_file(site, asset_type)
-      manifest_file = site.in_root_dir(".bridgetown-webpack", "manifest.json")
-      return "MISSING_WEBPACK_MANIFEST" unless File.exist?(manifest_file)
+      return log_webpack_asset_error("Webpack manifest") if site.frontend_manifest.nil?
 
-      manifest = JSON.parse(File.read(manifest_file))
+      asset_path = if %w(js css).include?(asset_type)
+                     site.frontend_manifest["main.#{asset_type}"]
+                   else
+                     site.frontend_manifest.find do |item, _|
+                       item.sub(%r{^../(frontend/|src/)?}, "") == asset_type
+                     end&.last
+                   end
 
-      known_assets = %w(js css)
-      asset_path = nil
-      if known_assets.include?(asset_type)
-        asset_path = manifest["main.#{asset_type}"]
-        log_webpack_asset_error(asset_type) && return if asset_path.nil?
-      else
-        asset_path = manifest.find do |item, _|
-          item.sub(%r{^../(frontend/|src/)?}, "") == asset_type
-        end&.last
-      end
+      return log_webpack_asset_error(asset_type) if asset_path.nil?
 
-      if asset_path
-        static_frontend_path(site, ["js", asset_path])
-      else
-        Bridgetown.logger.error("Unknown Webpack asset type", asset_type)
-        nil
-      end
+      static_frontend_path site, ["js", asset_path]
     end
 
     def static_frontend_path(site, additional_parts = [])
@@ -389,10 +382,13 @@ module Bridgetown
     end
 
     def log_webpack_asset_error(asset_type)
-      error_message = "There was an error parsing your #{asset_type} files. \
-        Please check your #{asset_type} for any errors."
+      Bridgetown.logger.warn(
+        "Webpack:",
+        "There was an error parsing your #{asset_type} file. \
+        Please check your #{asset_type} file for any errors."
+      )
 
-      Bridgetown.logger.warn(Errors::WebpackAssetError, error_message)
+      "MISSING_WEBPACK_MANIFEST_FILE"
     end
 
     def default_github_branch_name(repo_url)
@@ -404,6 +400,39 @@ module Bridgetown
       "master"
     end
 
+    def live_reload_js(site) # rubocop:disable Metrics/MethodLength
+      return "" unless Bridgetown.env.development? && !site.config.skip_live_reload
+
+      code = <<~JAVASCRIPT
+        let first_mod = 0
+        let connection_errors = 0
+        const checkForReload = () => {
+          fetch("/_bridgetown/live_reload").then(response => {
+            if (response.ok) {
+              response.json().then(data => {
+                const last_mod = data.last_mod
+                if (first_mod === 0) {
+                  first_mod = last_mod
+                } else if (last_mod > first_mod) {
+                  location.reload()
+                }
+                setTimeout(() => checkForReload(), 700)
+              })
+            } else {
+              if (connection_errors < 20) setTimeout(() => checkForReload(), 6000)
+              connection_errors++
+            }
+          }).catch((err) => {
+            if (connection_errors < 20) setTimeout(() => checkForReload(), 6000)
+            connection_errors++
+          })
+        }
+        checkForReload()
+      JAVASCRIPT
+
+      %(<script type="module">#{code}</script>).html_safe
+    end
+
     private
 
     def merge_values(target, overwrite)
@@ -453,7 +482,7 @@ module Bridgetown
         end
 
       # Strip according to the mode
-      string.gsub(replaceable_char, "-")
+      string.to_s.gsub(replaceable_char, "-")
     end
   end
 end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.21.1"
-  CODE_NAME = "Broughton Beach"
+  VERSION = "1.0.0.alpha1"
+  CODE_NAME = "Pearl"
 end

data/lib/bridgetown-core/watcher.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "listen"
-
 module Bridgetown
   module Watcher
     extend self
@@ -19,9 +17,9 @@ module Bridgetown
       listener = build_listener(site, options)
       listener.start
 
-      Bridgetown.logger.info "Auto-regeneration:", "enabled."
+      Bridgetown.logger.info "Auto-regeneration:", "enabled." unless options[:using_puma]
 
-      unless options["serving"]
+      unless options[:serving]
         trap("INT") do
           listener.stop
           Bridgetown.logger.info "", "Halting auto-regeneration."

data/lib/bridgetown-core.rb

@@ -47,6 +47,7 @@ require "hash_with_dot_access"
 require "addressable/uri"
 require "liquid"
 require "liquid-component"
+require "listen"
 require "kramdown"
 require "colorator"
 require "i18n"
@@ -66,53 +67,39 @@ end
 class Rb < String; end
 
 module Bridgetown
+  autoload :Cache,               "bridgetown-core/cache"
+  autoload :Current,             "bridgetown-core/current"
   autoload :Cleaner,             "bridgetown-core/cleaner"
   autoload :Collection,          "bridgetown-core/collection"
   autoload :Component,           "bridgetown-core/component"
   autoload :Configuration,       "bridgetown-core/configuration"
-  autoload :DataAccessible,      "bridgetown-core/concerns/data_accessible"
+  autoload :DefaultsReader,      "bridgetown-core/readers/defaults_reader"
   autoload :Deprecator,          "bridgetown-core/deprecator"
-  autoload :Document,            "bridgetown-core/document"
   autoload :EntryFilter,         "bridgetown-core/entry_filter"
   # TODO: we have too many errors! This is silly
   autoload :Errors,              "bridgetown-core/errors"
-  autoload :Excerpt,             "bridgetown-core/excerpt"
   autoload :FrontmatterDefaults, "bridgetown-core/frontmatter_defaults"
   autoload :FrontMatterImporter, "bridgetown-core/concerns/front_matter_importer"
+  autoload :GeneratedPage,       "bridgetown-core/generated_page"
   autoload :Hooks,               "bridgetown-core/hooks"
   autoload :Layout,              "bridgetown-core/layout"
   autoload :LayoutPlaceable,     "bridgetown-core/concerns/layout_placeable"
-  autoload :Cache,               "bridgetown-core/cache"
-  autoload :Current,             "bridgetown-core/current"
-  # TODO: remove this when legacy content engine is gone:
-  autoload :DataReader,          "bridgetown-core/readers/data_reader"
-  autoload :DefaultsReader,      "bridgetown-core/readers/defaults_reader"
   autoload :LayoutReader,        "bridgetown-core/readers/layout_reader"
-  # TODO: remove this when legacy content engine is gone:
-  autoload :PostReader,          "bridgetown-core/readers/post_reader"
-  # TODO: remove this when legacy content engine is gone:
-  autoload :PageReader,          "bridgetown-core/readers/page_reader"
-  autoload :PluginContentReader, "bridgetown-core/readers/plugin_content_reader"
+  autoload :LiquidRenderable,    "bridgetown-core/concerns/liquid_renderable"
+  autoload :LiquidRenderer,      "bridgetown-core/liquid_renderer"
   autoload :LogAdapter,          "bridgetown-core/log_adapter"
-  autoload :Page,                "bridgetown-core/page"
-  autoload :GeneratedPage,       "bridgetown-core/page"
+  autoload :PluginContentReader, "bridgetown-core/readers/plugin_content_reader"
   autoload :PluginManager,       "bridgetown-core/plugin_manager"
   autoload :Publishable,         "bridgetown-core/concerns/publishable"
   autoload :Publisher,           "bridgetown-core/publisher"
   autoload :Reader,              "bridgetown-core/reader"
-  # TODO: remove this when the incremental regenerator is gone:
-  autoload :Regenerator,         "bridgetown-core/regenerator"
-  autoload :RelatedPosts,        "bridgetown-core/related_posts"
   autoload :Renderer,            "bridgetown-core/renderer"
-  autoload :LiquidRenderable,    "bridgetown-core/concerns/liquid_renderable"
-  autoload :LiquidRenderer,      "bridgetown-core/liquid_renderer"
   autoload :RubyTemplateView,    "bridgetown-core/ruby_template_view"
   autoload :LogWriter,           "bridgetown-core/log_writer"
   autoload :Site,                "bridgetown-core/site"
   autoload :StaticFile,          "bridgetown-core/static_file"
   autoload :URL,                 "bridgetown-core/url"
   autoload :Utils,               "bridgetown-core/utils"
-  autoload :Validatable,         "bridgetown-core/concerns/validatable"
   autoload :VERSION,             "bridgetown-core/version"
   autoload :Watcher,             "bridgetown-core/watcher"
   autoload :YAMLParser,          "bridgetown-core/yaml_parser"
@@ -126,7 +113,6 @@ module Bridgetown
   require "bridgetown-core/filters"
 
   require "bridgetown-core/drops/drop"
-  require "bridgetown-core/drops/document_drop"
   require "bridgetown-core/drops/resource_drop"
   require_all "bridgetown-core/converters"
   require_all "bridgetown-core/converters/markdown"
@@ -173,6 +159,12 @@ module Bridgetown
       Bridgetown::Commands::Registrations.register(&block)
     end
 
+    def load_tasks
+      require "bridgetown-core/commands/base"
+      Bridgetown::PluginManager.require_from_bundler
+      load File.expand_path("bridgetown-core/tasks/bridgetown_tasks.rake", __dir__)
+    end
+
     # Determines the correct Bundler environment block method to use and passes
     # the block on to it.
     #

data/lib/site_template/Gemfile.erb

@@ -3,9 +3,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Hello! This is where you manage which Bridgetown version is used to run.
 # When you want to use a different version, change it below, save the
-# file and run `bundle install`. Run Bridgetown with `bundle exec`, like so:
+# file and run `bundle install`. Run Bridgetown like so:
 #
-#   bundle exec bridgetown serve
+#   bin/bridgetown start (or console, etc.)
 #
 # This will help ensure the proper Bridgetown version is running.
 #
@@ -17,3 +17,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 # Happy Bridgetowning!
 
 gem "bridgetown", "~> <%= Bridgetown::VERSION %>"
+
+# Puma is a Rack-compatible server
+# (you can optionally limit this to the "development" group)
+gem "puma", "~> 5.2"

data/lib/site_template/README.md

@@ -18,9 +18,9 @@ Welcome to your new Bridgetown website! You can update this README file to provi
 - [Ruby](https://www.ruby-lang.org/en/downloads/)
   - `>= 2.5`
 - [Bridgetown Gem](https://rubygems.org/gems/bridgetown)
-  - `gem install bundler bridgetown -N`
+  - `gem install bridgetown -N`
 - [Node](https://nodejs.org)
-  - `>= 10.13`
+  - `>= 12`
 - [Yarn](https://yarnpkg.com)
 
 ## Install
@@ -33,7 +33,7 @@ bundle install && yarn install
 
 ## Development
 
-To start your site in development mode, run `yarn start` and navigate to [localhost:4000](https://localhost:4000/)!
+To start your site in development mode, run `bin/bridgetown start` and navigate to [localhost:4000](https://localhost:4000/)!
 
 Use a [theme](https://github.com/topics/bridgetown-theme), add some [plugins](https://www.bridgetownrb.com/plugins/), and/or run some [automations](https://github.com/topics/bridgetown-automation) to get started quickly.
 
@@ -41,13 +41,13 @@ Use a [theme](https://github.com/topics/bridgetown-theme), add some [plugins](ht
 
 ```sh
 # running locally
-yarn start
+bin/bridgetown start
 
 # build & deploy to production
-yarn deploy
+bin/bridgetown deploy
 
 # load the site up within a Ruby console (IRB)
-bundle exec bridgetown console
+bin/bridgetown console
 ```
 
 > Learn more: [Bridgetown CLI Documentation](https://www.bridgetownrb.com/docs/command-line-usage)