jekyll_from_to_until 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a9e56c1266c423bdcca5f7fc1a5bfbd88038b3b7c92fbb84f0d05f73041f091
-  data.tar.gz: 6526b906d36f9937f63d0e81211dad42bec006eda5ec1cf62b286168925c489a
+  metadata.gz: 9831e3896befd48a89069726c44c2f1c724c890c4b63fedf398ed54259ecd889
+  data.tar.gz: e0401ec8f430b9cfabb6bb13cf3f77d179aadeca1c7ae1c3fc76357c575afdb7
 SHA512:
-  metadata.gz: b8a0f1ec7d9032e98edc3bd6729a1037b9884fb7b1ef7614f8b9f53045f5d223cf4615588d3f62c9fa604daeef8e06dc03d371fe452b34df6152c2545d8e3cab
-  data.tar.gz: 7a3621381e1d6bc4258728b98520087d8954035cfceecc2932885f77f6f87879f2d8d163f7fd07552a68ec134ded6b0b6a7e206382e979bacf06e57315a889ca
+  metadata.gz: b4092ea3fa73c237a380573c942be5ae11191af3704f277a3ec51430c0cebbc03a242a47a7d06eb3193cfe3e8167d6279746271b5bf79f358b50a644e5d01d23
+  data.tar.gz: 336d908450a37b2239e9ec3f31999b975466769648cc443d4576de8f7e3f89e973d02f3e03442bee571ab7ff560a036d7ffa1532f4442ac70ee8d87803406ac9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.0.6 / 2024-12-16
+
+* Fixed callability issue
+
+
 ## 1.0.5 / 2024-08-22
 
 * Fixed method forwarding

data/README.md

@@ -354,7 +354,7 @@ mslinn_aws.tar
 ### Encoding Special Characters
 
 Special characters can be specified as HTML entities.
-For example, `}` is `Open parenthesis. Belle par. A parent. 5 Resulting. OK. }`.
+For example, `}` is `Open parenthesis. Belle par. A parent. 5 Resulting. OK. OK, so now what }`.
 
 ```html
 {{ css | from: '.error' | to: '}' | strip }}

data/lib/jekyll_from_to_until/version.rb

@@ -1,3 +1,3 @@
 module JekyllFromToUntilVersion
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

data/lib/jekyll_from_to_until.rb

@@ -9,132 +9,130 @@ end
 
 CALLED_FROM_JEKYLL = !$LOADED_FEATURES.grep(/.*liquid.rb/).empty?
 
-module Jekyll
-  module FromToUntil
-    @logger = if CALLED_FROM_JEKYLL
-                require 'liquid'
-                require 'jekyll_plugin_logger'
-                PluginMetaLogger.instance.new_logger "FromToUntil", PluginMetaLogger.instance.config
-              else
-                require 'logger'
-                Logger.new $stdout
-              end
-
-    # Filters a multiline string, returning the portion beginning with the line that satisfies a regex.
-    # The regex could be enclosed in single quotes, double quotes, or nothing.
-    # @param input_strings [String] The multi-line string to scan
-    # @param regex [String] The regular expression to match against each line of `input_strings` until found
-    # @return [String] The remaining multi-line string
-    # @example Returns remaining lines starting with the line containing the word `module`.
-    #   {{ flexible_include '/blog/2020/10/03/jekyll-plugins.html' | from 'module' }}
-    def from(input_strings, regex)
-      return '' unless check_parameters(input_strings, regex)
-
-      regex = remove_quotations(regex.to_s.strip)
-      matched = false
-      result = ''
-      input_strings.each_line do |line|
-        matched = true if !matched && line =~ %r!#{regex}!
-        result += line if matched
-      end
-      result
+module FromToUntil
+  @logger = if CALLED_FROM_JEKYLL
+              require 'liquid'
+              require 'jekyll_plugin_logger'
+              PluginMetaLogger.instance.new_logger "FromToUntil", PluginMetaLogger.instance.config
+            else
+              require 'logger'
+              Logger.new $stdout
+            end
+
+  # Filters a multiline string, returning the portion beginning with the line that satisfies a regex.
+  # The regex could be enclosed in single quotes, double quotes, or nothing.
+  # @param input_strings [String] The multi-line string to scan
+  # @param regex [String] The regular expression to match against each line of `input_strings` until found
+  # @return [String] The remaining multi-line string
+  # @example Returns remaining lines starting with the line containing the word `module`.
+  #   {{ flexible_include '/blog/2020/10/03/jekyll-plugins.html' | from 'module' }}
+  def from(input_strings, regex)
+    return '' unless check_parameters(input_strings, regex)
+
+    regex = remove_quotations(regex.to_s.strip)
+    matched = false
+    result = ''
+    input_strings.each_line do |line|
+      matched = true if !matched && line =~ %r!#{regex}!
+      result += line if matched
     end
+    result
+  end
 
-    # Filters a multiline string, returning the portion from the beginning until and including the line that satisfies a regex.
-    # The regex could be enclosed in single quotes, double quotes, or nothing.
-    # @example Returns lines up to and including the line containing the word `module`.
-    #   {{ flexible_include '/blog/2020/10/03/jekyll-plugins.html' | to 'module' }}
-    def to(input_strings, regex)
-      return '' unless check_parameters(input_strings, regex)
-
-      regex = remove_quotations(regex.to_s.strip)
-      result = ''
-      input_strings.each_line do |line|
-        result += line
-        return result if line.match?(%r!#{regex}!)
-      end
-      result
+  # Filters a multiline string, returning the portion from the beginning until and including the line that satisfies a regex.
+  # The regex could be enclosed in single quotes, double quotes, or nothing.
+  # @example Returns lines up to and including the line containing the word `module`.
+  #   {{ flexible_include '/blog/2020/10/03/jekyll-plugins.html' | to 'module' }}
+  def to(input_strings, regex)
+    return '' unless check_parameters(input_strings, regex)
+
+    regex = remove_quotations(regex.to_s.strip)
+    result = ''
+    input_strings.each_line do |line|
+      result += line
+      return result if line.match?(%r!#{regex}!)
     end
+    result
+  end
 
-    # Filters a multiline string, returning the portion from the beginning until but not including the line that satisfies a regex.
-    # The regex could be enclosed in single quotes, double quotes, or nothing.
-    # @example Returns lines up to but not including the line containing the word `module`.
-    #   {{ flexible_include '/blog/2020/10/03/jekyll-plugins.html' | until 'module' }}
-    def until(input_strings, regex)
-      return '' unless check_parameters(input_strings, regex)
-
-      regex = remove_quotations(regex.to_s.strip)
-      result = ''
-      input_strings.each_line do |line|
-        return result if line.match?(%r!#{regex}!)
-
-        result += line
-      end
-      result
-    end
+  # Filters a multiline string, returning the portion from the beginning until but not including the line that satisfies a regex.
+  # The regex could be enclosed in single quotes, double quotes, or nothing.
+  # @example Returns lines up to but not including the line containing the word `module`.
+  #   {{ flexible_include '/blog/2020/10/03/jekyll-plugins.html' | until 'module' }}
+  def until(input_strings, regex)
+    return '' unless check_parameters(input_strings, regex)
+
+    regex = remove_quotations(regex.to_s.strip)
+    result = ''
+    input_strings.each_line do |line|
+      return result if line.match?(%r!#{regex}!)
 
-    private if CALLED_FROM_JEKYLL
+      result += line
+    end
+    result
+  end
 
-    def check_parameters(input_strings, regex)
-      if input_strings.nil? || input_strings.empty?
-        @logger.warn { "Warning: Plugin 'from' received no input for regex #{regex}." }
-        return false
-      end
+  private if CALLED_FROM_JEKYLL
 
-      regex = regex.to_s
-      if regex.nil? || regex.empty?
-        @logger.warn { "Warning: Plugin 'from' received no regex for input #{input_strings}." }
-        return false
-      end
-      true
+  def check_parameters(input_strings, regex)
+    if input_strings.nil? || input_strings.empty?
+      @logger.warn { "Warning: Plugin 'from' received no input for regex #{regex}." }
+      return false
     end
 
-    def remove_quotations(str)
-      str = str.slice(1..-2) if (str.start_with?('"') && str.end_with?('"')) ||
-                                (str.start_with?("'") && str.end_with?("'"))
-      str
+    regex = regex.to_s
+    if regex.nil? || regex.empty?
+      @logger.warn { "Warning: Plugin 'from' received no regex for input #{input_strings}." }
+      return false
     end
+    true
+  end
 
-    module_function :from, :to, :until, :check_parameters, :remove_quotations
+  def remove_quotations(str)
+    str = str.slice(1..-2) if (str.start_with?('"') && str.end_with?('"')) ||
+                              (str.start_with?("'") && str.end_with?("'"))
+    str
   end
 
-  # See https://www.mslinn.com/jekyll/10400-jekyll-plugin-template-collection.html#module_function
-  module FromToUntilFilter
-    def from(input_strings, regex)
-      input_strings = extra_decode HTMLEntities.new.decode input_strings
-      regex         = extra_decode HTMLEntities.new.decode regex
-      FromToUntil.from(input_strings, regex) # method forwarding
-    end
+  module_function :from, :to, :until, :check_parameters, :remove_quotations
+end
 
-    def to(input_strings, regex)
-      input_strings = extra_decode HTMLEntities.new.decode input_strings
-      regex         = extra_decode HTMLEntities.new.decode regex
-      FromToUntil.to(input_strings, regex) # method forwarding
-    end
+# See https://www.mslinn.com/jekyll/10400-jekyll-plugin-template-collection.html#module_function
+module FromToUntilFilter
+  def from(input_strings, regex)
+    input_strings = extra_decode HTMLEntities.new.decode input_strings
+    regex         = extra_decode HTMLEntities.new.decode regex
+    FromToUntil.from(input_strings, regex) # method forwarding
+  end
 
-    def until(input_strings, regex)
-      input_strings = extra_decode HTMLEntities.new.decode input_strings
-      regex         = extra_decode HTMLEntities.new.decode regex
-      FromToUntil.until(input_strings, regex) # method forwarding
-    end
+  def to(input_strings, regex)
+    input_strings = extra_decode HTMLEntities.new.decode input_strings
+    regex         = extra_decode HTMLEntities.new.decode regex
+    FromToUntil.to(input_strings, regex) # method forwarding
+  end
 
-    # HTMLEntities does not support enough HTML entities
-    def extra_decode(line)
-      line.gsub('{', '{')
-          .gsub('}', '}')
-          .gsub('(', '(')
-          .gsub(')', ')')
-          .gsub('&lparen;', '(')
-          .gsub('&rparen;', ')')
-          .gsub('[', '[')
-          .gsub(']', ']')
-          .gsub('[', '[')
-          .gsub(']', ']')
-    end
+  def until(input_strings, regex)
+    input_strings = extra_decode HTMLEntities.new.decode input_strings
+    regex         = extra_decode HTMLEntities.new.decode regex
+    FromToUntil.until(input_strings, regex) # method forwarding
   end
 
-  if CALLED_FROM_JEKYLL
-    PluginMetaLogger.instance.info { "Loaded #{JekyllPluginFromToUntilName::PLUGIN_NAME} v#{JekyllFromToUntilVersion::VERSION} plugin." }
-    Liquid::Template.register_filter(FromToUntilFilter)
+  # HTMLEntities does not support enough HTML entities
+  def extra_decode(line)
+    line.gsub('{', '{')
+        .gsub('}', '}')
+        .gsub('(', '(')
+        .gsub(')', ')')
+        .gsub('&lparen;', '(')
+        .gsub('&rparen;', ')')
+        .gsub('[', '[')
+        .gsub(']', ']')
+        .gsub('[', '[')
+        .gsub(']', ']')
   end
 end
+
+if CALLED_FROM_JEKYLL
+  PluginMetaLogger.instance.info { "Loaded #{JekyllPluginFromToUntilName::PLUGIN_NAME} v#{JekyllFromToUntilVersion::VERSION} plugin." }
+  Liquid::Template.register_filter(FromToUntilFilter)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_from_to_until
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -83,7 +83,7 @@ metadata:
   source_code_uri: https://github.com/mslinn/jekyll_from_to_until
 post_install_message: |2+
 
-  Thanks for installing jekyll_from_to_until v1.0.5!
+  Thanks for installing jekyll_from_to_until v1.0.6!
 
 rdoc_options: []
 require_paths:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: 'This Jekyll plugin provides 3 filters that return portions of a multiline