roku_pages 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e853aef80f1db89df86894812a675ed62ad6b4
-  data.tar.gz: 8912c58ac9f849c57f108f35ce4bb0f75344daeb
+  metadata.gz: 6d213effc36f44a85e7b2c97ca98a7c02418e235
+  data.tar.gz: 9bc7819e44721545e083e56e71c7d044b4f306a0
 SHA512:
-  metadata.gz: 8cef1b0483e56ab0ef410421d7b86284ee990278e18c730c0a3a7b4c78890fc5a2f43e69ee9626a3cfcbe559d1e503f9d698d4dbc034442009236fa298d8243c
-  data.tar.gz: 7225ad696acb4cf4a2a562ad4029290f3b5808d05570eac4ac418cc394ffb28340a6f484a9e187c25d682f9e986e3494d547289f45ded606c090d33434d96bd8
+  metadata.gz: 1c81ff1be3ebbb7882df73b8284fc3868f92fbd17ae9314ba80038de71b13bbf98a9714fca553f39f1865b0ac7b70cf7d16c05370d862d056429631671699975
+  data.tar.gz: b1264e268189fa9a1a4875fce67e525d544b73add8ae40134c2c33c7345af50c148d5eadfd98cd4e31740cdcb88b9f7310f3553c4b58ca4df87c4044b6ea2cd1

data/README.rdoc

@@ -3,9 +3,13 @@ Dumb idea for adding pagination to header.
 Only page numbers and total, no other.
 
 = Install
-    gem 'roku_pages', '~> 0.0.4'
+    gem 'roku_pages', '0.0.7'
 
 = Usage
+use <tt>params[:page]</tt> and <tt>params[:per_page]</tt> 
+
+default <tt>page: 1</tt> and <tt>per_page: 25</tt> 
+
 just replace render
     paginate json: articles
 
@@ -13,5 +17,18 @@ result
     Pagination:{"first":1,"prev":1,"current":1,"next":2,"last":4}
     Total:4
 
+you can also override by this
+    paginate json: articles, page: 2, per_page: 2
+
+result
+    Pagination:{"first":1,"prev":1,"current":2,"next":2,"last":2}
+    Total:4
+    
+you can use +json+ or +xml+
+    paginate json: articles
+    or
+    paginate xml: articles
+but respond is request format
+    
 
 This project rocks and uses MIT-LICENSE.

data/lib/roku_pages.rb

@@ -1,8 +1,8 @@
 module RokuPages
   module Pagination
     def paginate(options)
-      page = options[:page] || params[:page] || 1
-      per_page = options[:per_page] || params[:per_page] || 25
+      page = options[:page] || params[:page] || paginate_page
+      per_page = options[:per_page] || params[:per_page] || paginate_per_page
       if %w(json xml).include?(request.format)
         respond_format = "#{request.format}".split('/').last.to_sym
       else
@@ -19,21 +19,41 @@ module RokuPages
         collection = collection.page(page).per(per_page)
         options.delete(:xml)
         options.delete(:json)
-        p "options: #{options}"
         options[respond_format] = collection
 
+        pages_key = paginate_hash
+
         pages = {}
-        pages[:first] = 1
-        pages[:prev] = collection.current_page - 1 > 1 ? collection.current_page - 1 : 1
-        pages[:current] = collection.current_page
-        pages[:next] = collection.current_page + 1 < collection.total_pages ? collection.current_page + 1 : collection.total_pages
-        pages[:last] = collection.total_pages
+        pages[pages_key[:first]] = 1
+        pages[pages_key[:prev]] = collection.current_page - 1 > 1 ? collection.current_page - 1 : 1
+        pages[pages_key[:current]] = collection.current_page
+        pages[pages_key[:next]] = collection.current_page + 1 < collection.total_pages ? collection.current_page + 1 : collection.total_pages
+        pages[pages_key[:last]] = collection.total_pages
+        pages[pages_key[:total]] = collection.total_count.to_s
         headers['Pagination'] = pages.to_json
-        headers['Total'] = collection.total_count.to_s
       end
 
       render options
     end
+
+    def paginate_page
+      1
+    end
+
+    def paginate_per_page
+      25
+    end
+
+    def paginate_hash
+      {
+          first: :first,
+          prev: :prev,
+          current: :current,
+          next: :next,
+          last: :last,
+          total: :total
+      }
+    end
   end
 end
 
@@ -43,4 +63,4 @@ module RokuPages
       ActionController::Base.send :include, RokuPages::Pagination
     end
   end
-end
+end

data/lib/roku_pages/version.rb

@@ -1,3 +1,3 @@
 module RokuPages
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_pages
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - rokugou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails