sutty-archives 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de531ca1b1088e2b311d795bb399e76d4d472c13b146b4c87d711d0ff7f30612
-  data.tar.gz: 465b830b25c64e795503d591012e37268059265a1fb16b0d6d1d289fdf40dfae
+  metadata.gz: 504d81958bc2f61213d04212cd3988a17131869a0dff5e294f0782e353515f43
+  data.tar.gz: cb58a0438cdd6bbf51c33ac2bea2f33e5862498039d81d74c9bb56d94fe48c44
 SHA512:
-  metadata.gz: 4cd9ad72c38bf0a4fccad60781a6d2d161e42754d7e98262d15ca037e8c125ac3cfd3f312b2f58f52a0cb3b3e2a2a1f1cdfccf881180d9dd689238b154ec25ef
-  data.tar.gz: 82dc16f23c07788f6c69e592e3045a3d49f03987a556694825b005a9c0e7b66d3e9a203eeb73baf2d70287ec69dc44097a82b600f004d993a282ebb6cb926a5b
+  metadata.gz: b25f4cc57b9b894980af8c95a65d3e6c35b5ef68de2c91c983d11a7c53300f96116592f20a364e7aae34c71aa028ac98ebcbe421324a9b43b2f5cbf851889f26
+  data.tar.gz: 4259f6adafecb055f17404b46b1ba0a2033bc68905a174bca902dfdd09151ab9eb5f293d35ad37ae190e04de6c740b71107389a43734ac31c30180d64acc6a8b

data/lib/jekyll-archives.rb

@@ -71,14 +71,28 @@ module Jekyll
           post_attr_hash(attr).each do |title, posts|
             attr = LEGACY_ATTRS[attr] if LEGACY_ATTRS[attr]
 
+            next unless attr_title_enabled? attr, title
+
             @archives << Archive.new(@site, title, attr, posts)
           end
         end
       end
 
+      # If the permalink is a hash of value => template, check if it
+      # isn't disabled.
+      def attr_title_enabled?(attr, value)
+        permalinks = @config.dig('permalinks', attr)
+
+        if permalinks.is_a?(Hash)
+          !!permalinks.dig(value)
+        else
+          true
+        end
+      end
+
       def read_categories_tags
         if enabled? "categories-tags"
-          categories.each do |category, posts|
+          @site.categories.each do |category, posts|
             posts.map { |post| post.data['tags'] }.flatten.uniq.compact.each do |tag|
               category_tag_posts = posts.select do |post|
                 post.data['categories'].include?(category) &&

data/lib/jekyll-archives/archive.rb

@@ -50,7 +50,10 @@ module Jekyll
       #
       # Returns the template String.
       def template
-        @config.dig("permalinks", type) || "/#{type}/:name/"
+        t = @config.dig("permalinks", type)
+        t = t.is_a?(Hash) ? t[title] : t
+
+        t || "/#{type}/:name/"
       end
 
       # The layout to use for rendering
@@ -111,7 +114,7 @@ module Jekyll
       #
       # Returns a Date.
       def date
-        return unless @title.is_a?(Hash)
+        return unless date?
 
         @date ||= begin
           args = @title.values.map(&:to_i)
@@ -143,6 +146,10 @@ module Jekyll
         "#<Jekyll:Archive @type=#{@type} @title=#{@title} @data=#{@data.inspect}>"
       end
 
+      def date?
+        %w[year month day].include? @type
+      end
+
       private
 
       # Generate slug if @title attribute is a string.

data/lib/jekyll-archives/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Archives
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sutty-archives
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Alfred Xing
 - f
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -116,7 +116,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Automatically generate post archives by dates, and any front matter attribute.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -129,7 +129,7 @@ homepage: https://0xacab.org/sutty/jekyll/sutty-archives
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Post archives for Jekyll.  Fork of jekyll-archives.
 test_files: []