@@ -16,9 +16,7 @@ === TODO: * Make a concrete implementation of LinkRendererBase that will generate HTML for both ActionView and Merb -* Finish transition from view tests -> specs * ActionView and Merb integration tests for view helpers -* 9a9372 rename :prev_label to :previous_label for consistency. old name still functions but is deprecated * 3c4725 Oops, I used return in an iterator block. I obviously write too much JavaScript * 537f22 ensure that 'href' values in pagination links are escaped URLs CHANGELOG.rdoc @@ -14,7 +14,7 @@ module WillPaginate # WillPaginate::ViewHelpers.pagination_options hash. You can write to this hash to # override default options on the global level: # - # WillPaginate::ViewHelpers.pagination_options[:prev_label] = 'Previous page' + # WillPaginate::ViewHelpers.pagination_options[:previous_label] = 'Previous page' # # By putting this into your environment.rb you can easily translate link texts to previous # and next pages, as well as override some other defaults to your liking. @@ -22,19 +22,18 @@ module WillPaginate def self.pagination_options() @pagination_options; end def self.pagination_options=(value) @pagination_options = value; end - # default options that can be overridden on the global level self.pagination_options = { - :class => 'pagination', - :prev_label => '&laquo; Previous', - :next_label => 'Next &raquo;', - :inner_window => 4, # links around the current page - :outer_window => 1, # links around beginning and end - :separator => ' ', # single space is friendly to spiders and non-graphic browsers - :param_name => :page, - :params => nil, - :renderer => 'WillPaginate::ViewHelpers::LinkRenderer', - :page_links => true, - :container => true + :class => 'pagination', + :previous_label => '&laquo; Previous', + :next_label => 'Next &raquo;', + :inner_window => 4, # links around the current page + :outer_window => 1, # links around beginning and end + :separator => ' ', # single space is friendly to spiders and non-graphic browsers + :param_name => :page, + :params => nil, + :renderer => 'WillPaginate::ViewHelpers::LinkRenderer', + :page_links => true, + :container => true } def self.total_pages_for_collection(collection) #:nodoc: lib/will_paginate/view_helpers.rb @@ -9,7 +9,7 @@ module WillPaginate # # ==== Options # * <tt>:class</tt> -- CSS class name for the generated DIV (default: "pagination") - # * <tt>:prev_label</tt> -- default: "« Previous" + # * <tt>:previous_label</tt> -- default: "« Previous" # * <tt>:next_label</tt> -- default: "Next »" # * <tt>:inner_window</tt> -- how many links are shown around the current page (default: 4) # * <tt>:outer_window</tt> -- how many links are around the first and the last page (default: 1) @@ -54,6 +54,11 @@ module WillPaginate options = WillPaginate::ViewHelpers.pagination_options.merge(options) + if options[:prev_label] + WillPaginate::Deprecation::warn(":prev_label view parameter is now :previous_label; the old name has been deprecated.") + options[:previous_label] = options.delete(:prev_label) + end + # get the renderer instance renderer = case options[:renderer] when String lib/will_paginate/view_helpers/base.rb @@ -28,7 +28,7 @@ module WillPaginate def to_html links = @options[:page_links] ? windowed_links : [] # previous/next buttons - links.unshift page_link_or_span(@collection.previous_page, 'disabled prev_page', @options[:prev_label]) + links.unshift page_link_or_span(@collection.previous_page, 'disabled prev_page', @options[:previous_label]) links.push page_link_or_span(@collection.next_page, 'disabled next_page', @options[:next_label]) html = links.join(@options[:separator]) lib/will_paginate/view_helpers/link_renderer.rb @@ -50,7 +50,7 @@ describe WillPaginate::ViewHelpers::ActionView do end it "should paginate with options" do - paginate({ :page => 2 }, :class => 'will_paginate', :prev_label => 'Prev', :next_label => 'Next') do + paginate({ :page => 2 }, :class => 'will_paginate', :previous_label => 'Prev', :next_label => 'Next') do assert_select 'a[href]', 4 do |elements| validate_page_numbers [1,1,3,3], elements # test rel attribute values: @@ -94,6 +94,14 @@ describe WillPaginate::ViewHelpers::ActionView do assert_select 'a.next_page[href]:last-child' end end + + it "should warn about :prev_label being deprecated" do + lambda { + paginate({ :page => 2 }, :prev_label => 'Deprecated') do + assert_select 'a[href]:first-child', 'Deprecated' + end + }.should have_deprecation + end it "should match expected markup" do paginate spec/view_helpers/action_view_spec.rb @@ -78,6 +78,14 @@ class ViewExampleGroup < Spec::Example::ExampleGroup end end + def build_message(message, pattern, *args) + built_message = pattern.dup + for value in args + built_message.sub! '?', value.inspect + end + built_message + end + end Spec::Example::ExampleGroupFactory.register(:view_helpers, ViewExampleGroup) spec/view_helpers/view_example_group.rb 9f471b14f4161e243170ad826824f52a94e54665 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mattetti/will_paginate/commit/e0bebbbb1bc54bb05a559fe5c21d55b74ff5ed6d e0bebbbb1bc54bb05a559fe5c21d55b74ff5ed6d 2008-10-10T04:50:15-07:00 2008-10-10T04:50:15-07:00 rename :prev_label to :previous_label for consistency. old name still functions but is deprecated ed6a93c879f2f7a1383129f5f16ed485302d6b36 Mislav Marohnić mislav.marohnic@gmail.com