octopress-paginate 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e51b533c9a6bd3891a2ebb123e591dbe2cd9b4d
-  data.tar.gz: 824b2087235013b04bea4392847660c9486e5696
+  metadata.gz: beb5d4ee3e941d744aee3f99b22c7723a20685c4
+  data.tar.gz: b87404e4acae09cc52761909ae5076a4d3132695
 SHA512:
-  metadata.gz: d374f7bd5aaf4570dd6137ef8c3f53b335b689aa533668a03352c55aba1d46480af3ab4faa8c9a86a1709b3d0c2c790e22d46857bf432ff456f8dbcc13f58004
-  data.tar.gz: 072069d8e94b0d55c029a0ba6a41b6fdfdf95750a942ede3f379c7683d2ade00bf3f078d847484a5bc124fa866e1af9a1bb6a8a62c6f33eb4bc9e13c3be5d9f9
+  metadata.gz: ada480c93b4a62c44eae073690f13d8d35aa057f4febf88436882430e2136e572bcf9843943359d4e0bb55c29ee6c5d879c81f12c81efae62ca5e3ad99f40115
+  data.tar.gz: 16e17a538b19aaaba378524f8cdfa99605260a7d7ab4bbc759cc604a7bf2ec5fb1a28ac7eaeff4df314e746bc6365841b879e4a13d5ac687c6195325da9ad823

data/lib/octopress-paginate.rb

@@ -20,6 +20,12 @@ module Octopress
     # Simple Page class override
     class PaginationPage < Jekyll::Page
       attr_accessor :dir, :name
+
+      def relative_asset_path
+        site_source = Pathname.new Octopress.site.source
+        page_source = Pathname.new @base
+        page_source.relative_path_from(site_source).to_s
+      end
     end
 
     def paginate(page)
@@ -57,19 +63,17 @@ module Octopress
 
       pages.times do |i|
         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)
+        # If page is generated by an Octopress Ink plugin, use the built in 
+        # methods for cloning the page
+        #
+        if page.respond_to?(:asset) && page.asset.to_s.match('Octopress::Ink')
+          new_page = page.asset.new_page(page_data(page, index))
+        else
+          new_page = PaginationPage.new(page.site, page.site.source, File.dirname(page.path), File.basename(page.path))
+          new_page.data.merge!(page_data(page, index))
+          new_page.process('index.html')
+        end
 
         new_pages << new_page
       end
@@ -93,10 +97,41 @@ module Octopress
       page.site.pages.concat new_pages
     end
 
+    def page_data(page, index)
+      {
+        'paginate'  => paginate_data(page, index),
+        'permalink' => page_permalink(page, index),
+        'title'     => page_title(page, index),
+      }
+    end
+
+    def page_permalink(page, index)
+      subdir = page.data['paginate']['permalink'].clone.sub(':num', index.to_s)
+      File.join(page.dir, subdir)
+    end
+
+    def paginate_data(page, index)
+      paginate_data = page.data['paginate'].clone
+      paginate_data['page_num'] = index
+      paginate_data
+    end
+
+    def page_title(page, index)
+      title = if page.data['title']
+        page.data['title']
+      else 
+        page.data['paginate']['collection'].capitalize
+      end
+
+      title += page.data['paginate']['title_suffix'].sub(/:num/, index.to_s)
+
+      title
+    end
+
     def collection(page)
       collection = if page['paginate']['collection'] == 'posts'
         if defined?(Octopress::Multilingual) && page.lang
-          page.site.posts_by_language[page.lang]
+          page.site.posts_by_language(page.lang)
         else
           page.site.posts.reverse
         end

data/lib/octopress-paginate/hooks.rb

@@ -1,6 +1,8 @@
 module Octopress
   module Paginate
     class SiteHook < Hooks::Site
+      priority :low
+
       def post_read(site)
         site.pages.select {|p| p.data['paginate'] }.each do |page|
           Octopress::Paginate.paginate(page)

data/lib/octopress-paginate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-paginate
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks