jekyll-archives 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f27192f95a4ce144e1d72588b4bf80d765357f2
-  data.tar.gz: 2e51316514e8d6020cfc281c302b9854e66e7c4b
+SHA256:
+  metadata.gz: c5c95258f37bf6d7a5e8dc1befbefc7bbdf77aabfccdadd1c3a1522b9274907d
+  data.tar.gz: '0578f15ede10791f5febf123a00ded5fe86b90a79e1ba4091efcf012fba5b6d8'
 SHA512:
-  metadata.gz: 6a07cb99f2004e548f0b386485f1f6a5ec9139b24f99db985a8a3e1b55ae42459fe07826aa5eaadc92f8454bbf5a82d3ff5c0b9891e1a0aa557190b6da5dd6a6
-  data.tar.gz: f46620e903c6a09d2bd7ac414162d45eaeacf7a3f95ce407b6cb4e2dabe63358bd8e9946698bff2b32b436fbaa17da34fe24ad74df8b6ce51d48b40db18749d5
+  metadata.gz: cc616dc7d954f996eb84a485751c326aa3c825f52775bf42712b084083de3b9e46fb2cc2bed960f89785c4257fb8786046cd7d801d380778d7cb2737003f1dba
+  data.tar.gz: 190fe9519e46d52b7edbd68dd66fe38f5c92b1b84606bad1a1f336aea700f5b01af8ab6a498b160c9784575d411e6ed6721e8ddb756f7e3646b56d883f15b762

data/lib/jekyll-archives.rb

@@ -1,40 +1,30 @@
-require 'jekyll'
+# frozen_string_literal: true
+
+require "jekyll"
 
 module Jekyll
   module Archives
     # Internal requires
-    autoload :Archive, 'jekyll-archives/archive'
-    autoload :VERSION, 'jekyll-archives/version'
-
-    if (Jekyll.const_defined? :Hooks)
-      Jekyll::Hooks.register :site, :after_reset do |site|
-        # We need to disable incremental regen for Archives to generate with the
-        # correct content
-        site.regenerator.instance_variable_set(:@disabled, true)
-      end
-    end
+    autoload :Archive, "jekyll-archives/archive"
+    autoload :VERSION, "jekyll-archives/version"
 
     class Archives < Jekyll::Generator
       safe true
 
       DEFAULTS = {
-        'layout' => 'archive',
-        'enabled' => [],
-        'permalinks' => {
-          'year' => '/:year/',
-          'month' => '/:year/:month/',
-          'day' => '/:year/:month/:day/',
-          'tag' => '/tag/:name/',
-          'category' => '/category/:name/'
-        }
-      }
+        "layout"     => "archive",
+        "enabled"    => [],
+        "permalinks" => {
+          "year"     => "/:year/",
+          "month"    => "/:year/:month/",
+          "day"      => "/:year/:month/:day/",
+          "tag"      => "/tag/:name/",
+          "category" => "/category/:name/",
+        },
+      }.freeze
 
       def initialize(config = nil)
-        if config['jekyll-archives'].nil?
-          @config = DEFAULTS
-        else
-          @config = Utils.deep_merge_hashes(DEFAULTS, config['jekyll-archives'])
-        end
+        @config = Utils.deep_merge_hashes(DEFAULTS, config.fetch("jekyll-archives", {}))
       end
 
       def generate(site)
@@ -42,7 +32,7 @@ module Jekyll
         @posts = site.posts
         @archives = []
 
-        @site.config['jekyll-archives'] = @config
+        @site.config["jekyll-archives"] = @config
 
         read
         @site.pages.concat(@archives)
@@ -88,16 +78,16 @@ module Jekyll
       # Checks if archive type is enabled in config
       def enabled?(archive)
         @config["enabled"] == true || @config["enabled"] == "all" || if @config["enabled"].is_a? Array
-          @config["enabled"].include? archive
-        end
+                                                                       @config["enabled"].include? archive
+                                                                     end
       end
 
       def tags
-        @site.post_attr_hash('tags')
+        @site.post_attr_hash("tags")
       end
 
       def categories
-        @site.post_attr_hash('categories')
+        @site.post_attr_hash("categories")
       end
 
       # Custom `post_attr_hash` method for years
@@ -105,26 +95,26 @@ module Jekyll
         hash = Hash.new { |h, key| h[key] = [] }
 
         # In Jekyll 3, Collection#each should be called on the #docs array directly.
-        if Jekyll::VERSION >= '3.0.0' 
+        if Jekyll::VERSION >= "3.0.0"
           @posts.docs.each { |p| hash[p.date.strftime("%Y")] << p }
         else
           @posts.each { |p| hash[p.date.strftime("%Y")] << p }
         end
-        hash.values.each { |posts| posts.sort!.reverse! }
+        hash.each_value { |posts| posts.sort!.reverse! }
         hash
       end
 
       def months(year_posts)
         hash = Hash.new { |h, key| h[key] = [] }
         year_posts.each { |p| hash[p.date.strftime("%m")] << p }
-        hash.values.each { |posts| posts.sort!.reverse! }
+        hash.each_value { |posts| posts.sort!.reverse! }
         hash
       end
 
       def days(month_posts)
         hash = Hash.new { |h, key| h[key] = [] }
         month_posts.each { |p| hash[p.date.strftime("%d")] << p }
-        hash.values.each { |posts| posts.sort!.reverse! }
+        hash.each_value { |posts| posts.sort!.reverse! }
         hash
       end
     end

data/lib/jekyll-archives/archive.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Archives
     class Archive < Jekyll::Page
-
       attr_accessor :posts, :type, :slug
 
       # Attributes for Liquid templates
@@ -13,6 +14,7 @@ module Jekyll
         name
         path
         url
+        permalink
       ).freeze
 
       # Initialize a new Archive page
@@ -27,12 +29,11 @@ module Jekyll
         @posts  = posts
         @type   = type
         @title  = title
-        @config = site.config['jekyll-archives']
+        @config = site.config["jekyll-archives"]
 
-        # Generate slug if tag or category (taken from jekyll/jekyll/features/support/env.rb)
-        if title.to_s.length
-          @slug = Utils.slugify(title.to_s)
-        end
+        # Generate slug if tag or category
+        # (taken from jekyll/jekyll/features/support/env.rb)
+        @slug = Utils.slugify(title) if title.is_a? String
 
         # Use ".html" for file extension and url for path
         @ext  = File.extname(relative_path)
@@ -40,7 +41,7 @@ module Jekyll
         @name = File.basename(relative_path, @ext)
 
         @data = {
-          "layout" => layout
+          "layout" => layout,
         }
         @content = ""
       end
@@ -49,17 +50,17 @@ module Jekyll
       #
       # Returns the template String.
       def template
-        @config['permalinks'][type]
+        @config["permalinks"][type]
       end
 
       # The layout to use for rendering
       #
       # Returns the layout as a String
       def layout
-        if @config['layouts'] && @config['layouts'][type]
-          @config['layouts'][type]
+        if @config["layouts"] && @config["layouts"][type]
+          @config["layouts"][type]
         else
-          @config['layout']
+          @config["layout"]
         end
       end
 
@@ -67,7 +68,7 @@ module Jekyll
       # desired placeholder replacements. For details see "url.rb".
       def url_placeholders
         if @title.is_a? Hash
-          @title.merge({ :type => @type })
+          @title.merge(:type => @type)
         else
           { :name => @slug, :type => @type }
         end
@@ -77,13 +78,17 @@ module Jekyll
       #
       # Returns the String url.
       def url
-        @url ||= URL.new({
-          :template => template,
+        @url ||= URL.new(
+          :template     => template,
           :placeholders => url_placeholders,
-          :permalink => nil
-        }).to_s
+          :permalink    => nil
+        ).to_s
       rescue ArgumentError
-        raise ArgumentError.new "Template \"#{template}\" provided is invalid."
+        raise ArgumentError, "Template \"#{template}\" provided is invalid."
+      end
+
+      def permalink
+        data&.is_a?(Hash) && data["permalink"]
       end
 
       # Produce a title object suitable for Liquid based on type of archive.
@@ -91,9 +96,7 @@ module Jekyll
       # Returns a String (for tag and category archives) and nil for
       # date-based archives.
       def title
-        if @title.is_a? String
-          @title
-        end
+        @title if @title.is_a? String
       end
 
       # Produce a date object if a date-based archive
@@ -101,7 +104,7 @@ module Jekyll
       # Returns a Date.
       def date
         if @title.is_a? Hash
-          args = @title.values.map { |s| s.to_i }
+          args = @title.values.map(&:to_i)
           Date.new(*args)
         end
       end
@@ -110,14 +113,14 @@ module Jekyll
       #
       # Returns the destination relative path String.
       def relative_path
-        path = URL.unescape_path(url).gsub(/^\//, '')
-        path = File.join(path, "index.html") if url =~ /\/$/
+        path = URL.unescape_path(url).gsub(%r!^\/!, "")
+        path = File.join(path, "index.html") if url =~ %r!\/$!
         path
       end
 
       # Returns the object as a debug String.
       def inspect
-        "#<Jekyll:Archive @type=#{@type.to_s} @title=#{@title} @data=#{@data.inspect}>"
+        "#<Jekyll:Archive @type=#{@type} @title=#{@title} @data=#{@data.inspect}>"
       end
     end
   end

data/lib/jekyll-archives/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Archives
+    VERSION = "2.2.1"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-archives
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Alfred Xing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,16 +16,22 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +73,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,6 +122,7 @@ extra_rdoc_files: []
 files:
 - lib/jekyll-archives.rb
 - lib/jekyll-archives/archive.rb
+- lib/jekyll-archives/version.rb
 homepage: https://github.com/jekyll/jekyll-archives
 licenses:
 - MIT
@@ -100,15 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Post archives for Jekyll.