jekyll_plugin_support 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d96d3f40ca733d7fa1322a8fbec0a70131029baa063a32c55fdc003efcf0d24
-  data.tar.gz: 2ebb3e46419147a2f1b60e2024fd7118617be61c6cd8f359e448aad2279bf92f
+  metadata.gz: 20c575e857da7ffa50f37a587494b25232e1eb1309040946dd13d8f896250f07
+  data.tar.gz: 4aa5e163875f4e99adca9a6bc4ca97927c95c4cc4d017f52ca0b108d9ea24670
 SHA512:
-  metadata.gz: f4022b99e9b6b1eef55be72e3cbe6a8d99af12e6ec0004a1e2c610325c726ffdf5cef042ce8687eb9be4e352fc7372e3a51f7053e39303cb06ff2dd5f180d530
-  data.tar.gz: 6d6b5d1221e8985a02bc8bfe32d6411cb516aa4376a0a3f27d9dc6d7b66bee43ce41c02b026e102f9b5035f0b6b116cf8983e1b8b6cea3847a5c2d70733cff69
+  metadata.gz: f2a2123c073c9e344e097e3eecd364606037bdd0213045d7060a09d48acaac1810eb609e201126e3f4fc8e5edc0e4e6e81db43800aa4eea954490d4e21e91cdc
+  data.tar.gz: 2d4e8daa6ea71e412065356a7029f3ff0b432fb7a06cdc98f403ba02709106f75c62e8236bae12668e6b181f4c52ccba328811fdb9619cd075597fea622052e7

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Change Log
 
 
+## 0.8.5 / 2024-03-25
+
+* Empty block tags now return a value. See https://talk.jekyllrb.com/t/empty-liquid-block-not-rendering
+
+
 ## 0.8.4 / 2024-02-27
 
 * Problem in error handler fixed.
+* A warning is logged if an environment variable is undefined and `die_if_undefined` is not set.
 
 
 ## 0.8.3 / 2024-01-05

data/lib/jekyll_plugin_error_handling.rb

@@ -35,7 +35,6 @@ module JekyllSupportErrorHandling
     string.gsub(/\e\[([;\d]+)?m/, '')
   end
 
-  # TODO: Delete this
   def maybe_reraise_error(error, throw_error: true)
     fmsg = format_error_message "#{error.class}: #{error.message.strip}"
     @logger.error { fmsg }

data/lib/jekyll_plugin_helper.rb

@@ -98,7 +98,7 @@ class JekyllPluginHelper
                             .parse(@argv_original)
     @params_original = @keys_values_original unless respond_to?(:no_arg_parsing) && no_arg_parsing
 
-    @argv = Shellwords.split(self.class.expand_env(markup))
+    @argv = Shellwords.split(self.class.expand_env(markup, logger))
     @keys_values = KeyValueParser
                    .new({}, { array_values: false, normalize_keys: false, separator: /=/ })
                    .parse(@argv)

data/lib/jekyll_plugin_helper_class.rb

@@ -5,12 +5,19 @@ require 'yaml'
 # Class methods for JekyllPluginHelper
 class JekyllPluginHelper
   # Expand an environment variable reference
-  def self.expand_env(str, die_if_undefined: false)
-    str&.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do
+  def self.expand_env(str, logger = nil, die_if_undefined: false)
+    str&.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}/) do
       envar = Regexp.last_match(1)
-      raise JekyllPluginSupportError, "jekyll_plugin_support error: #{envar} is undefined".red, [] \
-        if !ENV.key?(envar) && die_if_undefined # Suppress stack trace
+      unless ENV.key? envar
+        msg = "jekyll_plugin_support error: environment variable #{envar} is undefined"
+        raise JekyllPluginSupportError, msg.red, [] if die_if_undefined
 
+        if logger
+          logger.warn msg
+        else
+          puts msg.red
+        end
+      end
       ENV.fetch(envar, nil)
     end
   end

data/lib/jekyll_plugin_support/version.rb

@@ -1,3 +1,3 @@
 module JekyllPluginSupportVersion
-  VERSION = '0.8.4'.freeze
+  VERSION = '0.8.5'.freeze
 end

data/lib/jekyll_plugin_support_block.rb

@@ -29,6 +29,12 @@ module JekyllSupport
       Jekyll::CustomError.factory @error_name
     end
 
+    # Liquid::Block subclasses do not render if there is no content within the tag
+    # This override fixes that
+    def blank?
+      false
+    end
+
     # Method prescribed by the Jekyll plugin lifecycle.
     # Defines @config, @envs, @mode, @page and @site
     # @return [String]
@@ -52,7 +58,7 @@ module JekyllSupport
 
       @mode = @config['env']&.key?('JEKYLL_ENV') ? @config['env']['JEKYLL_ENV'] : 'development'
 
-      @helper.reinitialize(@markup.strip)
+      @helper.reinitialize @markup.strip
 
       @attribution = @helper.parameter_specified?('attribution') || false unless @no_arg_parsing
       @logger.debug { "@keys_values='#{@keys_values}'" }
@@ -60,7 +66,7 @@ module JekyllSupport
       markup = JekyllSupport.lookup_liquid_variables liquid_context, @argument_string
       @helper.reinitialize markup
 
-      render_impl text
+      render_impl(text)
     rescue StandardError => e
       e.shorten_backtrace
       @logger.error { "#{e.class} on line #{@line_number} of #{e.backtrace[0].split(':').first} by #{tag_name} - #{e.message}" }

data/lib/jekyll_plugin_support_tag.rb

@@ -64,8 +64,9 @@ module JekyllSupport
     rescue StandardError => e
       e.shorten_backtrace
       file_name = e.backtrace[0]&.split(':')&.first
-      of_file_name = "of #{file_name} " if file_name
-      @logger.error { "#{e.class} on line #{@line_number} #{of_file_name}while processing #{tag_name} - #{e.message}" }
+      in_file_name = "in '#{file_name}' " if file_name
+      of_page = "of '#{@page['path']}'" if @page
+      @logger.error { "#{e.class} on line #{@line_number} #{of_page}while processing #{tag_name} #{in_file_name}- #{e.message}" }
       binding.pry if @pry_on_standard_error # rubocop:disable Lint/Debugger
       raise e if @die_on_standard_error
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_plugin_support
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets