jekyll_all_collections 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05fdaeb90e724ead5fe3036822f97e2d3b597eea75b8e2f6e2bd63d8b491401
-  data.tar.gz: 78ea31227b48c4c3ddaf49c12803c602e9b059097ae73b57083b2f411a28acb2
+  metadata.gz: d7f7fa2e1b1ca3dc3ee52ef85f6b1f55db8710bca3fed39386469d686bd6341f
+  data.tar.gz: 3827c3d5b908b972fb2d4efb3b6c0f703d84fbd710d5887485f1f6e0810718f9
 SHA512:
-  metadata.gz: b871ce27294c5b6474f07bae466bc89ec5b92b3b1d96718889595988934e5fef6f80711aca2ff9faf16b15df5729da8ba44c9d6e4fc67ef4b193f16ddd958262
-  data.tar.gz: 05ad4525f6e4deb03238a88b74cbd68c5779b7dc8b2437074db5a3c007b67113cec0f2b239d24dc3b148093727958b6505bd091337d602ad95d556e14c7be013
+  metadata.gz: fed15d67819f65a6711f9b4a3550fd4d309184f06e774cffe4ba9e9a4673f04e422e785a62c17c4151f12e1e98685f8317bec2e02542cfebac87ec94c9557a0c
+  data.tar.gz: 750f6e7f00532dc66bd992269c6cc0651deaebf2e10b385883c29010e4032a52ea7a925de12d55ecc064cdc2c604c919d6eb1a0807a641a31e7055f99a588048

data/.rubocop.yml

@@ -1,52 +1,71 @@
+require:
+  # - rubocop-jekyll
+  - rubocop-md
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
   Exclude:
+    - exe/**/*
     - vendor/**/*
     - Gemfile*
-    - '*.gemspec'
   NewCops: enable
   TargetRubyVersion: 2.6
 
-# Gemspec/RequireMFA:
-#   Enabled: false
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
 
 Layout/HashAlignment:
+  EnforcedColonStyle: table
   EnforcedHashRocketStyle: table
 
 Layout/LineLength:
   Max: 150
 
+Metrics/AbcSize:
+  Max: 45
+
 Metrics/BlockLength:
   Exclude:
-    - spec/**/*
-  Max: 50
-
-Metrics/AbcSize:
-  Max: 42
+    - jekyll_all_collections.gemspec
+  Max: 30
 
 Metrics/CyclomaticComplexity:
   Max: 25
 
 Metrics/MethodLength:
-  Max: 40
-
-Metrics/ModuleLength:
-  Enabled: false
+  Max: 30
 
 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 25
 
-Style/Documentation:
-  Enabled: false
+Naming/FileName:
+  Exclude:
+    - Rakefile
 
-Style/FrozenStringLiteralComment:
+RSpec/ExampleLength:
+  Max: 30
+
+RSpec/FilePath:
   Enabled: false
+  IgnoreMethods: true
+  SpecSuffixOnly: true
 
-Style/LineEndConcatenation:
+RSpec/IndexedLet:
   Enabled: false
 
-Style/StringConcatenation:
-  Exclude:
-    - spec/**/*
+RSpec/MultipleExpectations:
+  Max: 15
 
-Style/StringLiterals:
+Style/Documentation:
   Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 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'`
+
 ## 0.3.1 / 2023-03-16
   * Reduced the verbosity of the `@logger` message
 

data/README.md

@@ -15,25 +15,39 @@ 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:
+
+    $ bundle
+
+
 ## Requirements
 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
+   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
+   last_modified: 2023-01-01
    ---
    ```
 
    Or:
    ```
    ---
-   last_modified_at=2023-01-01
+   last_modified_at: 2023-01-01
    ---
    ```
 
@@ -79,7 +93,12 @@ exclude_from_all: true
 #### General Form
 The general form of the Jekyll tag is:
 ```
-{% all_collections date_column='date|last_modified' id='asdf' heading='All Posts' sort_by='SORT_KEYS' %}
+{% all_collections
+  date_column='date|last_modified'
+  heading='All Posts'
+  id='asdf'
+  sort_by='SORT_KEYS'
+%}
 ```
 
 #### `date_column` Attribute
@@ -89,19 +108,6 @@ 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:
 ```
@@ -109,7 +115,7 @@ If no `heading` attribute is specified, a heading will automatically be generate
 ```
 Generates a heading like:
 ```
-<h2 id="abcdef">All Posts Sorted By -last_modified</h2>
+<h2 id="abcdef">All Posts Sorted By last_modified</h2>
 ```
 
 To suppress both a `h2` heading (and the enclosed `id`) from being generated,
@@ -119,13 +125,39 @@ specify an empty string for the value of `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:
+```
+{% 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 <code>draft</code>,
+the secondary sort key as <code>last_modified</code>,
+and the tertiary key as <code>label</code>:
+
+```
+{% all_collections
+  date_column='last_modified'
+  heading='All Posts'
+  id='asdf'
+  sort_by='draft, last_modified, label'
+%}
+```
 
 
 #### Usage Examples
@@ -237,22 +269,6 @@ 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.

data/jekyll_all_collections.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |spec|
   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.files = Dir['.rubocop.yml', 'LICENSE.*', 'Rakefile', '{lib,spec}/**/*', '*.gemspec', '*.md']
 
-  spec.homepage = 'https://www.mslinn.com/blog/2020/12/30/jekyll-plugin-template-collection.html'
+  spec.homepage = 'https://www.mslinn.com/jekyll_plugins/jekyll_all_collections.html'
   spec.license = 'MIT'
   spec.metadata = {
     'allowed_push_host' => 'https://rubygems.org',
@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
 
   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_plugin_support', '>= 0.7.0'
 end

data/lib/all_collections_hooks.rb

@@ -66,22 +66,22 @@ module AllCollectionsHooks
   end
 
   class APage
-    attr_reader :content, :data, :date, :description, :destination, :draft, :excerpt, :ext, \
+    attr_reader :content, :data, :date, :description, :destination, :draft, :excerpt, :ext,
                 :label, :last_modified, :layout, :path, :relative_path, :tags, :title, :type, :url
 
     # Verify each property exists before accessing it; this helps write tests
     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
+      @date = (@data['date'].to_date if @data&.key?('date')) || Date.today
+      @description = @data['description'] if @data.key? 'description'
       @destination = obj.destination('') if obj.respond_to? :destination # TODO: What _config.yml setting should be passed 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 +89,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
@@ -105,9 +105,9 @@ module AllCollectionsHooks
     end
   end
 
-  PluginMetaLogger.instance.logger.info {
+  PluginMetaLogger.instance.logger.info do
     "Loaded AllCollectionsHooks v#{JekyllAllCollectionsVersion::VERSION} :site, :pre_render, :normal hook plugin."
-  }
+  end
 end
 
 Liquid::Template.register_filter(AllCollectionsHooks)

data/lib/all_collections_tag.rb

@@ -18,6 +18,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 +29,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_param = @helper.parameter_specified? 'sort_by'
       sort_by = (sort_by_param&.gsub(' ', '')&.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 +62,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,30 +97,38 @@ module AllCollectionsTag
 
     private
 
+    def last_modified_value(post)
+      @logger.debug { "  post.last_modified='#{post.last_modified}'; post.last_modified_at='#{post.last_modified_at}'; @date_column='#{@date_column}'" }
+      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.empty? ? '' : " id='#{@id}'"
-      heading = @heading.to_s.empty? ? '' : "<h2#{id}>#{@heading}</h2>"
-      @site.all_collections.each do |post|
-        # @logger.debug "#{post.relative_path}: last_modified=#{post.last_modified}(#{post.last_modified.class}) date=#{post.date}(#{post.date.class})"
-        @logger.debug "Error: #{post.relative_path} has no value for last_modified" if post.last_modified.to_s.empty?
-      end
+      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
-      puts e.message
-      puts 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.1'.freeze
+  VERSION = '0.3.3'.freeze
 end

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

@@ -20,95 +20,89 @@ 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') }
   let(:o4) { APageStub.new('2022-01-01', '2023-01-01', 'c_B') }
   let(:objs) { [o1, o2, o3, o4] }
 
-  it "defines sort_by lambda with last_modified" do
+  it 'defines sort_by lambda with 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 date" do
-    sort_lambda = eval "->(a, b) { a.last_modified <=> b.last_modified }",
+  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])
   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] }",
+  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])
   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] }",
+  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)
   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)
+  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)
   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)
+  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)
     expected = [o1, o2, o3, o4]
     # show(lambda_string, result, expected)
     expect(result).to eq(expected)
   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)
+  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)
     expected = [o1, o2, o3, o4]
     # show(lambda_string, result, expected)
     expect(result).to eq(expected)
   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)
+  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)
     expected = [o4, o3, o2, o1]
     # show(lambda_string, result, expected)
     expect(result).to eq(expected)
   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)
+  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)
     expected = [o4, o2, o3, o1]
     # show(lambda_string, result, expected)
     expect(result).to eq(expected)
   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)
+  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)
     expected = [o1, o3, o2, o4]
     # show(lambda_string, result, expected)

data/spec/date_sort_spec.rb

@@ -20,61 +20,61 @@ RSpec.describe(Obj) do # rubocop:disable Metrics/BlockLength
   let(:objs) { [o1, o2, o3, o4] }
 
   # See https://ruby-doc.org/3.2.0/Comparable.html
-  it "compares one key with ascending dates" do
+  it 'compares one key with ascending dates' do
     expect([o1.last_modified] <=> [o2.last_modified]).to eq(-1)
     expect([o2.last_modified] <=> [o3.last_modified]).to eq(0)
     expect([o3.last_modified] <=> [o4.last_modified]).to eq(-1)
   end
 
-  it "compares two keys with ascending dates" do
+  it 'compares two keys with ascending dates' do
     expect([o1.last_modified, o1.date] <=> [o2.last_modified, o2.date]).to eq(-1)
     expect([o2.last_modified, o2.date] <=> [o3.last_modified, o3.date]).to eq(-1)
     expect([o3.last_modified, o3.date] <=> [o4.last_modified, o4.date]).to eq(-1)
   end
 
-  it "compares one key with descending dates" do
+  it 'compares one key with descending dates' do
     expect([o1.last_modified] <=> [o2.last_modified]).to eq(-1)
     expect([o2.last_modified] <=> [o3.last_modified]).to eq(0)
   end
 
-  it "compares two keys with descending dates" do
+  it 'compares two keys with descending dates' do
     expect([o2.last_modified, o2.date] <=> [o1.last_modified, o1.date]).to eq(1)
     expect([o3.last_modified, o3.date] <=> [o2.last_modified, o2.date]).to eq(1)
     expect([o4.last_modified, o4.date] <=> [o3.last_modified, o3.date]).to eq(1)
   end
 
   # See https://ruby-doc.org/3.2.0/Enumerable.html#method-i-sort
-  it "sort with one key ascending" do
+  it 'sort with one key 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])
   end
 
-  it "sort with one key descending" do
+  it 'sort with one key descending' do
     sort_lambda = ->(a, b) { [b.last_modified] <=> [a.last_modified] }
     result = objs.sort(&sort_lambda)
     expect(result).to eq([o4, o2, o3, o1])
   end
 
-  it "sort with two keys ascending" do
+  it 'sort with two keys ascending' do
     sort_lambda = ->(a, b) { [a.last_modified, a.date] <=> [b.last_modified, b.date] }
     result = objs.sort(&sort_lambda)
     expect(result).to eq([o1, o2, o3, o4])
   end
 
-  it "sort with both keys descending" do
+  it 'sort with both keys descending' do
     sort_lambda = ->(a, b) { [b.last_modified, b.date] <=> [a.last_modified, a.date] }
     result = objs.sort(&sort_lambda)
     expect(result).to eq([o4, o3, o2, o1])
   end
 
-  it "sort with last_modified descending and date ascending" do
+  it 'sort with last_modified descending and date ascending' do
     sort_lambda = ->(a, b) { [b.last_modified, a.date] <=> [a.last_modified, b.date] }
     result = objs.sort(&sort_lambda)
     expect(result).to eq([o4, o2, o3, o1])
   end
 
-  it "sort with last_modified ascending and date descending" do
+  it 'sort with last_modified ascending and date descending' do
     sort_lambda = ->(a, b) { [a.last_modified, b.date] <=> [b.last_modified, a.date] }
     result = objs.sort(&sort_lambda)
     expect(result).to eq([o1, o3, o2, o4])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_all_collections
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -42,16 +42,16 @@ dependencies:
   name: jekyll_plugin_support
   requirement: !ruby/object:Gem::Requirement
     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.
 
   '
@@ -71,18 +71,17 @@ 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/date_sort_spec.rb
-- spec/lambda_sort_spec.rb
 - spec/spec_helper.rb
-- spec/status_persistence.txt
-homepage: https://www.mslinn.com/blog/2020/12/30/jekyll-plugin-template-collection.html
+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://www.mslinn.com/blog/2020/12/30/jekyll-plugin-template-collection.html
+  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: []

data/spec/status_persistence.txt

@@ -1,23 +0,0 @@
-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 |