middleman-pagination 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a29ba1726972cb939f315b1f5ac1ded71d23cc1f
-  data.tar.gz: 3660c0071d5073fc8df417b639a5a43c844041b3
+  metadata.gz: 6585d00919a91cfbdddc63b60109f4472f7eb005
+  data.tar.gz: 616eda1fe14317f7cbaf8b4f26304c5be10aab78
 SHA512:
-  metadata.gz: a9e6048da2b6ae427d11fa33b968216ffefab71aef562cdc0f8b22694410332c3eddacc4c0ca1974c4c5a2f57fd168f8dbc8ea88e7cc69e5b599f63dcf1a42c4
-  data.tar.gz: 3f1fd46306b3476eb8d6e43e2436f68fc451d6a6133d79b4666645d3008090a37f8d7e45ca793a36c2133bb0396e7252a0f9ee78ba18eaf364e31d51e395c870
+  metadata.gz: 2700db7a4c0f1d3b264dbdd0ba59f5444962dfbb2fa363ec7e562576113231ad17e9fa261a8e506d4030e4fab59413a22c95f517f1a46330f5b1c8d5caf5a4e0
+  data.tar.gz: 79ac07a2e77556d20586a315e9b36fc8af03fd7f4a65c3c188c254a80550ccc173370448f95e464fa2a7b6e2d0d92797c99e4f1ffc38e9b05e35349a765e6a5b

data/README.md

@@ -113,6 +113,7 @@ Bug? Feature request? You can [open an issue](https://github.com/Aupajo/middlema
 ## TODO
 
 * Custom sorting (e.g. by date)
+* Add tests for metadata support
 * Convenience helper methods (e.g. make `pagination.` optional)
 * Pagination link generator (e.g. `Pages: 1 2 [3] ... 7 8 9`)
 * Adopt Middleman's Queryable interface

data/lib/middleman/pagination/manipulated_resources.rb

@@ -14,6 +14,14 @@ module Middleman
 
       private
 
+      def pagination_data(resource, key)
+        keys = [:pagination, key]
+
+        [resource.data, resource.metadata[:options]].inject(nil) do |result, data_source|
+          result or keys.inject(data_source) { |source, key| source.try(:[], key) }
+        end
+      end
+
       def new_resources
         context.configuration.map do |name, filter|
           new_resources_for_pageable(name, filter)
@@ -22,17 +30,17 @@ module Middleman
 
       def new_resources_for_pageable(name, filter)
         original_resources.map do |resource|
-          if !resource.ignored? && resource.data.pagination.try(:for) == name.to_s
+          if !resource.ignored? && pagination_data(resource, :for) == name.to_s
             new_resources_for_index(resource, filter)
           end
         end.compact
       end
-      
+
       def new_resources_for_index(first_index, filter)
-        symbolic_replacement_path = first_index.data.pagination.try(:path)
+        symbolic_replacement_path = pagination_data(first_index, :path)
 
         pageable_context = PageableContext.new(
-          per_page: first_index.data.pagination.per_page || 20,
+          per_page: pagination_data(first_index, :per_page) || 20,
           # OPTIMIZE
           resources: original_resources.reject(&:ignored?).select(&filter).sort_by(&:path),
           index_resources: [first_index]
@@ -60,7 +68,7 @@ module Middleman
 
       def add_pagination_to(resource, attributes = {})
         in_page_context = InPageContext.new(attributes)
-        resource.add_metadata(:locals => { 'pagination' => in_page_context })
+        resource.add_metadata(locals: { 'pagination' => in_page_context })
       end
     end
   end

data/lib/middleman/pagination/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Pagination
-    VERSION = "1.0.5"
+    VERSION = "1.0.7"
   end
 end

data/spec/middleman/pagination/manipulated_resources_spec.rb

@@ -28,16 +28,17 @@ module Middleman::Pagination
         }
 
         let(:pagination_index) {
-          pagination_data = double(for: 'recipes', per_page: 2, path: nil)
-          resource = double(:resource, path: 'index.html', is_recipe?: false, ignored?: false).as_null_object
-          resource.stub_chain(:data, pagination: pagination_data)
+          pagination_data = { for: 'recipes', per_page: 2, path: nil }
+          resource_data = { pagination: pagination_data }
+          resource = double(:resource, path: 'index.html', is_recipe?: false, ignored?: false, metadata: {}).as_null_object
+          resource.stub(data: resource_data)
           resource
         }
 
         let(:resource_list) {
           [pagination_index] +
           7.times.map do |n|
-            double(:resource, path: "recipe-#{n}.html", is_recipe?: true, ignored?: false).as_null_object
+            double(:resource, path: "recipe-#{n}.html", is_recipe?: true, ignored?: false, metadata: {}, data: {}).as_null_object
           end
         }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-pagination
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core