will_paginate 2.3.15 → 2.3.16

data/test/ci.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+databases = %w[ sqlite3 mysql postgres ]
+# skip mysql on 1.8.6 (doesn't work for unknown reason)
+run_mysql = !(ENV['TRAVIS'] && RUBY_VERSION == '1.8.6')
+
+def announce(name, msg)
+  puts "\n\e[1;33m[#{name}] #{msg}\e[m\n"
+end
+
+def rails_version(gemfile)
+  gemfile =~ /\d[\d.]*$/ ? $& : '2.3'
+end
+
+def system(*args)
+  puts "$ #{args.join(' ')}"
+  super
+end
+
+if ENV['TRAVIS']
+  if run_mysql
+    system "mysql -e 'create database will_paginate;' >/dev/null"
+    abort "failed to create mysql database" unless $?.success?
+  end
+  system "psql -c 'create database will_paginate;' -U postgres >/dev/null"
+  abort "failed to create postgres database" unless $?.success?
+end
+
+gemfiles = ['Gemfile']
+gemfiles.concat Dir['test/gemfiles/*'].reject { |f| f.include? '.lock' }.sort.reverse
+
+ruby19 = RUBY_VERSION > '1.9'
+ruby19_gemfiles = gemfiles.first
+
+bundler_options = ENV['TRAVIS'] ? "--path #{Dir.pwd}/vendor/bundle" : ''
+
+failed = false
+
+gemfiles.each do |gemfile|
+  next if ruby19 and !ruby19_gemfiles.include? gemfile
+  version = rails_version(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  skip_install = gemfile == gemfiles.first
+  if skip_install or system %(bundle install #{bundler_options})
+    for db in databases
+      next if 'mysql' == db and !run_mysql
+      announce "Rails #{version}", "with #{db}"
+      ENV['DB'] = db
+      failed = true unless system %(bundle exec rake)
+    end
+  else
+    # bundle install failed
+    failed = true
+  end
+end
+
+exit 1 if failed

data/test/collection_test.rb

@@ -119,8 +119,9 @@ class ArrayPaginationTest < Test::Unit::TestCase
     end
   end
 
-  def test_invalid_per_page_setting
-    assert_raise(ArgumentError) { create(1, -1) }
+  def test_invalid_offset
+    error = assert_raise(WillPaginate::InvalidPage) { create(307445734561825862, 30) }
+    assert_equal "invalid offset: 9223372036854775830", error.message
   end
 
   def test_page_count_was_removed
@@ -128,6 +129,22 @@ class ArrayPaginationTest < Test::Unit::TestCase
     # It's `total_pages` now.
   end
 
+  def test_inherits_global_per_page
+    col = WillPaginate::Collection.new(1)
+    assert_equal 30, col.per_page
+
+    WillPaginate.per_page = 12
+    begin
+      col = WillPaginate::Collection.new(1)
+      assert_equal 12, col.per_page
+
+      col = ('a'..'z').to_a.paginate(:page => 1)
+      assert_equal 12, col.per_page
+    ensure
+      WillPaginate.per_page = 30
+    end
+  end
+
   private
     def create(page = 2, limit = 5, total = nil, &block)
       if block_given?

data/test/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-libs = []
 
-libs << 'irb/completion'
-libs << File.join('lib', 'load_fixtures')
+opts = %w[ --simple-prompt ]
+opts << '-rirb/completion'
+opts << '-rlib/load_fixtures'
 
-exec "#{irb} -Ilib:test#{libs.map{ |l| " -r #{l}" }.join} --simple-prompt"
+exec irb, '-Ilib:test', *opts

data/test/database.yml

@@ -3,20 +3,14 @@ sqlite3:
   adapter: sqlite3
   timeout: 500
 
-sqlite2:
-  database: ":memory:"
-  adapter: sqlite2
-
 mysql:
   adapter: mysql
-  username: root
-  password: 
+  database: will_paginate
+  username: 
   encoding: utf8
-  database: will_paginate_unittest
 
 postgres:
   adapter: postgresql
-  username: mislav
-  password: 
-  database: will_paginate_unittest
+  database: will_paginate
+  username: postgres
   min_messages: warning

data/test/finder_test.rb

@@ -27,6 +27,27 @@ class FinderTest < ActiveRecordTestCase
     end
   end
 
+  def test_per_page_setting
+    assert_equal 30, Topic.per_page
+    Topic.per_page = 12
+    begin
+      assert_equal 12, Topic.per_page
+    ensure
+      Topic.per_page = 30
+    end
+    assert_equal 10, Developer.per_page
+  end
+
+  def test_per_page_inheritance
+    subclass = Class.new(Topic)
+    assert_equal 30, subclass.per_page
+    subclass.per_page = 12
+    assert_equal 12, subclass.per_page
+    assert_equal 30, Topic.per_page
+    sub_subclass = Class.new(subclass)
+    assert_equal 12, sub_subclass.per_page
+  end
+
   def test_parameter_api
     # :page parameter in options is required!
     assert_raise(ArgumentError){ Topic.paginate }
@@ -246,6 +267,8 @@ class FinderTest < ActiveRecordTestCase
     assert_equal 2, entries.total_entries
   end
   
+  # fat chance I'll ever get to debugging and fixing this
+  unless '1.8.7' == RUBY_VERSION and ActiveRecord::VERSION::STRING < '2.2'
   def test_paginate_in_named_scope_on_habtm_association
     project = projects(:active_record)
     assert_queries(2) do
@@ -255,6 +278,7 @@ class FinderTest < ActiveRecordTestCase
       assert_equal 1, entries.total_entries, 'only one developer should be found'
     end
   end
+  end
 
   def test_paginate_in_named_scope_on_hmt_association
     project = projects(:active_record)

data/test/fixtures/developer.rb

@@ -10,5 +10,5 @@ class Developer < User
   named_scope :distinct, :select => 'DISTINCT `users`.*'
   named_scope :poor, :conditions => ['salary <= ?', 80000], :order => 'salary'
 
-  def self.per_page() 10 end
+  self.per_page = 10
 end

data/test/gemfiles/Gemfile.1.2

@@ -0,0 +1,13 @@
+source 'http://rubygems.org'
+
+gem 'rails', '~> 1.2.6'
+
+gem 'rake', '~> 0.8.7'
+gem 'mocha', '0.9.2'
+gem 'sqlite3-ruby', '1.3.1'
+gem 'mysql', :group => :mysql
+
+group :pg do
+  gem 'postgres', :platforms => :ruby_18
+  gem 'pg',       :platforms => :ruby_19
+end

data/test/gemfiles/Gemfile.1.2.lock

@@ -0,0 +1,39 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (1.3.6)
+      actionpack (= 1.13.6)
+    actionpack (1.13.6)
+      activesupport (= 1.4.4)
+    actionwebservice (1.2.6)
+      actionpack (= 1.13.6)
+      activerecord (= 1.15.6)
+    activerecord (1.15.6)
+      activesupport (= 1.4.4)
+    activesupport (1.4.4)
+    mocha (0.9.2)
+      rake
+    mysql (2.8.1)
+    pg (0.11.0)
+    postgres (0.7.9.2008.01.28)
+    rails (1.2.6)
+      actionmailer (= 1.3.6)
+      actionpack (= 1.13.6)
+      actionwebservice (= 1.2.6)
+      activerecord (= 1.15.6)
+      activesupport (= 1.4.4)
+      rake (>= 0.7.2)
+    rake (0.8.7)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha (= 0.9.2)
+  mysql
+  pg
+  postgres
+  rails (~> 1.2.6)
+  rake (~> 0.8.7)
+  sqlite3-ruby (= 1.3.1)

data/test/gemfiles/Gemfile.2.0

@@ -0,0 +1,16 @@
+source 'http://rubygems.org'
+
+rails_version = '~> 2.0.4'
+
+gem 'actionpack',   rails_version
+gem 'activerecord', rails_version
+
+gem 'rake', '~> 0.8.7'
+gem 'mocha', '0.9.2'
+gem 'sqlite3-ruby', '1.3.1'
+gem 'mysql', :group => :mysql
+
+group :pg do
+  gem 'postgres', :platforms => :ruby_18
+  gem 'pg',       :platforms => :ruby_19
+end

data/test/gemfiles/Gemfile.2.0.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (2.0.5)
+      activesupport (= 2.0.5)
+    activerecord (2.0.5)
+      activesupport (= 2.0.5)
+    activesupport (2.0.5)
+    mocha (0.9.2)
+      rake
+    mysql (2.8.1)
+    pg (0.11.0)
+    postgres (0.7.9.2008.01.28)
+    rake (0.8.7)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 2.0.4)
+  activerecord (~> 2.0.4)
+  mocha (= 0.9.2)
+  mysql
+  pg
+  postgres
+  rake (~> 0.8.7)
+  sqlite3-ruby (= 1.3.1)

data/test/gemfiles/Gemfile.2.1

@@ -0,0 +1,16 @@
+source 'http://rubygems.org'
+
+rails_version = '~> 2.1.0'
+
+gem 'actionpack',   rails_version
+gem 'activerecord', rails_version
+
+gem 'rake', '~> 0.8.7'
+gem 'mocha', '0.9.2'
+gem 'sqlite3-ruby', '1.3.1'
+gem 'mysql', :group => :mysql
+
+group :pg do
+  gem 'postgres', :platforms => :ruby_18
+  gem 'pg',       :platforms => :ruby_19
+end

data/test/gemfiles/Gemfile.2.1.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (2.1.2)
+      activesupport (= 2.1.2)
+    activerecord (2.1.2)
+      activesupport (= 2.1.2)
+    activesupport (2.1.2)
+    mocha (0.9.2)
+      rake
+    mysql (2.8.1)
+    pg (0.11.0)
+    postgres (0.7.9.2008.01.28)
+    rake (0.8.7)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 2.1.0)
+  activerecord (~> 2.1.0)
+  mocha (= 0.9.2)
+  mysql
+  pg
+  postgres
+  rake (~> 0.8.7)
+  sqlite3-ruby (= 1.3.1)

data/test/gemfiles/Gemfile.2.2

@@ -0,0 +1,16 @@
+source 'http://rubygems.org'
+
+rails_version = '~> 2.2.2'
+
+gem 'actionpack',   rails_version
+gem 'activerecord', rails_version
+
+gem 'rake', '~> 0.8.7'
+gem 'mocha', '0.9.2'
+gem 'sqlite3-ruby', '1.3.1'
+gem 'mysql', :group => :mysql
+
+group :pg do
+  gem 'postgres', :platforms => :ruby_18
+  gem 'pg',       :platforms => :ruby_19
+end

data/test/gemfiles/Gemfile.2.2.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (2.2.3)
+      activesupport (= 2.2.3)
+    activerecord (2.2.3)
+      activesupport (= 2.2.3)
+    activesupport (2.2.3)
+    mocha (0.9.2)
+      rake
+    mysql (2.8.1)
+    pg (0.11.0)
+    postgres (0.7.9.2008.01.28)
+    rake (0.8.7)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 2.2.2)
+  activerecord (~> 2.2.2)
+  mocha (= 0.9.2)
+  mysql
+  pg
+  postgres
+  rake (~> 0.8.7)
+  sqlite3-ruby (= 1.3.1)

data/test/helper.rb

@@ -1,10 +1,11 @@
 require 'test/unit'
-require 'rubygems'
-
-# gem install redgreen for colored test output
-begin require 'redgreen'; rescue LoadError; end
-
-require 'boot' unless defined?(ActiveRecord)
+require 'mocha'
+require 'will_paginate'
+begin
+  require 'ruby-debug'
+rescue LoadError
+  # no debuggging
+end
 
 class Test::Unit::TestCase
   protected
@@ -29,9 +30,5 @@ end
 
 # Wrap tests that use Mocha and skip if unavailable.
 def uses_mocha(test_name)
-  require 'mocha'
-rescue LoadError
-  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
-else
   yield
 end

data/test/lib/activerecord_test_case.rb

@@ -8,19 +8,9 @@ class ActiveRecordTestCase < Test::Unit::TestCase
   if defined?(ActiveRecord::TestFixtures)
     include ActiveRecord::TestFixtures
   end
-  # Set our fixture path
-  if ActiveRecordTestConnector.able_to_connect
-    self.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')
-    self.use_transactional_fixtures = true
-  end
-
-  def self.fixtures(*args)
-    super if ActiveRecordTestConnector.connected
-  end
 
-  def run(*args)
-    super if ActiveRecordTestConnector.connected
-  end
+  self.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')
+  self.use_transactional_fixtures = true
 
   # Default so Test::Unit::TestCase doesn't complain
   def test_truth
@@ -35,9 +25,14 @@ class ActiveRecordTestCase < Test::Unit::TestCase
       assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
     end
 
+    def method_name
+      'moo' # hack
+    end
+
     def assert_no_queries(&block)
       assert_queries(0, &block)
     end
 end
 
 ActiveRecordTestConnector.setup
+abort unless ActiveRecordTestConnector.able_to_connect