jekyll_plugin_support 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f595dc019d923dbbad9e84b1eacdaa15808b36d54fc692044e30f26e0767f1
-  data.tar.gz: 5632b03e8d9d29080ae0c43428d5c9a13243c4df529255013d63951d669a670d
+  metadata.gz: c20bec384d298ac931d132f59dbcaf621e9f55440954dc8c6579b1c9131df62e
+  data.tar.gz: 4cfd22137529da35c52f788ab70ec81fe9457d6b533ec5bc70f653b22791db0e
 SHA512:
-  metadata.gz: b5839393146e5d1ab2317f004a563bad4144467e506fd41516f489b065fa52d00bfcea4eedc7d8d06028afd35cba34b3360b19f4d968ec6a456e429f6a2af542
-  data.tar.gz: 203f6111c4127b4909534d4dcc6b7dcb7f3f5d7bbf9fa60016920558a6eb9faed7cd736212b8c3f25cb52514e21b75035dd00ea55928525127b9ca662ede224d
+  metadata.gz: eafd8b44d05e23011bd30a2bb3bab69befb3cd90b520585d4cf05d164b1b2c76a5218cdd0bdbf3bc7ba6f9a25e789f171403f3553d2cb68d13e0c54346d69b5e
+  data.tar.gz: 1beb29113474e1d501d5394b90288f7e46047e846b868df80f1a5afe9287ae7eece17e7d00e95e9443b7d3b2a69d6d93d9c27d0f6d81d1f4d2f0afba8ae152fe

data/.rubocop.yml

@@ -48,9 +48,10 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Exclude:
     - "**/all_collections_tag.rb"
+  Max: 150
 
 Metrics/CyclomaticComplexity:
-  Max: 25
+  Max: 35
 
 Metrics/MethodLength:
   Max: 50
@@ -60,7 +61,7 @@ Metrics/ModuleLength:
     - "**/jekyll_plugin_support_class.rb"
 
 Metrics/PerceivedComplexity:
-  Max: 25
+  Max: 35
 
 Naming/FileName:
   Exclude:
@@ -70,6 +71,9 @@ Naming/FileName:
 RSpec/ExampleLength:
   Max: 30
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 RSpec/SpecFilePathFormat:
   Enabled: false
   IgnoreMethods: true
@@ -83,6 +87,13 @@ RSpec/IndexedLet:
 RSpec/MultipleExpectations:
   Max: 15
 
+RSpec/MultipleDescribes:
+  Enabled: false
+
+Security/Eval:
+  Exclude:
+   - spec/all_collections_tag/all_collections_tag_sort_spec.rb
+
 Style/ClassVars:
   Enabled: false
 
@@ -92,8 +103,16 @@ Style/Documentation:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/GlobalVars:
+  Exclude:
+    - spec/mslinn_binary_search_spec.rb
+
 Style/StringConcatenation:
   Enabled: false
 
+Style/StringLiterals:
+  Exclude:
+    - spec/all_collections_tag/all_collections_tag_sort_spec.rb
+
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 3.1.0 / 2025-06-10
+
+* Added attribute `order` and method `field` to support `jekyll_outline`.
+* Added another constructor for `AllCollectionsHooks::APage`, called `apage_from`.
+* Added new method `new_attribute` to module `JekyllSupport`.
+* The displayed date field (`:date` or `:last_modified`) now defaults to the primary sort field.
+* Modified specs tests.
+* Jekyll tag `AllCollectionsTag` now accepts an optional parameter called
+  `collection_name`, which filters the selected data source. A warning is logged
+  if the data source is anything but `all_collections`.
+* Moved `APage` and its constructors to the `JekyllCollections` module.
+
+
 ## 3.0.0 / 2025-02-09
 
 * Numbered as v3.0.0 because `jekyll_draft` was at v2.1.0 and the two projects should have similar version numbers.

data/README.md

@@ -64,6 +64,10 @@ Jekyll plugin tags created from `jekyll_plugin_support` framework automatically
 
     d. `sorted_lru_files` is used by a new binary search lookup for matching page suffixes.
       The `jekyll_href` and `jekyll_draft` plugins use this feature.
+17. A new Ruby class, `APage`, which abstracts all URL-addressable entities in a Jekyll website.
+    An `APage` can be constructed from a Jekyll `Document` or `Page`, a static file, and a Ruby hash.
+
+    `APage` instances can help immensely when automating content generation and reporting tasks.
 
 ## Installation
 
@@ -76,7 +80,7 @@ add the following line to your Jekyll plugin’s `Gemfile`.
 ```ruby
 group :jekyll_plugins do
   # ...
-  gem 'jekyll_plugin_support', '>= 1.1.0'
+  gem 'jekyll_plugin_support', '>= 3.1.0'
   # ...
 end
 ```
@@ -95,7 +99,7 @@ If your custom plugin will be packaged into a gem, add the following to your plu
 ```ruby
 Gem::Specification.new do |spec|
   # ...
-  spec.add_dependency 'jekyll_plugin_support', '>= 1.1.0'
+  spec.add_dependency 'jekyll_plugin_support', '>= 3.1.0'
   # ...
 end
 ```
@@ -235,13 +239,28 @@ The general form of the Jekyll tag, including all options, is:
 
 ```html
 {% all_collections
+  collection_name='posts'
+  data_selector='all_collections'
   date_column='date|last_modified'
   heading='All Posts'
-  id='asdf'
+  id='post_outline'
   sort_by='SORT_KEYS'
 %}
 ```
 
+Each of these attributes are explained below.
+
+
+#### `collection_name` Attribute
+
+Name of the collection that this `APage` belongs to, or `nil`.
+
+
+##### `data_selector` Attribute
+
+Name of the data collection to work from, defaults to `all_collections`.
+Other allowable values are `all_documents` and `everything`.
+
 
 ##### `date_column` Attribute
 
@@ -1005,17 +1024,35 @@ The `site.all_collections`, `site.all_documents` and `site.everything` attribute
 consist of arrays of [`APage`](lib/hooks/a_page.rb) instances.
 
 The `APage` class has the following attributes:
-`content` (HTML or Markdown), `data` (array), `date` (Ruby Date), `description`, `destination`,
-`draft` (Boolean), `ext`, `href`, `label`, `last_modified` or `last_modified_at` (Ruby Date),
-`layout`, `origin`, `path`, `relative_path`, `tags`, `title`, `type`, and `url`.
 
+* `content` (HTML or Markdown)
+* `collection_name`
+* `content` (HTML or Markdown)
+* `data` (array)
+* `date` (Ruby Date)
+* `description`
+* `destination`,
+* `draft` (Boolean)
+* `ext` / `extname`
 * `href` always starts with a slash.
-  This value is consistent with `a href` values in website HTML.
+  This value is consistent with a `href` values in website HTML.
   Paths ending with a slash (`/`) have `index.html` appended so the path specifies an actual file.
-
+* `label`
+* `last_modified` (Ruby Date)
+* `last_modified_field` indicates the name of the field that originally contained the value for
+  `last_modified` (`last_modified` or `last_modified_at`)
+* `layout`
+* `logger` helpful for error handling
+* `name`
 * `origin` indicates the original source of the item.
   Possible values are `collection`, `individual_page` and `static_file`.
   Knowing the origin of each item allows code to process each type of item appropriately.
+* `path`
+* `relative_path`
+* `tags`
+* `title`
+* `type`
+* `url`
 
 
 ## `all_collections` Block Tag
@@ -1025,6 +1062,11 @@ The ordering is configurable; by default, the listing is sorted by `date`, newes
 The `all_collections` tag has a `data_source` parameter that specifies which new property to report on
 (`all_collections`, `all_documents`, or `everything`).
 
+For an example of how to use this Jekyll tag in conjunction with the
+[jekyll_outline](http://localhost:4001/jekyll_plugins/jekyll_outline.html) tag,
+see the [outline_tabs](http://localhost:4001/jekyll_plugins/jekyll_outline.html#outline_tabs)
+section of the jekyll_outline documentation.
+
 
 ## Requirements
 

data/jekyll_plugin_support.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.test_files            = spec.files.grep %r{^(test|spec|features)/}
   spec.version               = JekyllPluginSupportVersion::VERSION
 
+  spec.add_dependency 'bigdecimal'
   spec.add_dependency 'facets'
   spec.add_dependency 'jekyll', '>= 4.4.1'
   spec.add_dependency 'jekyll_plugin_logger'

data/lib/block/jekyll_plugin_support_block.rb

@@ -45,7 +45,7 @@ module JekyllSupport
     # Method prescribed by the Jekyll plugin lifecycle.
     # Defines @config, @envs, @mode, @page and @site
     # @return [String]
-    def render(liquid_context)
+    def render(liquid_context) # rubocop: disable Metrics/AbcSize
       @helper.liquid_context = ::JekyllSupport.inject_config_vars liquid_context # modifies liquid_context
       text = super # Liquid variable values in content are looked up and substituted
 
@@ -82,10 +82,11 @@ module JekyllSupport
       render_impl(text)
     rescue StandardError => e
       e.shorten_backtrace
+      @logger.error e.full_message
       file_name = e.backtrace[0]&.split(':')&.first
       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}" }
+      @logger.error { "While processing line #{@line_number} #{of_page} for #{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
 

data/lib/block/jekyll_plugin_support_block_noarg.rb

@@ -12,7 +12,7 @@ module JekyllSupport
     rescue StandardError => e
       e.shorten_backtrace
       @logger.error { e.full_message }
-      JekyllSupport.error_short_trace(@logger, e)
+      ::JekyllSupport.error_short_trace(@logger, e)
     end
 
     # Liquid::Block subclasses do not render if there is no content within the tag

data/lib/error/jekyll_custom_error.rb

@@ -42,11 +42,12 @@ module JekyllSupport
       END_MSG
     end
 
-    def shorten_backtrace(backtrace_element_count = 3)
-      b = backtrace[0..backtrace_element_count - 1].map do |x|
-        x.gsub(Dir.pwd + '/', './')
-      end
-      set_backtrace b
+    def shorten_backtrace(backtrace_element_count = 6)
+      set_backtrace backtrace[0..backtrace_element_count]
+      # b = backtrace[0..backtrace_element_count - 1].map do |x|
+      #   x.gsub(Dir.pwd + '/', './')
+      # end
+      # set_backtrace b
     end
   end
 end

data/lib/hooks/a_page.rb

@@ -1,27 +1,138 @@
-module AllCollectionsHooks
+require 'date'
+require 'jekyll_draft'
+require 'time'
+
+module JekyllSupport
+  # Contructor for testing and jekyll_outline
+  def self.apage_from( # rubocop:disable Metrics/ParameterLists
+    collection_name: nil,
+    date: nil,
+    description: nil,
+    draft: false,
+    last_modified: nil,
+    logger: nil,
+    order: nil,
+    title: nil,
+    url: nil
+  )
+    # Jekyll documents have inconsistent date and last_modified property types.
+    date = Time.parse(date) if date.instance_of?(String)
+    unless date.instance_of? Time
+      logger.error { "date is not an instance of Time, it is an instance of #{date.class}" }
+      exit 2
+    end
+
+    last_modified = Date.parse(last_modified) if last_modified.instance_of?(String)
+    last_modified = Date.parse(date.strftime('%Y-%m-%d')) if last_modified.nil?
+    unless last_modified.instance_of? Date
+      logger.error { "last_modified is not an instance of Date, it is an instance of #{last_modified.class}" }
+      exit 3
+    end
+    last_modified = Date.parse(date._to_s) if last_modified.nil?
+    data = {
+      collection:    { label: collection_name },
+      draft:         draft,
+      last_modified: last_modified,
+      order:         order,
+      title:         title,
+    }
+    obj = {}
+    JekyllSupport.new_attribute obj, :data, data
+    JekyllSupport.new_attribute obj, :date, date
+    JekyllSupport.new_attribute obj, :description, description
+    JekyllSupport.new_attribute obj, :draft, draft
+    JekyllSupport.new_attribute obj, :extname, '.html'
+    JekyllSupport.new_attribute obj, :last_modified, last_modified
+    JekyllSupport.new_attribute obj, :logger, PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config)
+    JekyllSupport.new_attribute obj, :title, title
+    JekyllSupport.new_attribute obj, :url, url
+
+    JekyllSupport::APage.new obj, nil
+  rescue StandardError => e
+    puts e.full_message
+  end
+
+  # Create Array of JekyllSupport::APage from objects
+  # @param objects [Array] An array of Jekyll::Document, Jekyll::Page or file names
+  # @param origin [String] Indicates type of objects being passed
+  def self.apages_from_objects(objects, origin)
+    pages = []
+    objects.each do |object|
+      unless object.respond_to?(:logger)
+        JekyllSupport.new_attribute(object,
+                                    :logger,
+                                    PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config))
+      end
+      page = APage.new(object, origin)
+      pages << page unless page.data['exclude_from_all'] || page.path == 'redirect.html'
+    end
+    pages
+  end
+
+  # Defines a new attribute called `prop_name` in object `obj` and sets it to `prop_value`
+  def self.new_attribute(obj, prop_name, prop_value)
+    obj.class.module_eval { attr_accessor prop_name }
+    obj.instance_variable_set :"@#{prop_name}", prop_value
+  end
+
+  FIXNUM_MAX = (2**((0.size * 8) - 2)) - 1 unless defined? FIXNUM_MAX
+  END_OF_DAYS = 1_000_000_000_000 unless defined? END_OF_DAYS # One trillion years in the future
+  # Time.new is -4712-01-01
+
   class APage
-    attr_reader :content, :data, :date, :description, :destination, :draft, :excerpt, :ext, :extname, :href,
-                :label, :last_modified, :layout, :origin, :path, :relative_path, :tags, :title, :type, :url
+    attr_reader :categories, :collection_name, :content, :data, :date, :description, :destination, :draft,
+                :excerpt, :ext, :extname, :href, :label, :last_modified, :last_modified_field,
+                :layout, :logger, :name, :origin, :path, :relative_path, :tags, :title, :type, :url
 
+    # @param obj can be a `Jekyll::Document` or a Hash with properties
+    # @param origin values: 'collection', 'individual_page', and 'static_file'
+    #               (See method JekyllSupport.apages_from_objects)
     def initialize(obj, origin)
+      @logger = obj.logger
       @origin = origin
-      data_field_init obj
-      obj_field_init obj
-      @draft = Jekyll::Draft.draft? obj
-      @href = @url if @href.nil?
-      # @href = "/#{@href}" if @origin == 'individual_page'
-      @href = "#{@href}index.html" if @href.end_with? '/'
-      @name = File.basename(@href)
-      @title = if @data&.key?('title')
-                 @data['title']
-               elsif obj.respond_to?(:title)
-                 obj.title
-               else
-                 "<code>#{@href}</code>"
-               end
+      build obj
     rescue StandardError => e
-      JekyllSupport.error_short_trace(@logger, e)
-      # JekyllSupport.warn_short_trace(@logger, e)
+      ::JekyllSupport.error_short_trace(@logger, e)
+    end
+
+    # @param name can be either a String or a Symbol
+    def field(name, use_default: true)
+      default_value = case name
+                      when :date, :last_modified, :last_modified_at
+                        END_OF_DAYS
+                      else
+                        ''
+                      end
+
+      result = data[name.to_sym] || data[name.to_s] if data.key?(name.to_sym) || data.key?(name.to_s)
+      return result if result
+
+      default_value if use_default
+    end
+
+    # Look within @data (if the property exists), then self for the given key as a symbol or a string
+    # @param key must be a symbol
+    # @return value of data[key] if key exists as a string or a symbol, else nil
+    def obj_field(obj, key)
+      if obj.respond_to? :data
+        return obj.data[key] if obj.data.key? key
+
+        return obj.data[key.to_s] if obj.data.key? key.to_s
+      end
+      return obj.send(key) if obj.respond_to?(key)
+
+      return unless obj.respond_to?(:key?)
+      return obj[key] if obj.key?(key)
+
+      obj[key.to_s] if obj.key?(key.to_s)
+    end
+
+    def order
+      if data.key?('order') || data.key?(:order)
+        data['order'] || data[:order]
+      else
+        FIXNUM_MAX
+      end
     end
 
     def to_s
@@ -30,40 +141,63 @@ module AllCollectionsHooks
 
     private
 
-    def data_field_init(obj)
-      return unless obj.respond_to? :data
-
-      @data = obj.data
-
-      @categories = @data['categories'] if @data.key? 'categories'
-      @date = (@data['date'].to_date if @data&.key?('date')) || Date.today
-      @description = @data['description'] if @data.key? 'description'
-      @excerpt = @data['excerpt'] if @data.key? 'excerpt'
-      @ext ||= @data['ext'] if @data.key? 'ext'
-      @last_modified = @data['last_modified'] || @data['last_modified_at'] || @date
-      @last_modified_field = case @data
-                             when @data.key?('last_modified')
-                               'last_modified'
-                             when @data.key?('last_modified_at')
-                               'last_modified_at'
-                             end
-      @layout = @data['layout'] if @data.key? 'layout'
-      @tags = @data['tags'] if @data.key? 'tags'
-    end
+    # Sets the following uninitialized instance attributes in APage from selected key/value pairs in `obj.data`:
+    # `categories`, `date`, `description`, `excerpt`, `ext`, `last_modified` or `last_modified_at`,
+    # `layout`, and `tags`.
+    # Sets the following instance attributes in APage from selected attributes in `obj` (when present):
+    # `content`, `destination`, `ext` and `extname`, `label` from `collection.label`,
+    # `path`, `relative_path`, `type`, and `url`.
+    def build(obj) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      @categories          ||= obj_field(obj, :categories)
 
-    def obj_field_init(obj)
-      @content = obj.content if obj.respond_to? :content
+      collection_value     = obj_field(obj, :collection)
+      @collection_name     = if collection_value
+                               if collection_value.respond_to?(:label)
+                                 collection_value.label
+                               elsif collection_value.key? :label
+                                 collection_value[:label]
+                               end
+                             end
 
+      @content             ||= obj.content if obj.respond_to? :content
+      @data                ||= obj.respond_to?(:data) ? obj.data : {}
+      @date                ||= obj_field(obj, :date) || Time.now # Jekyll doc.date property is a Time
+      @description         ||= obj_field(obj, :description)
       # TODO: What _config.yml setting should be passed to destination()?
-      @destination = obj.destination('') if obj.respond_to? :destination
-      @ext = obj.extname
-      @extname = @ext # For compatibility with previous versions of all_collections
-      @label = obj.collection.label if obj.respond_to?(:collection) && obj.collection.respond_to?(:label)
-      @path = obj.path if obj.respond_to? :path
-      @relative_path = obj.relative_path if obj.respond_to? :relative_path
-      @type = obj.type if obj.respond_to? :type
-      @url = obj.url
-      @url = "#{@url}index.html" if @url.end_with? '/'
+      @destination         ||= obj.destination('') if obj.respond_to? :destination
+      @draft               ||= Jekyll::Draft.draft? obj
+      @excerpt             ||= obj_field(obj, :excerpt)
+      @ext                 ||= obj_field(obj, :ext) || obj_field(obj, :extname)
+      @extname             ||= @ext # For compatibility with previous versions of all_collections
+      @label               ||= obj.collection.label if obj.respond_to?(:collection) && obj.collection.respond_to?(:label)
+
+      @last_modified       ||= obj_field(obj, :last_modified) ||
+                               obj_field(obj, :last_modified_at) ||
+                               Date.parse(@date.to_s) # Jekyll doc.last_modified property is a Date
+
+      @last_modified_field ||= if obj_field(obj, :last_modified)
+                                 :last_modified
+                               elsif obj_field(obj, :last_modified_at)
+                                 :last_modified_at
+                               end
+
+      @layout              ||= obj_field(obj, :layout)
+      @path                ||= obj_field(obj, :path)
+      @relative_path       ||= obj_field(obj, :relative_path)
+      @tags                ||= obj_field(obj, :tags)
+      @type                ||= obj_field(obj, :type)
+
+      @url                 ||= obj.url
+      if @url
+        @url = "#{@url}index.html" if @url&.end_with? '/'
+      else
+        @url = '/index.html'
+      end
+
+      # @href  = "/#{@href}" if @origin == 'individual_page'
+      @href  ||= @url
+      @name  ||= File.basename(@href)
+      @title ||= obj_field(obj, :title) || "<code>#{@href}</code>"
     end
   end
 end

data/lib/hooks/all_collections_hooks.rb

@@ -22,8 +22,8 @@ module JekyllAllCollections
         ::AllCollectionsHooks.compute(site) if !@site.class.method_defined?(:all_documents) || @site.all_documents.nil?
       end
     rescue StandardError => e
-      JekyllSupport.error_short_trace(@logger, e)
-      # JekyllSupport.warn_short_trace(@logger, e)
+      ::JekyllSupport.error_short_trace(@logger, e)
+      # ::JekyllSupport.warn_short_trace(@logger, e)
     end
 
     # Yes, all_collections is defined for this hook
@@ -31,8 +31,8 @@ module JekyllAllCollections
     #   defined_msg = ::AllCollectionsHooks.all_collections_defined?(site)
     #   @logger.debug { "Jekyll::Hooks.register(:site, :post_read, :low: #{defined_msg}" }
     # rescue StandardError => e
-    #   JekyllSupport.error_short_trace(@logger, e)
-    #   # JekyllSupport.warn_short_trace(@logger, e)
+    #   ::JekyllSupport.error_short_trace(@logger, e)
+    #   # ::JekyllSupport.warn_short_trace(@logger, e)
     # end
 
     # Yes, all_collections is defined for this hook
@@ -40,8 +40,8 @@ module JekyllAllCollections
     #   defined_msg = ::AllCollectionsHooks.all_collections_defined?(site)
     #   @logger.debug { "Jekyll::Hooks.register(:site, :post_read, :normal: #{defined_msg}" }
     # rescue StandardError => e
-    #   JekyllSupport.error_short_trace(@logger, e)
-    #   # JekyllSupport.warn_short_trace(@logger, e)
+    #   ::JekyllSupport.error_short_trace(@logger, e)
+    #   # ::JekyllSupport.warn_short_trace(@logger, e)
     # end
 
     # Yes, all_collections is defined for this hook
@@ -49,8 +49,8 @@ module JekyllAllCollections
     #   defined_msg = ::AllCollectionsHooks.all_collections_defined?(site)
     #   @logger.debug { "Jekyll::Hooks.register(:site, :pre_render: #{defined_msg}" }
     # rescue StandardError => e
-    #   JekyllSupport.error_short_trace(@logger, e)
-    #   # JekyllSupport.warn_short_trace(@logger, e)
+    #   ::JekyllSupport.error_short_trace(@logger, e)
+    #   # ::JekyllSupport.warn_short_trace(@logger, e)
     # end
   end
 end

data/lib/hooks/class_methods.rb

@@ -10,18 +10,6 @@ module AllCollectionsHooks
     "site.all_collections #{site.class.method_defined?(:all_collections) ? 'IS' : 'IS NOT'} defined"
   end
 
-  # Create Array of AllCollectionsHooks::APage from objects
-  # @param objects [Array] An array of Jekyll::Document, Jekyll::Page or file names
-  # @param origin [String] Indicates type of objects being passed
-  def self.apages_from_objects(objects, origin)
-    pages = []
-    objects.each do |object|
-      page = APage.new(object, origin)
-      pages << page unless page.data['exclude_from_all'] || page.path == 'redirect.html'
-    end
-    pages
-  end
-
   # Called by early, high-priority hook.
   # Computes site.all_collections, site.all_documents, site.everything, and site.sorted_lru_files
   def self.compute(site)
@@ -32,11 +20,11 @@ module AllCollectionsHooks
                     .map { |x| x.class.method_defined?(:docs) ? x.docs : x }
                     .flatten
                     .compact
-    @all_collections = AllCollectionsHooks.apages_from_objects(documents, 'collection')
+    @all_collections = JekyllSupport.apages_from_objects(documents, 'collection')
     @all_documents   = @all_collections +
-                       AllCollectionsHooks.apages_from_objects(site.pages, 'individual_page')
+                       JekyllSupport.apages_from_objects(site.pages, 'individual_page')
     @everything      = @all_documents +
-                       AllCollectionsHooks.apages_from_objects(site.static_files, 'static_file')
+                       JekyllSupport.apages_from_objects(site.static_files, 'static_file')
     @sorted_lru_files = SortedLruFiles.new.add_pages @everything
 
     site.all_collections  = @all_collections
@@ -44,7 +32,7 @@ module AllCollectionsHooks
     site.everything       = @everything
     site.sorted_lru_files = @sorted_lru_files
   rescue StandardError => e
-    JekyllSupport.error_short_trace(::JekyllAllCollections::AllCollectionsHooks.logger, e)
-    # JekyllSupport.warn_short_trace(::JekyllAllCollections::AllCollectionsHooks.logger, e)
+    ::JekyllSupport.error_short_trace(::JekyllAllCollections::AllCollectionsHooks.logger, e)
+    # ::JekyllSupport.warn_short_trace(::JekyllAllCollections::AllCollectionsHooks.logger, e)
   end
 end

data/lib/jekyll_all_collections/all_collections_tag.rb

@@ -1,4 +1,3 @@
-# require 'jekyll_draft'
 require 'securerandom'
 
 # @author Copyright 2020 Michael Slinn
@@ -15,17 +14,18 @@ module JekyllAllCollections
     # @return [String]
     def render_impl
       parse_arguments # Defines instance variables like @sort_by
-      sort_lambda = init_sort_by @sort_by, @sort_by_param
-      @heading = @helper.parameter_specified?('heading') || default_head(@sort_by)
+      sort_lambda = init_sort_by @sort_by
       generate_output sort_lambda
     rescue StandardError => e
-      JekyllSupport.error_short_trace @logger, e
-      # JekyllSupport.warn_short_trace @logger, e
+      ::JekyllSupport.error_short_trace @logger, e
+      # ::JekyllSupport.warn_short_trace @logger, e
     end
 
-    # Descending sort keys reverse the order of comparison
-    # Example return values:
-    #   "->(a, b) { [a.last_modified] <=> [b.last_modified] }"
+    # Descending sort keys are preceded by a minus sign, and reverse the order of comparison
+    # @param criteria String Examples: 'date', '-date', 'last_modified', '-last_modified',
+    #        ['date', 'last_modified], ['-date', '-last_modified'], ['date', '-last_modified']
+    # @return values:
+    #   "->(a, b) { [a.last_modified] <=> [b.last_modified] }" (ascending)
     #   "->(a, b) { [b.last_modified] <=> [a.last_modified] }" (descending)
     #   "->(a, b) { [a.last_modified, a.date] <=> [b.last_modified, b.date] }" (descending last_modified, ascending date)
     #   "->(a, b) { [a.last_modified, b.date] <=> [b.last_modified, a.date] }" (ascending last_modified, descending date)
@@ -76,43 +76,45 @@ module JekyllAllCollections
       warn_short_trace e.red
     end
 
-    def last_modified_value(apage)
-      @logger.debug do
-        "  apage.last_modified='#{apage.last_modified}'; " \
-          "apage.last_modified_at='#{apage.last_modified_at}'; " \
-          "@date_column='#{@date_column}'"
+    def date_value(apage, field_name)
+      if %i[last_modified last_modified_at].include? field_name
+        apage.field(:last_modified_at, use_default: false) ||
+          apage.field(:last_modified, use_default: false) ||
+          Date.today
+      else
+        apage.date || Time.now
       end
-      last_modified = if @date_column == 'last_modified' && apage.respond_to?(:last_modified)
-                        apage.last_modified
-                      elsif apage.respond_to? :last_modified_at
-                        apage.last_modified_at
-                      else
-                        apage.date
-                      end
-      last_modified ||= apage.date || Date.today
-      last_modified
     end
 
     def generate_output(sort_lambda)
-      id = @id.to_s.strip.empty? ? '' : " id='#{@id}'"
+      id = @id.to_s.strip.empty? ? '' : " id=\"#{@id}\""
       heading = @heading.strip.to_s.empty? ? '' : "<h2#{id}>#{@heading}</h2>"
-      data = case @data_selector
-             when 'all_collections'
-               @site.all_collections
-             when 'all_documents'
-               @site.all_documents
-             when 'everything'
-               @site.everything
-             else
-               raise AllCollectionsError, "Invalid value for @data_selector (#{data_selector})"
-             end
-      collection = data.sort(&sort_lambda)
-      posts = collection.map do |x|
-        last_modified = last_modified_value x
-        date = last_modified.strftime '%Y-%m-%d'
-        draft = x.draft ? DRAFT_HTML : ''
-        href = "<a href='#{x.href}'>#{x.title}</a>"
-        @logger.debug { "  date='#{date}' #{x.title}\n" }
+      apages = case @data_selector
+               when 'all_collections'
+                 @site.all_collections
+               when 'all_documents'
+                 @site.all_documents
+               when 'everything'
+                 @site.everything
+               else
+                 raise AllCollectionsError, "Invalid value for @data_selector (#{data_selector})"
+               end
+      filtered_apages = @collection_name.nil? ? apages : apages.select { |apage| apage.collection_name == @collection_name }
+      sorted_apages = filtered_apages.sort(&sort_lambda)
+      posts = sorted_apages.map do |apage|
+        date_column = @date_column.to_s == 'last_modified' ? :last_modified : :date
+        d = date_value(apage, date_column)
+        if d.respond_to?(:strftime)
+          date = d.strftime '%Y-%m-%d'
+        else
+          @logger.error do
+            "date_value returned a #{d.class} instead of a class with a strftime method like Date and Time; date_column=#{date_column}"
+          end
+        end
+        draft         = apage.draft ? DRAFT_HTML : ''
+        title         = apage.title || apage.href
+        href          = "<a href='#{apage.href}'>#{title}</a>"
+        @logger.debug { "  date='#{date}' #{title}\n" }
         "  <span>#{date}</span><span>#{href}#{draft}</span>"
       end
       <<~END_TEXT
@@ -121,35 +123,50 @@ module JekyllAllCollections
           #{posts.join "\n"}
         </div>
       END_TEXT
-    rescue ArgumentError => e
-      warn_short_trace e
+    rescue NoMethodError || ArgumentError => e
+      ::JekyllSupport.error_short_trace @logger, e
     end
 
     # See https://stackoverflow.com/a/75377832/553865
-    def init_sort_by(sort_by, sort_by_param)
+    def init_sort_by(sort_by)
       sort_lambda_string = AllCollectionsTag.create_lambda_string sort_by
 
       @logger.debug do
-        "#{@page['path']} sort_by_param=#{sort_by_param}  " \
-          "sort_lambda_string = #{sort_lambda_string}\n"
+        "#{@page['path']} sort_lambda_string = #{sort_lambda_string}\n"
       end
 
       evaluate sort_lambda_string
     end
 
+    # @return String defining the parsed sort_by expression
     def parse_arguments
+      @collection_name = @helper.parameter_specified?('collection_name')
       @data_selector = @helper.parameter_specified?('data_selector') || 'all_collections'
       abort "Invalid data_selector #{@data_selector}" unless %w[all_collections all_documents everything].include? @data_selector
+      if (@data_selector != 'all_collections') && @collection_name
+        @logger.warn do
+          "collection_name was specified as '#{@collection_name}', but data_selector is #{@data_selector},
+          which is less effcient than specifying all_collections."
+        end
+      end
+
+      sort_by_param = @helper.parameter_specified? 'sort_by' # Might specify multiple sort fields
 
-      @date_column = @helper.parameter_specified?('date_column') || 'date'
+      # Default to displaying last modified field unless a sort field is specified
+      @date_column = @helper.parameter_specified?('date_column') || 'last_modified'
       unless %w[date last_modified].include?(@date_column)
         raise AllCollectionsError "The date_column attribute must either have value 'date' or 'last_modified', " \
-                                  "but '#{@date_column}' was specified"
+                                  "but '#{@date_column}' was specified instead."
       end
+      @date_column ||= (sort_by_param.include?('last_modified') ? 'last_modified' : 'date') # display the sort date by default
 
       @id = @helper.parameter_specified?('id') || SecureRandom.hex(10)
-      @sort_by_param = @helper.parameter_specified? 'sort_by'
-      @sort_by = (@sort_by_param&.delete(' ')&.split(',') if @sort_by_param != false) || ['-date']
+
+      @sort_by = (sort_by_param&.delete(' ')&.split(',') if sort_by_param != false) || ['-date']
+
+      @heading = @helper.parameter_specified?('heading') || default_head(@sort_by)
+
+      @sort_by
     end
 
     ::JekyllSupport::JekyllPluginHelper.register(self, PLUGIN_NAME)

data/lib/jekyll_plugin_support/jekyll_plugin_support_class.rb

@@ -1,6 +1,7 @@
 # Monkey patch StandardError so a new method called shorten_backtrace is added.
 class StandardError
-  def shorten_backtrace(backtrace_element_count = 3)
+  def shorten_backtrace(backtrace_element_count = 5)
+    set_backtrace backtrace[0..backtrace_element_count]
     # self.backtrace = backtrace[0..backtrace_element_count].map do |x|
     #   raise JekyllPluginSupportError, "backtrace contains a #{x.class} with value '#{x}'." unless x.instance_of? String
 
@@ -14,7 +15,7 @@ module JekyllSupport
 
   def self.error_short_trace(logger, error)
     error.set_backtrace error.backtrace[0..DISPLAYED_CALLS]
-    logger.error { error }
+    logger.error { error.full_message } # Are error and logger.error defined?
     error
   end
 

data/lib/jekyll_plugin_support/version.rb

@@ -1,3 +1,3 @@
 module JekyllPluginSupportVersion
-  VERSION = '3.0.0'.freeze unless defined?(VERSION)
+  VERSION = '3.1.0'.freeze unless defined?(VERSION)
 end

data/lib/jekyll_plugin_support.rb

@@ -28,6 +28,12 @@ module JekyllSupport
   end
 end
 
+module ToString
+  def to_s
+    "#{self}.class.name"
+  end
+end
+
 module NoArgParsing
   attr_accessor :no_arg_parsing
 
@@ -37,17 +43,21 @@ end
 module JekyllSupport
   class JekyllTag
     include JekyllSupportError
+    include ToString
   end
 
   class JekyllTagNoArgParsing
     include JekyllSupportError
+    include ToString
   end
 
   class JekyllBlock
     include JekyllSupportError
+    include ToString
   end
 
   class JekyllBlockNoArgParsing
     include JekyllSupportError
+    include ToString
   end
 end

data/spec/all_collections_tag/all_collections_tag_sort_spec.rb

@@ -1,112 +1,184 @@
-require 'spec_helper'
-require_relative '../../lib/jekyll_all_collections'
+require_relative '../spec_helper'
+require_relative '../../lib/hooks/a_page'
 
-class APageStub
-  attr_reader :date, :last_modified, :label
+class NullBinding < BasicObject
+  include ::Kernel
 
-  def initialize(date, last_modified, label = '')
-    @date = Date.parse date
-    @last_modified = Date.parse last_modified
-    @label = label
-  end
+  # Avoid error message "warning: undefining `object_id' may cause serious problems"
+  # https://stackoverflow.com/a/17791631/553865
+  (
+    ::Kernel.instance_methods(false) +
+    ::Kernel.private_instance_methods(false) -
+    [:binding]
+  ).each { |x| undef_method(x) unless x == :object_id }
 
-  def to_s
-    @label
+  def min_binding
+    binding
   end
 end
 
-def show(lambda_string, result, expected)
-  p "For lambda_string: #{lambda_string}"
-  p "  result: #{result.map(&:label).join(', ')}  <==>  expected: #{expected.map(&:label).join(', ')}"
+def show_dates(label, array)
+  puts "  #{label} actual: #{array.map(&:title).join(', ')}  <==>  expected: #{expected.map(&:title).join(', ')}"
+end
+
+def show(label, lambda_string, actual, expected)
+  puts "#{label} - For lambda_string: #{lambda_string}"
+  puts "  actual: #{actual.map(&:title).join(', ')}"
+  puts "expected: #{expected.map(&:title).join(', ')}"
+  actual_array = actual.map do |x|
+    [
+      (x.date.strftime '%Y-%m-%d' + '/' + x.title), (x.last_modified.strftime '%Y-%m-%d' + '/' + x.title)
+    ].join('/')
+  end
+  expected_array = expected.map do |x|
+    [
+      (x.date.strftime '%Y-%m-%d' + '/' + x.title), (x.last_modified.strftime '%Y-%m-%d' + '/' + x.title)
+    ].join('/')
+  end
+  puts '  actual date/last_modified: ' + actual_array.join(', ')
+  puts 'expected date/last_modified: ' + expected_array.join(', ')
 end
 
+logger = PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config)
+
 # See https://stackoverflow.com/a/75388137/553865
-RSpec.describe(AllCollectionsTag::AllCollectionsTag) do
-  let(:o1) { APageStub.new('2020-01-01', '2020-01-01', 'a_A') }
-  let(:o2) { APageStub.new('2021-01-01', '2020-01-01', 'b_A') }
-  let(:o3) { APageStub.new('2021-01-01', '2023-01-01', 'b_B') }
-  let(:o4) { APageStub.new('2022-01-01', '2023-01-01', 'c_B') }
+RSpec.describe(JekyllSupport) do
+  let(:o1) do
+    described_class.apage_from(
+      collection_name: '_posts',
+      date:            '2020-01-20',
+      last_modified:   '2020-01-20',
+      logger:          logger,
+      title:           'a_A (o1)'
+    )
+  end
+  let(:o2) do
+    described_class.apage_from(
+      collection_name: '_posts',
+      date:            '2021-01-21',
+      last_modified:   '2021-01-21',
+      logger:          logger,
+      title:           'b_B (o2)'
+    )
+  end
+  let(:o3) do
+    described_class.apage_from(
+      collection_name: '_posts',
+      date:            '2021-01-21',
+      last_modified:   '2022-01-22',
+      logger:          logger,
+      title:           'b_C (o3)'
+    )
+  end
+  let(:o4) do
+    described_class.apage_from(
+      collection_name: '_posts',
+      date:            '2022-01-22',
+      last_modified:   '2022-01-22',
+      logger:          logger,
+      title:           'c_C (o4)'
+    )
+  end
   let(:objs) { [o1, o2, o3, o4] }
 
-  it 'defines sort_by lambda with last_modified' do
+  it '(1) defines sort_by lambda with last_modified (ascending)' do
     sort_lambda = ->(a, b) { [a.last_modified] <=> [b.last_modified] }
-    result = objs.sort(&sort_lambda)
-    expect(result).to eq([o1, o2, o3, o4])
+    actual = objs.sort(&sort_lambda)
+    expected = [o1, o2, o3, o4]
+    show('(1)', '[a.last_modified] <=> [b.last_modified]', actual, expected)
+    expect(actual).to eq(expected)
   end
 
-  it 'makes sort_by lambdas from stringified date' do
-    sort_lambda = eval '->(a, b) { a.last_modified <=> b.last_modified }',
-                       NullBinding.new.min_binding, __FILE__, __LINE__ - 1
-    result = objs.sort(&sort_lambda)
-    expect(result).to eq([o1, o2, o3, o4])
+  it '(2) makes sort_by lambdas from stringified comparison of last_modified (ascending)' do
+    sort_lambda_string = '->(a, b) { a.last_modified <=> b.last_modified }'
+    sort_lambda = eval sort_lambda_string, NullBinding.new.min_binding, __FILE__, __LINE__ - 1
+    actual = objs.sort(&sort_lambda)
+    expected = [o1, o2, o3, o4]
+    show('(2)', sort_lambda_string, actual, expected)
+    expect(actual).to eq(expected)
   end
 
-  it 'makes sort_by lambdas from stringified array of last_modified' do
-    sort_lambda = eval '->(a, b) { [a.last_modified] <=> [b.last_modified] }',
-                       NullBinding.new.min_binding, __FILE__, __LINE__ - 1
-    result = objs.sort(&sort_lambda)
-    expect(result).to eq([o1, o2, o3, o4])
+  it '(3) makes sort_by lambda from stringified array of last_modified (ascending)' do
+    sort_lambda_string = '->(a, b) { [a.last_modified] <=> [b.last_modified] }'
+    sort_lambda = eval sort_lambda_string, NullBinding.new.min_binding, __FILE__, __LINE__ - 1
+    actual = objs.sort(&sort_lambda)
+    expected = [o1, o2, o3, o4]
+    show('(3)', sort_lambda_string, actual, expected)
+    expect(actual).to eq(expected)
   end
 
-  it 'makes sort_by lambdas with descending keys from stringified array of last_modified' do
-    sort_lambda = eval '->(a, b) { [b.last_modified] <=> [a.last_modified] }',
-                       NullBinding.new.min_binding, __FILE__, __LINE__ - 1
-    result = objs.sort(&sort_lambda)
-    expected = [o3, o4, o1, o2]
-    expect(result).to eq(expected)
+  it '(4) makes sort_by lambda with last_modified (descending) from stringified array' do
+    sort_lambda_string = '->(a, b) { [b.last_modified] <=> [a.last_modified] }'
+    sort_lambda = eval sort_lambda_string, NullBinding.new.min_binding, __FILE__, __LINE__ - 1
+    actual = objs.sort(&sort_lambda)
+    expected = [o4, o3, o2, o1]
+    show('(4)', sort_lambda_string, actual, expected)
+    expect([o3, o4]).to include(actual[0]) # The sort might yield o3 or o4 in this position
+    expect([o3, o4]).to include(actual[1]) # The sort might yield o3 or o4 in this position
+    expect(o2).to eq(actual[2])
+    expect(o1).to eq(actual[3])
   end
 
-  it 'create_lambda with 1 date key, descending' do
-    lambda_string = described_class.create_lambda_string('-last_modified')
-    sort_lambda = described_class.evaluate(lambda_string)
-    result = objs.sort(&sort_lambda)
-    expected = [o3, o4, o1, o2]
-    # show(lambda_string, result, expected)
-    expect(result).to eq(expected)
+  it '(5) create_lambda with date (descending)' do
+    lambda_string = JekyllAllCollections::AllCollectionsTag.create_lambda_string('-last_modified')
+    expect(lambda_string).to eq('->(a, b) { [b.last_modified] <=> [a.last_modified] }')
+    sort_lambda = self.eval lambda_string, binding
+    actual = objs.sort(&sort_lambda)
+    expected = [o4, o3, o2, o1]
+    show('(5)', lambda_string, actual, expected)
+    expect([o3, o4]).to include(actual[0]) # The sort might yield o3 or o4 in this position
+    expect([o3, o4]).to include(actual[1]) # The sort might yield o3 or o4 in this position
+    expect(o2).to eq(actual[2])
+    expect(o1).to eq(actual[3])
   end
 
-  it 'create_lambda with 1 date key, ascending' do
-    lambda_string = described_class.create_lambda_string('date')
-    sort_lambda = described_class.evaluate(lambda_string)
-    result = objs.sort(&sort_lambda)
+  it '(6) create_lambda with date (ascending)' do
+    lambda_string = JekyllAllCollections::AllCollectionsTag.create_lambda_string('date')
+    expect(lambda_string).to eq('->(a, b) { [a.date] <=> [b.date] }')
+    sort_lambda = self.eval lambda_string, binding
+    actual = objs.sort(&sort_lambda)
     expected = [o1, o2, o3, o4]
-    # show(lambda_string, result, expected)
-    expect(result).to eq(expected)
+    show('(1)', lambda_string, actual, expected)
+    expect(actual).to eq(expected)
   end
 
-  it 'create_lambda with 2 date keys, both ascending' do
-    lambda_string = described_class.create_lambda_string(%w[date last_modified])
-    sort_lambda = described_class.evaluate(lambda_string)
-    result = objs.sort(&sort_lambda)
+  it '(7) create_lambda with date (ascending) and last_modified (ascending)' do
+    lambda_string = JekyllAllCollections::AllCollectionsTag.create_lambda_string(%w[date last_modified])
+    expect(lambda_string).to eq('->(a, b) { [a.date, a.last_modified] <=> [b.date, b.last_modified] }')
+    sort_lambda = self.eval lambda_string, binding
+    actual = objs.sort(&sort_lambda)
     expected = [o1, o2, o3, o4]
-    # show(lambda_string, result, expected)
-    expect(result).to eq(expected)
+    show('(7)', lambda_string, actual, expected)
+    expect(actual).to eq(expected)
   end
 
-  it 'create_lambda with 2 date keys, both descending' do
-    lambda_string = described_class.create_lambda_string(['-date', '-last_modified'])
-    sort_lambda = described_class.evaluate(lambda_string)
-    result = objs.sort(&sort_lambda)
+  it '(8) create_lambda with date (descending) and last_modified (descending)' do
+    lambda_string = JekyllAllCollections::AllCollectionsTag.create_lambda_string(['-date', '-last_modified'])
+    expect(lambda_string).to eq('->(a, b) { [b.date, b.last_modified] <=> [a.date, a.last_modified] }')
+    sort_lambda = self.eval lambda_string, binding
+    actual = objs.sort(&sort_lambda)
     expected = [o4, o3, o2, o1]
-    # show(lambda_string, result, expected)
-    expect(result).to eq(expected)
+    show('(8)', lambda_string, actual, expected)
+    expect(actual).to eq(expected)
   end
 
-  it 'create_lambda with 2 date keys, first descending and second ascending' do
-    lambda_string = described_class.create_lambda_string(['-date', 'last_modified'])
-    sort_lambda = described_class.evaluate(lambda_string)
-    result = objs.sort(&sort_lambda)
+  it '(9) create_lambda with date (descending) and last_modified (ascending)' do
+    lambda_string = JekyllAllCollections::AllCollectionsTag.create_lambda_string(['-date', 'last_modified'])
+    expect(lambda_string).to eq('->(a, b) { [b.date, a.last_modified] <=> [a.date, b.last_modified] }')
+    sort_lambda = self.eval lambda_string, binding
+    actual = objs.sort(&sort_lambda)
     expected = [o4, o2, o3, o1]
-    # show(lambda_string, result, expected)
-    expect(result).to eq(expected)
+    show('(9)', lambda_string, actual, expected)
+    expect(actual).to eq(expected)
   end
 
-  it 'create_lambda with 2 date keys, first ascending and second descending' do
-    lambda_string = described_class.create_lambda_string(['date', '-last_modified'])
-    sort_lambda = described_class.evaluate(lambda_string)
-    result = objs.sort(&sort_lambda)
+  it '(10) create_lambda with date (ascending) and last_modified (descending)' do
+    lambda_string = JekyllAllCollections::AllCollectionsTag.create_lambda_string(['date', '-last_modified'])
+    expect(lambda_string).to eq('->(a, b) { [a.date, b.last_modified] <=> [b.date, a.last_modified] }')
+    sort_lambda = self.eval lambda_string, binding
+    actual = objs.sort(&sort_lambda)
     expected = [o1, o3, o2, o4]
-    # show(lambda_string, result, expected)
-    expect(result).to eq(expected)
+    show('(10)', lambda_string, actual, expected)
+    expect(actual).to eq(expected)
   end
 end

data/spec/custom_error_spec.rb

@@ -1,5 +1,7 @@
+require 'spec_helper'
 require_relative '../lib/error/jekyll_custom_error'
 require_relative '../lib/jekyll_plugin_support/jekyll_plugin_support_class'
+require_relative '../lib/helper/jekyll_plugin_helper'
 
 class Dummy
   def just_for_testing; end
@@ -14,14 +16,14 @@ class CustomErrorSpec
 
   puts "AnError is a #{AnError.class}; StandardError is a #{StandardError.class}"
   begin
-    raise AnError, 'Oops'
+    raise AnError, 'This error is expected'
   rescue AnError => e
     puts "Caught AnError: #{e.message}"
   rescue ::JekyllSupport::CustomError => e
     puts "Caught CustomError: #{e.message}"
   end
 
-  RSpec.describe JekyllSupport::JekyllPluginHelper do
+  RSpec.describe ::JekyllSupport::JekyllPluginHelper do
     it 'generates messages' do
       msg = described_class.generate_message(Dummy, tag_name, '0.1.0')
       puts msg

data/spec/jekyll_plugin_helper_options_spec.rb

@@ -1,4 +1,6 @@
+require 'jekyll'
 require 'jekyll_plugin_logger'
+require 'spec_helper'
 # require 'rspec/match_ignoring_whitespace'
 require_relative '../lib/jekyll_plugin_support'
 require_relative '../lib/jekyll_plugin_support/jekyll_plugin_support_spec_support'

data/spec/liquid_variable_parsing_spec.rb

@@ -1,4 +1,5 @@
 require 'jekyll_plugin_logger'
+require 'spec_helper'
 # require 'rspec/match_ignoring_whitespace'
 require_relative '../lib/jekyll_plugin_support'
 require_relative '../lib/jekyll_plugin_support/jekyll_plugin_support_spec_support'

data/spec/spec_helper.rb

@@ -4,9 +4,19 @@ require_relative '../lib/jekyll_plugin_support'
 Jekyll.logger.log_level = :info
 
 RSpec.configure do |config|
-  config.filter_run_when_matching focus: true
-  # config.order = 'random'
-
   # See https://relishapp.com/rspec/rspec-core/docs/command-line/only-failures
   config.example_status_persistence_file_path = 'spec/status_persistence.txt'
+
+  # See https://rspec.info/features/3-12/rspec-core/filtering/filter-run-when-matching/
+  # and https://github.com/rspec/rspec/issues/221
+  config.filter_run_when_matching :focus
+
+  # Other values: :progress, :html, :json, CustomFormatterClass
+  config.formatter = :documentation
+
+  # See https://rspec.info/features/3-12/rspec-core/command-line/order/
+  config.order = :defined
+
+  # See https://www.rubydoc.info/github/rspec/rspec-core/RSpec%2FCore%2FConfiguration:pending_failure_output
+  config.pending_failure_output = :skip
 end

data/spec/status_persistence.txt

@@ -1,3 +1,6 @@
-example_id                                      | status | run_time        |
------------------------------------------------ | ------ | --------------- |
-./spec/jekyll_block_plugin_support_spec.rb[1:1] | passed | 0.00062 seconds |
+example_id                                       | status | run_time        |
+------------------------------------------------ | ------ | --------------- |
+./spec/jekyll_plugin_helper_options_spec.rb[1:1] | passed | 0.00559 seconds |
+./spec/jekyll_plugin_helper_options_spec.rb[1:2] | passed | 0.00583 seconds |
+./spec/jekyll_plugin_helper_options_spec.rb[1:3] | passed | 0.00543 seconds |
+./spec/jekyll_plugin_helper_options_spec.rb[1:4] | passed | 0.00157 seconds |

data/spec/testable_spec.rb

@@ -9,6 +9,15 @@ module TestModule
   end
 end
 
+RSpec.describe(TestModule) do
+  extend described_class
+
+  it 'Invokes a_method from module' do
+    result = self.class.a_method
+    expect(result).to eq('a_method says Hi!')
+  end
+end
+
 class TestClass
   extend TestModule # Defines class methods
 
@@ -19,15 +28,6 @@ class TestClass
   end
 end
 
-RSpec.describe(TestModule) do
-  extend described_class
-
-  it 'Invokes a_method from module' do
-    result = self.class.a_method
-    expect(result).to eq('a_method says Hi!')
-  end
-end
-
 RSpec.describe(TestClass) do
   let(:o1) { described_class.new('value1', 'value2') }
 

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_plugin_support
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Mike Slinn
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +107,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - mslinn@mslinn.com
 executables: []
@@ -169,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Provides a framework for writing and testing Jekyll plugins
 test_files: