bridgetown-core 0.15.0.beta2 → 0.15.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34bf7d4a458a8c56d645d8243fc445948bbed43c65d32930437ec92a06c25620
-  data.tar.gz: be2065a0a7e49ba29d84e49a5eb33df6d43f2a543d2cd29540e2f712599af4aa
+  metadata.gz: 0731d836363a7cc613e8a42a833fb1d45e50f293558cd78238d9b214b73e2d99
+  data.tar.gz: 2597ac785d145bcd26083d08e803d4f0937165d8150bfb05eea5b9ba90ad6e4f
 SHA512:
-  metadata.gz: bf8ef56bf7943a347c9fe092794551e2c6c620a068d7008eca1ee1c8c1c95ae9d71dd42448fd57011f77f4fc5025a32219345917d7e5aa72c2de196ddade77c0
-  data.tar.gz: ed4bee93af751055e526365d84b3c34c10665add8f2d5329da7cd7549a473ed2f0beb6b19d5e8b04e2f511926465d8cb892355cb25f8b22b4060dc33915dafc9
+  metadata.gz: 7bead893392ffe25b85bcef0419201fa5a8752793f9b8812ac26e512ab35e2638d888ec02c64c672e7930c509afbe0fffa2c98b40316351028951469e63c9310
+  data.tar.gz: e8083bd29fb64deef6f0fe17b028cb1aa373944cfcb15fe0ce686b03f6db6e12bcdbcb25842e4a508b2979facb9655cfe358fac685f7c2af4c44e2a6edb65c1c

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

@@ -77,27 +77,43 @@ module Bridgetown
 
       private
 
+      def determine_remote_filename(arg)
+        if arg.end_with?(".rb")
+          arg.split("/").yield_self do |segments|
+            arg.sub!(%r!/#{segments.last}$!, "")
+            segments.last
+          end
+        else
+          "bridgetown.automation.rb"
+        end
+      end
+
       # TODO: option to download and confirm remote automation?
       def transform_automation_url(arg)
         return arg unless arg.start_with?("http")
 
-        remote_file = if arg.end_with?(".rb")
-                        arg.split("/").yield_self do |segments|
-                          arg.sub!(%r!/#{segments.last}$!, "")
-                          segments.last
-                        end
-                      else
-                        "bridgetown.automation.rb"
-                      end
+        remote_file = determine_remote_filename(arg)
+
+        github_regex = %r!https://github\.com!
+        github_tree_regex = %r!#{github_regex}/.*/.*/tree/.*/?!
+
+        github_match = github_regex.match(arg)
+        github_tree_match = github_tree_regex.match(arg)
 
         if arg.start_with?("https://gist.github.com")
           return arg.sub(
             "https://gist.github.com", "https://gist.githubusercontent.com"
           ) + "/raw/#{remote_file}"
-        elsif arg.start_with?("https://github.com")
-          return arg.sub(
-            "https://github.com", "https://raw.githubusercontent.com"
-          ) + "/master/#{remote_file}"
+        elsif github_match
+          new_url = arg.sub(github_regex, "https://raw.githubusercontent.com")
+
+          if github_tree_match
+            new_url = new_url.sub("/tree/", "/")
+          else
+            new_url += "/master"
+          end
+
+          return "#{new_url}/#{remote_file}"
         end
 
         arg + "/#{remote_file}"

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

@@ -188,13 +188,10 @@ module Bridgetown
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      self.output = _renderer.tap do |renderer|
+      _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

data/lib/bridgetown-core/concerns/site/renderable.rb

@@ -43,8 +43,7 @@ module Bridgetown
     def render_regenerated(document, payload)
       return unless regenerator.regenerate?(document)
 
-      document.output = Bridgetown::Renderer.new(self, document, payload).run
-      document.trigger_hooks(:post_render)
+      Bridgetown::Renderer.new(self, document, payload).run
     end
   end
 end

data/lib/bridgetown-core/excerpt.rb

@@ -81,7 +81,10 @@ module Bridgetown
     end
 
     def output
-      @output ||= Renderer.new(doc.site, self, site.site_payload).run
+      @output || (
+        Renderer.new(doc.site, self, site.site_payload).run
+        @output
+      )
     end
 
     def place_in_layout?

data/lib/bridgetown-core/liquid_renderer/file.rb

@@ -10,11 +10,8 @@ module Bridgetown
 
       def parse(content)
         measure_time do
-          # Remove extraneous indentation for rendercontent tags
-          processed_content = content.gsub(%r!^[ \t]+{%-? rendercontent!, "{% rendercontent")
-
           @renderer.cache[@filename] ||= Liquid::Template.parse(
-            processed_content, line_numbers: true
+            content, line_numbers: true
           )
         end
         @template = @renderer.cache[@filename]

data/lib/bridgetown-core/plugin_manager.rb

@@ -67,30 +67,43 @@ module Bridgetown
     # If that exact package hasn't been installed, execute yarn add
     #
     # Returns nothing.
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     def self.install_yarn_dependencies(required_gems)
       return unless File.exist?("package.json")
 
       package_json = JSON.parse(File.read("package.json"))
 
       required_gems.each do |loaded_gem|
-        next unless loaded_gem.to_spec&.metadata&.dig("yarn-add")
-
-        yarn_add_dependency = loaded_gem.to_spec.metadata["yarn-add"].split("@")
-        next unless yarn_add_dependency.length == 2
-
-        # check matching version number is see if it's already installed
-        if package_json["dependencies"]
-          current_package = package_json["dependencies"].dig(yarn_add_dependency.first)
-          next unless current_package.nil? || current_package != yarn_add_dependency.last
-        end
+        yarn_dependency = find_yarn_dependency(loaded_gem)
+        next unless add_yarn_dependency?(yarn_dependency, package_json)
 
         # all right, time to install the package
-        cmd = "yarn add #{yarn_add_dependency.join("@")}"
+        cmd = "yarn add #{yarn_dependency.join("@")}"
         system cmd
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+
+    def self.find_yarn_dependency(loaded_gem)
+      yarn_dependency = loaded_gem.to_spec&.metadata&.dig("yarn-add")&.split("@")
+      return nil if yarn_dependency&.length != 2
+
+      yarn_dependency
+    end
+
+    def self.add_yarn_dependency?(yarn_dependency, package_json)
+      return false if yarn_dependency.nil?
+
+      # check matching version number is see if it's already installed
+      if package_json["dependencies"]
+        current_version = package_json["dependencies"].dig(yarn_dependency.first)
+        package_requires_updating?(current_version, yarn_dependency.last)
+      else
+        true
+      end
+    end
+
+    def self.package_requires_updating?(current_version, dep_version)
+      current_version.nil? || current_version != dep_version && !current_version.include?("/")
+    end
 
     # Require all .rb files
     #

data/lib/bridgetown-core/renderer.rb

@@ -53,7 +53,7 @@ module Bridgetown
 
     # Prepare payload and render the document
     #
-    # Returns String rendered document output
+    # Returns nothing
     def run
       Bridgetown.logger.debug "Rendering:", document.relative_path
 
@@ -63,8 +63,8 @@ module Bridgetown
       assign_layout_data!
 
       document.trigger_hooks(:pre_render, payload)
-
-      render_document
+      document.output = render_document
+      document.trigger_hooks(:post_render)
     end
 
     # Render the document.

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

@@ -5,7 +5,9 @@ module Bridgetown
     class BlockRenderTag < Liquid::Block
       def render(context)
         context.stack({}) do
-          content = super.gsub(%r!^[ \t]+!, "") # unindent the incoming text
+          # unindent the incoming text
+          content = Bridgetown::Utils.reindent_for_markdown(super)
+
           regions = gather_content_regions(context)
 
           site = context.registers[:site]
@@ -17,7 +19,7 @@ module Bridgetown
           unless regions.empty?
             regions.each do |region_name, region_content|
               region_name = region_name.sub("content_with_region_", "")
-              context[region_name] = converter.convert(region_content.gsub(%r!^[ \t]+!, ""))
+              context[region_name] = converter.convert(region_content.strip_heredoc)
               render_params.push "#{region_name}: #{region_name}"
             end
           end

data/lib/bridgetown-core/utils.rb

@@ -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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.15.0.beta2"
+  VERSION = "0.15.0.beta3"
   CODE_NAME = "Overlook"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta2
+  version: 0.15.0.beta3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport