bridgetown-core 0.20.0 → 0.21.0

data/lib/bridgetown-core/ruby_template_view.rb

@@ -7,6 +7,7 @@ module Bridgetown
     require "bridgetown-core/helpers"
 
     attr_reader :layout, :page, :paginator, :site, :content
+    alias_method :resource, :page
 
     def initialize(convertible)
       if convertible.is_a?(Layout)
@@ -27,17 +28,10 @@ module Bridgetown
 
     def render(item, options = {}, &block)
       if item.respond_to?(:render_in)
-        previous_buffer_state = @_erbout
-        @_erbout = Bridgetown::ERBBuffer.new
-
-        @in_view_component ||= defined?(::ViewComponent::Base) && item.is_a?(::ViewComponent::Base)
         result = item.render_in(self, &block)
-        @in_view_component = false
-
-        @_erbout = previous_buffer_state
-        result
+        result&.html_safe
       else
-        partial(item, options, &block)
+        partial(item, options, &block)&.html_safe
       end
     end
 
@@ -60,14 +54,15 @@ module Bridgetown
         Bridgetown.logger.warn "Liquid Warning:",
                                LiquidRenderer.format_error(e, path || document.relative_path)
       end
-      template.render!(options.deep_stringify_keys, _liquid_context)
+      template.render!(options.deep_stringify_keys, _liquid_context).html_safe
     end
 
     def helpers
       @helpers ||= Helpers.new(self, site)
     end
 
-    def method_missing(method, *args, &block)
+    # 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
       else
@@ -78,6 +73,7 @@ module Bridgetown
     def respond_to_missing?(method, include_private = false)
       helpers.respond_to?(method.to_sym, include_private) || super
     end
+    # rubocop:enable Style/MissingRespondToMissing
 
     private
 

data/lib/bridgetown-core/site.rb

@@ -30,12 +30,11 @@ module Bridgetown
     # is default
     alias_method :generated_pages, :pages
 
-    attr_accessor :exclude, :include, :lsi, :highlighter, :permalink_style,
-                  :time, :future, :unpublished, :limit_posts,
-                  :keep_files, :baseurl, :data, :file_read_opts,
-                  :plugin_manager, :converters, :generators, :reader
+    attr_accessor :permalink_style, :time, :baseurl, :data,
+                  :file_read_opts, :plugin_manager, :converters,
+                  :generators, :reader
 
-    # Public: Initialize a new Site.
+    # Initialize a new Site.
     #
     # config - A Hash containing site configuration details.
     def initialize(config)

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

@@ -36,13 +36,11 @@ module Bridgetown
         code = super.to_s.gsub(LEADING_OR_TRAILING_LINE_TERMINATORS, "")
 
         output =
-          case context.registers[:site].highlighter
+          case context.registers[:site].config.highlighter
           when "rouge"
             render_rouge(code)
-          when "pygments"
-            render_pygments(code, context)
           else
-            render_codehighlighter(code)
+            h(code).strip
           end
 
         rendered_output = add_code_tag(output)
@@ -72,13 +70,6 @@ module Bridgetown
         options
       end
 
-      def render_pygments(code, _context)
-        Bridgetown.logger.warn "Warning:", "Highlight Tag no longer supports" \
-                                " rendering with Pygments."
-        Bridgetown.logger.warn "", "Using the default highlighter, Rouge, instead."
-        render_rouge(code)
-      end
-
       def render_rouge(code)
         require "rouge"
         formatter = ::Rouge::Formatters::HTMLLegacy.new(
@@ -92,10 +83,6 @@ module Bridgetown
         formatter.format(lexer.lex(code))
       end
 
-      def render_codehighlighter(code)
-        h(code).strip
-      end
-
       def add_code_tag(code)
         code_attributes = [
           "class=\"language-#{@lang.to_s.tr("+", "-")}\"",

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

@@ -112,7 +112,7 @@ module Bridgetown
       def locate_include_file(context, file)
         includes_dirs = tag_includes_dirs(context)
         includes_dirs.each do |dir|
-          path = PathManager.join(dir, file)
+          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)

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

@@ -77,14 +77,14 @@ module Bridgetown
         @context = context
         site = context.registers[:site]
 
-        site.posts.docs.each do |document|
+        site.collections.posts.docs.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.posts.docs.each do |document|
+        site.collections.posts.docs.each do |document|
           next unless @post.deprecated_equality document
 
           Bridgetown::Deprecator.deprecation_message "A call to "\

data/lib/bridgetown-core/utils.rb

@@ -4,9 +4,9 @@ module Bridgetown
   module Utils
     extend self
     autoload :Ansi, "bridgetown-core/utils/ansi"
+    autoload :RequireGems, "bridgetown-core/utils/require_gems"
     autoload :RubyExec, "bridgetown-core/utils/ruby_exec"
-    autoload :Platforms, "bridgetown-core/utils/platforms"
-    autoload :ThreadEvent, "bridgetown-core/utils/thread_event"
+    autoload :RubyFrontMatterDSL, "bridgetown-core/utils/ruby_front_matter"
 
     # Constants for use in #slugify
     SLUGIFY_MODES = %w(raw default pretty simple ascii latin).freeze
@@ -118,7 +118,13 @@ module Bridgetown
     # @return [Boolean] if the YAML front matter is present.
     # rubocop: disable Naming/PredicateName
     def has_yaml_header?(file)
-      File.open(file, "rb", &:readline).match? %r!\A---\s*\r?\n!
+      File.open(file, "rb", &:readline).match? Bridgetown::FrontMatterImporter::YAML_HEADER
+    rescue EOFError
+      false
+    end
+
+    def has_rbfm_header?(file)
+      File.open(file, "rb", &:readline).match? Bridgetown::FrontMatterImporter::RUBY_HEADER
     rescue EOFError
       false
     end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Utils
+    module RequireGems
+      class << self
+        #
+        # Require a gem or file if it's present, otherwise silently fail.
+        #
+        # names - a string gem name or array of gem names
+        #
+        def require_if_present(names)
+          Array(names).each do |name|
+            require name
+          rescue LoadError
+            Bridgetown.logger.debug "Couldn't load #{name}. Skipping."
+            yield(name, version_constraint(name)) if block_given?
+            false
+          end
+        end
+
+        #
+        # The version constraint required to activate a given gem.
+        #
+        # Returns a String version constraint in a parseable form for
+        # RubyGems.
+        def version_constraint
+          "> 0"
+        end
+
+        #
+        # Require a gem or gems. If it's not present, show a very nice error
+        # message that explains everything and is much more helpful than the
+        # normal LoadError.
+        #
+        # names - a string gem name or array of gem names
+        #
+        def require_with_graceful_fail(names)
+          Array(names).each do |name|
+            Bridgetown.logger.debug "Requiring:", name.to_s
+            require name
+          rescue LoadError => e
+            Bridgetown.logger.error "Dependency Error:", <<~MSG
+              Yikes! It looks like you don't have #{name} or one of its dependencies installed.
+              In order to use Bridgetown as currently configured, you'll need to install this gem.
+
+              If you've run Bridgetown with `bundle exec`, ensure that you have included the #{name}
+              gem in your Gemfile as well.
+
+              The full error message from Ruby is: '#{e.message}'
+
+              If you run into trouble, you can find helpful resources at https://www.bridgetownrb.com/docs/community/
+            MSG
+            raise Bridgetown::Errors::MissingDependencyException, name
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,8 +5,8 @@ module Bridgetown
     module RubyExec
       extend self
 
-      # rubocop:disable Metrics/AbcSize
-      def search_data_for_ruby_code(convertible, renderer)
+      # 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
         return if convertible.data.empty?
 
         # Iterate using `keys` here so inline Ruby script can add new data keys
@@ -14,24 +14,21 @@ 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)
+          next unless v.is_a?(Rb) || v.is_a?(Hash) || v.is_a?(Proc)
 
-          if v.is_a?(Hash)
+          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)
 
-              Bridgetown.logger.debug("Executing inline Ruby…", convertible.relative_path)
               convertible.data[k][nested_k] = run(nested_v, convertible, renderer)
-              Bridgetown.logger.debug("Inline Ruby completed!", convertible.relative_path)
             end
           else
-            Bridgetown.logger.debug("Executing inline Ruby…", convertible.relative_path)
             convertible.data[k] = run(v, convertible, renderer)
-            Bridgetown.logger.debug("Inline Ruby completed!", convertible.relative_path)
           end
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       # Sets up a new context in which to eval Ruby coming from front matter.
       #

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Utils
+    module RubyFrontMatterDSL
+      def front_matter(&block)
+        RubyFrontMatter.new.tap { |fm| fm.instance_exec(&block) }
+      end
+    end
+
+    class RubyFrontMatter
+      def initialize
+        @data = {}
+      end
+
+      def method_missing(key, value) # rubocop:disable Style/MissingRespondToMissing
+        return super if respond_to?(key)
+
+        set(key, value)
+      end
+
+      def each(&block)
+        @data.each(&block)
+      end
+
+      def get(key)
+        @data[key]
+      end
+
+      def set(key, value)
+        @data[key] = value
+      end
+
+      def to_h
+        @data
+      end
+    end
+  end
+end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.20.0"
-  CODE_NAME = "Healy Heights"
+  VERSION = "0.21.0"
+  CODE_NAME = "Broughton Beach"
 end

data/lib/bridgetown-core/watcher.rb

@@ -127,6 +127,7 @@ module Bridgetown
 
     def process(site, time, options)
       begin
+        I18n.reload! # make sure any locale files get read again
         Bridgetown::Hooks.trigger :site, :pre_reload, site
         Bridgetown::Hooks.clear_reloadable_hooks
         site.plugin_manager.reload_plugin_files
@@ -140,7 +141,7 @@ module Bridgetown
         if options[:trace]
           Bridgetown.logger.info e.backtrace.join("\n")
         else
-          Bridgetown.logger.warn "Error:", "Use the --trace option for more information."
+          Bridgetown.logger.warn "Backtrace:", "Use the --trace option for more information."
         end
       end
       Bridgetown.logger.info ""

data/lib/bridgetown-core/yaml_parser.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  class YAMLParser
+    PERMITTED_CLASSES = [Date, Time, Rb].freeze
+
+    class << self
+      def load_file(filename, **kwargs)
+        kwargs = { permitted_classes: PERMITTED_CLASSES }.merge(kwargs)
+        YAML.safe_load_file(filename, **kwargs)
+      end
+
+      def load(yaml)
+        if RUBY_VERSION.start_with?("2.5")
+          YAML.safe_load yaml, PERMITTED_CLASSES
+        else
+          YAML.safe_load yaml, permitted_classes: PERMITTED_CLASSES
+        end
+      end
+    end
+  end
+end

data/lib/site_template/package.json.erb

@@ -25,13 +25,13 @@
     "file-loader": "^6.2.0",
     "mini-css-extract-plugin": "^1.3.1",
     <% if options["use-postcss"] %>
-    "postcss": "^8.1.9",
+    "postcss": "^8.3.0",
     "postcss-flexbugs-fixes": "^4.1.0",
-    "postcss-loader": "^4.1.0",
+    "postcss-loader": "^4.3.0",
     "postcss-preset-env": "^6.7.0",
     <% else %>
-    "node-sass": "^4.13.1",
-    "sass-loader": "^8.0.2",    
+    "sass": "^1.32.8",
+    "sass-loader": "^8.0.2",
     <% end %>
     "webpack": "^4.44.2",
     "webpack-cli": "^3.3.11",

data/lib/site_template/plugins/site_builder.rb

@@ -1,4 +1,4 @@
 class SiteBuilder < Bridgetown::Builder
-  # write builders which subclass SiteBuilder in plugins/builder
+  # write builders which subclass SiteBuilder in plugins/builders
 end
 

data/lib/site_template/src/_posts/0000-00-00-welcome-to-bridgetown.md.erb

@@ -21,6 +21,6 @@ def print_hi(name)
 end
 print_hi('Tom')
 #=> prints 'Hi, Tom' to STDOUT.
-````
+```
 
 Check out the [Bridgetown docs](https://bridgetownrb.com/docs/) for more info on how to get the most out of Bridgetown. File all bugs/feature requests at [Bridgetown’s GitHub repo](https://github.com/bridgetownrb/bridgetown). If you have questions, you can ask them on [Bridgetown Discussions on GitHub](https://github.com/bridgetownrb/bridgetown/discussions).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  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'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -327,6 +313,7 @@ files:
 - 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/git_helpers.rb
 - lib/bridgetown-core/commands/concerns/summarizable.rb
 - lib/bridgetown-core/commands/configure.rb
 - lib/bridgetown-core/commands/console.rb
@@ -336,7 +323,15 @@ files:
 - lib/bridgetown-core/commands/registrations.rb
 - lib/bridgetown-core/commands/serve.rb
 - lib/bridgetown-core/commands/serve/servlet.rb
+- lib/bridgetown-core/commands/webpack.rb
+- lib/bridgetown-core/commands/webpack/enable-postcss.rb
+- lib/bridgetown-core/commands/webpack/setup.rb
+- lib/bridgetown-core/commands/webpack/update.rb
+- lib/bridgetown-core/commands/webpack/webpack.config.js
+- lib/bridgetown-core/commands/webpack/webpack.defaults.js.erb
+- lib/bridgetown-core/component.rb
 - lib/bridgetown-core/concerns/data_accessible.rb
+- lib/bridgetown-core/concerns/front_matter_importer.rb
 - lib/bridgetown-core/concerns/layout_placeable.rb
 - lib/bridgetown-core/concerns/liquid_renderable.rb
 - lib/bridgetown-core/concerns/publishable.rb
@@ -369,7 +364,9 @@ files:
 - lib/bridgetown-core/converters/liquid_templates.rb
 - lib/bridgetown-core/converters/markdown.rb
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
+- lib/bridgetown-core/converters/ruby_templates.rb
 - lib/bridgetown-core/converters/smartypants.rb
+- lib/bridgetown-core/core_ext/psych.rb
 - lib/bridgetown-core/current.rb
 - lib/bridgetown-core/deprecator.rb
 - lib/bridgetown-core/document.rb
@@ -379,6 +376,7 @@ files:
 - lib/bridgetown-core/drops/drop.rb
 - lib/bridgetown-core/drops/excerpt_drop.rb
 - lib/bridgetown-core/drops/page_drop.rb
+- lib/bridgetown-core/drops/relations_drop.rb
 - lib/bridgetown-core/drops/resource_drop.rb
 - lib/bridgetown-core/drops/site_drop.rb
 - lib/bridgetown-core/drops/static_file_drop.rb
@@ -387,10 +385,10 @@ files:
 - lib/bridgetown-core/entry_filter.rb
 - lib/bridgetown-core/errors.rb
 - lib/bridgetown-core/excerpt.rb
-- lib/bridgetown-core/external.rb
 - lib/bridgetown-core/filters.rb
 - lib/bridgetown-core/filters/condition_helpers.rb
 - lib/bridgetown-core/filters/date_filters.rb
+- lib/bridgetown-core/filters/from_liquid.rb
 - lib/bridgetown-core/filters/grouping_filters.rb
 - lib/bridgetown-core/filters/url_filters.rb
 - lib/bridgetown-core/frontmatter_defaults.rb
@@ -409,10 +407,9 @@ files:
 - lib/bridgetown-core/mime.types
 - lib/bridgetown-core/model/base.rb
 - lib/bridgetown-core/model/builder_origin.rb
-- lib/bridgetown-core/model/file_origin.rb
 - lib/bridgetown-core/model/origin.rb
+- lib/bridgetown-core/model/repo_origin.rb
 - lib/bridgetown-core/page.rb
-- lib/bridgetown-core/path_manager.rb
 - lib/bridgetown-core/plugin.rb
 - lib/bridgetown-core/plugin_manager.rb
 - lib/bridgetown-core/publisher.rb
@@ -423,13 +420,13 @@ files:
 - lib/bridgetown-core/readers/page_reader.rb
 - lib/bridgetown-core/readers/plugin_content_reader.rb
 - lib/bridgetown-core/readers/post_reader.rb
-- lib/bridgetown-core/readers/static_file_reader.rb
 - lib/bridgetown-core/regenerator.rb
 - lib/bridgetown-core/related_posts.rb
 - lib/bridgetown-core/renderer.rb
 - lib/bridgetown-core/resource/base.rb
 - lib/bridgetown-core/resource/destination.rb
 - lib/bridgetown-core/resource/permalink_processor.rb
+- lib/bridgetown-core/resource/relations.rb
 - lib/bridgetown-core/resource/taxonomy_term.rb
 - lib/bridgetown-core/resource/taxonomy_type.rb
 - lib/bridgetown-core/resource/transformer.rb
@@ -449,15 +446,17 @@ files:
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
-- lib/bridgetown-core/utils/platforms.rb
+- lib/bridgetown-core/utils/require_gems.rb
 - lib/bridgetown-core/utils/ruby_exec.rb
-- lib/bridgetown-core/utils/thread_event.rb
+- lib/bridgetown-core/utils/ruby_front_matter.rb
 - lib/bridgetown-core/version.rb
 - lib/bridgetown-core/watcher.rb
+- lib/bridgetown-core/yaml_parser.rb
 - lib/site_template/.gitignore
 - lib/site_template/Gemfile.erb
 - lib/site_template/README.md
 - lib/site_template/bridgetown.config.yml
+- lib/site_template/config/.keep
 - lib/site_template/frontend/javascript/index.js.erb
 - lib/site_template/frontend/styles/index.css
 - lib/site_template/frontend/styles/index.scss
@@ -482,7 +481,6 @@ files:
 - lib/site_template/src/posts.md
 - lib/site_template/start.js
 - lib/site_template/sync.js
-- lib/site_template/webpack.config.js.erb
 homepage: https://www.bridgetownrb.com
 licenses:
 - MIT