jekyll_all_collections 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e45646b46cf5d0c78cf2fa66195a35790cbefc9cf70c3bfa9e29d28aed1f684
-  data.tar.gz: cc7670319738667e93ef05ca78b015aa2089df8225cb03523634bfe7bdccbe20
+  metadata.gz: 48527cdeb305237310b14a6748a3a95aab2fea5a837a650d277a8d9c93daed97
+  data.tar.gz: 98b3eebd250c4d16e2141b9aaac2c211a54ff9478eafe4a5cbb68f7de905cc6a
 SHA512:
-  metadata.gz: '06595b7270e805c029445553062919c8bebf6d493e84dfda94d95341c2368c22508d7ea3e025db87581e681732fae4dc798efab6fab5e5d50abb5d5d43dc5764'
-  data.tar.gz: 1dc9236d70270bd7115e1536641f8c3190aaa9e2bdd11f896568e1249c11cc065f056f17eaebd5edda5501a2a4b8e35f9290920f45e8b0475981847bd9d048f6
+  metadata.gz: 0ebd2507129ca1d62ca6fba8bbeb3bce545c100093ed1bab1390f03c5d495b7dd51fcb0780e8438253fcbf87a74cb57f54034b526fe54d290338f3b732b325c1
+  data.tar.gz: 30b284bb7cb19a4ef0cb246c052e2818086343fc722e4713065c4b9f5cb9a0fd0d807d0df1d7a5e16cb0cf08993ed56ddad3bd006f93175393b27d81305740a9

data/.rubocop.yml

@@ -7,11 +7,11 @@ require:
 
 AllCops:
   Exclude:
-    - exe/**/*
+    - binstub/**/*
+    - demo/_site/*
     - vendor/**/*
     - Gemfile*
   NewCops: enable
-  TargetRubyVersion: 2.6
 
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: false
@@ -19,6 +19,9 @@ Gemspec/DeprecatedAttributeAssignment:
 Gemspec/RequireMFA:
   Enabled: false
 
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
 Layout/HashAlignment:
   EnforcedColonStyle: table
   EnforcedHashRocketStyle: table
@@ -27,7 +30,7 @@ Layout/LineLength:
   Max: 150
 
 Metrics/AbcSize:
-  Max: 35
+  Max: 45
 
 Metrics/BlockLength:
   Exclude:
@@ -47,21 +50,25 @@ Naming/FileName:
   Exclude:
     - Rakefile
 
-Style/Documentation:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
+RSpec/ExampleLength:
+  Max: 30
 
 RSpec/FilePath:
+  Enabled: false
   IgnoreMethods: true
   SpecSuffixOnly: true
 
-RSpec/ExampleLength:
-  Max: 30
+RSpec/IndexedLet:
+  Enabled: false
 
 RSpec/MultipleExpectations:
   Max: 15
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

data/CHANGELOG.md

@@ -1,25 +1,51 @@
+# Changelog
+
+## 0.3.4 / 2023-12-24
+
+* Changed dependency to Jekyll >= 4.3.2
+
+
+## 0.3.3 / 2023-05-22
+
+* Corrected key presence checks in APage.initialize
+* Using `warn_short_trace` from `jekyll_plugin_support` for non-fatal errors.
+
+
 ## 0.3.2 / 2023-04-05
-  * Modified dependency `'jekyll_plugin_support', '>= 0.5.0'`
+
+* Modified dependency `'jekyll_plugin_support', '>= 0.5.0'`
+
 
 ## 0.3.1 / 2023-03-16
-  * Reduced the verbosity of the `@logger` message
+
+* Reduced the verbosity of the `@logger` message
 
 ## 0.3.0 / 2023-02-16
-  * Updated dependency `'jekyll_plugin_support', '~> 0.5.0'`
+
+* Updated dependency `'jekyll_plugin_support', '~> 0.5.0'`
 
 ## 0.2.2 / 2023-02-12
-  * Updated dependency `'jekyll_plugin_support', '~> 0.4.0'`
+
+* Updated dependency `'jekyll_plugin_support', '~> 0.4.0'`
+
 
 ## 0.2.1 / 2023-02-12
-  * Reduced the verbosity of log output from `info` to `debug`
+
+* Reduced the verbosity of log output from `info` to `debug`
+
 
 ## 0.2.0 / 2023-02-04
-  * Returns Array[APage] instead of a collection of different types of objects.
-  * Converted the plugin to a `:site, :post_read` hook instead of a tag,
+
+* Returns Array[APage] instead of a collection of different types of objects.
+* Converted the plugin to a `:site, :post_read` hook instead of a tag,
     so explicit initialization is no longer required.
 
+
 ## 0.1.1 / 2022-04-27
-  * Changed invocation from a `:site` hook to an idempotent method invocation.
+
+* Changed invocation from a `:site` hook to an idempotent method invocation.
+
 
 ## 0.1.0 / 2022-04-26
-  * Initial version published
+
+* Initial version published

data/README.md

@@ -1,6 +1,5 @@
-`jekyll_all_collections`
-[![Gem Version](https://badge.fury.io/rb/jekyll_all_collections.svg)](https://badge.fury.io/rb/jekyll_all_collections)
-===========
+# `jekyll_all_collections` [![Gem Version](https://badge.fury.io/rb/jekyll_all_collections.svg)](https://badge.fury.io/rb/jekyll_all_collections)
+
 
 `Jekyll_all_collections` is a Jekyll plugin that adds a new property called `all_collections` to `site`.
 It also provides a new Jekyll tag called `all_collections`,
@@ -15,39 +14,68 @@ The collection consists of an array of objects with the following properties:
 Pages that are not in any collection are not included.
 
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+group :jekyll_plugins do
+  gem 'jekyll_all_collections'
+end
+```
+
+And then execute:
+
+```shell
+$ bundle
+```
+
+
 ## Requirements
-All the pages in the Jekyll website must have an implicit date (for example, all posts are assigned this property by Jekyll),
+
+All the pages in the Jekyll website must have an implicit date
+(for example, all posts are assigned this property by Jekyll),
 or an explicit `date` set in front matter, like this:
-   ```
-   ---
-   date=2022-01-01
-   ---
-   ```
-If a front matter variable called `last_modified` or `last_modified_at` exists, its value will be converted to a Ruby `Date`:
-   ```
-   ---
-   last_modified=2023-01-01
-   ---
-   ```
-
-   Or:
-   ```
-   ---
-   last_modified_at=2023-01-01
-   ---
-   ```
-
-Otherwise, if `last_modified` or `last_modified_at` is not present in the front matter for a page, the `date` value will be used last modified date value.
+
+```html
+---
+date: 2022-01-01
+---
+```
+
+If a front matter variable called `last_modified` or `last_modified_at` exists,
+its value will be converted to a Ruby `Date`:
+
+```html
+---
+last_modified: 2023-01-01
+---
+```
+
+Or:
+
+```html
+---
+last_modified_at: 2023-01-01
+---
+```
+
+Otherwise, if `last_modified` or `last_modified_at` is not present in the front matter for a page,
+the `date` value will be used last modified date value.
+
 
 ## Usage
 
 ### `Site.all_collections`
+
 No explicit initialization or setup is required.
 Jekyll plugins can access the value of `site.all_collections`, however Liquid code in Jekyll pages and documents cannot.
 
 
 ### `All_collections` Tag
+
 Add the following CSS to your stylesheet:
+
 ```css
 .posts {
   display: flex;
@@ -68,70 +96,110 @@ Add the following CSS to your stylesheet:
 }
 ```
 
+
 #### Excluding Pages
-Adding the following entry to a page's front matter `` causes that page to be excluded from the collection created by this plugin:
-```
+
+Adding the following entry to a page’s front matter causes that page to be excluded
+from the collection created by this plugin:
+
+```html
 ---
 exclude_from_all: true
 ---
 ```
 
+
 #### General Form
+
 The general form of the Jekyll tag is:
+
+```html
+{% all_collections
+  date_column='date|last_modified'
+  heading='All Posts'
+  id='asdf'
+  sort_by='SORT_KEYS'
+%}
 ```
-{% all_collections date_column='date|last_modified' id='asdf' heading='All Posts' sort_by='SORT_KEYS' %}
-```
+
 
 #### `date_column` Attribute
+
 One of two date columns can be displayed in the generated HTML:
 either `date` (when the article was originally written),
 or `last_modified`.
 The default value for the `date_column` attribute is `date`.
 
 
-#### `id` Attribute
-If your Jekyll layout employs [`jekyll-toc`](https://github.com/allejo/jekyll-toc), then `id` attributes are important.
-The `jekyll-toc` include checks for `id` attributes in `h2` ... `h6` tags, and if found, and if the attribute value is enclosed in double quotes (`id="my_id"`, not `id='my_id'`),
-then the heading is included in the table of contents.
-
-To suppress an `id` from being generated,
-and thereby preventing the heading from appearing in the automatically generated table of contents from `jekyll-toc`,
-specify an empty string for the value of `id`, like this:
-```
-{% all_collections id='' %}
-```
+#### `heading` Attribute
 
+If no `heading` attribute is specified, a heading will automatically be generated, which contains the `sort_by` values,
+for example:
 
-#### `heading` Attribute
-If no `heading` attribute is specified, a heading will automatically be generated, which contains the `sort_by` values, for example:
-```
+```html
 {% all_collections id='abcdef' sort_by="last_modified" %}
 ```
+
 Generates a heading like:
-```
-<h2 id="abcdef">All Posts Sorted By -last_modified</h2>
+
+```html
+<h2 id="abcdef">All Posts Sorted By last_modified</h2>
 ```
 
 To suppress both a `h2` heading (and the enclosed `id`) from being generated,
 specify an empty string for the value of `heading`:
-```
+
+```html
 {% all_collections heading='' %}
 ```
 
 
+#### `id` Attribute
+
+If your Jekyll layout employs [`jekyll-toc`](https://github.com/allejo/jekyll-toc), then `id` attributes are important.
+The `jekyll-toc` include checks for `id` attributes in `h2` ... `h6` tags, and if found,
+and if the attribute value is enclosed in double quotes (`id="my_id"`, not `id='my_id'`),
+then the heading is included in the table of contents.
+
+To suppress an `id` from being generated,
+and thereby preventing the heading from appearing in the automatically generated table of contents from `jekyll-toc`,
+specify an empty string for the value of `id`, like this:
+
+```html
+{% all_collections id='' %}
+```
+
+
 #### `SORT_KEYS` Values
+
 `SORT_KEYS` specifies how to sort the collection.
 Values can include one or more of the following attributes:
-`date`, `destination`, `draft`, `label`, `last_modified`, `path`, `relative_path`, `title`, `type`, and `url`.
+`date`, `destination`, `draft`, `label`, `last_modified`, `last_modified_at`, `path`, `relative_path`,
+`title`, `type`, and `url`.
 Ascending sorts are the default, however a descending sort can be achieved by prepending `-` before an attribute.
 
-To specify more than one sort key, provide an array of values.
+To specify more than one sort key, provide a comma-delimited string of values.
+Included spaces are ignored.
+For example, specify the primary sort key as `draft`,
+the secondary sort key as `last_modified`,
+and the tertiary key as `label`:
+
+```html
+{% all_collections
+  date_column='last_modified'
+  heading='All Posts'
+  id='asdf'
+  sort_by='draft, last_modified, label'
+%}
+```
 
 
 #### Usage Examples
+
 Here is a short Jekyll page, including front matter,
 demonstrating this plugin being invoked with all default attribute values:
-```
+
+```html
 ---
 description: "
   Dump of all collections, sorted by date originally written, newest to oldest.
@@ -145,51 +213,62 @@ title: Testing, 1, 2, 3
 
 Explicitly express the default sort
 (sort by the date originally written, newest to oldest):
-```
+
+```html
 {% all_collections sort_by="-date" %}
 ```
 
 Sort by date, from oldest to newest:
-```
+
+```html
 {% all_collections sort_by="date" %}
 ```
 
 Sort by the date last modified, oldest to newest:
-```
+
+```html
 {% all_collections sort_by="last_modified" %}
 ```
 
 Sort by the date last modified, newest to oldest:
-```
+
+```html
 {% all_collections sort_by="-last_modified" %}
 ```
 
 Several attributes can be specified as sort criteria by passing them as a comma-delimited string.
 Included spaces are ignored:
-```
+
+```html
 {% all_collections sort_by="-last_modified, -date" %}
 {% all_collections sort_by="-last_modified, title" %}
 {% all_collections sort_by="-last_modified, -date, title" %}
 ```
 
 The following two examples produce the same output:
-```
+
+```html
 {% all_collections sort_by="-last_modified,-date" %}
 {% all_collections sort_by="-last_modified, -date" %}
 ```
 
 
 ## Demo
+
 The [`demo`](./demo) directory contains a demonstration website, which uses the plugin.
 To run, type:
+
 ```console
 $ demo/_bin/debug -r
 ```
+
 Now point your web browser to http://localhost:4444
 
 
 ## Debugging
+
 You can control the verbosity of log output by adding the following to `_config.yml` in your Jekyll project:
+
 ```yaml
 plugin_loggers:
   AllCollectionsTag::AllCollectionsTag: warn
@@ -199,7 +278,8 @@ plugin_loggers:
 1. You have two options for initiating a debug session:
 
    1. Run `demo/_bin/debug`, without the `-r` options shown above.
-      ```
+
+      ```console
       ... lots of output as bundle update runs...
       Bundle updated!
 
@@ -216,6 +296,7 @@ plugin_loggers:
 
    2. Run `bin/attach` and pass the directory name of a Jekyll website that has a suitable script called `_bin/debug`.
       The `demo` subdirectory fits this description.
+
       ```console
       $ bin/attach demo
       Successfully uninstalled jekyll_all_collections-0.1.2
@@ -233,26 +314,11 @@ plugin_loggers:
 
 
 ## Additional Information
+
 More information is available on Mike Slinn's website about
 [Jekyll plugins](https://www.mslinn.com/blog/index.html#Jekyll).
 
 
-## Installation
-This has already been done for the demo;
-these instructions are for incorporating the plugin(s) into other Jekyll websites.
-Add this line to your application's Gemfile:
-
-```ruby
-group :jekyll_plugins do
-  gem 'jekyll_all_collections'
-end
-```
-
-And then execute:
-
-    $ bundle install
-
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies.
@@ -261,12 +327,9 @@ You can also run `bin/console` for an interactive prompt that will allow you to
 
 
 ### Build and Install Locally
+
 To build and install this gem onto your local machine, run:
-```shell
-$ rake install
-```
 
-The following also does the same thing:
 ```shell
 $ bundle exec rake install
 jekyll_all_collections 0.1.0 built to pkg/jekyll_all_collections-0.1.0.gem.
@@ -274,6 +337,7 @@ jekyll_all_collections (0.1.0) installed.
 ```
 
 Examine the newly built gem:
+
 ```shell
 $ gem info jekyll_all_collections
 
@@ -290,15 +354,19 @@ jekyll_all_collections (0.1.0)
 
 
 ### Build and Push to RubyGems
+
 To release a new version,
-  1. Update the version number in `version.rb`.
-  2. Commit all changes to git; if you don't the next step might fail with an unexplainable error message.
-  3. Run the following:
-     ```shell
-     $ bundle exec rake release
-     ```
-     The above creates a git tag for the version, commits the created tag,
-     and pushes the new `.gem` file to [RubyGems.org](https://rubygems.org).
+
+1. Update the version number in `version.rb`.
+2. Commit all changes to git; if you don't the next step might fail with an unexplainable error message.
+3. Run the following:
+
+    ```shell
+    $ bundle exec rake release
+    ```
+
+    The above creates a git tag for the version, commits the created tag,
+    and pushes the new `.gem` file to [RubyGems.org](https://rubygems.org).
 
 
 ## Contributing

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 task default: :spec

data/jekyll_all_collections.gemspec

@@ -4,17 +4,17 @@ Gem::Specification.new do |spec|
   github = 'https://github.com/mslinn/jekyll_all_collections'
 
   spec.authors = ['Mike Slinn']
-  spec.bindir = 'bin'
+  spec.bindir = 'exe'
   spec.description = <<~END_OF_DESC
     Provides a collection of all collections in site.all_collections.
   END_OF_DESC
-  spec.email = ['email@email.com']
+  spec.email = ['mslinn@mslinn.com']
   spec.executables = []
 
   # Specify which files should be added to the gem when it is released.
   spec.files = Dir['.rubocop.yml', 'LICENSE.*', 'Rakefile', '{lib,spec}/**/*', '*.gemspec', '*.md']
 
-  spec.homepage = github
+  spec.homepage = 'https://www.mslinn.com/jekyll_plugins/jekyll_all_collections.html'
   spec.license = 'MIT'
   spec.metadata = {
     'allowed_push_host' => 'https://rubygems.org',
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.version = JekyllAllCollectionsVersion::VERSION
 
   spec.add_dependency 'jekyll', '>= 3.5.0'
-  spec.add_dependency 'jekyll_draft', '~> 1.1.1'
-  spec.add_dependency 'jekyll_plugin_support', '>= 0.5.0'
+  spec.add_dependency 'jekyll_draft', '>= 1.1.1'
+  spec.add_dependency 'jekyll_plugin_support', '>= 0.7.0'
 end

data/lib/all_collections_hooks.rb

@@ -73,15 +73,18 @@ module AllCollectionsHooks
     def initialize(obj) # rubocop:disable Metrics/AbcSize
       @data = obj.data if obj.respond_to? :data
 
-      @categories = @data['categories'] if obj.respond_to? :categories
+      @categories = @data['categories'] if @data.key? 'categories'
       @content = obj.content if obj.respond_to? :content
-      @date = @data['date'].to_date if obj.respond_to? :date
-      @description = @data['description'] if obj.respond_to? :data
-      @destination = obj.destination('') if obj.respond_to? :destination # TODO: What _config.yml setting should be passed to destination()?
+      @date = (@data['date'].to_date if @data&.key?('date')) || Date.today
+      @description = @data['description'] if @data.key? 'description'
+
+      # TODO: What _config.yml setting should be passed to destination()?
+      @destination = obj.destination('') if obj.respond_to? :destination
+
       @draft = Jekyll::Draft.draft?(obj)
-      @excerpt = @data['excerpt'] if obj.respond_to? :excerpt
-      @ext = @data['ext'] if obj.respond_to? :data
-      @label = obj.collection.label if obj.respond_to? :label
+      @excerpt = @data['excerpt'] if @data.key? 'excerpt'
+      @ext = @data['ext'] if @data.key? 'ext'
+      @label = obj.collection.label if obj&.collection.respond_to? :label
       @last_modified = @data['last_modified'] || @data['last_modified_at'] || @date
       @last_modified_field = case @data
                              when @data.key?('last_modified')
@@ -89,11 +92,11 @@ module AllCollectionsHooks
                              when @data.key?('last_modified_at')
                                'last_modified_at'
                              end
-      @layout = @data['layout'] if obj.respond_to? :layout
+      @layout = @data['layout'] if @data.key? 'layout'
       @path = obj.path if obj.respond_to? :path
       @relative_path = obj.relative_path if obj.respond_to? :relative_path
-      @tags = @data['tags'] if obj.respond_to? :tags
-      @title = @data['title'] if obj.respond_to? :title
+      @tags = @data['tags'] if @data.key? 'tags'
+      @title = @data['title'] if @data.key? 'title'
       @type = obj.type if obj.respond_to? :type
       @url = obj.url
     end

data/lib/all_collections_tag.rb

@@ -8,8 +8,7 @@ class NullBinding < BasicObject
   def min_binding
     ::Kernel
       .instance_method(:binding)
-      .bind(self)
-      .call
+      .bind_call(self)
   end
 end
 
@@ -18,6 +17,7 @@ end
 module AllCollectionsTag
   PLUGIN_NAME = 'all_collections'.freeze
   CRITERIA = %w[date destination draft label last_modified last_modified_at path relative_path title type url].freeze
+  DRAFT_HTML = '<i class="jekyll_draft">Draft</i>'.freeze
 
   class AllCollectionsTag < JekyllSupport::JekyllTag
     include JekyllAllCollectionsVersion
@@ -28,18 +28,22 @@ module AllCollectionsTag
       AllCollectionsHooks.compute(@site) unless @site.class.method_defined? :all_collections
 
       @date_column = @helper.parameter_specified?('date_column') || 'date'
-      abort "Error: the date_column attribute must either have value 'date' or 'last_modified', but '#{@date_column}' was specified" \
-        unless %w[date last_modified].include?(@date_column)
-
+      unless %w[date last_modified].include?(@date_column)
+        # TODO: should this just issue a warning and return instead of dieing?
+        abort "Error: the date_column attribute must either have value 'date' or 'last_modified', " \
+              "but '#{@date_column}' was specified"
+      end
       @id = @helper.parameter_specified?('id') || SecureRandom.hex(10)
-      sort_by_param = @helper.parameter_specified?('sort_by')
-      sort_by = (sort_by_param&.gsub(' ', '')&.split(',') if sort_by_param != false) || ['-date']
+      sort_by_param = @helper.parameter_specified? 'sort_by'
+      sort_by = (sort_by_param&.delete(' ')&.split(',') if sort_by_param != false) || ['-date']
       @heading = @helper.parameter_specified?('heading') || self.class.default_head(sort_by)
       sort_lambda_string = self.class.create_lambda_string(sort_by)
-      @logger.debug "#{@page['path']} sort_by_param=#{sort_by_param}"
-      @logger.debug "  sort_lambda_string = #{sort_lambda_string}\n"
-      sort_lambda = self.class.evaluate(sort_lambda_string)
-      generate_output(sort_lambda)
+      @logger.debug do
+        "#{@page['path']} sort_by_param=#{sort_by_param}  " \
+          "sort_lambda_string = #{sort_lambda_string}\n"
+      end
+      sort_lambda = self.class.evaluate sort_lambda_string
+      generate_output sort_lambda
     end
 
     def self.default_head(sort_by)
@@ -57,9 +61,9 @@ module AllCollectionsTag
       criteria_lhs_array = []
       criteria_rhs_array = []
       verify_sort_by_type(criteria).each do |c|
-        descending_sort = c.start_with?('-')
+        descending_sort = c.start_with? '-'
         c.delete_prefix! '-'
-        abort("Error: '#{c}' is not a valid sort field. Valid field names are: #{CRITERIA.join(', ')}") \
+        abort("Error: '#{c}' is not a valid sort field. Valid field names are: #{CRITERIA.join ', '}") \
           unless CRITERIA.include?(c)
         criteria_lhs_array << (descending_sort ? "b.#{c}" : "a.#{c}")
         criteria_rhs_array << (descending_sort ? "a.#{c}" : "b.#{c}")
@@ -92,32 +96,42 @@ module AllCollectionsTag
 
     private
 
-    def generate_output(sort_lambda)
-      id = @id.to_s.empty? ? '' : " id='#{@id}'"
-      heading = @heading.to_s.empty? ? '' : "<h2#{id}>#{@heading}</h2>"
-      @site.all_collections.each do |post|
-        # @logger.debug do
-        #   "#{post.relative_path}: last_modified=#{post.last_modified}(#{post.last_modified.class}) date=#{post.date}(#{post.date.class})"
-        # end
-        @logger.debug { "Error: #{post.relative_path} has no value for last_modified" if post.last_modified.to_s.empty? }
+    def last_modified_value(post)
+      @logger.debug do
+        "  post.last_modified='#{post.last_modified}'; " \
+          "post.last_modified_at='#{post.last_modified_at}'; " \
+          "@date_column='#{@date_column}'"
       end
+      last_modified = if @date_column == 'last_modified' && post.respond_to?(:last_modified)
+                        post.last_modified
+                      elsif post.respond_to? :last_modified_at
+                        post.last_modified_at
+                      else
+                        post.date
+                      end
+      last_modified ||= post.date || Date.today
+      last_modified
+    end
+
+    def generate_output(sort_lambda)
+      id = @id.to_s.strip.empty? ? '' : " id='#{@id}'"
+      heading = @heading.strip.to_s.empty? ? '' : "<h2#{id}>#{@heading}</h2>"
       collection = @site.all_collections.sort(&sort_lambda)
       <<~END_TEXT
         #{heading}
         <div class="posts">
-        #{(collection.map do |post|
-             @logger.debug { "  post.last_modified='#{post.last_modified}' @date_column='#{@date_column}'" }
-             date = (@date_column == 'last_modified' ? post.last_modified : post.date).strftime('%Y-%m-%d')
-             draft = post.draft ? "<i class='jekyll_draft'>Draft</i>" : ''
-             href = "<a href='#{post.url}'>#{post.title}</a>"
-             @logger.debug { "  date='#{date}' #{post.title}\n" }
-             "  <span>#{date}</span><span>#{href}#{draft}</span>"
-           end).join("\n")}
+          #{(collection.map do |post|
+               last_modified = last_modified_value post
+               date = last_modified.strftime '%Y-%m-%d'
+               draft = post.draft ? DRAFT_HTML : ''
+               href = "<a href='#{post.url}'>#{post.title}</a>"
+               @logger.debug { "  date='#{date}' #{post.title}\n" }
+               "  <span>#{date}</span><span>#{href}#{draft}</span>"
+             end).join "\n"}
         </div>
       END_TEXT
     rescue ArgumentError => e
-      @logger.warn { e.message }
-      @logger.warn { e.backtrace.join("\n") }
+      warn_short_trace e
     end
 
     JekyllPluginHelper.register(self, PLUGIN_NAME)

data/lib/jekyll_all_collections/version.rb

@@ -1,3 +1,3 @@
 module JekyllAllCollectionsVersion
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.4'.freeze
 end

data/lib/jekyll_all_collections.rb

@@ -1,5 +1,5 @@
-require_relative './all_collections_hooks'
-require_relative './all_collections_tag'
+require_relative 'all_collections_hooks'
+require_relative 'all_collections_tag'
 
 module JekyllAllCollections
   include AllCollectionsHooks

data/spec/{all_collections_tag_sort_spec.rb → all_collections_tag/all_collections_tag_sort_spec.rb}

@@ -20,7 +20,7 @@ def show(lambda_string, result, expected)
 end
 
 # See https://stackoverflow.com/a/75388137/553865
-RSpec.describe(AllCollectionsTag) do
+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') }
@@ -40,12 +40,6 @@ RSpec.describe(AllCollectionsTag) do
     expect(result).to eq([o1, o2, o3, o4])
   end
 
-  it 'defines sort_by lambda with array of last_modified' do
-    sort_lambda = ->(a, b) { [a.last_modified] <=> [b.last_modified] }
-    result = objs.sort(&sort_lambda)
-    expect(result).to eq([o1, o2, o3, o4])
-  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
@@ -62,8 +56,8 @@ RSpec.describe(AllCollectionsTag) do
   end
 
   it 'create_lambda with 1 date key, descending' do
-    lambda_string = AllCollectionsTag::AllCollectionsTag.create_lambda_string('-last_modified')
-    sort_lambda = AllCollectionsTag::AllCollectionsTag.evaluate(lambda_string)
+    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)
@@ -71,8 +65,8 @@ RSpec.describe(AllCollectionsTag) do
   end
 
   it 'create_lambda with 1 date key, ascending' do
-    lambda_string = AllCollectionsTag::AllCollectionsTag.create_lambda_string('date')
-    sort_lambda = AllCollectionsTag::AllCollectionsTag.evaluate(lambda_string)
+    lambda_string = described_class.create_lambda_string('date')
+    sort_lambda = described_class.evaluate(lambda_string)
     result = objs.sort(&sort_lambda)
     expected = [o1, o2, o3, o4]
     # show(lambda_string, result, expected)
@@ -80,8 +74,8 @@ RSpec.describe(AllCollectionsTag) do
   end
 
   it 'create_lambda with 2 date keys, both ascending' do
-    lambda_string = AllCollectionsTag::AllCollectionsTag.create_lambda_string(%w[date last_modified])
-    sort_lambda = AllCollectionsTag::AllCollectionsTag.evaluate(lambda_string)
+    lambda_string = described_class.create_lambda_string(%w[date last_modified])
+    sort_lambda = described_class.evaluate(lambda_string)
     result = objs.sort(&sort_lambda)
     expected = [o1, o2, o3, o4]
     # show(lambda_string, result, expected)
@@ -89,8 +83,8 @@ RSpec.describe(AllCollectionsTag) do
   end
 
   it 'create_lambda with 2 date keys, both descending' do
-    lambda_string = AllCollectionsTag::AllCollectionsTag.create_lambda_string(['-date', '-last_modified'])
-    sort_lambda = AllCollectionsTag::AllCollectionsTag.evaluate(lambda_string)
+    lambda_string = described_class.create_lambda_string(['-date', '-last_modified'])
+    sort_lambda = described_class.evaluate(lambda_string)
     result = objs.sort(&sort_lambda)
     expected = [o4, o3, o2, o1]
     # show(lambda_string, result, expected)
@@ -98,8 +92,8 @@ RSpec.describe(AllCollectionsTag) do
   end
 
   it 'create_lambda with 2 date keys, first descending and second ascending' do
-    lambda_string = AllCollectionsTag::AllCollectionsTag.create_lambda_string(['-date', 'last_modified'])
-    sort_lambda = AllCollectionsTag::AllCollectionsTag.evaluate(lambda_string)
+    lambda_string = described_class.create_lambda_string(['-date', 'last_modified'])
+    sort_lambda = described_class.evaluate(lambda_string)
     result = objs.sort(&sort_lambda)
     expected = [o4, o2, o3, o1]
     # show(lambda_string, result, expected)
@@ -107,8 +101,8 @@ RSpec.describe(AllCollectionsTag) do
   end
 
   it 'create_lambda with 2 date keys, first ascending and second descending' do
-    lambda_string = AllCollectionsTag::AllCollectionsTag.create_lambda_string(['date', '-last_modified'])
-    sort_lambda = AllCollectionsTag::AllCollectionsTag.evaluate(lambda_string)
+    lambda_string = described_class.create_lambda_string(['date', '-last_modified'])
+    sort_lambda = described_class.evaluate(lambda_string)
     result = objs.sort(&sort_lambda)
     expected = [o1, o3, o2, o4]
     # show(lambda_string, result, expected)

data/spec/spec_helper.rb

@@ -6,9 +6,8 @@ require_relative '../lib/jekyll_all_collections'
 Jekyll.logger.log_level = :info
 
 RSpec.configure do |config|
-  config.filter_run :focus
   # config.order = 'random'
-  config.run_all_when_everything_filtered = true
+  config.filter_run_when_matching focus: true
 
   # See https://relishapp.com/rspec/rspec-core/docs/command-line/only-failures
   config.example_status_persistence_file_path = 'spec/status_persistence.txt'

data/spec/status_persistence.txt

@@ -1,20 +1,23 @@
-example_id                                 | status | run_time        |
------------------------------------------- | ------ | --------------- |
-./spec/jekyll_all_collections_spec.rb[1:1] | passed | 0.00268 seconds |
-./spec/jekyll_all_collections_spec.rb[1:2] | passed | 0.00018 seconds |
-./spec/jekyll_all_collections_spec.rb[1:3] | passed | 0.00008 seconds |
-./spec/jekyll_all_collections_spec.rb[1:4] | passed | 0.00007 seconds |
-./spec/jekyll_all_collections_spec.rb[1:5] | passed | 0.00008 seconds |
-./spec/jekyll_all_collections_spec.rb[1:6] | passed | 0.00006 seconds |
-./spec/jekyll_all_collections_spec.rb[1:7] | passed | 0.00006 seconds |
-./spec/jekyll_all_collections_spec.rb[1:8] | passed | 0.00008 seconds |
-./spec/jekyll_all_collections_spec.rb[1:9] | passed | 0.00006 seconds |
-./spec/jekyll_all_collections_spec.rb[2:1] | passed | 0.00037 seconds |
-./spec/jekyll_all_collections_spec.rb[2:2] | passed | 0.00019 seconds |
-./spec/jekyll_all_collections_spec.rb[2:3] | passed | 0.00028 seconds |
-./spec/jekyll_all_collections_spec.rb[2:4] | failed | 0.0493 seconds  |
-./spec/jekyll_all_collections_spec.rb[2:5] | passed | 0.00026 seconds |
-./spec/jekyll_all_collections_spec.rb[2:6] | passed | 0.00017 seconds |
-./spec/jekyll_all_collections_spec.rb[2:7] | failed | 0.01092 seconds |
-./spec/jekyll_all_collections_spec.rb[2:8] | failed | 0.01013 seconds |
-./spec/jekyll_all_collections_spec.rb[2:9] | failed | 0.01195 seconds |
+example_id                       | status | run_time        |
+-------------------------------- | ------ | --------------- |
+./spec/date_sort_spec.rb[1:1]    | passed | 0.00111 seconds |
+./spec/date_sort_spec.rb[1:2]    | passed | 0.00019 seconds |
+./spec/date_sort_spec.rb[1:3]    | passed | 0.00014 seconds |
+./spec/date_sort_spec.rb[1:4]    | passed | 0.00016 seconds |
+./spec/date_sort_spec.rb[1:5]    | passed | 0.00016 seconds |
+./spec/date_sort_spec.rb[1:6]    | passed | 0.00015 seconds |
+./spec/date_sort_spec.rb[1:7]    | passed | 0.00014 seconds |
+./spec/date_sort_spec.rb[1:8]    | passed | 0.00014 seconds |
+./spec/date_sort_spec.rb[1:9]    | passed | 0.00016 seconds |
+./spec/date_sort_spec.rb[1:10]   | passed | 0.00015 seconds |
+./spec/lambda_sort_spec.rb[1:1]  | passed | 0.00017 seconds |
+./spec/lambda_sort_spec.rb[1:2]  | passed | 0.00022 seconds |
+./spec/lambda_sort_spec.rb[1:3]  | passed | 0.00029 seconds |
+./spec/lambda_sort_spec.rb[1:4]  | passed | 0.0002 seconds  |
+./spec/lambda_sort_spec.rb[1:5]  | passed | 0.00018 seconds |
+./spec/lambda_sort_spec.rb[1:6]  | passed | 0.0002 seconds  |
+./spec/lambda_sort_spec.rb[1:7]  | passed | 0.00019 seconds |
+./spec/lambda_sort_spec.rb[1:8]  | passed | 0.00019 seconds |
+./spec/lambda_sort_spec.rb[1:9]  | passed | 0.00019 seconds |
+./spec/lambda_sort_spec.rb[1:10] | passed | 0.00019 seconds |
+./spec/lambda_sort_spec.rb[1:11] | passed | 0.00036 seconds |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_all_collections
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -28,14 +28,14 @@ dependencies:
   name: jekyll_draft
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
@@ -44,19 +44,19 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 description: 'Provides a collection of all collections in site.all_collections.
 
   '
 email:
-- email@email.com
+- mslinn@mslinn.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -71,18 +71,18 @@ files:
 - lib/all_collections_tag.rb
 - lib/jekyll_all_collections.rb
 - lib/jekyll_all_collections/version.rb
-- spec/all_collections_tag_sort_spec.rb
+- spec/all_collections_tag/all_collections_tag_sort_spec.rb
 - spec/date_sort_spec.rb
 - spec/spec_helper.rb
 - spec/status_persistence.txt
-homepage: https://github.com/mslinn/jekyll_all_collections
+homepage: https://www.mslinn.com/jekyll_plugins/jekyll_all_collections.html
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
   bug_tracker_uri: https://github.com/mslinn/jekyll_all_collections/issues
   changelog_uri: https://github.com/mslinn/jekyll_all_collections/CHANGELOG.md
-  homepage_uri: https://github.com/mslinn/jekyll_all_collections
+  homepage_uri: https://www.mslinn.com/jekyll_plugins/jekyll_all_collections.html
   source_code_uri: https://github.com/mslinn/jekyll_all_collections
 post_install_message:
 rdoc_options: []