sutty-archives 2.4.0 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc14da399823bcacdb254eb2a61dc1da3ef87787da6e7873ac2a119d2ce9eb1
-  data.tar.gz: c36acd59da6ec7e2cf8ed837c4989371e3c6edf2a4b65a087ea211f3df59f4e6
+  metadata.gz: 89fc03fd9fff85a88a73cb5847f0e6427216b14f1c9af207254a560742e0b771
+  data.tar.gz: 2987fa0535baaea98ab919184b89e8d01c25796c1a45a4dffe4966126c61d163
 SHA512:
-  metadata.gz: 0b8c2af7c4ba9b48932bccda9cc8bb47a560ed1d3c4d573d487a5444c26052fcb8340014ed766bdec9c2802627d5b2afd4c2a3472ec0b87a245e17a1be06cadd
-  data.tar.gz: 51caab8fb1756dd2f77c752c36d2fe70ed14ce863932ac6a953c1ec26edaa0d862dca7d310aa7749fea198ed2e5319f0d9f4abd3c5a2019f76bc3a0aa123a485
+  metadata.gz: 192e025c68cf91285f43e4ddb95c9f4552200e7472a1e1585b9275c9b1e4b8f0ee8b933381c4a6f1c0c93b138930034642625a8ce79b23f1c9fba9237230d64f
+  data.tar.gz: c0b46364fc8bd7e406ad218c4d6296774e5a62d278f131e8c033fb6dff996d03aa9fad6911d0d521d4cf9518974ba675b073e9f97acbfe21ca7f86605ea3ee5c

data/lib/jekyll-archives.rb

@@ -62,8 +62,8 @@ module Jekyll
 
       # Read archive data from posts
       def read
+        read_combined if combined?
         read_attrs
-        read_categories_tags if enabled? "categories-tags"
         read_dates
         read_types if group?
       end
@@ -82,7 +82,8 @@ module Jekyll
             next unless group?
 
             @site.config['archives'] ||= {}
-            @site.config['archives'][attr] = @archives.last
+            @site.config['archives'][attr] ||= []
+            @site.config['archives'][attr] << @archives.last
           end
         end
       end
@@ -99,15 +100,57 @@ module Jekyll
         end
       end
 
-      def read_categories_tags
-        @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)
+      # Archive posts by a combination of attributes.
+      def read_combined
+        # We can have many combination archives
+        @config['combined'].each do |type, combined|
+          # This is an empty map so we can have all keys on the result
+          empty_combination = Hash[combined.map{|k| [k,nil]}]
+
+          # We collect all posts
+          @posts.docs.map do |post|
+            # Array of Jekyll::Document and Hash of values, some may be
+            # empty.
+            [ post, empty_combination.merge(**post.data.slice(*combined)) ]
+          end.select do |combination|
+            # We skip Documents that don't have any of the attributes
+            combination.last.none? do |_, e|
+              # TODO: Move to its own method
+              e.nil? || (e.respond_to?(:empty?) && e.empty?) || (e.respond_to?(:blank?) && e.blank?) || (e.respond_to?(:zero?) && e.zero?)
             end
+          end.map do |post, data|
+            # Since the values can be Arrays, we'll generate all
+            # combinations
+            data.values.reduce do |memo, value|
+              # XXX: Ensure value is an Array, it could be a String or other
+              # value.
+              (memo.is_a?(Array) ? memo : [memo]).product([value].flatten)
+            end.map(&:flatten).map do |v|
+              # Recreate a Hash of attribute and single value for each
+              # combination
+              data.keys.zip(v)
+            end.map do |hash|
+              # Recreate the first collection of Document and Hash for
+              # each combination.
+              [ post, Hash[hash] ]
+            end
+          end.flatten(1).group_by(&:last).transform_values(&:flatten).transform_values do |v|
+            # Create groups by value combinations and select only
+            # Documents
+            v.select do |p|
+              p.is_a? Jekyll::Document
+            end
+          end.each do |combination, posts|
+            # Then create Archives for them.
+            archive = Archive.new(@site, combination, type, posts)
+
+            @archives << archive
 
-            @archives << Archive.new(@site, { category: category, tag: tag }, "category-tag", category_tag_posts)
+            next unless group?
+
+            @site.config['archives'] ||= {}
+            @site.config['archives'][type] ||= []
+            @site.config['archives'][type] << archive
           end
         end
       end
@@ -129,7 +172,13 @@ module Jekyll
         @config['enabled'].each do |type|
           type = LEGACY_ATTRS[type] if LEGACY_ATTRS[type]
 
-          @archives << Archive.new(@site, type, 'type', @archives[type].posts)
+          @archives << Archive.new(@site, type, 'group', @site.config['archives'][type].map(&:posts).flatten.uniq)
+        end
+
+        return unless combined?
+
+        @config['combined'].each do |type, _|
+          @archives << Archive.new(@site, type, 'group', @site.config['archives'][type].map(&:posts).flatten.uniq)
         end
       end
 
@@ -152,6 +201,11 @@ module Jekyll
         @config['group']
       end
 
+      # Check if we have combined archives
+      def combined?
+        @config['combined'].is_a?(Hash)
+      end
+
       # Custom `post_attr_hash` method for years
       def years
         date_attr_hash(@posts.docs, "%Y")

data/lib/jekyll-archives/archive.rb

@@ -42,8 +42,17 @@ module Jekyll
 
         @data = { "layout" => layout }
 
+        if title.is_a?(Hash) && !date?
+          title['_layout'] = title.delete 'layout'
+          @data.merge! title
+        end
+
         @content = ""
 
+        data.default_proc = proc do |_, key|
+          site.frontmatter_defaults.find(relative_path, type, key)
+        end
+
         # 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?
@@ -79,9 +88,9 @@ module Jekyll
         if @title.is_a? Hash
           placeholders = @title.merge(:type => @type)
 
-          if @type == 'category-tag'
-            %i[category tag].each do |k|
-              placeholders[k] = Utils.slugify(@title[k], mode: @config.dig('slug'))
+          unless date?
+            placeholders.transform_values! do |v|
+              Utils.slugify(v, mode: @config.dig('slug'))
             end
           end
 
@@ -115,7 +124,7 @@ module Jekyll
       def title
         if @title.is_a? String
           @config.dig('titles', @title) || @title
-        elsif @type == 'category-tag'
+        elsif !date?
           @title.values.join(@config.fetch('separator', ' / '))
         end
       end
@@ -162,8 +171,9 @@ module Jekyll
 
       private
 
+      # Layout is a special attribute that can't be replaced
       def replace?
-        @config['replace'] && !(date? || @type == 'category-tag')
+        @config['replace'] && !@type.is_a?(Hash) && attribute != 'layout'
       end
 
       def attribute

data/lib/jekyll-archives/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Archives
-    VERSION = "2.4.0"
+    VERSION = "2.5.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sutty-archives
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.3
 platform: ruby
 authors:
 - Alfred Xing
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll