dm-pagination 0.2.1 → 0.3.1

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/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "dm-pagination"
-GEM_VERSION = "0.2.1"
+GEM_VERSION = "0.3.1"
 AUTHOR = "Genki Takiuchi"
 EMAIL = "genki@s21g.com"
 HOMEPAGE = "http://blog.s21g.com/genki"

data/lib/dm-pagination/paginatable.rb

@@ -1,9 +1,12 @@
-require 'dm-pagination/pagination'
+require 'dm-pagination/paginator'
 
 module DmPagination
   module Paginatable
     def paginate(options = {})
-      Pagination.new(all, options)
+      paginator_type = options.delete(:paginator) ||
+        Merb::Plugins.config[:dm_pagination][:paginator]
+      paginator = Paginator.const_get(paginator_type.to_s.camel_case)
+      paginator.new(all, options)
     end
   end
 end

data/lib/dm-pagination/pagination_builder.rb

@@ -79,6 +79,7 @@ module DmPagination
     end
 
     def url(params)
+      @context.params.delete(:action) if @context.params[:action] == 'index'
       @context.url(@context.params.merge(params))
     end
   end

data/lib/dm-pagination/paginator/solo.rb

@@ -0,0 +1,23 @@
+module DmPagination
+  module Paginator
+    class Solo < Base
+      def pages(window = 10, left = 5, right = 4)
+        num_of_pages = num_pages
+        return [] if num_of_pages <= 1
+        right_page = page + right
+        if right_page > num_of_pages
+          right_page = num_of_pages
+        elsif right_page < window
+          right_page = window
+        end
+        left_page = if num_of_pages - right_page < right
+          page - (window - (right_page - page + 1))
+        else
+          page - left
+        end
+        left_page = 1 if left_page <= 0
+        (left_page..right_page)
+      end  
+    end
+  end
+end

data/lib/dm-pagination/paginator/trio.rb

@@ -0,0 +1,12 @@
+module DmPagination
+  module Paginator
+    class Trio < Base
+      def pages(window = 5, left = 2, right = 2)
+        (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
+    end
+  end
+end

data/lib/dm-pagination/paginator.rb

@@ -0,0 +1,38 @@
+module DmPagination
+  module Paginator
+    class Base
+      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
+        @num_pages = (@proxy_collection.count + @per_page - 1) / @per_page
+        @offset = (@page - 1)*@per_page
+
+        @collection = collection.all(:offset => @offset, :limit => @per_page)
+        @collection = @collection.all(:order => order) if order
+      end
+
+      def count
+        [0, [@proxy_collection.count - @offset, @per_page].min].max
+      end
+
+      def respond_to?(*args, &block)
+        super || @collection.send(:respond_to?, *args, &block)
+      end
+
+      def method_missing(method, *args, &block)
+        @collection.send(method, *args, &block)
+      end
+    
+      def to_json
+        @collection.to_json
+      end
+    end
+  end
+end
+
+Dir[File.join(File.dirname(__FILE__), %w(paginator *))].each{|i| require(i)}

data/lib/dm-pagination.rb

@@ -5,7 +5,8 @@ if defined?(Merb::Plugins)
   Merb::Plugins.config[:dm_pagination] = {
     :prev_label => '« Prev',
     :next_label => 'Next »',
-    :truncate => '...'
+    :truncate => '...',
+    :paginator => :trio,
   }
   
   Merb::BootLoader.before_app_loads do

data/spec/dm-pagination_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/spec_helper'
-
 DataMapper.setup(:default, "sqlite3::memory:")
 
 Post.auto_migrate!
@@ -14,8 +13,8 @@ describe "dm-pagination" do
     end
 
     it "should return Pagination object" do
-      Post.paginate.should be_kind_of(DmPagination::Pagination)
-      Post.all.paginate.should be_kind_of(DmPagination::Pagination)
+      Post.paginate.should be_kind_of(DmPagination::Paginator::Base)
+      Post.all.paginate.should be_kind_of(DmPagination::Paginator::Base)
     end
 
     it "should respond to model's method" do
@@ -50,6 +49,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
@@ -95,5 +98,89 @@ describe "dm-pagination" do
       url = "/pagination_builder/variant?foo=2"
       response.should have_xpath("//a[@href='#{url}']")
     end
+
+    describe "solo paginator" do
+      before :all do
+        Merb::Plugins.config[:dm_pagination][:paginator] = :solo
+      end
+
+      after :all do
+        Merb::Plugins.config[:dm_pagination][:paginator] = :trio
+      end
+
+      it "should have rendered with pagination(1, 3, 4, 5, 6, 7, 8, 9, 10) at page 2" do
+        response = request "/pagination_builder/simple", :params => {:page => 2}
+        (1..10).reject{|p| p == 2}.each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should have_xpath("//a[@href='#{url}']")
+        end
+        [2, 11].each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should_not have_xpath("//a[@href='#{url}']")
+        end
+      end
+
+      it "should have rendered with pagination(1, 2, 3, 4, 6, 7, 8, 9, 10) at page 5" do
+        response = request "/pagination_builder/simple", :params => {:page => 5}
+        (1..10).reject{|p| p == 5}.each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should have_xpath("//a[@href='#{url}']")
+        end
+        [5, 11].each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should_not have_xpath("//a[@href='#{url}']")
+        end
+      end
+
+      it "should have rendered with pagination(2, 3, 4, 5, 6, 8, 9, 10, 11) at page 7" do
+        response = request "/pagination_builder/simple", :params => {:page => 7}
+        (2..11).reject{|p| p == 7}.each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should have_xpath("//a[@href='#{url}']")
+        end
+        [1, 7].each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should_not have_xpath("//a[@href='#{url}']")
+        end
+      end
+
+      it "should have rendered with pagination(2, 3, 4, 5, 6, 7, 8, 9, 11) at page 10" do
+        response = request "/pagination_builder/simple", :params => {:page => 10}
+        (2..11).reject{|p| p == 10}.each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should have_xpath("//a[@href='#{url}']")
+        end
+        [1, 10].each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should_not have_xpath("//a[@href='#{url}']")
+        end
+      end
+
+      it "should have rendered with pagination(2, 3, 4, 5, 6, 7, 8, 9, 10) at page 11" do
+        response = request "/pagination_builder/simple", :params => {:page => 11}
+        (2..10).each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should have_xpath("//a[@href='#{url}']")
+        end
+        [1, 11].each do |page|
+          url = "/pagination_builder/simple?page=#{page}"
+          response.should_not have_xpath("//a[@href='#{url}']")
+        end
+      end
+    end
+
+    it "should have rendered with pagination 'pagination_builder?page=2'" do
+      response = request "/pagination_builder"
+      url = "/pagination_builder?page=2"
+      response.should have_xpath("//a[@href='#{url}']")
+    end
+  end
+
+  describe "#to_json" do
+    it "returns the json of the collection" do
+      pagination = Post.paginate(:page => 1)
+
+      pagination.to_json.should == pagination.instance_variable_get(:@collection).to_json
+    end
   end
 end

data/spec/fixture/app/controllers/pagination_builder.rb

@@ -8,4 +8,9 @@ class PaginationBuilder < Merb::Controller
     @posts = Post.paginate(params)
     render
   end
+
+  def index
+    @posts = Post.paginate(params)
+    render
+  end
 end

data/spec/fixture/app/views/pagination_builder/index.html.erb

@@ -0,0 +1,7 @@
+<ul>
+  <% @posts.each do |post| %>
+    <li><%= post.index %></li>
+  <% end %>
+</ul>
+
+<%= paginate @posts %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-pagination
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 +09:00
+date: 2009-03-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,8 +40,11 @@ files:
 - lib/dm-pagination
 - lib/dm-pagination/merbtasks.rb
 - lib/dm-pagination/paginatable.rb
-- lib/dm-pagination/pagination.rb
 - lib/dm-pagination/pagination_builder.rb
+- lib/dm-pagination/paginator
+- lib/dm-pagination/paginator/solo.rb
+- lib/dm-pagination/paginator/trio.rb
+- lib/dm-pagination/paginator.rb
 - lib/dm-pagination.rb
 - spec/dm-pagination_spec.rb
 - spec/fixture
@@ -54,6 +57,7 @@ files:
 - spec/fixture/app/views/layout
 - spec/fixture/app/views/layout/application.html.erb
 - spec/fixture/app/views/pagination_builder
+- spec/fixture/app/views/pagination_builder/index.html.erb
 - spec/fixture/app/views/pagination_builder/simple.html.erb
 - spec/fixture/app/views/pagination_builder/variant.html.erb
 - spec/fixture/config

data/lib/dm-pagination/pagination.rb

@@ -1,41 +0,0 @@
-module DmPagination
-  class Pagination
-    def initialize(collection, options)
-      @page = (options[:page] || 1).to_i
-      @per_page = (options[:per_page] || 10).to_i
-      @proxy_collection = collection
-      @collection = collection.all(
-        :offset => (@page - 1)*@per_page, :limit => @per_page)
-      @num_pages = num_pages
-    end
-
-    def page
-      @page
-    end
-
-    def num_pages
-      (@proxy_collection.count + @per_page - 1) / @per_page
-    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 ?
-          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
-    end
-
-    def respond_to?(*args, &block)
-      super || @collection.send(:respond_to?, *args, &block)
-    end
-
-    def method_missing(method, *args, &block)
-      @collection.send(method, *args, &block)
-    end
-  end
-end