mislav-will_paginate 2.3.0 → 2.3.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 2.3.1, released 2008-05-04
+
+* Fixed page numbers not showing with custom routes and implicit first page
+* Try to use Hanna for documentation (falls back to default RDoc template if not)
+
 == 2.3.0, released 2008-04-29
 
 * Changed LinkRenderer to receive collection, options and reference to view template NOT in

data/Rakefile

@@ -1,74 +1,30 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rubygems'
+begin
+  hanna_dir = '/home/mislav/projects/hanna/lib'
+  $:.unshift hanna_dir if File.exists? hanna_dir
+  require 'hanna/rdoctask'
+rescue LoadError
+  require 'rake'
+  require 'rake/rdoctask'
+end
+load 'test/tasks.rake'
 
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the will_paginate plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-  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'
-    t.verbose = true
-    t.env = { 'DB' => configuration }
-    t.libs << 'test'
-  end
-end
-
-task :test_databases => %w(test_mysql test_sqlite3 test_postgres)
-
-desc %{Test everything on SQLite3, MySQL and PostgreSQL}
-task :test_full => %w(test test_mysql test_postgres)
-
-desc %{Test everything with Rails 1.2.x and 2.0.x gems}
-task :test_all do
-  all = Rake::Task['test_full']
-  ENV['RAILS_VERSION'] = '~>1.2.6'
-  all.invoke 
-  # reset the invoked flag
-  %w( test_full test test_mysql test_postgres ).each do |name|
-    Rake::Task[name].instance_variable_set '@already_invoked', false
-  end
-  # do it again
-  ENV['RAILS_VERSION'] = '~>2.0.2'
-  all.invoke 
-end
-
 desc 'Generate RDoc documentation for the will_paginate plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
-  files = ['README.rdoc', 'LICENSE', 'CHANGELOG']
-  files << FileList.new('lib/**/*.rb').
+  rdoc.rdoc_files.include('README.rdoc', 'LICENSE', 'CHANGELOG').
+    include('lib/**/*.rb').
     exclude('lib/will_paginate/named_scope*').
     exclude('lib/will_paginate/array.rb').
     exclude('lib/will_paginate/version.rb')
-    
-  rdoc.rdoc_files.add(files)
+  
   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 }
-  
   rdoc.rdoc_dir = 'doc' # rdoc output folder
-  rdoc.options << '--inline-source'
-  rdoc.options << '--charset=UTF-8'
+  rdoc.options << '--inline-source' << '--charset=UTF-8'
   rdoc.options << '--webcvs=http://github.com/mislav/will_paginate/tree/master/'
 end
 
@@ -104,12 +60,3 @@ task :examples do
   %x(haml examples/index.haml examples/index.html)
   %x(sass examples/pagination.sass examples/pagination.css)
 end
-
-task :rcov do
-  excludes = %w( lib/will_paginate/named_scope*
-                 lib/will_paginate/core_ext.rb
-                 lib/will_paginate.rb
-                 rails* )
-  
-  system %[rcov -Itest:lib test/*.rb -x #{excludes.join(',')}]
-end

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers.rb

@@ -297,7 +297,8 @@ module WillPaginate
     # Returns URL params for +page_link_or_span+, taking the current GET params
     # and <tt>:params</tt> option into account.
     def url_for(page)
-      unless @url_string
+      page_one = page == 1
+      unless @url_string and !page_one
         @url_params = { :escape => false }
         # page links should preserve GET parameters
         stringified_merge @url_params, @template.params if @template.request.get?
@@ -309,19 +310,20 @@ module WillPaginate
           
           stringified_merge @url_params, page_param
         else
-          @url_params[param_name] = 1
+          @url_params[param_name] = page_one ? 1 : 2
         end
 
         url = @template.url_for(@url_params)
+        return url if page_one
         
         if complex
           @url_string = url.sub(%r!([?&]#{CGI.escape param_name}=)#{page}!, '\1@')
           return url
         else
           @url_string = url
-          @url_params[param_name] = 2
+          @url_params[param_name] = 3
           @template.url_for(@url_params).split(//).each_with_index do |char, i|
-            if char == '2' and url[i, 1] == '1'
+            if char == '3' and url[i, 1] == '2'
               @url_string[i] = '@'
               break
             end

data/test/lib/view_test_process.rb

@@ -7,6 +7,10 @@ WillPaginate.enable_actionpack
 ActionController::Routing::Routes.draw do |map|
   map.connect 'dummy/page/:page', :controller => 'dummy'
   map.connect 'dummy/dots/page.:page', :controller => 'dummy', :action => 'dots'
+  map.connect 'ibocorp/:page', :controller => 'ibocorp',
+                               :requirements => { :page => /\d+/ },
+                               :defaults => { :page => 1 }
+                               
   map.connect ':controller/:action/:id'
 end
 
@@ -79,7 +83,7 @@ class WillPaginate::ViewTestCase < Test::Unit::TestCase
         assert_match pattern, el['href']
         if numbers
           el['href'] =~ pattern
-          pages << $1.to_i
+          pages << ($1.nil?? nil : $1.to_i)
         end
       end
 

data/test/view_test.rb

@@ -287,6 +287,15 @@ class ViewTest < WillPaginate::ViewTestCase
     end
   end
 
+  def test_custom_routing_with_first_page_hidden
+    @request.symbolized_path_parameters.update :controller => 'ibocorp', :action => nil
+    paginate :page => 2, :per_page => 2 do
+      assert_select 'a[href]', 7 do |links|
+        assert_links_match %r{/ibocorp(?:/(\d+))?$}, links, [nil, nil, 3, 4, 5, 6, 3]
+      end
+    end
+  end
+
   ## internal hardcore stuff ##
 
   class LegacyCollection < WillPaginate::Collection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mislav-will_paginate
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 -07:00
+date: 2008-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: []