will_paginate 2.2.1 → 2.2.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 2.2.2, released 2008-04-21
+
+* Add support for page parameter in custom routes like "/foo/page/2"
+* Change output of "page_entries_info" on single-page collection and erraneous
+  output with empty collection as reported by Tim Chater
+  
 == 2.2.1, released 2008-04-08
 
 * take less risky path when monkeypatching named_scope; fix that it no longer

data/README.rdoc

@@ -114,7 +114,7 @@ contributions or just simply awesome ideas:
 Chris Wanstrath, Dr. Nic Williams, K. Adam Christensen, Mike Garey, Bence
 Golda, Matt Aimonetti, Charles Brian Quinn, Desi McAdam, James Coglan, Matijs
 van Zuijlen, Maria, Brendan Ribera, Todd Willey, Bryan Helmkamp, Jan Berkel,
-Lourens Naudé, Rick Olson.
+Lourens Naudé, Rick Olson, Russell Norris.
 
 
 == Usable pagination in the UI

data/Rakefile

@@ -1,6 +1,4 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require File.dirname(__FILE__) + '/lib/rake_hacks'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -12,17 +10,6 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
 end
 
-# I want to specify environment variables at call time
-class EnvTestTask < Rake::TestTask
-  attr_accessor :env
-
-  def ruby(*args)
-    env.each { |key, value| ENV[key] = value } if env
-    super
-    env.keys.each { |key| ENV.delete key } if env
-  end
-end
-
 for configuration in %w( sqlite3 mysql postgres )
   EnvTestTask.new("test_#{configuration}") do |t|
     t.pattern = 'test/finder_test.rb'
@@ -52,7 +39,7 @@ task :test_all do
 end
 
 desc 'Generate RDoc documentation for the will_paginate plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+Rake::RDocTask.new(:doc) do |rdoc|
   files = ['README.rdoc', 'LICENSE', 'CHANGELOG']
   files << FileList.new('lib/**/*.rb').
     exclude('lib/will_paginate/named_scope*').
@@ -63,8 +50,8 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.main = "README.rdoc" # page to start on
   rdoc.title = "will_paginate documentation"
   
-  templates = %w[/Users/chris/ruby/projects/err/rock/template.rb /var/www/rock/template.rb]
-  rdoc.template = templates.find { |t| File.exists? t }
+  my_template = '/home/mislav/projects/rdoc_template/mislav.rb'
+  rdoc.template = my_template if File.exists? my_template
   
   rdoc.rdoc_dir = 'doc' # rdoc output folder
   rdoc.options << '--inline-source'

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/will_paginate/view_helpers.rb

@@ -132,11 +132,19 @@ module WillPaginate
     #   <%= page_entries_info @posts %>
     #   #-> Displaying entries 6 - 10 of 26 in total
     def page_entries_info(collection)
-      %{Displaying entries <b>%d&nbsp;-&nbsp;%d</b> of <b>%d</b> in total} % [
-        collection.offset + 1,
-        collection.offset + collection.length,
-        collection.total_entries
-      ]
+      if collection.total_pages < 2
+        case collection.size
+        when 0; 'No entries found'
+        when 1; 'Displaying <b>1</b> entry'
+        else;   "Displaying <b>all #{collection.size}</b> entries"
+        end
+      else
+        %{Displaying entries <b>%d&nbsp;-&nbsp;%d</b> of <b>%d</b> in total} % [
+          collection.offset + 1,
+          collection.offset + collection.length,
+          collection.total_entries
+        ]
+      end
     end
 
     def self.total_pages_for_collection(collection) #:nodoc:
@@ -272,7 +280,7 @@ module WillPaginate
         end
 
         url = @template.url_for(@url_params)
-        @url_string = url.sub(/([?&]#{CGI.escape param_name}=)#{page}/, '\1@')
+        @url_string = url.sub(%r!([?&/]#{CGI.escape param_name}[=/])#{page}!, '\1@')
         return url
       end
       @url_string.sub '@', page.to_s

data/test/lib/view_test_process.rb

@@ -5,15 +5,19 @@ require 'will_paginate'
 WillPaginate.enable_actionpack
 
 ActionController::Routing::Routes.draw do |map|
+  map.connect 'dummy/page/:page', :controller => 'dummy'
   map.connect ':controller/:action/:id'
 end
 
 ActionController::Base.perform_caching = false
 
 class DummyRequest
+  attr_accessor :symbolized_path_parameters
+  
   def initialize
     @get = true
     @params = {}
+    @symbolized_path_parameters = { :controller => 'foo', :action => 'bar' }
   end
   
   def get?
@@ -24,10 +28,6 @@ class DummyRequest
     @get = false
   end
 
-  def symbolized_path_parameters
-    { :controller => 'foo', :action => 'bar' }
-  end
-
   def relative_url_root
     ''
   end

data/test/view_test.rb

@@ -156,6 +156,19 @@ class ViewTest < Test::Unit::TestCase
     assert_equal %{Displaying entries <b>25&nbsp;-&nbsp;26</b> of <b>26</b> in total},
       @html_result
   end
+
+  def test_page_entries_info_with_single_page_collection
+    @template = '<%= page_entries_info collection %>'
+    
+    paginate(('a'..'d').to_a.paginate(:page => 1, :per_page => 5))
+    assert_equal %{Displaying <b>all 4</b> entries}, @html_result
+    
+    paginate(['a'].paginate(:page => 1, :per_page => 5))
+    assert_equal %{Displaying <b>1</b> entry}, @html_result
+    
+    paginate([].paginate(:page => 1, :per_page => 5))
+    assert_equal %{No entries found}, @html_result
+  end
   
   ## parameter handling in page links ##
   
@@ -207,6 +220,15 @@ class ViewTest < Test::Unit::TestCase
     end
   end
 
+  def test_custom_routing_page_param
+    @request.symbolized_path_parameters.update :controller => 'dummy', :action => nil
+    paginate :per_page => 2 do
+      assert_select 'a[href]', 6 do |links|
+        assert_links_match %r{/page/(\d+)$}, links, [2, 3, 4, 5, 6, 2]
+      end
+    end
+  end
+
   ## internal hardcore stuff ##
 
   class LegacyCollection < WillPaginate::Collection
@@ -294,14 +316,22 @@ class ViewTest < Test::Unit::TestCase
       })
     end
 
-    def assert_links_match pattern, links = nil
+    def assert_links_match pattern, links = nil, numbers = nil
       links ||= assert_select 'div.pagination a[href]' do |elements|
         elements
       end
+
+      pages = [] if numbers
       
       links.each do |el|
         assert_match pattern, el['href']
+        if numbers
+          el['href'] =~ pattern
+          pages << $1.to_i
+        end
       end
+
+      assert_equal pages, numbers, "page numbers don't match" if numbers
     end
 
     def assert_no_links_match pattern

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: will_paginate
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-08 00:00:00 +02:00
+date: 2008-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: will-paginate
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Most awesome pagination solution for Rails