bridgetown-core 0.16.0.beta1 → 0.16.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a57f1cf4e0a06e347edf5c97c78a168bc56f5efab6fdcf7f55a78ac491a3de
-  data.tar.gz: 96f00f4e411b8f46467d3f8ff6ecb153c07a34f5496f4109361afdfe8d7493c0
+  metadata.gz: d9c23ef7da53e1f746ee14540f1f370ad6edea81667e314e9ff9e4c032c8c40c
+  data.tar.gz: f8ef26737713ef23c95a5b61407b51e791c266a0eef766ab4ca07fd9ad9e39bc
 SHA512:
-  metadata.gz: 378534362fb45c10c4aef9600771e10d13d07f827309ee2dd2395ff5c60a9b36c1e1b309e48274de3ef09ac9d16178ad563d49da437535961ba27844c86020d0
-  data.tar.gz: dda52cf9adc2768b57dc93677babdd63b5d1e500a8fbfe7c69f0dcb719701f3b986ae740d3fca703932f346b172b23e0c8561549a7f1dddad7b3b97b3605e535
+  metadata.gz: 4fd1626a1708c19486e34a74deeea3c5f2659eb7c96dc7ff0444d464347e4b83e410e36b7b75da727d0120399e01e9f9b11915f6a7f601bb89159bf5bcc863e5
+  data.tar.gz: f087e6a3c5d2990f514f9ebfa33cf6a7654d0ab2f22ea09f0411dee72caaed12684642a43a5fa4b55790544814f6a599fe663ccc91390849d3acb51ec58d9b22

data/bridgetown-core.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("addressable",           "~> 2.4")
   s.add_runtime_dependency("awesome_print",         "~> 1.8")
   s.add_runtime_dependency("colorator",             "~> 1.0")
+  s.add_runtime_dependency("erubi",                 "~> 1.9")
   s.add_runtime_dependency("faraday",               "~> 1.0")
   s.add_runtime_dependency("faraday_middleware",    "~> 1.0")
   s.add_runtime_dependency("i18n",                  "~> 1.0")

data/lib/bridgetown-core/commands/concerns/actions.rb

@@ -11,6 +11,7 @@ module Bridgetown
       GITHUB_REGEX = %r!https://github\.com!.freeze
       GITHUB_TREE_REGEX = %r!#{GITHUB_REGEX}/.*/.*/tree/.*/?!.freeze
       GITHUB_BLOB_REGEX = %r!#{GITHUB_REGEX}/.*/.*/blob/!.freeze
+      GITHUB_REPO_REGEX = %r!github\.com/(.*?/[^/]*)!.freeze
 
       def create_builder(filename, data = nil)
         say_status :create_builder, filename
@@ -114,7 +115,7 @@ module Bridgetown
                 elsif github_blob_match
                   new_url.sub("/blob/", "/")
                 else
-                  "#{new_url}/master"
+                  "#{new_url}/#{Bridgetown::Utils.default_github_branch_name(arg)}"
                 end
               else
                 arg

data/lib/bridgetown-core/converters/erb_templates.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require "tilt/erb"
-require "active_support/core_ext/hash/keys"
+require "tilt/erubi"
+require "erubi/capture_end"
 
 module Bridgetown
   class ERBView < RubyTemplateView
-    include ERB::Util
+    def h(input)
+      Erubi.h(input)
+    end
 
     def partial(partial_name, options = {})
       options.merge!(options[:locals]) if options[:locals]
@@ -14,10 +16,10 @@ module Bridgetown
       partial_segments.last.sub!(%r!^!, "_")
       partial_name = partial_segments.join("/")
 
-      Tilt::ERBTemplate.new(
+      Tilt::ErubiTemplate.new(
         site.in_source_dir(site.config[:partials_dir], "#{partial_name}.erb"),
-        trim: "<>-",
-        outvar: "@_erbout"
+        outvar: "@_erbout",
+        engine_class: Erubi::CaptureEndEngine
       ).render(self, options)
     end
 
@@ -32,21 +34,36 @@ module Bridgetown
       md_output = converter.convert(content).strip
       @_erbout << md_output
     end
+
+    def capture
+      previous_buffer_state = @_erbout
+      @_erbout = +""
+      result = yield
+      @_erbout = previous_buffer_state
+
+      result
+    end
   end
 
   module Converters
     class ERBTemplates < Converter
       input :erb
 
-      # Logic to do the content conversion.
+      # Logic to do the ERB content conversion.
       #
-      # content - String content of file (without front matter).
+      # @param content [String] Content of the file (without front matter).
+      # @params convertible [Bridgetown::Page, Bridgetown::Document, Bridgetown::Layout]
+      #   The instantiated object which is processing the file.
       #
-      # Returns a String of the converted content.
+      # @return [String] The converted content.
       def convert(content, convertible)
         erb_view = Bridgetown::ERBView.new(convertible)
 
-        erb_renderer = Tilt::ERBTemplate.new(trim: "<>-", outvar: "@_erbout") { content }
+        erb_renderer = Tilt::ErubiTemplate.new(
+          convertible.relative_path,
+          outvar: "@_erbout",
+          engine_class: Erubi::CaptureEndEngine
+        ) { content }
 
         if convertible.is_a?(Bridgetown::Layout)
           erb_renderer.render(erb_view) do

data/lib/bridgetown-core/plugin_manager.rb

@@ -68,12 +68,20 @@ module Bridgetown
     # If that exact package hasn't been installed, execute yarn add
     #
     # Returns nothing.
-    def self.install_yarn_dependencies(required_gems)
+    def self.install_yarn_dependencies(required_gems, single_gemname = nil)
       return unless File.exist?("package.json")
 
       package_json = JSON.parse(File.read("package.json"))
 
-      required_gems.each do |loaded_gem|
+      gems_to_search = if single_gemname
+                         required_gems.select do |loaded_gem|
+                           loaded_gem.to_spec&.name == single_gemname.to_s
+                         end
+                       else
+                         required_gems
+                       end
+
+      gems_to_search.each do |loaded_gem|
         yarn_dependency = find_yarn_dependency(loaded_gem)
         next unless add_yarn_dependency?(yarn_dependency, package_json)
 

data/lib/bridgetown-core/ruby_template_view.rb

@@ -1,11 +1,25 @@
 # frozen_string_literal: true
 
 require "digest"
+require "active_support/core_ext/hash/keys"
 
 module Bridgetown
   class RubyTemplateView
     class Helpers
       include Bridgetown::Filters
+
+      Context = Struct.new(:registers)
+
+      def initialize(site)
+        @site = site
+
+        # duck typing for Liquid context
+        @context = Context.new({ site: @site })
+      end
+
+      def webpack_path(asset_type)
+        Bridgetown::Utils.parse_webpack_manifest_file(@site, asset_type.to_s)
+      end
     end
 
     attr_reader :layout, :page, :site, :content
@@ -43,7 +57,7 @@ module Bridgetown
     end
 
     def helpers
-      @helpers ||= Helpers.new
+      @helpers ||= Helpers.new(@site)
     end
 
     def method_missing(method, *args, &block)

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

@@ -5,12 +5,10 @@ module Bridgetown
     # 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
-
       # @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 WebpackPath
+      # @return [void]
       # @see {https://www.rdoc.info/github/Shopify/liquid/Liquid/Tag#initialize-instance_method}
       def initialize(tag_name, asset_type, options)
         super
@@ -19,12 +17,12 @@ module Bridgetown
         @asset_type = asset_type.strip
       end
 
-      # Render the contents of a webpack manifest file
-      # @param context [String] Root directory that contains the manifest file
+      # 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 isnt found
-      # @return [nil] Returns nil if the asset isnt found
+      # 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
@@ -32,40 +30,7 @@ module Bridgetown
       def render(context)
         @context = context
         site = context.registers[:site]
-
-        manifest_file = site.in_root_dir(".bridgetown-webpack", "manifest.json")
-
-        parse_manifest_file(manifest_file)
-      end
-
-      private
-
-      def parse_manifest_file(manifest_file)
-        return "MISSING_WEBPACK_MANIFEST" unless File.exist?(manifest_file)
-
-        manifest = JSON.parse(File.read(manifest_file))
-        frontend_path = relative_url("_bridgetown/static")
-
-        known_assets = %w(js css)
-
-        if known_assets.include?(@asset_type)
-          asset_path = manifest["main.#{@asset_type}"]
-
-          log_webpack_asset_error(@asset_type) if asset_path.nil?
-
-          asset_path = asset_path.split("/").last
-          return [frontend_path, @asset_type, asset_path].join("/")
-        end
-
-        Bridgetown.logger.error("Unknown Webpack asset type", @asset_type)
-        nil
-      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)
+        Bridgetown::Utils.parse_webpack_manifest_file(site, @asset_type) || ""
       end
     end
   end

data/lib/bridgetown-core/utils.rb

@@ -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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.16.0.beta1
+  version: 0.16.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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
@@ -409,10 +423,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