middleman-paginate 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d9716b324b38651350e48cea10659bf384b198
-  data.tar.gz: 152b81f96508e9e3528a0667c18d62d6fe3e11e0
+  metadata.gz: a84f25e6ff6b38f219a0fd27053bd75aa094bca2
+  data.tar.gz: fe0775c19cbd7bae7df0f3ded11e0807d30c5544
 SHA512:
-  metadata.gz: d1f573e86cc015a549fa87015a91b0facbb9a0700f91bd4aab9a260082947d3e7bf3f9cc2e04b880f9e79072d7b2fa7caa98a53f64ff4790a1e9fc1fdb6f86cd
-  data.tar.gz: b1ea5c1f61f0418f822068e67f173fae91bd7acf6342e93f311bf0311a6bcb0938323f3a4de8a87d806153a101053e07b0cf5e03290612c1d99bf7b9fae1bdc2
+  metadata.gz: f32d457d783865981779024eb32fbde0c46a36e47dfa1d72caef9baaa8f058c3a3f5bec469b6277e0080aba09b80dad837e1e570c4042035ec713a12057fbd15
+  data.tar.gz: a45eb9b23387c961c144c8a6fd97e55131f395045d5c4d5eaae112e6c2f995540e0985ea9c75314287082ab62c8c45241ceaead2cae4da624cc9170854171425

data/lib/middleman/paginate/extension.rb

@@ -3,25 +3,9 @@ require 'middleman_dato/middleman_extension'
 
 module Middleman
   module Paginate
-    class Extension < ::Middleman::ConfigExtension
-      self.resource_list_manipulator_priority = 0
-
+    class Extension < ::Middleman::Extension
       expose_to_config paginate: :paginate
 
-      class CollectionDescriptor
-        attr_reader :descriptors
-
-        def initialize(descriptors)
-          @descriptors = descriptors
-        end
-
-        def execute_descriptor(app, sum)
-          descriptors.reduce(sum) do |sum, descriptor|
-            descriptor.execute_descriptor(app, sum)
-          end
-        end
-      end
-
       class Pager
         attr_reader :current_page, :total_pages, :per_page
 
@@ -42,31 +26,29 @@ module Middleman
         end
 
         def page_path(page = current_page)
-          "#{@base_path}#{page == 1 ? '' : @suffix.gsub(/:num/, page.to_s)}.html"
+          "#{@base_path}#{page == 1 ? '/index' : @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
-
-        descriptors = []
-
-        pages.each_with_index do |page_collection, i|
-          pager = Pager.new(base_path, suffix, i + 1, pages.size, per_page)
-
-          opts = {
-            locals: locals.merge(items: page_collection, pager: pager),
-            data: data
-          }
-
-          descriptors << Middleman::Sitemap::Extensions::ProxyDescriptor.new(
-            Middleman::Util.normalize_path(pager.page_path),
-            Middleman::Util.normalize_path(template),
-            opts
-          )
+        collection.tap do |collection|
+          pages = collection.each_slice(per_page).to_a
+
+          pages.each_with_index do |page_collection, i|
+            pager = Pager.new(base_path, suffix, i + 1, pages.size, per_page)
+
+            opts = {
+              locals: locals.merge(items: page_collection, pager: pager),
+              data: data
+            }
+
+            proxy(
+              Middleman::Util.normalize_path(pager.page_path),
+              Middleman::Util.normalize_path(template),
+              opts
+            )
+          end
         end
-
-        CollectionDescriptor.new(descriptors)
       end
     end
   end

data/lib/middleman/paginate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-paginate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler