bridgetown-core 0.14.1 → 0.15.0.beta1

data/lib/bridgetown-core/generators/prototype_generator.rb

@@ -63,6 +63,8 @@ module Bridgetown
       new_page
     end
 
+    # TODO: this would be a great use of .try
+    # document.try(:collection).try(:label) == @configured_collection
     def terms_matching_pages(search_term)
       selected_docs = @site.documents.select do |document|
         document.respond_to?(:collection) && document.collection.label == @configured_collection

data/lib/bridgetown-core/liquid_renderer.rb

@@ -26,6 +26,7 @@ module Bridgetown
     def reset
       @stats = {}
       @cache = {}
+      Renderer.cached_partials = {}
     end
 
     def file(filename)

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

@@ -31,7 +31,9 @@ module Bridgetown
         raise Liquid::FileSystemError, "No such template '#{template_path}'" if found_paths.empty?
 
         # Last path in the list wins
-        ::File.read(found_paths.last, site.file_read_opts)
+        LiquidComponent.parse(
+          ::File.read(found_paths.last, site.file_read_opts)
+        ).content
       end
     end
   end

data/lib/bridgetown-core/plugin_manager.rb

@@ -2,6 +2,8 @@
 
 module Bridgetown
   class PluginManager
+    PLUGINS_GROUP = :bridgetown_plugins
+
     attr_reader :site
 
     @source_manifests = Set.new
@@ -40,11 +42,9 @@ module Bridgetown
       if !ENV["BRIDGETOWN_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
         require "bundler"
 
-        group_name = :bridgetown_plugins
-
-        required_gems = Bundler.require group_name
+        required_gems = Bundler.require PLUGINS_GROUP
         required_gems.select! do |dep|
-          (dep.groups & [group_name]).any? && dep.should_include?
+          (dep.groups & [PLUGINS_GROUP]).any? && dep.should_include?
         end
 
         install_yarn_dependencies(required_gems)

data/lib/bridgetown-core/renderer.rb

@@ -5,11 +5,16 @@ module Bridgetown
     attr_reader :document, :site
     attr_writer :layouts, :payload
 
+    class << self
+      attr_accessor :cached_partials
+    end
+
     def initialize(site, document, site_payload = nil)
       @site     = site
       @document = document
       @payload  = site_payload
       @layouts  = nil
+      self.class.cached_partials ||= {}
     end
 
     # Fetches the payload used in Liquid rendering.
@@ -67,18 +72,14 @@ module Bridgetown
     # Returns String rendered document output
     # rubocop: disable Metrics/AbcSize
     def render_document
-      info = {
-        registers: { site: site, page: payload["page"] },
-        strict_filters: liquid_options["strict_filters"],
-        strict_variables: liquid_options["strict_variables"],
-      }
+      liquid_context = provide_liquid_context
 
       execute_inline_ruby!
 
       output = document.content
       if document.render_with_liquid?
         Bridgetown.logger.debug "Rendering Liquid:", document.relative_path
-        output = render_liquid(output, payload, info, document.path)
+        output = render_liquid(output, payload, liquid_context, document.path)
       end
 
       Bridgetown.logger.debug "Rendering Markup:", document.relative_path
@@ -87,12 +88,24 @@ module Bridgetown
 
       if document.place_in_layout?
         Bridgetown.logger.debug "Rendering Layout:", document.relative_path
-        output = place_in_layouts(output, payload, info)
+        output = place_in_layouts(output, payload, liquid_context)
       end
 
       output
     end
 
+    def provide_liquid_context
+      {
+        registers: {
+          site: site,
+          page: payload["page"],
+          cached_partials: self.class.cached_partials,
+        },
+        strict_filters: liquid_options["strict_filters"],
+        strict_variables: liquid_options["strict_variables"],
+      }
+    end
+
     def execute_inline_ruby!
       return unless site.config.should_execute_inline_ruby?
 
@@ -101,21 +114,21 @@ module Bridgetown
 
     # rubocop: enable Metrics/AbcSize
 
-    # Render the given content with the payload and info
+    # Render the given content with the payload and context
     #
     # content -
     # payload -
-    # info    -
+    # context    -
     # path    - (optional) the path to the file, for use in ex
     #
     # Returns String the content, rendered by Liquid.
-    def render_liquid(content, payload, info, path = nil)
+    def render_liquid(content, payload, liquid_context, path = nil)
       template = site.liquid_renderer.file(path).parse(content)
       template.warnings.each do |e|
         Bridgetown.logger.warn "Liquid Warning:",
                                LiquidRenderer.format_error(e, path || document.relative_path)
       end
-      template.render!(payload, info)
+      template.render!(payload, liquid_context)
     # rubocop: disable Lint/RescueException
     rescue Exception => e
       Bridgetown.logger.error "Liquid Exception:",
@@ -151,7 +164,7 @@ module Bridgetown
     # Render layouts and place document content inside.
     #
     # Returns String rendered content
-    def place_in_layouts(content, payload, info)
+    def place_in_layouts(content, payload, liquid_context)
       output = content.dup
       layout = layouts[document.data["layout"].to_s]
       validate_layout(layout)
@@ -162,7 +175,7 @@ module Bridgetown
       payload["layout"] = nil
 
       while layout
-        output = render_layout(output, layout, info)
+        output = render_layout(output, layout, liquid_context)
         add_regenerator_dependencies(layout)
 
         next unless (layout = site.layouts[layout.data["layout"]])
@@ -189,14 +202,14 @@ module Bridgetown
     # Render layout content into document.output
     #
     # Returns String rendered content
-    def render_layout(output, layout, info)
+    def render_layout(output, layout, liquid_context)
       payload["content"] = output
       payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
 
       render_liquid(
         layout.content,
         payload,
-        info,
+        liquid_context,
         layout.path
       )
     end

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

@@ -3,6 +3,10 @@
 module Bridgetown
   module Tags
     class IncludeTag < Liquid::Tag
+      class << self
+        attr_accessor :deprecation_message_shown
+      end
+
       VALID_SYNTAX = %r!
         ([\w-]+)\s*=\s*
         (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))
@@ -18,6 +22,14 @@ module Bridgetown
 
       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

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

@@ -3,27 +3,38 @@
 module Bridgetown
   module Tags
     class BlockRenderTag < Liquid::Block
-      def initialize(tag_name, markup, options)
-        super
+      def render(context)
+        context.stack({}) do
+          content = super.gsub(%r!^[ \t]+!, "") # unindent the incoming text
+          regions = gather_content_regions(context)
 
-        @tag = tag_name
-        @markup = markup
-        @options = options
-      end
+          site = context.registers[:site]
+          converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
+          markdownified_content = converter.convert(content)
+          context["processed_component_content"] = markdownified_content
 
-      def render(context)
-        content = super.gsub(%r!^[ \t]+!, "") # unindent the incoming text
+          render_params = [@markup, "content: processed_component_content"]
+          unless regions.empty?
+            regions.each do |region_name, region_content|
+              region_name = region_name.sub("content_with_region_", "")
+              context[region_name] = converter.convert(region_content.gsub(%r!^[ \t]+!, ""))
+              render_params.push "#{region_name}: #{region_name}"
+            end
+          end
 
-        site = context.registers[:site]
-        converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
-        markdownified_content = converter.convert(content)
+          Liquid::Render.parse("render", render_params.join(","), nil, @parse_context)
+            .render_tag(context, +"")
+        end
+      end
+
+      private
 
-        context.stack do
-          context["componentcontent"] = markdownified_content
-          render_params = "#{@markup}, content: componentcontent"
-          render_tag = Liquid::Render.parse("render", render_params, @options, @parse_context)
-          render_tag.render_tag(context, +"")
+      def gather_content_regions(context)
+        unless context.scopes[0].keys.find { |k| k.to_s.start_with? "content_with_region_" }
+          return {}
         end
+
+        context.scopes[0].select { |k| k.to_s.start_with? "content_with_region_" }
       end
     end
   end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class WithTag < Liquid::Block
+      def render(context)
+        region_name = @markup.strip
+        context["content_with_region_#{region_name}"] = super
+        ""
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("with", Bridgetown::Tags::WithTag)

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.14.1"
-  CODE_NAME = "Hazelwood"
+  VERSION = "0.15.0.beta1"
+  CODE_NAME = "Overlook"
 end

data/lib/bridgetown-core/watcher.rb

@@ -39,17 +39,21 @@ module Bridgetown
     def build_listener(site, options)
       webpack_path = site.in_root_dir(".bridgetown-webpack")
       FileUtils.mkdir(webpack_path) unless Dir.exist?(webpack_path)
+      plugin_paths_to_watch = site.plugin_manager.plugins_path.select do |path|
+        Dir.exist?(path)
+      end
+
       Listen.to(
         options["source"],
         webpack_path,
-        *site.plugin_manager.plugins_path,
+        *plugin_paths_to_watch,
         ignore: listen_ignore_paths(options),
         force_polling: options["force_polling"],
-        &listen_handler(site)
+        &listen_handler(site, options)
       )
     end
 
-    def listen_handler(site)
+    def listen_handler(site, options)
       proc do |modified, added, removed|
         t = Time.now
         c = modified + added + removed
@@ -59,7 +63,7 @@ module Bridgetown
         Bridgetown.logger.info "", "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")}"
 
         c.each { |path| Bridgetown.logger.info "", path["#{site.root_dir}/".length..-1] }
-        process(site, t)
+        process(site, t, options)
       end
     end
 
@@ -95,7 +99,6 @@ module Bridgetown
     # options - A Hash of options passed to the command
     #
     # Returns a list of relative paths from source that should be ignored
-    # rubocop: disable Metrics/AbcSize
     def listen_ignore_paths(options)
       source = Pathname.new(options["source"]).expand_path
       paths  = to_exclude(options)
@@ -117,13 +120,12 @@ module Bridgetown
         end
       end.compact + [%r!^\.bridgetown\-metadata!]
     end
-    # rubocop:enable Metrics/AbcSize
 
     def sleep_forever
       loop { sleep 1000 }
     end
 
-    def process(site, time)
+    def process(site, time, options)
       begin
         Bridgetown::Hooks.trigger :site, :pre_reload, site
         Bridgetown::Hooks.clear_reloadable_hooks
@@ -131,9 +133,14 @@ module Bridgetown
         site.process
         Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
                                " #{(Time.now - time).ceil(2)} seconds."
-      rescue StandardError => e
-        Bridgetown.logger.warn "Error:", e.message
-        Bridgetown.logger.warn "Error:", "Run bridgetown build --trace for more information."
+      rescue Exception => e
+        Bridgetown.logger.error "Error:", e.message
+
+        if options[:trace]
+          Bridgetown.logger.info e.backtrace.join("\n")
+        else
+          Bridgetown.logger.warn "Error:", "Use the --trace option for more information."
+        end
       end
       Bridgetown.logger.info ""
     end

data/lib/site_template/Gemfile.erb

@@ -0,0 +1,19 @@
+source "https://rubygems.org"
+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:
+#
+#   bundle exec bridgetown serve
+#
+# This will help ensure the proper Bridgetown version is running.
+#
+# To install a plugin, simply run bundle add and specify the group
+# "bridgetown_plugins". For example:
+#
+#   bundle add some-new-plugin -g bridgetown_plugins
+#
+# Happy Bridgetowning!
+
+gem "bridgetown", "~> <%= Bridgetown::VERSION %>"

data/lib/site_template/src/_components/footer.html

@@ -0,0 +1,3 @@
+<footer>
+  Contact me at {{ metadata.email }}
+</footer>

data/lib/site_template/src/_components/head.html

@@ -0,0 +1,9 @@
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+{% capture page_title %}{{ title | strip_html | strip_newlines }}{% endcapture %}
+<title>{% if page_title != "" %}{{ page_title | escape }} | {{ metadata.title | escape }}{% else %}{{ metadata.title | escape }}: {{ metadata.tagline | escape }}{% endif %}</title>
+
+<meta name="description" content="{{ metadata.description }}" />
+
+<link rel="stylesheet" href="{% webpack_path css %}" />
+<script src="{% webpack_path js %}" defer></script>

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

@@ -1,15 +1,15 @@
 <!doctype html>
 <html lang="en">
   <head>
-    {% include head.html %}
+    {% render "head", metadata: site.metadata, title: page.title %}
   </head>
   <body class="{{ page.layout }} {{ page.page_class }}">
-    {% include navbar.html %}
+    {% render "navbar" %}
 
     <main>
       {{ content }}
     </main>
 
-    {% include footer.html %}
+    {% render "footer", metadata: site.metadata %}
   </body>
 </html>

data/lib/site_template/start.js

@@ -14,4 +14,4 @@ concurrently([
 ], {
   restartTries: 3,
   killOthers: ['failure', 'success'],
-}).then(() => { console.log("Done.") }, () => {});
+}).then(() => { console.log("Done.");console.log('\033[0G'); }, () => {});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-23 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -137,47 +137,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: liquid-render-tag
+  name: liquid-component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: liquid-render-tag
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: mercenary
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pathutil
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: thor
+  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'
 description: Bridgetown is a Webpack-aware, Ruby-powered static site generator for
   the modern Jamstack era
 email: maintainers@bridgetownrb.com
@@ -249,14 +263,19 @@ files:
 - lib/bridgetown-core/cache.rb
 - lib/bridgetown-core/cleaner.rb
 - lib/bridgetown-core/collection.rb
-- lib/bridgetown-core/command.rb
+- lib/bridgetown-core/commands/apply.rb
+- lib/bridgetown-core/commands/base.rb
 - lib/bridgetown-core/commands/build.rb
 - lib/bridgetown-core/commands/clean.rb
+- 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/summarizable.rb
 - lib/bridgetown-core/commands/console.rb
 - lib/bridgetown-core/commands/doctor.rb
-- lib/bridgetown-core/commands/help.rb
 - lib/bridgetown-core/commands/new.rb
 - lib/bridgetown-core/commands/plugins.rb
+- lib/bridgetown-core/commands/registrations.rb
 - lib/bridgetown-core/commands/serve.rb
 - lib/bridgetown-core/commands/serve/servlet.rb
 - lib/bridgetown-core/concerns/convertible.rb
@@ -330,6 +349,7 @@ files:
 - lib/bridgetown-core/tags/post_url.rb
 - lib/bridgetown-core/tags/render_content.rb
 - lib/bridgetown-core/tags/webpack_path.rb
+- lib/bridgetown-core/tags/with.rb
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
@@ -342,6 +362,7 @@ files:
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
 - lib/site_template/.gitignore
+- lib/site_template/Gemfile.erb
 - lib/site_template/bridgetown.config.yml
 - lib/site_template/frontend/javascript/index.js
 - lib/site_template/frontend/styles/index.scss
@@ -349,11 +370,10 @@ files:
 - lib/site_template/plugins/builders/.keep
 - lib/site_template/plugins/site_builder.rb
 - lib/site_template/src/404.html
-- lib/site_template/src/_components/.keep
+- lib/site_template/src/_components/footer.html
+- lib/site_template/src/_components/head.html
+- lib/site_template/src/_components/navbar.html
 - lib/site_template/src/_data/site_metadata.yml
-- lib/site_template/src/_includes/footer.html
-- lib/site_template/src/_includes/head.html
-- lib/site_template/src/_includes/navbar.html
 - lib/site_template/src/_layouts/default.html
 - lib/site_template/src/_layouts/home.html
 - lib/site_template/src/_layouts/page.html