bridgetown-paginate 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af8a59db674148dbfbb66a2ade0333ceb589917f22eef04533cde1cd097d65d
-  data.tar.gz: e75a96fc01a65161609c90923a222883dfcf500102dc9f36d7924468545fc04f
+  metadata.gz: ece4df58f98cea6fa950bb3c3ca63cb89c6dbbac4bf00a0b2e12eed31cf91b8e
+  data.tar.gz: b967004c16729ed3f95bd07902774e6435b4740d9e4444734dd356b61ae35d7e
 SHA512:
-  metadata.gz: b261fecd3cbae9ac8e8f0dfd3e5232e1fc516cd6a667cba3467e23152109d3e5a07364cfee7f694b36cd35f524532f0a01db79415649a9e999faa67c3aceb81a
-  data.tar.gz: 2a1d1d909a289a7f0578792b11b9eb2d1b2fc30d6cf39de4c52313f0d7eb4237fc8540ad23d994820f3d9fc03355222344bdc5c397cf1ccd3b5657b875d9606b
+  metadata.gz: 53e202734aaaa86f82443da095b490f9d2b92cd96778d6329c78537dbdace78b9b7b062257ee3db4dabe030fcd9d33ce97b3c950a8208b9d34d25c898b5526b7
+  data.tar.gz: 37abe6427f2ceeac8bbc2c3c38e372ad1de4cfad4b425709aa5420fd356a2f9fef9d84d79ac5ea9f2da6f888c000a03b5385f3818a9b6543bc5153aca6095ad2

data/.rubocop.yml

@@ -40,6 +40,7 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Exclude:
     - lib/bridgetown-paginate/pagination_model.rb
+    - lib/bridgetown-paginate/pagination_page.rb
     - lib/bridgetown-paginate/paginator.rb
 Metrics/PerceivedComplexity:
   Exclude:

data/lib/bridgetown-paginate/defaults.rb

@@ -13,7 +13,7 @@ module Bridgetown
         "permalink"    => "/page/:num/", # Supports :num as customizable elements
         "title"        => ":title (Page :num)", # Supports :num as customizable elements
         "page_num"     => 1,
-        "sort_reverse" => false,
+        "sort_reverse" => true,
         "sort_field"   => "date",
         "limit"        => 0, # Limit how many content objects to paginate (default: 0, means all)
         "trail"        => {

data/lib/bridgetown-paginate/pagination_model.rb

@@ -271,18 +271,14 @@ module Bridgetown
           # list of all newly created pages
           newpages = []
 
-          # Consider the default index page name and extension
-          index_page_name = if config["indexpage"].nil?
-                              ""
-                            else
-                              config["indexpage"].split(".")[0]
-                            end
-          index_page_ext = if config["extension"].nil?
-                             ""
-                           else
+          # Consider the index page name and extension
+          # By default, they will be nil and the Page object will infer
+          # it from the template used
+          index_page_name = config["indexpage"].split(".")[0] unless config["indexpage"].nil?
+          index_page_ext = unless index_page_name.nil? || config["extension"].nil?
                              Utils.ensure_leading_dot(config["extension"])
                            end
-          index_page_with_ext = index_page_name + index_page_ext
+          index_page_with_ext = index_page_name + index_page_ext if index_page_name
 
           # In case there are no (visible) posts, generate the index file anyway
           total_pages = 1 if total_pages.zero?
@@ -296,7 +292,13 @@ module Bridgetown
             # 1. Create the in-memory page
             # External Proc call to create the actual page for us (this is
             # passed in when the pagination is run)
-            newpage = PaginationPage.new template, cur_page_nr, total_pages, index_page_with_ext
+            newpage = PaginationPage.new(
+              template,
+              cur_page_nr,
+              total_pages,
+              index_page_with_ext,
+              template.ext
+            )
 
             # 2. Create the url for the in-memory page (calc permalink etc),
             # construct the title, set all page.data values needed
@@ -327,12 +329,12 @@ module Bridgetown
             # that are defined in the template page before
             if newpage.pager.page_path.end_with? "/"
               newpage.set_url(File.join(newpage.pager.page_path, index_page_with_ext))
-            elsif newpage.pager.page_path.end_with? index_page_ext
+            elsif newpage.pager.page_path.end_with? index_page_ext.to_s
               # Support for direct .html files
               newpage.set_url(newpage.pager.page_path)
             else
               # Support for extensionless permalinks
-              newpage.set_url(newpage.pager.page_path + index_page_ext)
+              newpage.set_url(newpage.pager.page_path + index_page_ext.to_s)
             end
 
             newpage.data["permalink"] = newpage.pager.page_path if template.data["permalink"]

data/lib/bridgetown-paginate/pagination_page.rb

@@ -12,11 +12,11 @@ module Bridgetown
       # not read from disk
       #
       class PaginationPage < Bridgetown::Page
-        def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext)
+        def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext, template_ext)
           @site = page_to_copy.site
           @base = ""
           @url = ""
-          @name = index_pageandext.nil? ? "index.html" : index_pageandext
+          @name = index_pageandext.nil? ? "index#{template_ext}" : index_pageandext
           @path = page_to_copy.path
 
           # Creates the basename and ext member values

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-paginate
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 description: 
 email: maintainers@bridgetownrb.com
 executables: []