sutty-archives 2.2.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de531ca1b1088e2b311d795bb399e76d4d472c13b146b4c87d711d0ff7f30612
-  data.tar.gz: 465b830b25c64e795503d591012e37268059265a1fb16b0d6d1d289fdf40dfae
+  metadata.gz: 0d8ab803634bfa88c376d923c7a899074bbc92ae78bb61864e7ebc0defebbbf2
+  data.tar.gz: 7c582de4ff9d9178c45590829d62ed2134785b26724442d2edeb51e7e5441f3a
 SHA512:
-  metadata.gz: 4cd9ad72c38bf0a4fccad60781a6d2d161e42754d7e98262d15ca037e8c125ac3cfd3f312b2f58f52a0cb3b3e2a2a1f1cdfccf881180d9dd689238b154ec25ef
-  data.tar.gz: 82dc16f23c07788f6c69e592e3045a3d49f03987a556694825b005a9c0e7b66d3e9a203eeb73baf2d70287ec69dc44097a82b600f004d993a282ebb6cb926a5b
+  metadata.gz: 84275c56a027c307d3bcb8367e92ad8dabde13da114250d7f9dda90d5c62c1de3bec5da8a1da86e8555f1f61f58a6d6beffe179f0f62df444c86a86da04de79f
+  data.tar.gz: e17da6c402e748a19083be9a0e38081897a037932b3b9c4aa8e985d801be0c8f0c0a124d5ccc217c1fbecaf18ed468ee6b06eacd366b822e09e5555b0fb9aa26

data/lib/jekyll-archives.rb

@@ -18,15 +18,18 @@ module Jekyll
 
       DEFAULTS = {
         "layout"     => "archive",
+        "group"      => false,
         "enabled"    => [],
+        "titles"     => {},
+        "replace"    => false,
         "permalinks" => {
           "year"     => "/:year/",
           "month"    => "/:year/:month/",
           "day"      => "/:year/:month/:day/",
           "tag"      => "/tag/:name/",
           "category" => "/category/:name/",
-          "category-tag" => "/category/:category/tag/:tag/"
-        },
+          "category-tag" => "/category/:category/tag/:tag/",
+        }
       }.freeze
 
       def initialize(config = {})
@@ -54,14 +57,15 @@ module Jekyll
         read
         @site.pages.concat(@archives)
 
-        @site.config["archives"] = @archives
+        @site.config["archives"] = @archives unless group?
       end
 
       # Read archive data from posts
       def read
         read_attrs
-        read_categories_tags
+        read_categories_tags if enabled? "categories-tags"
         read_dates
+        read_types if group?
       end
 
       # Read and group by attributes, using the legacy names when
@@ -71,22 +75,40 @@ 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)
+
+            next unless group?
+
+            @site.config['archives'] ||= {}
+            @site.config['archives'][attr] ||= []
+            @site.config['archives'][attr] << @archives.last
           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|
-            posts.map { |post| post.data['tags'] }.flatten.uniq.compact.each do |tag|
-              category_tag_posts = posts.select do |post|
-                post.data['categories'].include?(category) &&
-                  post.data['tags'].include?(tag)
-              end
-
-              @archives << Archive.new(@site, { category: category, tag: tag }, "category-tag", category_tag_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) &&
+                post.data['tags'].include?(tag)
             end
+
+            @archives << Archive.new(@site, { category: category, tag: tag }, "category-tag", category_tag_posts)
           end
         end
       end
@@ -103,6 +125,15 @@ module Jekyll
         end
       end
 
+      # Generates Archives by Archive type
+      def read_types
+        @config['enabled'].each do |type|
+          type = LEGACY_ATTRS[type] if LEGACY_ATTRS[type]
+
+          @archives << Archive.new(@site, type, 'group', @site.config['archives'][type].map(&:posts).flatten.uniq)
+        end
+      end
+
       # Return the front matter attributes to archive by, using the
       # legacy names unless specified and leaving out the date
       # attributes.
@@ -117,6 +148,11 @@ module Jekyll
         @enabled == true || @enabled == "all" || (@enabled.is_a?(Array) && @enabled.include?(archive))
       end
 
+      # Checks if we want grouped archives
+      def group?
+        @config['group']
+      end
+
       # Custom `post_attr_hash` method for years
       def years
         date_attr_hash(@posts.docs, "%Y")

data/lib/jekyll-archives/archive.rb

@@ -40,17 +40,30 @@ module Jekyll
         @path = relative_path
         @name = File.basename(relative_path, @ext)
 
-        @data = {
-          "layout" => layout,
-        }
+        @data = { "layout" => layout }
+
         @content = ""
+
+        # Replace the value with the archive except for date and
+        # category-tag.  For category-tag, do we want to replace the
+        # category or the tag?
+        return unless replace?
+        @posts.each do |post|
+          case post.data[attribute]
+          when Array then post.data[attribute].map!{|v| (v == title) ? self : v }
+          else post.data[attribute] = self
+          end
+        end
       end
 
       # The template of the permalink.
       #
       # 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
@@ -101,7 +114,7 @@ module Jekyll
       # date-based archives.
       def title
         if @title.is_a? String
-          @title
+          @config.dig('titles', @title) || @title
         elsif @type == 'category-tag'
           @title.values.join(@config.fetch('separator', ' / '))
         end
@@ -111,7 +124,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,8 +156,24 @@ module Jekyll
         "#<Jekyll:Archive @type=#{@type} @title=#{@title} @data=#{@data.inspect}>"
       end
 
+      def date?
+        %w[year month day].include? @type
+      end
+
       private
 
+      def replace?
+        @config['replace'] && !(date? || @type == 'category-tag')
+      end
+
+      def attribute
+        case type
+        when 'tag' then 'tags'
+        when 'category' then 'categories'
+        else type
+        end
+      end
+
       # Generate slug if @title attribute is a string.
       #
       # Note: mode other than those expected by Jekyll returns the given string after

data/lib/jekyll-archives/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Archives
-    VERSION = "2.2.1"
+    VERSION = "2.4.1"
   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.4.1
 platform: ruby
 authors:
 - Alfred Xing
 - f
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-10-02 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
@@ -144,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Post archives for Jekyll.  Fork of jekyll-archives.
 test_files: []