genki-dm-pagination 0.1.2 → 0.1.2.1

data/Rakefile

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

data/lib/dm-pagination/pagination_builder.rb

@@ -5,6 +5,7 @@ module DmPagination
       @pagination = pagination
       @block = block
       @options = args.last.kind_of?(Hash) ? args.pop : {}
+      @options[:page] ||= :page
       @args = args.blank? ? [:prev, :pages, :next] : args
     end
 
@@ -22,7 +23,7 @@ module DmPagination
     def link_to_prev
       if @pagination.page > 1
         @context.link_to prev_label,
-          url(:page => @pagination.page - 1),
+          url(@options[:page] => @pagination.page - 1),
           :class => :prev, :rel => "prev"
       else
         span.call(prev_label, :prev)
@@ -32,7 +33,7 @@ module DmPagination
     def link_to_next
       if @pagination.page < @pagination.num_pages
         @context.link_to next_label,
-          url(:page => @pagination.page + 1),
+          url(@options[:page] => @pagination.page + 1),
           :class => :next, :rel => "next"
       else
         span.call(next_label, :next)
@@ -61,7 +62,7 @@ module DmPagination
       if @block
         @block.call(page, *args)
       else
-        @context.link_to(page, url(:page => page))
+        @context.link_to(page, url(@options[:page] => page))
       end
     end
 

data/spec/dm-pagination_spec.rb

@@ -79,6 +79,8 @@ describe "dm-pagination" do
       response.should have_selector("a.prev[rel=prev]")
       response.should have_selector("a.next[rel=next]")
       response.body.scan(/Prev|Next/).should == %w(Prev Next)
+      url = "/pagination_builder/simple?page=3"
+      response.should have_xpath("//a[@href='#{url}']")
     end
 
     it "should be able to control links" do
@@ -90,6 +92,8 @@ describe "dm-pagination" do
       response.should have_selector("span.prev")
       response.should have_selector("span.number")
       response.should_not have_selector("span.prev.number")
+      url = "/pagination_builder/variant?foo=2"
+      response.should have_xpath("//a[@href='#{url}']")
     end
   end
 end

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

@@ -1 +1 @@
-<%= paginate @posts, :pages, :next, :prev, :style => 'number' %>
+<%= paginate @posts, :pages, :next, :prev, :style => 'number', :page => :foo %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-dm-pagination
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.2.1
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-23 00:00:00 -08:00
+date: 2009-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency