jekyll-paginate-v2 1.3.3 → 1.4.0

data/lib/jekyll-paginate-v2/paginationPage.rb

@@ -0,0 +1,38 @@
+module Jekyll
+  module PaginateV2
+
+    #
+    # This page handles the creation of the fake pagination pages based on the original page configuration
+    # The code does the same things as the default Jekyll/page.rb code but just forces the code to look
+    # into the template instead of the (currently non-existing) pagination page.
+    #
+    class PaginationPage < Page
+      def initialize(site, base, dir, template_path)
+        @site = site
+        @base = base
+        @dir = dir
+        @template = template_path
+        @name = 'index.html'
+
+        templ_dir = File.dirname(template_path)
+        templ_file = File.basename(template_path)
+
+        # Path is only used by the convertible module and accessed below when calling read_yaml
+        # in our case we have the path point to the original template instead of our faux new pagination page
+        @path = if site.in_theme_dir(base) == base # we're in a theme
+                  site.in_theme_dir(base, templ_dir, templ_file)
+                else
+                  site.in_source_dir(base, templ_dir, templ_file)
+                end
+        
+        self.process(@name)
+        self.read_yaml(templ_dir, templ_file)
+
+        data.default_proc = proc do |_, key|
+          site.frontmatter_defaults.find(File.join(templ_dir, templ_file), type, key)
+        end
+
+      end
+    end # class PaginationPage
+  end # module PaginateV2
+end # module Jekyll

data/lib/jekyll-paginate-v2/paginator.rb

@@ -15,7 +15,7 @@ module Jekyll
       # all_posts - The Array of all the site's Posts.
       # num_pages - The Integer number of pages or nil if you'd like the number
       #             of pages calculated.
-      def initialize(config_per_page, config_permalink, posts, cur_page_nr, num_pages, template_url )
+      def initialize(config_per_page, config_permalink, posts, cur_page_nr, num_pages, template_url, template_path )
         @page = cur_page_nr
         @per_page = config_per_page.to_i
         @total_pages = num_pages
@@ -30,9 +30,9 @@ module Jekyll
         @total_posts = posts.size
         @posts = posts[init..offset]
         @previous_page = @page != 1 ? @page - 1 : nil
-        @previous_page_path = @page != 1 ? Utils.paginate_path(template_url, @previous_page, config_permalink) : nil
+        @previous_page_path = @page != 1 ? Utils.paginate_path(template_url, template_path, @previous_page, config_permalink) : nil
         @next_page = @page != @total_pages ? @page + 1 : nil
-        @next_page_path = @page != @total_pages ? Utils.paginate_path(template_url, @next_page, config_permalink) : nil
+        @next_page_path = @page != @total_pages ? Utils.paginate_path(template_url, template_path, @next_page, config_permalink) : nil
       end
 
       # Convert this Paginator's data to a Hash suitable for use by Liquid.

data/lib/jekyll-paginate-v2/utils.rb

@@ -24,7 +24,7 @@ module Jekyll
       # config - the current configuration in use
       #
       # Returns the pagination path as a string
-      def self.paginate_path(template_url, cur_page_nr, permalink_format)
+      def self.paginate_path(template_url, template_path, cur_page_nr, permalink_format)
         return nil if cur_page_nr.nil?
         return template_url if cur_page_nr <= 1
         if permalink_format.include?(":num")
@@ -32,6 +32,13 @@ module Jekyll
         else
           raise ArgumentError.new("Invalid pagination path: '#{permalink_format}'. It must include ':num'.")
         end
+
+        # If the template url is not just root "/" then pre-pend the template_url path to it
+        template_dir = File.dirname(template_path)
+        if( template_dir != "" && template_dir != "/" )
+          permalink_format = File.join(template_url, permalink_format)
+        end
+
         Utils.ensure_leading_slash(permalink_format)
       end #function paginate_path
       
@@ -61,6 +68,45 @@ module Jekyll
         path[0..0] == "/" ? path[1..-1] : path
       end
 
+      #
+      # Sorting routine used for ordering posts by custom fields.
+      # Handles Strings separately as we want a case-insenstive sorting
+      #
+      def self.sort_values(a, b)
+        if a.is_a?(String)
+          return a.downcase <=> b.downcase
+        end
+        
+        # By default use the built in sorting for the data type
+        return a <=> b
+      end
+
+      # Retrieves the given sort field from the given post
+      # the sort_field variable can be a hierarchical value on the form "parent_field:child_field" repeated as many times as needed
+      # only the leaf child_field will be retrieved  
+      def self.sort_get_post_data(post, sort_field)
+        
+        # Begin by splitting up the sort_field by (;,:.)
+        sort_split = sort_field.split(":")
+        sort_value = post.data
+
+        for r_key in sort_split
+          key = r_key.downcase.strip # Remove any erronious whitespace and convert to lower case
+          if !sort_value.has_key?(key)
+            return nil
+          end
+          # Work my way through the hash
+          sort_value = sort_value[key]
+        end
+
+        # If the sort value is a hash then return nil else return the value
+        if( sort_value.is_a?(Hash) )
+          return nil
+        else
+          return sort_value
+        end
+      end
+
     end
 
   end # module PaginateV2

data/lib/jekyll-paginate-v2/version.rb

@@ -1,8 +1,8 @@
 module Jekyll
   module PaginateV2
-    VERSION = "1.3.3"
+    VERSION = "1.4.0"
     # When modifying remember to issue a new tag command in git before committing, then push the new tag
-    # git tag -a v1.3.3 -m "Gem v1.3.3"
+    # git tag -a v1.4.0 -m "Gem v1.4.0"
     # git push origin --tags
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require_relative '../lib/jekyll-paginate-v2/defaults'
 require_relative '../lib/jekyll-paginate-v2/utils'
 require_relative '../lib/jekyll-paginate-v2/compatibilityUtils'
 require_relative '../lib/jekyll-paginate-v2/paginator'
+require_relative '../lib/jekyll-paginate-v2/paginationPage'
 require_relative '../lib/jekyll-paginate-v2/paginationModel'
 require_relative '../lib/jekyll-paginate-v2/paginationGenerator'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-paginate-v2
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Sverrir Sigmundarson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -67,12 +67,84 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/01-typicalblog/Gemfile
+- examples/01-typicalblog/README.md
+- examples/01-typicalblog/_config.yml
+- examples/01-typicalblog/_includes/header.html
+- examples/01-typicalblog/_layouts/home.html
+- examples/01-typicalblog/_posts/2016-11-20-geography-of-minneapolis.md
+- examples/01-typicalblog/_posts/2016-11-21-sailing-summer-olympics-1988.md
+- examples/01-typicalblog/_posts/2016-11-22-rotary-engine.md
+- examples/01-typicalblog/_posts/2016-11-23-luft-fahrzeug-gesellschaft.md
+- examples/01-typicalblog/_posts/2016-11-24-narcisse-snake-pits.md
+- examples/01-typicalblog/_posts/2016-11-25-tele7jours.md
+- examples/01-typicalblog/_posts/2016-11-26-columbia-river.md
+- examples/01-typicalblog/_posts/2016-11-27-welcome-to-jekyll-paginate-v2.md
+- examples/01-typicalblog/about.md
+- examples/01-typicalblog/index.html
+- examples/02-category/Gemfile
+- examples/02-category/README.md
+- examples/02-category/_config.yml
+- examples/02-category/_includes/header.html
+- examples/02-category/_layouts/home.html
+- examples/02-category/_posts/2016-10-27-welcome-to-jekyll-paginate-v2.md
+- examples/02-category/about.md
+- examples/02-category/cars/_posts/2016-10-18-Porsche-918-Spyder.md
+- examples/02-category/cars/_posts/2016-10-19-Porsche-964.md
+- examples/02-category/cars/_posts/2016-10-20-porsche-911-gt3.md
+- examples/02-category/cars/_posts/2016-10-21-porsche-911.md
+- examples/02-category/cars/_posts/2016-10-22-porsche-962.md
+- examples/02-category/cars/_posts/2016-10-23-Toyota-GT-One.md
+- examples/02-category/cars/_posts/2016-10-24-Mercedes-Benz-CLK-GTR.md
+- examples/02-category/cars/_posts/2016-10-25-rolls-royce-silver-ghost.md
+- examples/02-category/categories/byname.md
+- examples/02-category/categories/porsche.md
+- examples/02-category/index.md
+- examples/02-category/toyota/index.md
+- examples/03-tags/Gemfile
+- examples/03-tags/README.md
+- examples/03-tags/_config.yml
+- examples/03-tags/_includes/header.html
+- examples/03-tags/_layouts/home.html
+- examples/03-tags/_layouts/post.html
+- examples/03-tags/biography/_posts/2016-10-27-born-to-run.md
+- examples/03-tags/biography/_posts/2016-10-27-forty-autumns.md
+- examples/03-tags/biography/_posts/2016-10-27-life-in-questions-a.md
+- examples/03-tags/biography/_posts/2016-10-27-not-dead-yet.md
+- examples/03-tags/biography/_posts/2016-10-27-princess-diarist-the.md
+- examples/03-tags/biography/_posts/2016-10-27-when-breath-becomes-air.md
+- examples/03-tags/biography/biography-musicians.md
+- examples/03-tags/biography/biography.md
+- examples/03-tags/blog/_posts/2016-09-30-welcome-to-jekyll-paginate-v2.md
+- examples/03-tags/byisbn.md
+- examples/03-tags/fantasy/_posts/2016-10-27-harry-potter-deathly-hallows.md
+- examples/03-tags/fantasy/_posts/2016-10-27-harry-potter-philosophers-stone.md
+- examples/03-tags/fantasy/_posts/2016-10-27-mistborn-trilogy.md
+- examples/03-tags/fantasy/_posts/2016-10-27-ready-player-one.md
+- examples/03-tags/fantasy/_posts/2016-10-27-sword-of-destiny.md
+- examples/03-tags/fantasy/_posts/2016-10-27-terry-pratchet-diary-2017.md
+- examples/03-tags/index.md
+- examples/03-tags/romance/_posts/2016-10-27-breath-of-snow-and-ashes-a.md
+- examples/03-tags/romance/_posts/2016-10-27-dressmaker-the.md
+- examples/03-tags/romance/_posts/2016-10-27-fiery-cross-the.md
+- examples/03-tags/romance/_posts/2016-10-27-it-ends-with-us.md
+- examples/03-tags/romance/_posts/2016-10-27-outlander-novel.md
+- examples/03-tags/romance/_posts/2016-10-27-virgins-outlander-short-story.md
+- examples/03-tags/romance/romance-historical.md
+- examples/03-tags/tags/contemporary.md
+- examples/03-tags/tags/fantasy.md
+- examples/03-tags/tags/sci-fi.md
+- examples/README.md
+- examples/img/01-example-screenshot-main.png
+- examples/img/02-example-screenshot-main.png
+- examples/img/03-example-screenshot-main.png
 - jekyll-paginate-v2.gemspec
 - lib/jekyll-paginate-v2.rb
 - lib/jekyll-paginate-v2/compatibilityUtils.rb
 - lib/jekyll-paginate-v2/defaults.rb
 - lib/jekyll-paginate-v2/paginationGenerator.rb
 - lib/jekyll-paginate-v2/paginationModel.rb
+- lib/jekyll-paginate-v2/paginationPage.rb
 - lib/jekyll-paginate-v2/paginator.rb
 - lib/jekyll-paginate-v2/utils.rb
 - lib/jekyll-paginate-v2/version.rb