@@ -33,7 +33,7 @@ method. To display the pagination, use the paginate helper. # general usage - # path = String + # path = String/Proc # options = Hash <%= paginate @users, path, options %> <%= paginate @users, options={} %> @@ -48,6 +48,7 @@ To display the pagination, use the paginate helper. <%= paginate @users, users_path, :show_page => true %> <%= paginate @users, users_path, :show_disabled => false %> <%= paginate @users, :url => users_path %> + <%= paginate @users, :url => proc {|page| users_path(page) }%> You can set properties globally. README.markdown @@ -1,12 +1,12 @@ class Paginate @@settings = { - :next_label => 'Next page', - :previous_label => 'Previous page', + :next_label => "Next page", + :previous_label => "Previous page", :param_name => :page, :show_disabled => true, :show_page => true, :limit => 10, - :format => 'Page %d' + :format => "Page %d" } def self.settings=(options) @@ -106,15 +106,19 @@ module ApplicationHelper options[:page] ||= params[options[:param_name]] url = options.delete(:url) - url ||= request.request_uri - re = Regexp.new("([&?])#{Regexp.escape(options[:param_name].to_s)}=[0-9]+") - url.gsub!(re, "\\1") - url.gsub!(/\?$/, "") - url.gsub!(/\?&/, "?") - url = URI.parse(url).to_s + unless url.kind_of?(Proc) + url ||= request.request_uri + + re = Regexp.new("([&?])#{Regexp.escape(options[:param_name].to_s)}=[0-9]+") + url.gsub!(re, "\\1") + url.gsub!(/\?$/, "") + url.gsub!(/\?&/, "?") + url = URI.parse(url).to_s + + connector = (url =~ /\?/) ? "&amp;" : "?" + end - connector = (url =~ /\?/) ? '&amp;' : '?' current_page = Paginate.page(options) returning "" do |contents| @@ -123,20 +127,30 @@ module ApplicationHelper page = "" if current_page > 1 - previous_url = url - previous_url += connector + (current_page - 1).to_s.to_query(options[:param_name]) if current_page > 2 - link = content_tag(:a, options[:previous_label], :class => 'previous', :href => previous_url) - previous_item << content_tag(:li, link, :class => 'previous') + if url.kind_of?(Proc) + previous_url = url.call(current_page - 1) + else + previous_url = url + previous_url += connector + (current_page - 1).to_s.to_query(options[:param_name]) if current_page > 2 + end + + link = content_tag(:a, options[:previous_label], :class => "previous", :href => previous_url) + previous_item << content_tag(:li, link, :class => "previous") elsif options[:show_disabled] - previous_item << content_tag(:li, content_tag(:span, options[:previous_label]), :class => 'previous disabled') + previous_item << content_tag(:li, content_tag(:span, options[:previous_label]), :class => "previous disabled") end if collection.length > Paginate.limit(options) - next_url = url + connector + (current_page + 1).to_s.to_query(options[:param_name]) - link = content_tag(:a, options[:next_label], :class => 'next', :href => next_url) - next_item << content_tag(:li, link, :class => 'next') + if url.kind_of?(Proc) + next_url = url.call(current_page + 1) + else + next_url = url + connector + (current_page + 1).to_s.to_query(options[:param_name]) + end + + link = content_tag(:a, options[:next_label], :class => "next", :href => next_url) + next_item << content_tag(:li, link, :class => "next") elsif options[:show_disabled] - next_item << content_tag(:li, content_tag(:span, options[:next_label]), :class => 'next disabled') + next_item << content_tag(:li, content_tag(:span, options[:next_label]), :class => "next disabled") end if options[:show_page] @@ -144,7 +158,7 @@ module ApplicationHelper end if options[:disabled] || !previous_item.blank? || !next_item.blank? - contents << content_tag(:ul, previous_item + page + next_item, :class => 'paginate') + contents << content_tag(:ul, previous_item + page + next_item, :class => "paginate") end end end lib/has_paginate.rb @@ -80,6 +80,12 @@ describe "has_paginate" do @helper.paginate(@things, :param_name => :p).should have_tag("a.next[href=/requested/path?p=2]", "Next page") end + it "should call proc as url parameter" do + @html = @helper.paginate(@things, :page => 2, :url => proc {|page| "/some/path/#{page}" }) + @html.should have_tag("a.next[href=/some/path/3]", "Next page") + @html.should have_tag("a.previous[href=/some/path/1]", "Previous page") + end + it "should have current page number" do @helper.paginate(@things, '/some/path').should have_tag("ul.paginate") do |ul| ul.should have_tag("li.page.page-1") do |li| spec/has_paginate_spec.rb 7ccd65f1efcd3b0bcef43d7e08d8ae02695d035a Nando Vieira fnando.vieira@gmail.com http://github.com/fnando/has_paginate/commit/9e12ae51387e98a5e2810fa84d1f0a4ef564b10c 9e12ae51387e98a5e2810fa84d1f0a4ef564b10c 2009-04-27T18:33:13-07:00 2009-04-27T18:33:13-07:00 The paginate helper can accept a proc as URL generator; check it out the README. cd5c6d400bd44e7894359fd66aefdb715be632a2 Nando Vieira fnando.vieira@gmail.com