@@ -32,7 +32,8 @@ module WillPaginate
:params => nil,
:renderer => 'WillPaginate::LinkRenderer',
:page_links => true,
- :container => true
+ :container => true,
+ :semantic => false
}
mattr_reader :pagination_options
@@ -56,6 +57,7 @@ module WillPaginate
# * <tt>:id</tt> -- HTML ID for the container (default: nil). Pass +true+ to have the ID
# automatically generated from the class name of objects in collection: for example, paginating
# ArticleComment models would yield an ID of "article_comments_pagination".
+ # * <tt>:semantic</tt> -- pagination links rendered with UL/LI tags
#
# Advanced options:
# * <tt>:param_name</tt> -- parameter name for page number in URLs (default: <tt>:page</tt>)
@@ -103,6 +105,13 @@ module WillPaginate
options[:previous_label] = options.delete(:prev_label)
end
+ # semantic link rendering
+ if options[:semantic]
+ options[:renderer] = "WillPaginate::SemanticLinkRenderer"
+ options[:separator] = nil
+ options[:container] = true
+ end
+
# get the renderer instance
renderer = case options[:renderer]
when String
@@ -234,7 +243,8 @@ module WillPaginate
links.push page_link_or_span(@collection.next_page, 'disabled next_page', @options[:next_label])
html = links.join(@options[:separator])
- @options[:container] ? @template.content_tag(:div, html, html_attributes) : html
+ container_tag = @options[:semantic] ? :ul : :div
+ @options[:container] ? @template.content_tag(container_tag, html, html_attributes) : html
end
# Returns the subset of +options+ this instance was initialized with that
@@ -401,4 +411,21 @@ module WillPaginate
end
end
end
+
+ class SemanticLinkRenderer < LinkRenderer
+
+ def initialize
+ @gap_marker = '<li class="gap">…</li>'
+ end
+
+ protected
+ def page_link(page, text, attributes = {})
+ li_attributes = attributes.has_key?(:class) ? {:class => attributes[:class] } : {}
+ @template.content_tag(:li, @template.link_to(text, url_for(page), attributes), li_attributes)
+ end
+
+ def page_span(page, text, attributes = {})
+ @template.content_tag(:li, text, attributes)
+ end
+ end
end
lib/will_paginate/view_helpers.rb
@@ -68,8 +68,9 @@ class WillPaginate::ViewTestCase < Test::Unit::TestCase
@html_document = HTML::Document.new(@html_result, true, false)
if block_given?
+ elementname = options[:semantic] ? 'ul' : 'div'
classname = options[:class] || WillPaginate::ViewHelpers.pagination_options[:class]
- assert_select("div.#{classname}", 1, 'no main DIV', &block)
+ assert_select("#{elementname}.#{classname}", 1, "no main #{elementname.upcase}", &block)
end
end
test/lib/view_test_process.rb
@@ -370,4 +370,26 @@ class ViewTest < WillPaginate::ViewTestCase
end
end
+ ## semantic pagination ##
+
+ def test_semantic
+ paginate([1].paginate({ :page => 1, :total_entries => 13, :per_page => 4 }), :semantic => true) do |pagination|
+ assert_select 'li a[href]', 4 do |elements|
+ validate_page_numbers [2,3,4,2], elements
+ assert_select elements.last, ':last-child', "Next »"
+ end
+ assert_select 'li', 6
+ assert_select 'li.disabled.prev_page', '« Previous'
+ assert_select 'li.current', '1'
+ assert_select 'li a[rel=next]', '2'
+ assert_select 'li.next_page a.next_page[rel=next]', 'Next »'
+ assert_equal %Q(<ul class="pagination"><li class="disabled prev_page">« Previous</li><li class="current">1</li><li><a href="/foo/bar?page=2" rel="next">2</a></li><li><a href="/foo/bar?page=3">3</a></li><li><a href="/foo/bar?page=4">4</a></li><li class="next_page"><a href="/foo/bar?page=2" class="next_page" rel="next">Next »</a></li></ul>), @html_result
+ end
+ end
+
+ def test_semantic_gap
+ paginate([1].paginate({ :page => 2, :total_entries => 25, :per_page => 4 }), :inner_window => 1, :semantic => true) do |pagination|
+ assert_select 'li.gap', '…'
+ end
+ end
end
test/view_test.rb
0ee5b657442df7b561487b0521bd6d4ffafe2840
Les Hill
leshill
leshill@gmail.com
http://github.com/leshill/will_paginate/commit/6db9356185c9172d35d548000ab91d1bd8cbc7b2
6db9356185c9172d35d548000ab91d1bd8cbc7b2
2009-06-26T10:54:42-07:00
2009-06-25T14:23:49-07:00
:semantic => true == ul/li pagination
e73712f2b4bcd29c019d77a4f2236f995f7628c1
Les Hill
leshill
leshill@gmail.com