bridgetown-core 0.19.3 → 0.21.0.beta4

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.19.3"
-  CODE_NAME = "Arbor Lodge"
+  VERSION = "0.21.0.beta4"
+  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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.21.0.beta4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pathutil
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -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,10 @@ 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
 - lib/bridgetown-core/drops/bridgetown_drop.rb
@@ -378,6 +376,8 @@ 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
 - lib/bridgetown-core/drops/unified_payload_drop.rb
@@ -385,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
@@ -405,24 +405,31 @@ files:
 - lib/bridgetown-core/log_adapter.rb
 - lib/bridgetown-core/log_writer.rb
 - lib/bridgetown-core/mime.types
+- lib/bridgetown-core/model/base.rb
+- lib/bridgetown-core/model/builder_origin.rb
+- lib/bridgetown-core/model/origin.rb
+- lib/bridgetown-core/model/repo_origin.rb
 - lib/bridgetown-core/page.rb
-- lib/bridgetown-core/page_without_a_file.rb
-- lib/bridgetown-core/path_manager.rb
 - lib/bridgetown-core/plugin.rb
 - lib/bridgetown-core/plugin_manager.rb
 - lib/bridgetown-core/publisher.rb
 - lib/bridgetown-core/reader.rb
-- lib/bridgetown-core/readers/collection_reader.rb
 - lib/bridgetown-core/readers/data_reader.rb
 - lib/bridgetown-core/readers/defaults_reader.rb
 - lib/bridgetown-core/readers/layout_reader.rb
 - 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
 - lib/bridgetown-core/ruby_template_view.rb
 - lib/bridgetown-core/site.rb
 - lib/bridgetown-core/static_file.rb
@@ -439,18 +446,17 @@ files:
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb
-- lib/bridgetown-core/utils/exec.rb
-- lib/bridgetown-core/utils/internet.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/win_tz.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
@@ -475,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

data/lib/bridgetown-core/external.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  module External
-    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

data/lib/bridgetown-core/page_without_a_file.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  # A Bridgetown::Page subclass to handle processing files without reading it to
-  # determine the page-data and page-content based on Front Matter delimiters.
-  #
-  # The class instance is basically just a bare-bones entity with just
-  # attributes "dir", "name", "path", "url" defined on it.
-  class PageWithoutAFile < Page
-    Bridgetown.logger.warn "NOTICE: the PageWithoutAFile class is deprecated and" \
-                           " will be removed in Bridgetown 0.20."
-
-    def read_yaml(*)
-      @data ||= {}
-    end
-  end
-end

data/lib/bridgetown-core/path_manager.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  # A singleton class that caches frozen instances of path strings returned from its methods.
-  #
-  # NOTE:
-  #   This class exists because `File.join` allocates an Array and returns a new String on every
-  #   call using **the same arguments**. Caching the result means reduced memory usage.
-  #   However, the caches are never flushed so that they can be used even when a site is
-  #   regenerating. The results are frozen to deter mutation of the cached string.
-  #
-  #   Therefore, employ this class only for situations where caching the result is necessary
-  #   for performance reasons.
-  #
-  class PathManager
-    # This class cannot be initialized from outside
-    private_class_method :new
-
-    # Wraps `File.join` to cache the frozen result.
-    # Reassigns `nil`, empty strings and empty arrays to a frozen empty string beforehand.
-    #
-    # Returns a frozen string.
-    def self.join(base, item)
-      base = "" if base.nil? || base.empty?
-      item = "" if item.nil? || item.empty?
-      @join ||= {}
-      @join[base] ||= {}
-      @join[base][item] ||= File.join(base, item).freeze
-    end
-  end
-end

data/lib/bridgetown-core/readers/collection_reader.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Bridgetown
-  class CollectionReader
-    SPECIAL_COLLECTIONS = %w(posts data).freeze
-
-    attr_reader :site, :content
-
-    def initialize(site)
-      @site = site
-      @content = {}
-    end
-
-    # Read in all collections specified in the configuration
-    #
-    # Returns nothing.
-    def read
-      site.collections.each_value do |collection|
-        collection.read unless SPECIAL_COLLECTIONS.include?(collection.label)
-      end
-    end
-  end
-end