jekyll_plugin_support 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f595dc019d923dbbad9e84b1eacdaa15808b36d54fc692044e30f26e0767f1
-  data.tar.gz: 5632b03e8d9d29080ae0c43428d5c9a13243c4df529255013d63951d669a670d
+  metadata.gz: 89c80e46269ce8e9476f0758550b2d0acb48bd9462ffe0e6d957c436d1c98d2d
+  data.tar.gz: 920e92f0c86d0884193650af1039790df087edc158b529537d37c1fa1d04e680
 SHA512:
-  metadata.gz: b5839393146e5d1ab2317f004a563bad4144467e506fd41516f489b065fa52d00bfcea4eedc7d8d06028afd35cba34b3360b19f4d968ec6a456e429f6a2af542
-  data.tar.gz: 203f6111c4127b4909534d4dcc6b7dcb7f3f5d7bbf9fa60016920558a6eb9faed7cd736212b8c3f25cb52514e21b75035dd00ea55928525127b9ca662ede224d
+  metadata.gz: 1d0045d9f09b3b76c8306073d50c06b1f93fd4c7914a08ce24a826d75ffa033c84660710d8822ea25f18e5585cb94232e7634d68f7b4822aee311865768fc028
+  data.tar.gz: 779da912b97c957c69f8829265c7ad2ad213c6ccf286acae65d87e13a03c24d23e32eea85d22edd9c93aa4084f07732178325f9e7cb7bbb5484859b8e2f8ca79

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,24 @@
 # Change Log
 
+## 3.1.1 / 2025-09-13
+
+* Now looks up Windows environment variables (surrounded by `%` characters).
+  An error is generated for undefined variables.
+
+
+## 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,9 +64,31 @@ 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
 
+### If You Need Windows Environment Variable Expansion
+
+This only works if Jekyll is running on a Windows / WSL machine.
+If you have a Mac, ignore the rest of this section, however be sure
+not to try to include a file whose name contains two percent characters.
+
+If a %WindowsStyleEnvironmentVariable% is detected in the `url` parameter,
+`wslvar` is called.
+If your WSL installation is old it might not have the `wslvar` command
+
+The wslvar utility is part of the wslu package, a collection of useful utilities that come with WSL.
+The most straightforward fix is to reinstall it.
+
+```shell
+$ sudo apt update
+$ sudo apt install wslu
+```
+
 ### For A Jekyll Website
 
 `Jekyll_plugin_support` is packaged as a Ruby gem.
@@ -76,7 +98,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 +117,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 +257,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 +1042,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 +1080,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/helper/jekyll_plugin_helper_class.rb

@@ -5,10 +5,10 @@ require 'yaml'
 module JekyllSupport
   # Class methods for JekyllPluginHelper
   class JekyllPluginHelper
-    # Expand an environment variable reference
+    # Expand an environment variable reference; first expand bash environment variables, then expand windows environment vars
     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)
+      x = str&.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}/) do
+        envar = Regexp.last_match 1
         unless ENV.key? envar
           msg = "jekyll_plugin_support error: environment variable #{envar} is undefined"
           raise JekyllPluginSupportError, msg.red, [] if die_if_undefined
@@ -21,6 +21,26 @@ module JekyllSupport
         end
         ENV.fetch(envar, nil)
       end
+      # Only expand %VAR% if x is not nil and contains a %
+      if x&.include?('%')
+        x.gsub(/%([a-zA-Z_][a-zA-Z0-9_]*)%|{\g<1>}/) do
+          envar = Regexp.last_match 1
+          value = `wslvar #{envar} &2> /dev/null`.chomp
+          unless value
+            msg = "jekyll_plugin_support error: Windows environment variable %#{envar}% is undefined"
+            raise JekyllPluginSupportError, msg.red, [] if die_if_undefined
+
+            if logger
+              logger.warn msg
+            else
+              puts msg.red
+            end
+          end
+          value
+        end
+      else
+        x
+      end
     end
 
     def self.generate_message(klass, tag_name, version)

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