From 5bbdf2239dfe43bfac637118d2bf8edbc51e2e9d Mon Sep 17 00:00:00 2001 From: Urban Hafner Date: Tue, 2 Jun 2009 11:11:04 +0300 Subject: [PATCH] Feature for the pagination templating --- features/pagination.feature | 17 +++++++++++++++++ lib/jekyll/site.rb | 2 -- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/features/pagination.feature b/features/pagination.feature index 778c4e44..b52ddcf2 100644 --- a/features/pagination.feature +++ b/features/pagination.feature @@ -21,3 +21,20 @@ Feature: Site pagination | num | | 1 | | 2 | + + Scenario: Correct liquid paginator replacements + Given I have a configuration file with "paginate" set to "1" + And I have a _layouts directory + And I have an "index.html" file that contains "{{ paginator.page }}" + And I have a _posts directory + And I have the following post: + | title | date | layout | content | + | Wargames | 3/27/2009 | default | The only winning move is not to play. | + | Wargames2 | 4/27/2009 | default | The only winning move is not to play2. | + When I run jekyll + Then the _site/index.html file should exist + And I should see "1" in "_site/index.html" + Then the _site/page2 directory should exist + And the _site/page2/index.html file should exist + And I should see "2" in "_site/page2/index.html" + \ No newline at end of file diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index feef7933..a578dd1f 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -250,11 +250,9 @@ module Jekyll # "next_page" => }} def paginate_posts(file, dir) all_posts = self.posts.sort { |a,b| b <=> a } - pages = Pager.calculate_pages(all_posts, self.config['paginate'].to_i) pages += 1 (1..pages).each do |num_page| - pager = Pager.new(self.config, num_page, all_posts, pages) page = Page.new(self, self.source, dir, file) page.render(self.layouts, site_payload.merge({'paginator' => pager.to_hash}))