middleman-paginate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84dab631363b257b6c8add9d272a9b66446f3972
-  data.tar.gz: 2954d12a57dfb91a52aa3c392fa387b34bfc7bbb
+  metadata.gz: e8d9716b324b38651350e48cea10659bf384b198
+  data.tar.gz: 152b81f96508e9e3528a0667c18d62d6fe3e11e0
 SHA512:
-  metadata.gz: 7f3386ade439d408e336d92887cf3e6be3f316d6d23e72f97d18912d99d367649153091fc1e49dd064381d02aca435a921252f2f92e7af2bc1cedb1a79b19c26
-  data.tar.gz: 0f9ce64e7005f872c58af15989257412c5bb3f429ad0cac59043ebe713b0de03ebb1b914095a644f6cd7e94516bf238f4c77aad9e151caa715c2741938f5644d
+  metadata.gz: d1f573e86cc015a549fa87015a91b0facbb9a0700f91bd4aab9a260082947d3e7bf3f9cc2e04b880f9e79072d7b2fa7caa98a53f64ff4790a1e9fc1fdb6f86cd
+  data.tar.gz: b1ea5c1f61f0418f822068e67f173fae91bd7acf6342e93f311bf0311a6bcb0938323f3a4de8a87d806153a101053e07b0cf5e03290612c1d99bf7b9fae1bdc2

data/lib/middleman/paginate/extension.rb

@@ -8,17 +8,6 @@ module Middleman
 
       expose_to_config paginate: :paginate
 
-      class Helper
-        attr_reader :page, :total_pages, :base_path, :suffix
-
-        def initialize(page, total_pages, base_path, suffix)
-          @page = page
-          @total_pages = total_pages
-          @base_path = base_path
-          @suffix = suffix
-        end
-      end
-
       class CollectionDescriptor
         attr_reader :descriptors
 
@@ -33,42 +22,45 @@ module Middleman
         end
       end
 
+      class Pager
+        attr_reader :current_page, :total_pages, :per_page
+
+        def initialize(base_path, suffix, current_page, total_pages, per_page)
+          @base_path = base_path
+          @suffix = suffix
+          @current_page = current_page
+          @total_pages = total_pages
+          @per_page = per_page
+        end
+
+        def next_page
+          current_page < total_pages && current_page + 1
+        end
+
+        def previous_page
+          current_page > 1 && current_page - 1
+        end
+
+        def page_path(page = current_page)
+          "#{@base_path}#{page == 1 ? '' : @suffix.gsub(/:num/, page.to_s)}.html"
+        end
+      end
+
       def paginate(collection, base_path, template, per_page: 20, suffix: "/page/:num", locals: {}, data: {})
         pages = collection.each_slice(per_page).to_a
-        num_pages = pages.size
 
         descriptors = []
 
-        path_builder = ->(page) {
-          "#{base_path}#{page == 1 ? '' : suffix.gsub(/:num/, page.to_s)}.html"
-        }
-
         pages.each_with_index do |page_collection, i|
-          page_num = i + 1
-          next_page_num = page_num < num_pages && page_num + 1
-          previous_page_num = page_num > 1 && page_num - 1
-
-          page_path = path_builder.call(page_num)
-          next_page_path = next_page_num && path_builder.call(next_page_num)
-          previous_page_path = previous_page_num && path_builder.call(previous_page_num)
-
-          meta = ::Middleman::Util.recursively_enhance(
-            page_number: page_num,
-            num_pages: num_pages,
-            per_page: per_page,
-            next_page_num: next_page_num,
-            next_page_path: next_page_path,
-            previous_page_num: previous_page_num,
-            previous_page_path: previous_page_path
-          )
+          pager = Pager.new(base_path, suffix, i + 1, pages.size, per_page)
 
           opts = {
-            locals: locals.merge(items: page_collection, pager: meta),
+            locals: locals.merge(items: page_collection, pager: pager),
             data: data
           }
 
           descriptors << Middleman::Sitemap::Extensions::ProxyDescriptor.new(
-            Middleman::Util.normalize_path(page_path),
+            Middleman::Util.normalize_path(pager.page_path),
             Middleman::Util.normalize_path(template),
             opts
           )

data/lib/middleman/paginate/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Paginate
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-paginate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,4 +113,3 @@ signing_key:
 specification_version: 4
 summary: A simple helper to generate custom paginated content with Middleman
 test_files: []
-has_rdoc: