krunaldo-dm-pagination 0.3.0.0 → 0.3.0.2

data/README

@@ -21,3 +21,10 @@ USAGE:
   </ul>
   <%= paginate @posts %>
 
+Paramaters:
+:order = same paramaters as the :order in a normal DM call
+  (http://datamapper.org/doku.php?id=docs:finders&s[]=order#order)
+
+:per_page = Number of items per page
+
+:page = What page number

data/lib/dm-pagination/pagination.rb

@@ -1,40 +1,30 @@
 module DmPagination
   class Pagination
+    attr_reader :page, :num_pages
+
     def initialize(collection, options)
+      @proxy_collection = collection
+      order = options[:order]
+
       @page = (options[:page] || 1).to_i
       @per_page = (options[:per_page] || 10).to_i
-      @reverse = true if options[:reverse]
-      @proxy_collection = collection
-      @offset = offset
       @num_pages = (@proxy_collection.count + @per_page - 1) / @per_page
-      @collection = collection.all(
-        :offset => @offset , :limit => @per_page)
-    end
+      @offset = (@page - 1)*@per_page
 
-    def page
-      @page
+      @collection = collection.all(:offset => @offset, :limit => @per_page)
+      @collection = @collection.all(:order => order) if order
     end
 
-    def offset
-      if @reverse
-        (@page - @numpages)*@per_page
-      else
-        (@page - 1)*@per_page
-      end
-    end
-
-
     def pages(window = 5, left = 2, right = 2)
-      return [] if @num_pages <= 1
-      (1..@num_pages).inject([]) do |result, i|
-        i <= left || (@num_pages - i) < right || (i-page).abs < window ?
+      return [] if num_pages <= 1
+      (1..num_pages).inject([]) do |result, i|
+        i <= left || (num_pages - i) < right || (i-page).abs < window ?
           result << i : (result.last.nil? ? result : result << nil)
       end
     end
 
     def count
-      offset = (@page - 1)*@per_page
-      [0, [@proxy_collection.count - offset, @per_page].min].max
+      [0, [@proxy_collection.count - @offset, @per_page].min].max
     end
 
     def respond_to?(*args, &block)

data/spec/dm-pagination_spec.rb

@@ -50,6 +50,10 @@ describe "dm-pagination" do
       Post.paginate(:page => 12).count.should == 0
       Post.paginate(:page => 5, :per_page => 6).count.should == 6
     end
+
+    it "should handle :order parametetr" do
+      Post.paginate(:page => 1, :order => [:id.desc]).first.id.should == 101
+    end
   end
 
   describe "pagination builder" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: krunaldo-dm-pagination
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.0
+  version: 0.3.0.2
 platform: ruby
 authors: 
 - Genki Takiuchi