octopress-paginate 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdb9b591fdc9f11af9fc2cb3a20baef96d83db36
-  data.tar.gz: dad38d9bfc07d065a2ebe20dc1aff8bffb46e256
+  metadata.gz: 0e51b533c9a6bd3891a2ebb123e591dbe2cd9b4d
+  data.tar.gz: 824b2087235013b04bea4392847660c9486e5696
 SHA512:
-  metadata.gz: ee890b2580f06e6e9d370d7414e350ebfe6290040989f6addf786e6837abb37a00f3dd64e07b09e62331756b781b9bf07497ceba4ab65ddaed60f0c7ea063c1d
-  data.tar.gz: 95b88ea34100c6dfac058b34a4e9520c55223028e47073c5191345eaa8f97c12b6e72aa12fcc124fcb03f20db9a6fdc129f4851ebbb49dc98e0424726fcae208
+  metadata.gz: d374f7bd5aaf4570dd6137ef8c3f53b335b689aa533668a03352c55aba1d46480af3ab4faa8c9a86a1709b3d0c2c790e22d46857bf432ff456f8dbcc13f58004
+  data.tar.gz: 072069d8e94b0d55c029a0ba6a41b6fdfdf95750a942ede3f379c7683d2ade00bf3f078d847484a5bc124fa866e1af9a1bb6a8a62c6f33eb4bc9e13c3be5d9f9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.1.1 (2015-02-27)
+
+- Fix: Typo caused paginated collections to fail.
+
 ### 1.1.0 (2015-02-11)
 
 - New: Configure site-wide defaults in _config.yml 

data/README.md

@@ -8,6 +8,10 @@ Simple and flexible pagination for Jekyll sites featuring:
 - Filter by categories or tags
 - Multi-language support (with [octopress-multilingual](https://github.com/octopress/multilingual))
 
+[![Build Status](http://img.shields.io/travis/octopress/paginate.svg)](https://travis-ci.org/octopress/paginate)
+[![Gem Version](http://img.shields.io/gem/v/octopress-paginate.svg)](https://rubygems.org/gems/octopress-paginate)
+[![License](http://img.shields.io/:license-mit-blue.svg)](http://octopress.mit-license.org)
+
 ## Installation
 
 If you're using bundler add this gem to your site's Gemfile in the `:jekyll_plugins` group:
@@ -31,9 +35,7 @@ Then add the gem to your Jekyll configuration.
 
 ## Usage
 
-### To paginate posts
-
-Create a page to be used as the pagination template.
+To paginate posts, create a page to be used as the pagination template.
 
 ```
 ---
@@ -46,10 +48,7 @@ paginate: true
 {% endfor %}
 ```
 
-### To paginate collections
-
-This is basically the same as paginating posts, except you have to configure the paginate collection and set up the paginator to
-use the collection name.
+Paginating collection is almost the same as posts except you need to set the collection to paginate.
 
 ```
 ---
@@ -63,24 +62,43 @@ paginate:
 {% endfor %}
 ```
 
+### Multilingual pagination
+
+If you are running a multilingual site with [octopress-multilingual](https://github.com/octopress/multilingual), simply set a language for your pagination template and posts will be filtered by that language. For example:
+
+```
+---
+Title: "Deutsch Posts"
+permalink: /de/posts/ # <- Or wherever makes sense on your site
+paginate: true
+lang: de  # <- Add a language
+---
+
+{% for posts in paginator.posts %}
+/ do stuff /
+{% endfor %}
+```
+
+That's all there is to it.
+
 ### Template variables
 
 Just like Jekyll's paginator, your pagination pages will have access to the following liquid variables.
 
 
 ```yaml
-{{ paginator.total_pages }}          # Number of paginated pages
-{{ paginator.total_posts }}          # Total number of posts being paginated
-{{ paginator.per_page }}             # Posts per page
-{{ paginator.limit }}                # Maximum number of paginated pages
-{{ paginator.page }}                 # Current page number
-{{ paginator.previous_page }}        # Previous page number (nil if first page)
-{{ paginator.previous_page_path }}   # Url for previous page (nil if first page)
-{{ paginator.next_page }}            # Next page number (nil if last page)
-{{ paginator.next_page_path }}       # Next page URL (nil if last page)
+paginator.total_pages          # Number of paginated pages
+paginator.total_posts          # Total number of posts being paginated
+paginator.per_page             # Posts per page
+paginator.limit                # Maximum number of paginated pages
+paginator.page                 # Current page number
+paginator.previous_page        # Previous page number (nil if first page)
+paginator.previous_page_path   # Url for previous page (nil if first page)
+paginator.next_page            # Next page number (nil if last page)
+paginator.next_page_path       # Next page URL (nil if last page)
 
 # If you're pagination through a collection named `penguins`
-{{ pagination.total_penguins }}      # Total number of peguins being paginated
+pagination.total_penguins      # Total number of peguins being paginated
 ```
 
 ## Configuration

data/lib/octopress-paginate.rb

@@ -1,7 +1,6 @@
 require "octopress-hooks"
 require "octopress-paginate/version"
 require "octopress-paginate/hooks"
-require "octopress-paginate/page"
 
 module Octopress
   module Paginate
@@ -18,6 +17,11 @@ module Octopress
 
     LOOP = /(paginate.+\s+in)\s+(site\.(.+?))(.+)%}/
 
+    # Simple Page class override
+    class PaginationPage < Jekyll::Page
+      attr_accessor :dir, :name
+    end
+
     def paginate(page)
 
       defaults = DEFAULT.merge(page.site.config['pagination'] || {})
@@ -52,7 +56,22 @@ module Octopress
       new_pages = []
 
       pages.times do |i|
-        new_pages << PaginationPage.new(page.site, page.site.source, i+2, page)
+        index = i+2
+        new_page = PaginationPage.new(page.site, page.site.source, File.dirname(page.path), File.basename(page.path))
+        new_page.process('index.html')
+        new_page.data.delete('permalink')
+
+        new_page.data.merge!({'paginate' => page.data['paginate'].clone})
+        new_page.data['paginate']['page_num'] = index
+
+        title = page.data['title'].clone || page.data['paginate']['collection'].capitalize
+        title << page.data['paginate']['title_suffix'].sub(/:num/, index.to_s)
+        new_page.data['title'] = title
+
+        subdir = page.data['paginate']['permalink'].clone.sub(':num', index.to_s)
+        new_page.dir = File.join(page.dir, subdir)
+
+        new_pages << new_page
       end
 
       all_pages = [page].concat(new_pages)

data/lib/octopress-paginate/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Paginate
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-paginate
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks
@@ -120,7 +120,6 @@ files:
 - README.md
 - lib/octopress-paginate.rb
 - lib/octopress-paginate/hooks.rb
-- lib/octopress-paginate/page.rb
 - lib/octopress-paginate/version.rb
 homepage: https://github.com/octopress/paginate
 licenses:

data/lib/octopress-paginate/page.rb

@@ -1,21 +0,0 @@
-module Octopress
-  module Paginate
-    class PaginationPage < Jekyll::Page
-      def initialize(site, base, index, template)
-        @site = site
-        @base = base
-        @dir  = File.join(template.dir, template.data['paginate']['permalink'].clone.sub(':num', index.to_s))
-        @name = 'index.html'
-        process(name)
-        read_yaml(File.join(base, File.dirname(template.path)), File.basename(template.path))
-
-        self.data.delete('permalink')
-        self.data.merge!({ 'paginate' => template.data['paginate'].clone })
-        self.data['paginate']['page_num'] = index
-
-        self.data['title'] ||= self.data['paginate']['collection'].capitlaize
-        self.data['title'] << data['paginate']['title_suffix'].sub(/:num/, data['paginate']['page_num'].to_s)
-      end
-    end
-  end
-end