jekyll-tally-tags 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5903dcfca2ed55cd34e7a86a40ca2565b2aa7981f2a3fe81d04a35d6a2bbe558
-  data.tar.gz: 4ece7a9e9aaa7ddbf1cfe54efea8f03d7c534c59e273d6f2cb501d71c7131346
+  metadata.gz: 34b78495f4983b7c7eba9fdf4214753b26efaad6fe98606ca5c69ada66a6a5aa
+  data.tar.gz: 915a7ddb6dfc629796941fdb0ab669722c0b22dea4c3029f2e5f68da63f2ac1f
 SHA512:
-  metadata.gz: dfb1fa03b7ced48a5f6ee40cf228602166f4f063a877cc558ad6a61b045e0917b111ac4ce4ac4dc32fc02aa2a0c9afb064b8dac974017b0bb521eeea2704002c
-  data.tar.gz: 19dc53b00954e5f764310c8ee2438b6d7463dca92ccac0b3b32ca67f03146429030c14586cfb5a5b957737c390729c0885db5469f9cae2648588579ad5a419da
+  metadata.gz: 94e15c2fd5e7856b2899ea56bee1ce9b323568cf8312f28e613d562cea8349416b7428df4081edad30295652da672bb76dcdb24ac2e73f8a57ee79306880d945
+  data.tar.gz: 6e82474e5d7c83e197294597be8274706b39f398aa9b9fca13a0e22dc8f467a47c52463911d8a43a5a0d48d6b3bf27c6ead03c0ba62decab0081d960ec858544

data/lib/jekyll-tally-tags.rb

@@ -8,7 +8,6 @@ module Jekyll
 
     autoload :DocsToItems, "jekyll-tally-tags/docs_to_items"
     autoload :Item, "jekyll-tally-tags/item"
-    autoload :ItemsToPage, "jekyll-tally-tags/items_to_page"
     autoload :Methods, "jekyll-tally-tags/methods"
     autoload :Utils, "jekyll-tally-tags/utils"
     autoload :BasePage, "jekyll-tally-tags/pages/base_page"

data/lib/jekyll-tally-tags/docs_to_items.rb

@@ -137,10 +137,17 @@ module Jekyll
           end
         end
         # 把模板内自带有 `keys` 的加入进来
-        date_hash.each do |date, hash|
-          hash.each do |temp_key, csv_list|
+        date_hash.each do |date, csv_list|
+          date_hash[date] = {}
+          csv_list.each do |csv|
+            # lstrip rstrip 去掉前后空格
+            values = csv.gsub(/[，|,|\s]+/, " , ").split(',').each(&:lstrip!).each(&:rstrip!)
+            temp_key = values[0]
+            if !date_hash[date][temp_key]
+              date_hash[date][temp_key] = [csv]
+            end
             if templates[temp_key][KEYS]
-              csv_list.insert(0, templates[temp_key][KEYS].join(" "))
+              date_hash[date][temp_key].insert(0, templates[temp_key][KEYS].join(" "))
             end
           end
         end

data/lib/jekyll-tally-tags/pages/year_page.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module TallyTags
 
-    
+
 
     class YearPage < TallyTags::BasePage
 
@@ -48,17 +48,18 @@ module Jekyll
             templates_hash = yml_temp_hash[date]
             templates_hash.each_key do |temp_keys|
               temp    = temp_keys.keys[0]
-              content += "  #{temp}:\n"
+              # content += "  #{temp}:\n"
               keys    = temp_keys.values[0]
               hash    = templates_hash[temp_keys]
               lengths = hash[MAX_LENGTH]
               # content += "    - #{center_values(keys, lengths, sep)}\n"
               hash[VALUES].each_index do |index|
                 values  = hash[VALUES][index]
-                content += "    - #{center_values(values, lengths, sep)}\n"
+                content += "  - #{center_values(values, lengths, sep)}\n"
               end
-              content += "\n"
+              # content += "\n"
             end
+            content += "\n"
           end
           content += "```"
         end

data/lib/jekyll-tally-tags/version.rb

@@ -5,7 +5,7 @@ require "jekyll"
 module Jekyll
   module TallyTags
 
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
 
     # Hooks
     NO_NAME    = %r!^(?>.+/)*?(\d{2,4}-\d{1,2}-\d{1,2})(-([^/]*))?(\.[^.]+)$!.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-tally-tags
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Danyow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -54,7 +54,6 @@ files:
 - lib/jekyll-tally-tags.rb
 - lib/jekyll-tally-tags/docs_to_items.rb
 - lib/jekyll-tally-tags/item.rb
-- lib/jekyll-tally-tags/items_to_page.rb
 - lib/jekyll-tally-tags/methods.rb
 - lib/jekyll-tally-tags/pages/base_page.rb
 - lib/jekyll-tally-tags/pages/day_page.rb

data/lib/jekyll-tally-tags/items_to_page.rb

@@ -1,128 +0,0 @@
-# # frozen_string_literal: true
-#
-# require "jekyll"
-#
-# module Jekyll
-#   module TallyTags
-#
-#     class ItemsToPage < Generator
-#       safe true
-#       # @param [Configuration] config
-#       def initialize(config = nil)
-#         @config  = Utils.get_permalink_config(config)
-#         @enabled = Utils.get_permalink_config(config, ENABLED)
-#       end
-#
-#       # @param [Site] site
-#       def generate(site)
-#         # 判断是否为空
-#         return if @config.nil?
-#         # 开始赋值
-#         @site  = site
-#         @posts = site.posts
-#         @pages = []
-#
-#         read_all(@config[PERMALINKS], @site.posts.docs)
-#         # 把所有的拼接到到 `pages` 里面
-#         @site.pages.concat(@pages)
-#         # 配置里面也放一份
-#         @site.config[PAGES] = @pages
-#       end
-#
-#       # @param [Hash{String => String}] permalinks
-#       # @param [Array<Document>] scan_docs
-#       def read_all(permalinks, scan_docs)
-#         permalinks.each do |key, permalink|
-#           # 判断 链接是否包含 :xxx :(\w+)
-#           matches = []
-#           permalink.scan(/:(\w+)/) { |match| matches << match[0] }
-#           read_loop(key, {}, Array.new(scan_docs), matches, 0)
-#         end
-#       end
-#
-#       # @param [String] permalink_key
-#       # @param [Hash{Symbol => String}] titles
-#       # @param [Array<Document>] docs
-#       # @param [Array<String>] matches
-#       # @param [Integer] index
-#       def read_loop(permalink_key, titles, docs, matches, index)
-#         if index > matches.size - 1
-#           return
-#         end
-#         match = matches[index]
-#         # 找到对应的 docs
-#         if DATE_HASH.keys.include?(match)
-#           docs_hash = date_to_docs_hash(docs, DATE_HASH[match])
-#           read_any(docs_hash, match.to_sym, permalink_key, titles, matches, index + 1)
-#         else
-#           begin
-#             docs_hash = tags_to_docs_hash(docs, match)
-#             read_any(docs_hash, match.to_sym, permalink_key, titles, matches, index + 1)
-#           rescue
-#             Jekyll.logger.warn CLASSIFY, "没有该keys ':#{match}'"
-#           end
-#         end
-#       end
-#
-#       # @param [Hash{String => Array<Document>}] docs_hash
-#       # @param [Symbol] symbol
-#       # @param [String] permalink_key
-#       # @param [Hash{Symbol => String}] titles
-#       # @param [Array<String>] matches
-#       # @param [Integer] index
-#       def read_any(docs_hash, symbol, permalink_key, titles, matches, index)
-#         docs_hash.each do |key, docs|
-#           new_titles = titles.merge({ symbol => key })
-#           # 开启了该字段 同时 是匹配的最后一项的时候 写入数组
-#           if enabled?(permalink_key) && index == matches.size
-#             clz = SinglePage
-#             case permalink_key
-#             when YEAR
-#               clz = YearPage
-#             when MONTH
-#               clz = MonthPage
-#             when DAY
-#               clz = DayPage
-#             when WEEK
-#               clz = WeekPage
-#             when WEEKS
-#               clz = WeekPage
-#             end
-#             @pages << clz.new(@site, new_titles, permalink_key, docs.keep_if { |doc| doc.data[TEMPLATE] })
-#           end
-#           read_loop(permalink_key, new_titles, docs, matches, index)
-#         end
-#       end
-#
-#       private
-#
-#       # @param [String] type
-#       def enabled?(type)
-#         @enabled == true || @enabled == ALL || (@enabled.is_a?(Array) && @enabled.include?(type))
-#       end
-#
-#       # @param [Array<Document>] docs
-#       # @param [String] attr
-#       # @return [Hash{String => Array<Document>}]
-#       def tags_to_docs_hash(docs, attr)
-#         hash = Hash.new { |h, key| h[key] = [] }
-#         docs.each do |doc|
-#           doc.data[attr]&.each { |key| hash[key] << doc }
-#         end
-#         hash.each_value { |docs| docs.sort!.reverse! }
-#         hash
-#       end
-#
-#       # @param [Array<Document>] docs `yaml` 头部信息
-#       # @param [String] id ISO-8601
-#       # @return [Hash{String=>Array<Document>}]
-#       def date_to_docs_hash(docs, id)
-#         hash = Hash.new { |h, k| h[k] = [] }
-#         docs.each { |doc| hash[doc.date.strftime(id)] << doc }
-#         hash.each_value { |docs| docs.sort!.reverse! }
-#         hash
-#       end
-#
-#     end
-#   end
-# end