dimples 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b634c387f28dce364954a393bdd1c515942c53f8
-  data.tar.gz: 0b04146454413293bcdc39962f9057a7bff40660
+  metadata.gz: 3be3dfc36f4a8285d77823deff68e9585cb71baf
+  data.tar.gz: cb592149ddd792be5f46f1bf647cbcf8084c5cb9
 SHA512:
-  metadata.gz: c2d8140add07d0aa4bfcffbdc5267c622d8d4cc34ba050c4b6ed2c3a2e509e90964613a976431840b49734a85417886a363bc4606e499e93a4a9e4cb4d9417a4
-  data.tar.gz: 8df6e21eb9b1b569ae2c82dd955d3c94a036aa3bc5c368dbfc0f9e116a024f2fa7bc7a2a54bb7b99f1a0f8d90fb8f75c4106af35eea4cbff74cfcab249596e56
+  metadata.gz: 93ec231ac30080beeef7d13876fb573b361c8131e5378775e8472905c2bbc5ad56561eda9f4ec8d18ac66a6060033d3ffa8ea048bec84171eccbc87171bc797a
+  data.tar.gz: eb90279afa05032d464ff0e7a38ab400e1ee82befa8341a85f20f229f54755a7322c883c514b87b7c7778dad5658943dd15262dd42d3916e15b57bfc1e4f717a

data/lib/dimples/site.rb

@@ -205,31 +205,32 @@ module Dimples
       page_count = (posts.length.to_f / per_page.to_i).ceil
 
       for index in 1..page_count
-        range = posts.slice((index - 1) * per_page, per_page)
-
         page = @page_class.new(self)
 
         page.layout = layout
         page.title = title || @templates[layout].title
 
-        page_paths = paths.clone
-
         pagination = {
           page: index,
           pages: page_count,
           post_count: posts.length,
-          path: pagination_url(index, page_paths)
+          path: pagination_url(index, paths)
         }
 
-        page_paths << "page#{index}" if index != 1
-
         pagination[:previous_page] = pagination[:page] - 1 if (pagination[:page] - 1) > 0
         pagination[:next_page] = pagination[:page] + 1 if (pagination[:page] + 1) <= pagination[:pages]
 
-        path = File.join(page_paths)
+        if pagination[:previous_page]
+          pagination[:previous_page_url] = pagination[:path]
+          pagination[:previous_page_url] += "page" + pagination[:previous_page].to_s if pagination[:previous_page] != 1
+        end
+
+        pagination[:next_page_url] = pagination[:path] + "page" + pagination[:next_page].to_s if pagination[:next_page]
+
+        output_path = File.join(paths, index != 1 ? "page#{index}" : '')
 
         begin
-          page.write(path, {posts: range, pagination: pagination})
+          page.write(output_path, {posts: posts.slice((index - 1) * per_page, per_page), pagination: pagination})
         rescue => e
           raise "Failed to generate paginated page #{path} (#{e})"
         end

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt