sutty-archives 2.2.3 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb321000de02f19e06eeeb4c87cb3e631a5e587a8eaa1c8f8b1d1ca5f122035d
-  data.tar.gz: 7c246d8580ac25397faf9408c70baebc7297deee7ad4c4e678d8c0e7de0012a5
+  metadata.gz: 413366df4f9c1af2ee08ab9917418ec8c7698584622beedada89b61bc6dc8caa
+  data.tar.gz: bc6943836ab1aef4d5863521affaea867fdc8b51acc68e80e0a3ae5a183b0cda
 SHA512:
-  metadata.gz: c0aa4305061361e3aee1ed18a230f09f0dbea26458fbb97f98c72399afe29d4180e7ad51b688716824ae6f820464f49e34eb9d1810a5023a228840e611fed87d
-  data.tar.gz: 8d2a98375dcb61f3af31fe0c6168366fa5525311f10ab07f6ec3926feb652c48a3750940d9b6c8937cf83add40145a0e97298fbb115264a834b927995fe8530b
+  metadata.gz: 75254b9af7f51d8871be7328b3b3ac7474b0f30525ae1c2d858819be7ef14b21b3b16789e95d8f27d4b72f33579d5ac65e46b0ef6516dd3a52b84b63088e06ee
+  data.tar.gz: cf09bcc54730dd7a1c3f4daf74ce1e3366a28eaea0241f7034acc1b1b31a06a27ddb94a7a2bbd59260349dd726ebee51f67ff3e9c468a589824de71c1702150c

data/lib/jekyll-archives.rb

@@ -18,8 +18,10 @@ module Jekyll
 
       DEFAULTS = {
         "layout"     => "archive",
+        "group"      => false,
         "enabled"    => [],
         "titles"     => {},
+        "replace"    => false,
         "permalinks" => {
           "year"     => "/:year/",
           "month"    => "/:year/:month/",
@@ -55,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_combined if combined?
         read_attrs
-        read_categories_tags
         read_dates
+        read_types if group?
       end
 
       # Read and group by attributes, using the legacy names when
@@ -75,6 +78,12 @@ module Jekyll
             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
@@ -91,17 +100,57 @@ module Jekyll
         end
       end
 
-      def read_categories_tags
-        if enabled? "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)
-              end
-
-              @archives << Archive.new(@site, { category: category, tag: tag }, "category-tag", category_tag_posts)
+      # 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
+
+            next unless group?
+
+            @site.config['archives'] ||= {}
+            @site.config['archives'][type] ||= []
+            @site.config['archives'][type] << archive
           end
         end
       end
@@ -118,6 +167,21 @@ 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
+
+        return unless combined?
+
+        @config['combined'].each do |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.
@@ -132,6 +196,16 @@ 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
+
+      # 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,7 +42,26 @@ module Jekyll
 
         @data = { "layout" => layout }
 
+        if title.is_a?(Hash) && !date?
+          @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?
+        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.
@@ -68,9 +87,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
 
@@ -104,7 +123,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
@@ -151,6 +170,18 @@ module Jekyll
 
       private
 
+      def replace?
+        @config['replace'] && !@type.is_a?(Hash)
+      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.3"
+    VERSION = "2.5.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sutty-archives
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.5.1
 platform: ruby
 authors:
 - Alfred Xing
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Post archives for Jekyll.  Fork of jekyll-archives.