bridgetown-core 0.15.0 → 0.17.1

data/lib/bridgetown-core/site.rb

@@ -7,6 +7,7 @@ module Bridgetown
     include Configurable
     include Content
     include Extensible
+    include Localizable
     include Processable
     include Renderable
     include Writable
@@ -25,6 +26,7 @@ module Bridgetown
     # config - A Hash containing site configuration details.
     def initialize(config)
       self.config = config
+      locale
 
       @plugin_manager  = PluginManager.new(self)
       @cleaner         = Cleaner.new(self)

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require "set"
+
+module Bridgetown
+  module Tags
+    # A ClassMap class is meant to take a hash and append styles based on if the
+    # value is truthy or falsy
+    #
+    # @example
+    #   center-var = true
+    #   small-var = nil
+    #
+    #   # input
+    #   <div class="{% class_map has-centered-text: center-var, is-small: small-var %}">
+    #     Text
+    #   </div>
+    #
+    #   # output
+    #   <div class="has-centered-text">
+    #     Text
+    #   </div>
+    class ClassMap < Liquid::Tag
+      # @see https://api.rubyonrails.org/classes/ActiveModel/Type/Boolean.html
+      FALSE_VALUES = [
+        nil, "nil", "NIL", false, 0, "0", :"0", "f", :f, "F", :F, "false",
+        false, "FALSE", :FALSE,
+      ].to_set.freeze
+
+      # @param tag_name [String] The name to use for the tag
+      # @param input [String] The input to the tag
+      # @param tokens [Hash] A hash of config tokens for Liquid.
+      #
+      #
+      # @return [ClassMap] Returns a ClassMap object
+      def initialize(tag_name, input, tokens)
+        super
+        @input = input
+      end
+
+      def render(context)
+        class_map(@input, context)
+      end
+
+      private
+
+      def class_map(string, context)
+        ary = []
+
+        string.split(%r!,\s+!).each do |item|
+          kv_pair = item.split(%r!:\s+!)
+          klass = kv_pair[0]
+          variable = kv_pair[1]
+
+          # Check if a user wants the opposite of the variable
+          if variable[0] == "!"
+            check_opposite = true
+            variable.slice!(1..-1)
+          end
+
+          variable = find_variable(context, variable)
+
+          if check_opposite
+            ary.push(klass) if FALSE_VALUES.include?(variable)
+          else
+            ary.push(klass) unless FALSE_VALUES.include?(variable)
+          end
+        end
+
+        ary.join(" ")
+
+      # Gracefully handle if syntax is improper
+      rescue NoMethodError
+        "invalid-class-map"
+      end
+
+      def find_variable(context, variable)
+        lookup = context
+
+        variable.split(".").each do |value|
+          lookup = lookup[value.strip]
+        end
+
+        lookup || nil
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("class_map", Bridgetown::Tags::ClassMap)

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class Find < Liquid::Tag
+      include Bridgetown::Filters::ConditionHelpers
+      include Bridgetown::LiquidExtensions
+
+      SYNTAX = %r!^(.*?) (where|in) (.*?),(.*)$!.freeze
+      CONDITIONS_SEP = "~FINDSEP~"
+
+      def initialize(tag_name, markup, tokens)
+        super
+        if markup.strip =~ SYNTAX
+          @new_var_name = Regexp.last_match(1).strip
+          @single_or_group = Regexp.last_match(2)
+          @arr_name = Regexp.last_match(3).strip
+          @conditions = process_conditions(Regexp.last_match(4).strip)
+        else
+          raise SyntaxError, <<~MSG
+            Syntax Error in tag 'find' while parsing the following markup:
+
+            #{markup}
+
+            Valid syntax: find <varname> where|in <array>, <condition(s)>
+          MSG
+        end
+      end
+
+      def render(context)
+        @group = lookup_variable(context, @arr_name)
+        return "" unless @group.respond_to?(:select)
+
+        @group = @group.values if @group.is_a?(Hash)
+
+        expression = @conditions.split(CONDITIONS_SEP).map do |condition|
+          "__find_tag_item__.#{condition.strip}"
+        end.join(" and ")
+        @liquid_condition = parse_condition(expression)
+
+        context[@new_var_name] = if @single_or_group == "where"
+                                   group_evaluate(context)
+                                 else
+                                   single_evaluate(context)
+                                 end
+
+        ""
+      end
+
+      private
+
+      def process_conditions(conditions)
+        processed_conditions = +""
+        in_quotes = false
+
+        conditions.each_char do |c|
+          in_quotes = !in_quotes if c == '"'
+
+          processed_conditions << (c == "," && !in_quotes ? CONDITIONS_SEP : c)
+        end
+
+        processed_conditions
+      end
+
+      def group_evaluate(context)
+        context.stack do
+          @group.select do |object|
+            context["__find_tag_item__"] = object
+            @liquid_condition.evaluate(context)
+          end
+        end || []
+      end
+
+      def single_evaluate(context)
+        context.stack do
+          @group.find do |object|
+            context["__find_tag_item__"] = object
+            @liquid_condition.evaluate(context)
+          end
+        end || nil
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("find", Bridgetown::Tags::Find)

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class TranslationTag < Liquid::Tag
+      def render(_context)
+        key = @markup.strip
+        I18n.t(key)
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("t", Bridgetown::Tags::TranslationTag)

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

@@ -2,38 +2,35 @@
 
 module Bridgetown
   module Tags
+    # A helper class to help find the path to webpack asset inside of a webpack
+    # manifest file.
     class WebpackPath < Liquid::Tag
-      include Bridgetown::Filters::URLFilters
-
-      def initialize(tag_name, asset_type, tokens)
+      # @param tag_name [String] Name of the tag
+      # @param asset_type [String] The type of asset to parse (js, css)
+      # @param options [Hash] An options hash
+      # @return [void]
+      # @see {https://www.rdoc.info/github/Shopify/liquid/Liquid/Tag#initialize-instance_method}
+      def initialize(tag_name, asset_type, options)
         super
 
         # js or css
         @asset_type = asset_type.strip
       end
 
+      # Render an asset path based on the Webpack manifest file
+      # @param context [Liquid::Context] Context passed to the tag
+      #
+      # @return [String] Returns "MISSING_WEBPACK_MANIFEST" if the manifest
+      # file isn't found
+      # @return [String] Returns a blank string if the asset isn't found
+      # @return [String] Returns the path to the asset if no issues parsing
+      #
+      # @raise [WebpackAssetError] if unable to find css or js in the manifest
+      # file
       def render(context)
         @context = context
         site = context.registers[:site]
-
-        frontend_path = relative_url("_bridgetown/static")
-
-        manifest_file = site.in_root_dir(".bridgetown-webpack", "manifest.json")
-        if File.exist?(manifest_file)
-          manifest = JSON.parse(File.read(manifest_file))
-          if @asset_type == "js"
-            js_path = manifest["main.js"].split("/").last
-            [frontend_path, "js", js_path].join("/")
-          elsif @asset_type == "css"
-            css_path = manifest["main.css"].split("/").last
-            [frontend_path, "css", css_path].join("/")
-          else
-            Bridgetown.logger.error("Unknown Webpack asset type", @asset_type)
-            nil
-          end
-        else
-          "MISSING_WEBPACK_MANIFEST"
-        end
+        Bridgetown::Utils.parse_webpack_manifest_file(site, @asset_type) || ""
       end
     end
   end

data/lib/bridgetown-core/utils.rb

@@ -14,8 +14,8 @@ module Bridgetown
     # Constants for use in #slugify
     SLUGIFY_MODES = %w(raw default pretty simple ascii latin).freeze
     SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
-    SLUGIFY_DEFAULT_REGEXP = Regexp.new("[^[:alnum:]]+").freeze
-    SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
+    SLUGIFY_DEFAULT_REGEXP = Regexp.new("[^\\p{M}\\p{L}\\p{Nd}]+").freeze
+    SLUGIFY_PRETTY_REGEXP = Regexp.new("[^\\p{M}\\p{L}\\p{Nd}._~!$&'()+,;=@]+").freeze
     SLUGIFY_ASCII_REGEXP = Regexp.new("[^[A-Za-z0-9]]+").freeze
 
     # Takes a slug and turns it into a simple title.
@@ -331,6 +331,59 @@ module Bridgetown
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
+    # Return an asset path based on the Webpack manifest file
+    # @param site [Bridgetown::Site] The current site object
+    # @param asset_type [String] js or css
+    #
+    # @return [String] Returns "MISSING_WEBPACK_MANIFEST" if the manifest
+    # file isnt found
+    # @return [nil] Returns nil if the asset isnt found
+    # @return [String] Returns the path to the asset if no issues parsing
+    #
+    # @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)
+
+      manifest = JSON.parse(File.read(manifest_file))
+
+      known_assets = %w(js css)
+      if known_assets.include?(asset_type)
+        asset_path = manifest["main.#{asset_type}"]
+
+        log_webpack_asset_error(asset_type) && return if asset_path.nil?
+
+        asset_path = asset_path.split("/").last
+        return [static_frontend_path(site), asset_type, asset_path].join("/")
+      end
+
+      Bridgetown.logger.error("Unknown Webpack asset type", asset_type)
+      nil
+    end
+
+    def static_frontend_path(site)
+      path_parts = [site.config["baseurl"].to_s.chomp("/"), "_bridgetown/static"]
+      path_parts[0] = "/#{path_parts[0]}" unless path_parts[0].empty?
+      Addressable::URI.parse(path_parts.join("/")).normalize.to_s
+    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(Errors::WebpackAssetError, error_message)
+    end
+
+    def default_github_branch_name(repo_url)
+      repo_match = Bridgetown::Commands::Actions::GITHUB_REPO_REGEX.match(repo_url)
+      api_endpoint = "https://api.github.com/repos/#{repo_match[1]}"
+      JSON.parse(Faraday.get(api_endpoint).body)["default_branch"] || "master"
+    rescue StandardError => e
+      Bridgetown.logger.warn("Unable to connect to GitHub API: #{e.message}")
+      "master"
+    end
+
     private
 
     def merge_values(target, overwrite)

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

@@ -59,7 +59,7 @@ module Bridgetown
 
         # This is where the magic happens! DON'T BE EVIL!!! ;-)
         output = obj.instance_eval(ruby_code)
-        output.is_a?(Hash) ? output.with_indifferent_access : output
+        output.is_a?(Hash) ? output.with_dot_access : output
       end
     end
   end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.15.0"
-  CODE_NAME = "Overlook"
+  VERSION = "0.17.1"
+  CODE_NAME = "Mount Scott"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: erubi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hash_with_dot_access
+  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: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +290,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
@@ -292,15 +334,21 @@ 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/localizable.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
@@ -322,6 +370,7 @@ files:
 - 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/grouping_filters.rb
 - lib/bridgetown-core/filters/url_filters.rb
@@ -347,6 +396,7 @@ files:
 - 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
@@ -355,13 +405,17 @@ 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/find.rb
 - lib/bridgetown-core/tags/highlight.rb
 - lib/bridgetown-core/tags/include.rb
 - lib/bridgetown-core/tags/link.rb
 - lib/bridgetown-core/tags/post_url.rb
 - lib/bridgetown-core/tags/render_content.rb
+- lib/bridgetown-core/tags/t.rb
 - lib/bridgetown-core/tags/webpack_path.rb
 - lib/bridgetown-core/tags/with.rb
 - lib/bridgetown-core/url.rb
@@ -388,10 +442,10 @@ files:
 - 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
-- lib/site_template/src/_layouts/page.html
-- lib/site_template/src/_layouts/post.html
+- lib/site_template/src/_layouts/default.liquid
+- lib/site_template/src/_layouts/home.liquid
+- lib/site_template/src/_layouts/page.liquid
+- lib/site_template/src/_layouts/post.liquid
 - lib/site_template/src/_posts/0000-00-00-welcome-to-bridgetown.md.erb
 - lib/site_template/src/about.md
 - lib/site_template/src/favicon.ico