RubyGems - bridgetown-core - Versions diffs - 0.15.0.beta1 → 0.16.0.beta1 - Mend

bridgetown-core 0.15.0.beta1 → 0.16.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

checksums.yaml +4 -4
data/Rakefile +14 -0
data/bridgetown-core.gemspec +2 -0
data/lib/bridgetown-core.rb +6 -1
data/lib/bridgetown-core/commands/concerns/actions.rb +54 -21
data/lib/bridgetown-core/commands/console.rb +12 -2
data/lib/bridgetown-core/commands/serve.rb +5 -0
data/lib/bridgetown-core/concerns/data_accessible.rb +19 -0
data/lib/bridgetown-core/concerns/layout_placeable.rb +17 -0
data/lib/bridgetown-core/concerns/liquid_renderable.rb +20 -0
data/lib/bridgetown-core/concerns/publishable.rb +10 -0
data/lib/bridgetown-core/concerns/site/configurable.rb +62 -31
data/lib/bridgetown-core/concerns/site/content.rb +88 -29
data/lib/bridgetown-core/concerns/site/extensible.rb +15 -12
data/lib/bridgetown-core/concerns/site/processable.rb +12 -10
data/lib/bridgetown-core/concerns/site/renderable.rb +23 -4
data/lib/bridgetown-core/concerns/site/writable.rb +16 -2
data/lib/bridgetown-core/concerns/validatable.rb +59 -0
data/lib/bridgetown-core/configuration.rb +1 -0
data/lib/bridgetown-core/converter.rb +34 -0
data/lib/bridgetown-core/converters/erb_templates.rb +61 -0
data/lib/bridgetown-core/converters/markdown.rb +6 -23
data/lib/bridgetown-core/converters/smartypants.rb +0 -10
data/lib/bridgetown-core/document.rb +8 -52
data/lib/bridgetown-core/drops/document_drop.rb +9 -1
data/lib/bridgetown-core/drops/page_drop.rb +1 -1
data/lib/bridgetown-core/errors.rb +2 -0
data/lib/bridgetown-core/excerpt.rb +5 -7
data/lib/bridgetown-core/filters.rb +2 -0
data/lib/bridgetown-core/layout.rb +24 -1
data/lib/bridgetown-core/liquid_renderer/file.rb +1 -4
data/lib/bridgetown-core/liquid_renderer/file_system.rb +1 -1
data/lib/bridgetown-core/page.rb +36 -42
data/lib/bridgetown-core/plugin_manager.rb +27 -13
data/lib/bridgetown-core/regenerator.rb +1 -1
data/lib/bridgetown-core/renderer.rb +41 -15
data/lib/bridgetown-core/ruby_template_view.rb +84 -0
data/lib/bridgetown-core/tags/class_map.rb +90 -0
data/lib/bridgetown-core/tags/include.rb +2 -0
data/lib/bridgetown-core/tags/render_content.rb +14 -2
data/lib/bridgetown-core/tags/webpack_path.rb +48 -16
data/lib/bridgetown-core/utils.rb +44 -0
data/lib/bridgetown-core/version.rb +2 -2
data/lib/site_template/bridgetown.config.yml +5 -3
data/lib/site_template/package.json +1 -0
data/lib/site_template/src/_components/{footer.html → footer.liquid} +0 -0
data/lib/site_template/src/_components/{head.html → head.liquid} +0 -0
data/lib/site_template/src/_components/{navbar.html → navbar.liquid} +0 -0
data/lib/site_template/src/_layouts/default.html +1 -1
data/lib/site_template/webpack.config.js +3 -3
metadata +41 -6
data/lib/bridgetown-core/concerns/convertible.rb +0 -238

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

@@ -287,6 +287,50 @@ module Bridgetown
       merged
     end
+    # Returns a string that's been reindented so that Markdown's four+ spaces =
+    # code doesn't get triggered for nested Liquid components
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
+    def reindent_for_markdown(input)
+      lines = input.lines
+      return input if lines.first.nil?
+      starting_indentation = lines.find { |line| line != "\n" }&.match(%r!^ +!)
+      return input unless starting_indentation
+      starting_indent_length = starting_indentation[0].length
+      skip_pre_lines = false
+      lines.map do |line|
+        continue_processing = !skip_pre_lines
+        if skip_pre_lines
+          skip_pre_lines = false if line.include?("</pre>")
+        end
+        if line.include?("<pre")
+          skip_pre_lines = true
+          continue_processing = false
+        end
+        if continue_processing
+          line_indentation = line.match(%r!^ +!).yield_self do |indent|
+            indent.nil? ? "" : indent[0]
+          end
+          new_indentation = line_indentation.rjust(starting_indent_length, " ")
+          if %r!^ +!.match?(line)
+            line
+              .sub(%r!^ {1,#{starting_indent_length}}!, new_indentation)
+              .sub(%r!^#{new_indentation}!, "")
+          else
+            line
+          end
+        else
+          line
+        end
+      end.join("")
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
     private
     def merge_values(target, overwrite)

data/lib/bridgetown-core/version.rb CHANGED

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

data/lib/site_template/bridgetown.config.yml CHANGED

@@ -10,12 +10,14 @@
 # For reloadable site metadata like title, SEO description, social media
 # handles, etc., take a look at src/_data/site_metadata.yml
 #
-# If you need help with YAML syntax, here are some quick references for you:
+# If you need help with YAML syntax, here are some quick references for you:
 # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
 # https://learnxinyminutes.com/docs/yaml/
 #
 baseurl: "" # OPTIONAL: the subpath of your site, e.g. /blog
-url: "" # the base hostname & protocol for your site, e.g. http://example.com
+url: "" # the base hostname & protocol for your site, e.g. https://example.com
-# Additional build settings go here
+permalink: pretty
+# timezone: America/Los_Angeles

data/lib/site_template/package.json CHANGED

@@ -14,6 +14,7 @@
   "devDependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-decorators": "^7.10.1",
     "@babel/plugin-transform-runtime": "^7.9.0",
     "@babel/preset-env": "^7.9.0",
     "babel-loader": "^8.1.0",

data/lib/site_template/src/_components/{footer.html → footer.liquid} RENAMED

File without changes

data/lib/site_template/src/_components/{head.html → head.liquid} RENAMED

File without changes

data/lib/site_template/src/_components/{navbar.html → navbar.liquid} RENAMED

File without changes

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

@@ -4,7 +4,7 @@
     {% render "head", metadata: site.metadata, title: page.title %}
   </head>
   <body class="{{ page.layout }} {{ page.page_class }}">
-    {% render "navbar" %}
+    {% render "navbar", metadata: site.metadata, page: page %}
     <main>
       {{ content }}

data/lib/site_template/webpack.config.js CHANGED

@@ -36,7 +36,8 @@ module.exports = {
           options: {
             presets: ["@babel/preset-env"],
             plugins: [
-              "@babel/plugin-proposal-class-properties",
+              ["@babel/plugin-proposal-decorators", { "legacy": true }],
+              ["@babel/plugin-proposal-class-properties", { "loose" : true }],
               [
                 "@babel/plugin-transform-runtime",
                 {
@@ -57,8 +58,7 @@ module.exports = {
             options: {
               sassOptions: {
                 includePaths: [
-                  path.resolve(__dirname, "src/_components"),
-                  path.resolve(__dirname, "src/_includes"),
+                  path.resolve(__dirname, "src/_components")
                 ],
               },
             },

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta1
+  version: 0.16.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Bridgetown is a Webpack-aware, Ruby-powered static site generator for
   the modern Jamstack era
 email: maintainers@bridgetownrb.com
@@ -278,15 +306,20 @@ files:
 - 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
+- lib/bridgetown-core/concerns/data_accessible.rb
+- lib/bridgetown-core/concerns/layout_placeable.rb
+- lib/bridgetown-core/concerns/liquid_renderable.rb
+- lib/bridgetown-core/concerns/publishable.rb
 - lib/bridgetown-core/concerns/site/configurable.rb
 - lib/bridgetown-core/concerns/site/content.rb
 - lib/bridgetown-core/concerns/site/extensible.rb
 - lib/bridgetown-core/concerns/site/processable.rb
 - lib/bridgetown-core/concerns/site/renderable.rb
 - lib/bridgetown-core/concerns/site/writable.rb
+- lib/bridgetown-core/concerns/validatable.rb
 - lib/bridgetown-core/configuration.rb
 - lib/bridgetown-core/converter.rb
+- lib/bridgetown-core/converters/erb_templates.rb
 - lib/bridgetown-core/converters/identity.rb
 - lib/bridgetown-core/converters/markdown.rb
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
@@ -341,8 +374,10 @@ files:
 - lib/bridgetown-core/regenerator.rb
 - lib/bridgetown-core/related_posts.rb
 - lib/bridgetown-core/renderer.rb
+- lib/bridgetown-core/ruby_template_view.rb
 - lib/bridgetown-core/site.rb
 - lib/bridgetown-core/static_file.rb
+- lib/bridgetown-core/tags/class_map.rb
 - lib/bridgetown-core/tags/highlight.rb
 - lib/bridgetown-core/tags/include.rb
 - lib/bridgetown-core/tags/link.rb
@@ -370,9 +405,9 @@ 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/footer.html
-- lib/site_template/src/_components/head.html
-- lib/site_template/src/_components/navbar.html
+- lib/site_template/src/_components/footer.liquid
+- lib/site_template/src/_components/head.liquid
+- lib/site_template/src/_components/navbar.liquid
 - lib/site_template/src/_data/site_metadata.yml
 - lib/site_template/src/_layouts/default.html
 - lib/site_template/src/_layouts/home.html

data/lib/bridgetown-core/concerns/convertible.rb DELETED

@@ -1,238 +0,0 @@
-# frozen_string_literal: true
-# Convertible provides methods for converting a pagelike item
-# from a certain type of markup into actual content
-#
-# Requires
-#   self.site -> Bridgetown::Site
-#   self.content
-#   self.content=
-#   self.data=
-#   self.ext=
-#   self.output=
-#   self.name
-#   self.path
-#   self.type -> :page or :post
-module Bridgetown
-  module Convertible
-    # Returns the contents as a String.
-    def to_s
-      content || ""
-    end
-    # Whether the file is published or not, as indicated in YAML front-matter
-    def published?
-      !(data.key?("published") && data["published"] == false)
-    end
-    # Read the YAML frontmatter.
-    #
-    # base - The String path to the dir containing the file.
-    # name - The String filename of the file.
-    # opts - optional parameter to File.read, default at site configs
-    #
-    # Returns nothing.
-    # rubocop:disable Metrics/AbcSize
-    def read_yaml(base, name, opts = {})
-      filename = File.join(base, name)
-      begin
-        self.content = File.read(@path || site.in_source_dir(base, name),
-                                 **Utils.merged_file_read_opts(site, opts))
-        if content =~ Document::YAML_FRONT_MATTER_REGEXP
-          self.content = $POSTMATCH
-          self.data = SafeYAML.load(Regexp.last_match(1))&.with_indifferent_access
-        end
-      rescue Psych::SyntaxError => e
-        Bridgetown.logger.warn "YAML Exception reading #{filename}: #{e.message}"
-        raise e if site.config["strict_front_matter"]
-      rescue StandardError => e
-        Bridgetown.logger.warn "Error reading file #{filename}: #{e.message}"
-        raise e if site.config["strict_front_matter"]
-      end
-      self.data ||= ActiveSupport::HashWithIndifferentAccess.new
-      validate_data! filename
-      validate_permalink! filename
-      self.data
-    end
-    # rubocop:enable Metrics/AbcSize
-    def validate_data!(filename)
-      unless self.data.is_a?(Hash)
-        raise Errors::InvalidYAMLFrontMatterError,
-              "Invalid YAML front matter in #{filename}"
-      end
-    end
-    def validate_permalink!(filename)
-      if self.data["permalink"]&.to_s&.empty?
-        raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}"
-      end
-    end
-    # TODO: this method never seems to get called...why's it here?
-    # Transform the contents based on the content type.
-    #
-    # Returns the transformed contents.
-    def transform
-      _renderer.convert(content)
-    end
-    # Determine the extension depending on content_type.
-    #
-    # Returns the String extension for the output file.
-    #   e.g. ".html" for an HTML output file.
-    def output_ext
-      _renderer.output_ext
-    end
-    # Determine which converter to use based on this convertible's
-    # extension.
-    #
-    # Returns the Converter instance.
-    def converters
-      _renderer.converters
-    end
-    # Render Liquid in the content
-    #
-    # content - the raw Liquid content to render
-    # payload - the payload for Liquid
-    # info    - the info for Liquid
-    #
-    # Returns the converted content
-    def render_liquid(content, payload, info, path)
-      _renderer.render_liquid(content, payload, info, path)
-    end
-    # Convert this Convertible's data to a Hash suitable for use by Liquid.
-    #
-    # Returns the Hash representation of this Convertible.
-    def to_liquid(attrs = nil)
-      further_data = \
-        (attrs || self.class::ATTRIBUTES_FOR_LIQUID).each_with_object({}) do |attribute, hsh|
-          hsh[attribute] = send(attribute)
-        end
-      defaults = site.frontmatter_defaults.all(relative_path, type)
-      Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
-    end
-    # The type of a document,
-    #   i.e., its classname downcase'd and to_sym'd.
-    #
-    # Returns the type of self.
-    def type
-      :pages if is_a?(Page)
-    end
-    # returns the owner symbol for hook triggering
-    def hook_owner
-      :pages if is_a?(Page)
-    end
-    # TODO: Depricated
-    # Used to determine CoffeeScript and Sass/SCSS files.
-    def asset_file?
-      false
-    end
-    # Determine whether the file should be rendered with Liquid.
-    #
-    # Returns true if the file has Liquid Tags or Variables, false otherwise.
-    def render_with_liquid?
-      return false if data["render_with_liquid"] == false
-      Bridgetown::Utils.has_liquid_construct?(content)
-    end
-    # Determine whether the file should be placed into layouts.
-    #
-    # Returns false if the document is an asset file or if the front matter
-    #   specifies `layout: none`
-    def place_in_layout?
-      !(asset_file? || no_layout?)
-    end
-    # Checks if the layout specified in the document actually exists
-    #
-    # layout - the layout to check
-    #
-    # Returns true if the layout is invalid, false if otherwise
-    def invalid_layout?(layout)
-      !data["layout"].nil? && layout.nil? && !(is_a? Bridgetown::Excerpt)
-    end
-    # Recursively render layouts
-    #
-    # layouts - a list of the layouts
-    # payload - the payload for Liquid
-    # info    - the info for Liquid
-    #
-    # Returns nothing
-    def render_all_layouts(layouts, payload, info)
-      _renderer.layouts = layouts
-      self.output = _renderer.place_in_layouts(output, payload, info)
-    ensure
-      @_renderer = nil # this will allow the modifications above to disappear
-    end
-    # Add any necessary layouts to this convertible document.
-    #
-    # payload - The site payload Drop or Hash.
-    # layouts - A Hash of {"name" => "layout"}.
-    #
-    # Returns nothing.
-    def do_layout(payload, layouts)
-      self.output = _renderer.tap do |renderer|
-        renderer.layouts = layouts
-        renderer.payload = payload
-      end.run
-      Bridgetown.logger.debug "Post-Render Hooks:", relative_path
-      Bridgetown::Hooks.trigger hook_owner, :post_render, self
-    ensure
-      @_renderer = nil # this will allow the modifications above to disappear
-    end
-    # Write the generated page file to the destination directory.
-    #
-    # dest - The String path to the destination dir.
-    #
-    # Returns nothing.
-    def write(dest)
-      path = destination(dest)
-      FileUtils.mkdir_p(File.dirname(path))
-      Bridgetown.logger.debug "Writing:", path
-      File.write(path, output, mode: "wb")
-      Bridgetown::Hooks.trigger hook_owner, :post_write, self
-    end
-    # Accessor for data properties by Liquid.
-    #
-    # property - The String name of the property to retrieve.
-    #
-    # Returns the String value or nil if the property isn't included.
-    def [](property)
-      if self.class::ATTRIBUTES_FOR_LIQUID.include?(property)
-        send(property)
-      else
-        data[property]
-      end
-    end
-    private
-    def _renderer
-      @_renderer ||= Bridgetown::Renderer.new(site, self)
-    end
-    def no_layout?
-      data["layout"] == "none"
-    end
-  end
-end