will_paginate 2.3.15 → 2.3.16

data/test/lib/activerecord_test_connector.rb

@@ -2,6 +2,10 @@ require 'active_record'
 require 'active_record/version'
 require 'active_record/fixtures'
 
+# prevent psych kicking in on 1.9 and interpreting
+# local timestamps in fixtures as UTC
+YAML::ENGINE.yamler = 'syck' if defined? YAML::ENGINE
+
 class ActiveRecordTestConnector
   cattr_accessor :able_to_connect
   cattr_accessor :connected
@@ -42,10 +46,9 @@ class ActiveRecordTestConnector
     ActiveRecord::Base.logger = Logger.new(STDOUT) if $0 == 'irb'
     puts "using #{configuration['adapter']} adapter" unless ENV['DB'].blank?
     
-    gem 'sqlite3-ruby' if 'sqlite3' == db
-    
     ActiveRecord::Base.establish_connection(configuration)
     ActiveRecord::Base.configurations = { db => configuration }
+    ActiveRecord::Base.default_timezone = :local if ActiveRecord::Base.respond_to? :default_timezone
     prepare ActiveRecord::Base.connection
 
     unless Object.const_defined?(:QUOTED_TYPE)
@@ -62,11 +65,18 @@ class ActiveRecordTestConnector
 
   def self.prepare(conn)
     class << conn
-      IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SHOW FIELDS /]
+      IGNORED_SQL = /
+          ^(
+            PRAGMA | SHOW\ max_identifier_length |
+            SELECT\ (currval|CAST|@@IDENTITY|@@ROWCOUNT) |
+            SHOW\ (FIELDS|TABLES)
+          )\b |
+          \bFROM\ (sqlite_master|pg_tables|pg_attribute)\b
+        /x
 
       def execute_with_counting(sql, name = nil, &block)
         $query_count ||= 0
-        $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
+        $query_count  += 1 unless sql =~ IGNORED_SQL
         execute_without_counting(sql, name, &block)
       end
 

data/test/lib/load_fixtures.rb

@@ -1,4 +1,5 @@
-require 'boot'
+require 'bundler'
+Bundler.setup
 require 'lib/activerecord_test_connector'
 
 # setup the connection

data/test/lib/view_test_process.rb

@@ -111,6 +111,13 @@ class WillPaginate::ViewTestCase < Test::Unit::TestCase
         end
       end
     end
+
+  private
+
+    def load_fixtures
+      # fix for Rails 1.2
+      @loaded_fixtures = {}
+    end
 end
 
 class DummyRequest

data/test/view_test.rb

@@ -196,7 +196,7 @@ class ViewTest < WillPaginate::ViewTestCase
     def test_page_entries_info_with_longer_class_name
       @template = '<%= page_entries_info collection %>'
       collection = ('a'..'z').to_a.paginate
-      collection.first.stubs(:class).returns(mock('class', :name => 'ProjectType'))
+      collection.first.stubs(:class).returns(mock('class', :to_s => 'ProjectType'))
     
       paginate collection
       assert @html_result.index('project types'), "expected <#{@html_result.inspect}> to mention 'project types'"
@@ -207,7 +207,7 @@ class ViewTest < WillPaginate::ViewTestCase
     @template = '<%= page_entries_info collection %>'
     
     paginate(('a'..'d').to_a.paginate(:page => 1, :per_page => 5))
-    assert_equal %{Displaying <b>all 4</b> strings}, @html_result
+    assert_equal %{Displaying <b>all&nbsp;4</b> strings}, @html_result
     
     paginate(['a'].paginate(:page => 1, :per_page => 5))
     assert_equal %{Displaying <b>1</b> string}, @html_result
@@ -217,7 +217,7 @@ class ViewTest < WillPaginate::ViewTestCase
   end
   
   def test_page_entries_info_with_custom_entry_name
-    @template = '<%= page_entries_info collection, :entry_name => "author" %>'
+    @template = '<%= page_entries_info collection, :model => "author" %>'
     
     entries = (1..20).to_a
     
@@ -225,7 +225,7 @@ class ViewTest < WillPaginate::ViewTestCase
     assert_equal %{Displaying authors <b>1&nbsp;-&nbsp;5</b> of <b>20</b> in total}, @html_result
     
     paginate(entries.paginate(:page => 1, :per_page => 20))
-    assert_equal %{Displaying <b>all 20</b> authors}, @html_result
+    assert_equal %{Displaying <b>all&nbsp;20</b> authors}, @html_result
     
     paginate(['a'].paginate(:page => 1, :per_page => 5))
     assert_equal %{Displaying <b>1</b> author}, @html_result
@@ -283,7 +283,7 @@ class ViewTest < WillPaginate::ViewTestCase
     renderer = WillPaginate::LinkRenderer.new
     
     paginate({ :page => 1 }, :renderer=>renderer)
-    assert_links_match %r[/foo/@tag\?page=\d]
+    assert_links_match %r[/foo/(?:@|%40)tag\?page=\d]
   end
   
   def test_complex_custom_page_param

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: will_paginate
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 2
-  - 3
-  - 15
-  version: 2.3.15
+  prerelease: 
+  version: 2.3.16
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -16,18 +11,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +02:00
-default_executable: 
+date: 2011-08-09 00:00:00 Z
 dependencies: []
 
-description: The will_paginate library provides a simple, yet powerful and extensible API for ActiveRecord pagination and rendering of pagination links in ActionView templates.
+description: will_paginate provides a simple API for Active Record pagination and rendering of pagination links in Rails templates.
 email: mislav.marohnic@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 - LICENSE
 - CHANGELOG.rdoc
 files: 
@@ -36,12 +30,15 @@ files:
 - lib/will_paginate/collection.rb
 - lib/will_paginate/core_ext.rb
 - lib/will_paginate/finder.rb
+- lib/will_paginate/i18n.rb
+- lib/will_paginate/locale/en.yml
 - lib/will_paginate/named_scope.rb
 - lib/will_paginate/named_scope_patch.rb
+- lib/will_paginate/per_page.rb
 - lib/will_paginate/version.rb
 - lib/will_paginate/view_helpers.rb
 - lib/will_paginate.rb
-- test/boot.rb
+- test/ci.rb
 - test/collection_test.rb
 - test/console
 - test/database.yml
@@ -58,24 +55,30 @@ files:
 - test/fixtures/topics.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
+- test/gemfiles/Gemfile.1.2
+- test/gemfiles/Gemfile.1.2.lock
+- test/gemfiles/Gemfile.2.0
+- test/gemfiles/Gemfile.2.0.lock
+- test/gemfiles/Gemfile.2.1
+- test/gemfiles/Gemfile.2.1.lock
+- test/gemfiles/Gemfile.2.2
+- test/gemfiles/Gemfile.2.2.lock
 - test/helper.rb
 - test/lib/activerecord_test_case.rb
 - test/lib/activerecord_test_connector.rb
 - test/lib/load_fixtures.rb
 - test/lib/view_test_process.rb
-- test/tasks.rake
 - test/view_test.rb
-- README.rdoc
+- README.md
 - LICENSE
 - CHANGELOG.rdoc
-has_rdoc: true
-homepage: http://github.com/mislav/will_paginate/wikis
+homepage: https://github.com/mislav/will_paginate/wiki
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.md
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -84,25 +87,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Pagination for Rails
+summary: Easy pagination for Rails
 test_files: []
 

data/README.rdoc

@@ -1,107 +0,0 @@
-= WillPaginate
-
-Pagination is just limiting the number of records displayed. Why should you let
-it get in your way while developing, then? This plugin makes magic happen. Did
-you ever want to be able to do just this on a model:
-
-  Post.paginate :page => 1, :order => 'created_at DESC'
-
-... and then render the page links with a single view helper? Well, now you
-can.
-
-Some resources to get you started:
-
-* {Installation instructions}[http://github.com/mislav/will_paginate/wikis/installation]
-  on {the wiki}[http://github.com/mislav/will_paginate/wikis]
-* Your mind reels with questions? Join our
-  {Google group}[http://groups.google.com/group/will_paginate].
-* {How to report bugs}[http://github.com/mislav/will_paginate/wikis/report-bugs]
-
-
-== Example usage
-
-Use a paginate finder in the controller:
-
-  @posts = Post.paginate_by_board_id @board.id, :page => params[:page], :order => 'updated_at DESC'
-
-Yeah, +paginate+ works just like +find+ -- it just doesn't fetch all the
-records.  Don't forget to tell it which page you want, or it will complain!
-Read more on WillPaginate::Finder::ClassMethods.
-
-Render the posts in your view like you would normally do. When you need to render
-pagination, just stick this in:
-
-  <%= will_paginate @posts %>
-
-You're done. (You can find the option list at WillPaginate::ViewHelpers.)
-
-How does it know how much items to fetch per page? It asks your model by calling
-its <tt>per_page</tt> class method. You can define it like this:
-
-  class Post < ActiveRecord::Base
-    cattr_reader :per_page
-    @@per_page = 50
-  end
-
-... or like this:
-
-  class Post < ActiveRecord::Base
-    def self.per_page
-      50
-    end
-  end
-
-... or don't worry about it at all. WillPaginate defines it to be <b>30</b> by default.
-But you can always specify the count explicitly when calling +paginate+:
-
-  @posts = Post.paginate :page => params[:page], :per_page => 50
-
-The +paginate+ finder wraps the original finder and returns your resultset that now has
-some new properties. You can use the collection as you would with any ActiveRecord
-resultset. WillPaginate view helpers also need that object to be able to render pagination:
-
-  <ol>
-    <% for post in @posts -%>
-      <li>Render `post` in some nice way.</li>
-    <% end -%>
-  </ol>
-
-  <p>Now let's render us some pagination!</p>
-  <%= will_paginate @posts %>
-
-More detailed documentation:
-
-* WillPaginate::Finder::ClassMethods for pagination on your models;
-* WillPaginate::ViewHelpers for your views.
-
-
-== Authors and credits
-
-Authors::                Mislav Marohnić, PJ Hyett
-Original announcement::  http://errtheblog.com/post/929 
-Original PHP source::    http://www.strangerstudios.com/sandbox/pagination/diggstyle.php
-
-All these people helped making will_paginate what it is now with their code
-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, Russell Norris, Piotr Usewicz, Chris Eppstein,
-Denis Barushev, Ben Pickles.
-
-
-== Usable pagination in the UI
-
-There are some CSS styles to get you started in the "examples/" directory. They
-are {showcased online here}[http://mislav.uniqpath.com/will_paginate/].
-
-More reading about pagination as design pattern:
-
-* {Pagination 101}[http://kurafire.net/log/archive/2007/06/22/pagination-101]
-* {Pagination gallery}[http://www.smashingmagazine.com/2007/11/16/pagination-gallery-examples-and-good-practices/]
-* {Pagination on Yahoo Design Pattern Library}[http://developer.yahoo.com/ypatterns/parent.php?pattern=pagination]
-
-Want to discuss, request features, ask questions? Join the
-{Google group}[http://groups.google.com/group/will_paginate].
-

data/test/boot.rb

@@ -1,21 +0,0 @@
-plugin_root = File.join(File.dirname(__FILE__), '..')
-version = ENV['RAILS_VERSION']
-version = nil if version and version == ""
-
-# first look for a symlink to a copy of the framework
-if !version and framework_root = ["#{plugin_root}/rails", "#{plugin_root}/../../rails"].find { |p| File.directory? p }
-  puts "found framework root: #{framework_root}"
-  # this allows for a plugin to be tested outside of an app and without Rails gems
-  $:.unshift "#{framework_root}/activesupport/lib", "#{framework_root}/activerecord/lib", "#{framework_root}/actionpack/lib"
-else
-  # simply use installed gems if available
-  puts "using Rails#{version ? ' ' + version : nil} gems"
-  require 'rubygems'
-  
-  if version
-    gem 'rails', version
-  else
-    gem 'actionpack', '< 3.0.0.a'
-    gem 'activerecord', '< 3.0.0.a'
-  end
-end

data/test/tasks.rake

@@ -1,59 +0,0 @@
-require 'rake/testtask'
-
-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 2.1.x, 2.0.x & 1.2.x gems}
-task :test_all do
-  all = Rake::Task['test_full']
-  versions = %w(2.3.2 2.2.2 2.1.0 2.0.4 1.2.6)
-  versions.each do |version|
-    ENV['RAILS_VERSION'] = "~> #{version}"
-    all.invoke
-    reset_invoked unless version == versions.last
-  end
-end
-
-def reset_invoked
-  %w( test_full test test_mysql test_postgres ).each do |name|
-    Rake::Task[name].instance_variable_set '@already_invoked', false
-  end
-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