Fix Pagination #1198

parkr · 2013-06-09T16:32:20Z

New: Look for an index.html page starting in the paginate_path and searching upward (in the FS tree) until an index.html is found.

paginate in subdirectories properly
traverse hierarchy (vertically) to find proper index.html file
add tests for new cases
fix tests for internals that were changed

…found

parkr · 2013-06-09T19:10:12Z

@mattr- this is ready for review :)

mattr- · 2013-06-10T02:40:13Z

lib/jekyll/configuration.rb

@@ -29,7 +29,7 @@ class Configuration < Hash
      'baseurl'       => '/',
      'include'       => ['.htaccess'],
      'exclude'       => [],
-      'paginate_path' => 'page:num',
+      'paginate_path' => '/page:num',


I'm missing some context for this change. How is the added slash significant here?

It's not significant as far as I know.

I was just testing with both :)

mattr- · 2013-06-10T02:42:01Z

lib/jekyll/generators/pagination.rb

+      # site - the Jekyll::Site object
+      #
+      # Returns the url of the template page
+      def self.first_page_url(site)


Do we have a URL helpers module or something where this method could go instead? I don't think this method belongs on the Pagination class.

URL Helpers? Nope. Might be a good idea to add, but I'd rather do that in a different PR. It could also handle generation of URLs for Pages and Posts.

What do you think about this? Do you think a URL Helper to cover these two things is a good idea?

I don't really see the pattern that I was seeing before so I don't think we need a URL Helper to cover these two things anymore.

mattr- · 2013-06-10T02:42:39Z

lib/jekyll/generators/pagination.rb

+      # site - the Jekyll::Site object
+      #
+      # Returns the Jekyll::Page which will act as the pager template
+      def template_page(site)


hmm, after seeing this method, I'm wondering if we don't need a TemplatePage object for both this method and the previous method. Thoughts?

mattr- · 2013-06-10T02:45:01Z

lib/jekyll/generators/pagination.rb

+    #
+    # Returns the path with a leading slash
+    def self.ensure_leading_slash(path)
+      path[0..0] == "/" ? path : "/#{path}"


Why use a range here?

Compatibility with 1.8.7. In 1.8.7, string[index] returns the ordinal instead of the character.

mattr- · 2013-06-10T02:47:36Z

test/test_pager.rb

-    assert_equal("page-2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 2))
+    assert_equal("/index.html",  Pager.paginate_path(build_site, 1))
+    assert_equal("/page2",       Pager.paginate_path(build_site, 2))
+    assert_equal("/index.html",  Pager.paginate_path(build_site({'paginate_path' => '/blog/page-:num'}), 1))


This passes but I don't understand why.

Shouldn't we end up with /blog/index.html here?

No! There's no index.html file in the /blog folder so it'll fall back to the root index.html.

parkr · 2013-06-22T15:08:23Z

@mattr- – Any further comments? I think I'd like to hold off on the URL Helper for a different PR.

mattr- · 2013-06-23T12:52:01Z

I'm cool with that. 👍

On Sat, Jun 22, 2013 at 10:08 AM, Parker Moore notifications@github.com
wrote:

@mattr- – Any further comments? I think I'd like to hold off on the URL Helper for a different PR.

Reply to this email directly or view it on GitHub:
#1198 (comment)

Fix Pagination

wakproductions · 2013-12-23T14:39:52Z

This change seems to break the pagination plugin in Octopress. Using Octopress 2.5, its pagination plugin takes two arguments for pagination_enabled? When I do a $ jekyll build it gives me an error: Generating... /Users/wkotzan/Google Drive/Development/sites/winstonkotzancom/plugins/pagination.rb:72:in `pagination_enabled?': wrong number of arguments (1 for 2) (ArgumentError)

parkr · 2013-12-24T19:13:32Z

Yeah, 2.5 isn't ready for prime-time.

parkr added 8 commits Jun 8, 2013

Add feature to test new functionality.

ce3fa7f

Remove superfluous "After" block from step defintions.

a71b755

Fixed bugs with pagination in a subdirectory.

bd0e45c

WIP – fixing tests.

Loading status checks…

81a2d03

Fix tests for Pager.

Loading status checks…

6e80ba8

Add warning when pagination is enabled but no template page has been …

0521871

…found

Fix Pager.in_hierarchy to actually do the right thing

7dc6767

Fix tests to match new behaviour of Pager.paginate_path

Loading status checks…

7f10b32

mattr- reviewed Jun 10, 2013
View changes

parkr mentioned this pull request Jun 23, 2013

Specifying deeper routes with paginate_path fails. #1049

Closed

parkr added a commit that referenced this pull request Jun 23, 2013

Merge pull request #1198 from mojombo/fix-pagination

Loading status checks…

f9d1739

Fix Pagination

parkr merged commit f9d1739 into master Jun 23, 2013
1 check passed

1 check passed

default The Travis CI build passed
Details

parkr deleted the fix-pagination branch Jun 23, 2013

parkr added a commit that referenced this pull request Jun 23, 2013

Update history to reflect merge of #1198.

Loading status checks…

84113c3

This was referenced Jul 5, 2013

Pagination on index.html doesn't work #1264

Closed

Pagination upgrades #936

Closed

jekyll locked and limited conversation to collaborators Feb 27, 2017

jekyllbot added the frozen-due-to-age label Feb 27, 2017

jekyll / jekyll

Fix Pagination #1198

Fix Pagination #1198

parkr commented Jun 9, 2013

parkr commented Jun 9, 2013

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

parkr commented Jun 22, 2013

mattr- commented Jun 23, 2013

@mattr- – Any further comments? I think I'd like to hold off on the URL Helper for a different PR.

This comment has been minimized.

wakproductions commented on `lib/jekyll/generators/pagination.rb` in `bd0e45c` Dec 23, 2013

This comment has been minimized.

parkr replied Dec 24, 2013

jekyll / jekyll

Sponsor jekyll/jekyll

Fix Pagination #1198

Fix Pagination #1198

Conversation

parkr commented Jun 9, 2013

parkr commented Jun 9, 2013

This comment has been minimized.

mattr- Jun 10, 2013 Member

This comment has been minimized.

parkr Jun 10, 2013 Author Member

This comment has been minimized.

parkr Jun 10, 2013 Author Member

This comment has been minimized.

mattr- Jun 10, 2013 Member

This comment has been minimized.

parkr Jun 22, 2013 Author Member

This comment has been minimized.

parkr Jun 23, 2013 Author Member

This comment has been minimized.

mattr- Jun 25, 2013 Member

This comment has been minimized.

mattr- Jun 10, 2013 Member

This comment has been minimized.

mattr- Jun 10, 2013 Member

This comment has been minimized.

parkr Jun 10, 2013 Author Member

This comment has been minimized.

mattr- Jun 10, 2013 Member

This comment has been minimized.

parkr Jun 10, 2013 Author Member

parkr commented Jun 22, 2013

mattr- commented Jun 23, 2013

@mattr- – Any further comments? I think I'd like to hold off on the URL Helper for a different PR.

This comment has been minimized.

wakproductions commented on lib/jekyll/generators/pagination.rb in bd0e45c Dec 23, 2013

This comment has been minimized.

parkr replied Dec 24, 2013

mattr- Jun 10, 2013
Member

parkr Jun 10, 2013
Author Member

parkr Jun 10, 2013
Author Member

mattr- Jun 10, 2013
Member

parkr Jun 22, 2013
Author Member

parkr Jun 23, 2013
Author Member

mattr- Jun 25, 2013
Member

mattr- Jun 10, 2013
Member

mattr- Jun 10, 2013
Member

parkr Jun 10, 2013
Author Member

mattr- Jun 10, 2013
Member

parkr Jun 10, 2013
Author Member

wakproductions commented on `lib/jekyll/generators/pagination.rb` in `bd0e45c` Dec 23, 2013