will_paginate 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6263dfb6824224c74e2383ba39b7f35abe25288dfcdd89a3dbab6f2585eb91e
-  data.tar.gz: c26bb41e5bf140fd2564ed63fda7ed4822f3c126a6a3b3885b27e2585dbf3647
+  metadata.gz: 3015c2c4a4d84d48b8a9c60a5ad19297e4ccbd515682df95399badb293386536
+  data.tar.gz: d28dd41a8fe68e9f5e43649978cb8a49b8ff03fc6fcdab303c04fcbe654a6894
 SHA512:
-  metadata.gz: 8f67913552fff8839f5de82d9e55c61ad69c1a57216da3d5d627aef77455ee32a03d2b8c2b732299b37481ea6e9fd72a5baa1432e1fe296e78fc06b6a46ee8e0
-  data.tar.gz: 8979fdd5d35ee416e4c607f759b8e868188b11bb2ca7540d982866e936168170519492a027fff90cb31db12fb758b144389691c9374acfd58fd1880105d2201c
+  metadata.gz: b6c6843a2f26883a439520ef4106124c1706c8f5deae59c16d1fee074d74a8eb50e39ef3ea8ae8dc0bd6a18331dd618c0f18079f3834b0ebda45a13f050d3f62
+  data.tar.gz: 5479f100b92648394d8074d2d34be19120008955ce5f5e289073eafac35389890f044d4a66fe0e54d5331fc7d6a82c17497fa800f4fee44c743939560a71af8c

data/README.md

@@ -2,15 +2,13 @@
 
 will_paginate is a pagination library that integrates with Ruby on Rails, Sinatra, Hanami::View, Merb, DataMapper and Sequel.
 
-Installation:
-
 ``` ruby
-## Gemfile for Rails 3+, Sinatra, and Merb
 gem 'will_paginate', '~> 3.1.0'
 ```
 
 See [installation instructions][install] on the wiki for more info.
 
+ℹ️ will_paginate is now in _maintenance mode_ and it will not be receiving new features. [See alternatives](https://www.ruby-toolbox.com/categories/pagination)
 
 ## Basic will_paginate use
 

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers/link_renderer.rb

@@ -71,7 +71,7 @@ module WillPaginate
         if page
           link(text, page, :class => classname)
         else
-          tag(:span, text, :class => classname + ' disabled')
+          tag(:span, text, :class => classname + ' disabled', :"aria-disabled" => true)
         end
       end
       

data/spec/database.yml

@@ -3,27 +3,27 @@ sqlite3:
   adapter: sqlite3
   timeout: 500
 
-mysql: &mysql
-  adapter: mysql
+mysql:
+  adapter: mysql2
   database: will_paginate
-  username: root
+  username: <%= ENV["MYSQL_USER"] || "root" %>
   encoding: utf8
-<% if File.exist?("/var/run/mysql5/mysqld.sock") %>
+<% if ENV["MYSQL_PORT"] %>
+  host: <%= ENV["MYSQL_HOST"] %>
+  port: <%= ENV["MYSQL_PORT"] %>
+<% elsif File.exist?("/var/run/mysql5/mysqld.sock") %>
   host: localhost
   socket: /var/run/mysql5/mysqld.sock
 <% elsif File.exist? "/tmp/mysql.sock" %>
   host: localhost
   socket: /tmp/mysql.sock
-<% else %>
-  host: 127.0.0.1
 <% end %>
 
-mysql2:
-  <<: *mysql
-  adapter: mysql2
-
 postgres:
   adapter: postgresql
   database: will_paginate
-  username: <%= "postgres" if ENV["TRAVIS"] %>
   min_messages: warning
+  username: <%= ENV["POSTGRES_USER"] %>
+  password: <%= ENV["POSTGRES_PASSWORD"] %>
+  host: <%= ENV["POSTGRES_HOST"] %>
+  port: <%= ENV["POSTGRES_PORT"] %>

data/spec/finders/activerecord_test_connector.rb

@@ -1,20 +1,8 @@
 require 'active_record'
 require 'active_record/fixtures'
-require 'active_support/multibyte' # needed for Ruby 1.9.1
 require 'stringio'
 require 'erb'
 
-# https://travis-ci.org/mislav/will_paginate/jobs/99999001
-require 'active_support/core_ext/string/conversions'
-class String
-  alias to_datetime_without_patch to_datetime
-  def to_datetime
-    to_datetime_without_patch
-  rescue ArgumentError
-    return nil
-  end
-end
-
 $query_count = 0
 $query_sql = []
 
@@ -42,10 +30,6 @@ module ActiverecordTestConnector
 
   FIXTURES_PATH = File.expand_path('../../fixtures', __FILE__)
 
-  Fixtures = defined?(ActiveRecord::FixtureSet) ? ActiveRecord::FixtureSet :
-             defined?(ActiveRecord::Fixtures) ? ActiveRecord::Fixtures :
-             ::Fixtures
-
   # Set our defaults
   self.connected = false
 
@@ -79,13 +63,6 @@ module ActiverecordTestConnector
     ActiveRecord::Base.configurations = { db => configuration }
     ActiveRecord::Base.establish_connection(db.to_sym)
     ActiveRecord::Base.default_timezone = :utc
-
-    case configuration['adapter']
-    when 'mysql'
-      fix_primary_key(ActiveRecord::ConnectionAdapters::MysqlAdapter)
-    when 'mysql2'
-      fix_primary_key(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-    end
   end
 
   def load_schema
@@ -98,37 +75,27 @@ module ActiverecordTestConnector
     end
   end
 
-  def fix_primary_key(adapter_class)
-    if ActiveRecord::VERSION::STRING < "4.1"
-      adapter_class::NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
-    end
-  end
-
   module FixtureSetup
     def fixtures(*tables)
       table_names = tables.map { |t| t.to_s }
 
-      fixtures = Fixtures.create_fixtures ActiverecordTestConnector::FIXTURES_PATH, table_names
+      fixtures = ActiveRecord::FixtureSet.create_fixtures(ActiverecordTestConnector::FIXTURES_PATH, table_names)
       @@loaded_fixtures = {}
       @@fixture_cache = {}
 
       unless fixtures.nil?
-        if fixtures.instance_of?(Fixtures)
-          @@loaded_fixtures[fixtures.table_name] = fixtures
-        else
-          fixtures.each { |f| @@loaded_fixtures[f.table_name] = f }
-        end
+        fixtures.each { |f| @@loaded_fixtures[f.table_name] = f }
       end
 
       table_names.each do |table_name|
-        define_method(table_name) do |*fixtures|
+        define_method(table_name) do |*names|
           @@fixture_cache[table_name] ||= {}
 
-          instances = fixtures.map do |fixture|
-            if @@loaded_fixtures[table_name][fixture.to_s]
-              @@fixture_cache[table_name][fixture] ||= @@loaded_fixtures[table_name][fixture.to_s].find
+          instances = names.map do |name|
+            if @@loaded_fixtures[table_name][name.to_s]
+              @@fixture_cache[table_name][name] ||= @@loaded_fixtures[table_name][name.to_s].find
             else
-              raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
+              raise StandardError, "No fixture with name '#{name}' found for table '#{table_name}'"
             end
           end
 

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
 require 'rspec'
 require 'view_helpers/view_example_group'
-begin
-  require 'ruby-debug'
-rescue LoadError
-  # no debugger available
-end
 
 Dir[File.expand_path('../matchers/*_matcher.rb', __FILE__)].each { |matcher| require matcher }
 

data/spec/view_helpers/action_view_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'spec_helper'
-require 'active_support/rescuable' # needed for Ruby 1.9.1
 require 'action_controller'
 require 'action_view'
 require 'will_paginate/view_helpers/action_view'
@@ -23,6 +22,8 @@ describe WillPaginate::ActionView do
   before(:all) do
     I18n.load_path.concat WillPaginate::I18n.load_path
     I18n.enforce_available_locales = false
+
+    ActionController::Parameters.permit_all_parameters = false
   end
 
   before(:each) do
@@ -40,9 +41,7 @@ describe WillPaginate::ActionView do
   
   def render(locals)
     lookup_context = []
-    if defined? ActionView::LookupContext
-      lookup_context = ActionView::LookupContext.new(lookup_context)
-    end
+    lookup_context = ActionView::LookupContext.new(lookup_context)
 
     klass = ActionView::Base
     klass = klass.with_empty_template_cache if klass.respond_to?(:with_empty_template_cache)
@@ -128,7 +127,7 @@ describe WillPaginate::ActionView do
   it "should match expected markup" do
     paginate
     expected = <<-HTML
-      <div class="pagination" role="navigation" aria-label="Pagination"><span class="previous_page disabled">&#8592; Previous</span>
+      <div class="pagination" role="navigation" aria-label="Pagination"><span class="previous_page disabled" aria-disabled="true">&#8592; Previous</span>
       <em class="current" aria-label="Page 1" aria-current="page">1</em>
       <a href="/foo/bar?page=2" aria-label="Page 2" rel="next">2</a>
       <a href="/foo/bar?page=3" aria-label="Page 3">3</a>
@@ -370,6 +369,16 @@ describe WillPaginate::ActionView do
     end
   end
 
+  # TODO: re-enable once Rails 6.1.4 ships
+  xit "page_entries_info" do
+    @template = "<%= page_entries_info collection, options %>"
+    output = render(
+      collection: WillPaginate::Collection.new(1, 1, 3),
+      options: {html: false},
+    )
+    output.should == "Displaying entries 1 - 0 of 3 in total"
+  end
+
   private
 
   def translation(data)
@@ -454,11 +463,7 @@ class DummyRequest
 
   def params(more = nil)
     @params.update(more) if more
-    if defined?(ActionController::Parameters)
-      ActionController::Parameters.new(@params)
-    else
-      @params
-    end
+    ActionController::Parameters.new(@params)
   end
   
   def host_with_port
@@ -474,7 +479,3 @@ class DummyRequest
     'http:'
   end
 end
-
-if defined?(ActionController::Parameters)
-  ActionController::Parameters.permit_all_parameters = false
-end

data/spec/view_helpers/view_example_group.rb

@@ -1,30 +1,13 @@
 require 'active_support'
 require 'stringio'
-begin
-  $stderr = StringIO.new
-  require 'minitest/unit'
-rescue LoadError
-  # Fails on Ruby 1.8, but it's OK since we only need MiniTest::Assertions
-  # on Rails 4 which doesn't support 1.8 anyway.
-ensure
-  $stderr = STDERR
-end
-
-begin
-  require 'rails/dom/testing/assertions'
-rescue LoadError
-  require 'action_dispatch/testing/assertions'
-end
+require 'minitest/assertions'
+require 'rails/dom/testing/assertions'
 require 'will_paginate/array'
 
 module ViewExampleGroup
   
-  if defined?(Rails::Dom::Testing::Assertions)
-    include Rails::Dom::Testing::Assertions::SelectorAssertions
-  else
-    include ActionDispatch::Assertions::SelectorAssertions
-  end
-  include MiniTest::Assertions if defined? MiniTest
+  include Rails::Dom::Testing::Assertions::SelectorAssertions
+  include Minitest::Assertions
 
   def assert(value, message)
     raise message unless value
@@ -50,11 +33,7 @@ module ViewExampleGroup
   end
 
   def parse_html_document(html)
-    if defined?(Rails::Dom::Testing::Assertions)
-      Nokogiri::HTML::Document.parse(html)
-    else
-      HTML::Document.new(html, true, false)
-    end
+    Nokogiri::HTML::Document.parse(html)
   end
 
   def html_document
@@ -124,23 +103,3 @@ RSpec.configure do |config|
     :file_path => %r{spec/view_helpers/}
   }
 end
-
-module HTML
-  Node.class_eval do
-    def inner_text
-      children.map(&:inner_text).join('')
-    end
-  end
-  
-  Text.class_eval do
-    def inner_text
-      self.to_s
-    end
-  end
-
-  Tag.class_eval do
-    def inner_text
-      childless?? '' : super
-    end
-  end
-end if defined?(HTML)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Mislav Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies: []
 description: will_paginate provides a simple API for performing paginated queries
   with Active Record, DataMapper and Sequel, and includes helpers for rendering pagination
@@ -48,14 +48,8 @@ files:
 - spec/console
 - spec/console_fixtures.rb
 - spec/database.yml
-- spec/fake_rubygems.rb
 - spec/finders/active_record_spec.rb
 - spec/finders/activerecord_test_connector.rb
-- spec/finders/data_mapper_spec.rb
-- spec/finders/data_mapper_test_connector.rb
-- spec/finders/mongoid_spec.rb
-- spec/finders/sequel_spec.rb
-- spec/finders/sequel_test_connector.rb
 - spec/fixtures/admin.rb
 - spec/fixtures/developer.rb
 - spec/fixtures/developers_projects.yml
@@ -83,11 +77,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/mislav/will_paginate/issues
-  changelog_uri: https://github.com/mislav/will_paginate/releases/tag/v3.3.0
-  documentation_uri: https://www.rubydoc.info/gems/will_paginate/3.3.0
-  source_code_uri: https://github.com/mislav/will_paginate/tree/v3.3.0
+  changelog_uri: https://github.com/mislav/will_paginate/releases/tag/v3.3.1
+  documentation_uri: https://www.rubydoc.info/gems/will_paginate/3.3.1
+  source_code_uri: https://github.com/mislav/will_paginate/tree/v3.3.1
   wiki_uri: https://github.com/mislav/will_paginate/wiki
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -105,8 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Pagination plugin for web frameworks and other apps
 test_files: []

data/spec/fake_rubygems.rb

@@ -1,18 +0,0 @@
-# Makes the test suite compatible with Bundler standalone mode (used in CI)
-# because Active Record uses `gem` for loading adapters.
-Kernel.module_eval do
-
-  remove_method :gem if 'method' == defined? gem
-
-  def gem(*args)
-    return if $VERBOSE.nil?
-    $stderr << "warning: gem(#{args.map {|o| o.inspect }.join(', ')}) ignored"
-    $stderr << "; called from:\n  " << caller[0,5].join("\n  ") if $DEBUG
-    $stderr << "\n"
-  end
-
-  private :gem
-
-end
-
-$" << "rubygems.rb"

data/spec/finders/data_mapper_spec.rb

@@ -1,114 +0,0 @@
-require 'spec_helper'
-
-if !ENV['SKIP_NONRAILS_TESTS']
-  require 'will_paginate/data_mapper'
-  require File.expand_path('../data_mapper_test_connector', __FILE__)
-  datamapper_loaded = true
-else
-  datamapper_loaded = false
-end
-
-describe WillPaginate::DataMapper do
-
-  it "has per_page" do
-    Animal.per_page.should == 30
-    begin
-      Animal.per_page = 10
-      Animal.per_page.should == 10
-
-      subclass = Class.new(Animal)
-      subclass.per_page.should == 10
-    ensure
-      Animal.per_page = 30
-    end
-  end
-
-  it "doesn't make normal collections appear paginated" do
-    Animal.all.should_not be_paginated
-  end
-
-  it "paginates to first page by default" do
-    animals = Animal.paginate(:page => nil)
-
-    animals.should be_paginated
-    animals.current_page.should == 1
-    animals.per_page.should == 30
-    animals.offset.should == 0
-    animals.total_entries.should == 3
-    animals.total_pages.should == 1
-  end
-
-  it "paginates to first page, explicit limit" do
-    animals = Animal.paginate(:page => 1, :per_page => 2)
-
-    animals.current_page.should == 1
-    animals.per_page.should == 2
-    animals.total_entries.should == 3
-    animals.total_pages.should == 2
-    animals.map {|a| a.name }.should == %w[ Dog Cat ]
-  end
-
-  it "paginates to second page" do
-    animals = Animal.paginate(:page => 2, :per_page => 2)
-
-    animals.current_page.should == 2
-    animals.offset.should == 2
-    animals.map {|a| a.name }.should == %w[ Lion ]
-  end
-
-  it "paginates a collection" do
-    friends = Animal.all(:notes.like => '%friend%')
-    friends.paginate(:page => 1).per_page.should == 30
-    friends.paginate(:page => 1, :per_page => 1).total_entries.should == 2
-  end
-
-  it "paginates a limited collection" do
-    animals = Animal.all(:limit => 2).paginate(:page => 1)
-    animals.per_page.should == 2
-  end
-
-  it "has page() method" do
-    Animal.page(2).per_page.should == 30
-    Animal.page(2).offset.should == 30
-    Animal.page(2).current_page.should == 2
-    Animal.all(:limit => 2).page(2).per_page.should == 2
-  end
-
-  it "has total_pages at 1 for empty collections" do
-    Animal.all(:conditions => ['1=2']).page(1).total_pages.should == 1
-  end
-
-  it "overrides total_entries count with a fixed value" do
-    lambda {
-      animals = Animal.paginate :page => 1, :per_page => 3, :total_entries => 999
-      animals.total_entries.should == 999
-    }.should run_queries(0)
-  end
-
-  it "supports a non-int for total_entries" do
-    topics = Animal.paginate :page => 1, :per_page => 3, :total_entries => "999"
-    topics.total_entries.should == 999
-  end
-
-
-  it "can iterate and then call WP methods" do
-    animals = Animal.all(:limit => 2).page(1)
-    animals.each { |a| }
-    animals.total_entries.should == 3
-  end
-
-  it "augments to_a to return a WP::Collection" do
-    animals = Animal.all(:limit => 2).page(1)
-    array = animals.to_a
-    array.size.should == 2
-    array.should be_kind_of(WillPaginate::Collection)
-    array.current_page.should == 1
-    array.per_page.should == 2
-  end
-
-  it "doesn't have a problem assigning has-one-through relationship" do
-    human = Human.create :name => "Mislav"
-    human.pet = Animal.first
-  end
-
-end if datamapper_loaded

data/spec/finders/data_mapper_test_connector.rb

@@ -1,54 +0,0 @@
-require 'sqlite3'
-require 'dm-core'
-require 'dm-core/support/logger'
-require 'dm-migrations'
-
-DataMapper.setup :default, 'sqlite3::memory:'
-
-# Define models
-class Animal
-  include DataMapper::Resource
-  property :id, Serial
-  property :name, String
-  property :notes, Text
- 
-  def self.setup
-    Animal.create(:name => 'Dog', :notes => "Man's best friend")
-    Animal.create(:name => 'Cat', :notes => "Woman's best friend")
-    Animal.create(:name => 'Lion', :notes => 'King of the Jungle')
-  end
-end
-
-class Ownership
-  include DataMapper::Resource
-
-  belongs_to :animal, :key => true
-  belongs_to :human, :key => true
-
-  def self.setup
-  end
-end
-
-class Human
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :name, String
-
-  has n, :ownerships
-  has 1, :pet, :model => 'Animal', :through => :ownerships, :via => :animal
-
-  def self.setup
-  end
-end
-
-# Load fixtures
-[Animal, Ownership, Human].each do |klass|
-  klass.auto_migrate!
-  klass.setup
-end
-
-if 'irb' == $0
-  DataMapper.logger.set_log($stdout, :debug)
-  DataMapper.logger.auto_flush = true
-end

data/spec/finders/mongoid_spec.rb

@@ -1,147 +0,0 @@
-require 'spec_helper'
-
-if !ENV['SKIP_NONRAILS_TESTS']
-  if defined?(Rails)
-    old_rails = Rails
-    # Mongoid sees the `Rails` constant and then proceeds to `require "rails"`
-    # from its railtie. This tricks it into believing there is no Rails.
-    Object.send(:remove_const, :Rails)
-  end
-  require 'will_paginate/mongoid'
-  Object.send(:const_set, :Rails, old_rails) if old_rails
-
-  Mongo::Logger.logger.level = Logger::INFO
-
-  Mongoid.connect_to 'will_paginate_test'
-  class MongoidModel
-    include Mongoid::Document
-  end
-
-  mongoid_loaded = true
-else
-  mongoid_loaded = false
-end
-
-describe WillPaginate::Mongoid do
-  before(:all) do
-    MongoidModel.delete_all
-    4.times { MongoidModel.create! }
-  end
-
-  let(:criteria) { MongoidModel.criteria }
-
-  describe "#page" do
-    it "should forward to the paginate method" do
-      criteria.expects(:paginate).with(:page => 2).returns("itself")
-      criteria.page(2).should == "itself"
-    end
-
-    it "should not override per_page if set earlier in the chain" do
-      criteria.paginate(:per_page => 10).page(1).per_page.should == 10
-      criteria.paginate(:per_page => 20).page(1).per_page.should == 20
-    end
-  end
-
-  describe "#per_page" do
-    it "should set the limit if given an argument" do
-      criteria.per_page(10).options[:limit].should == 10
-    end
-
-    it "should return the current limit if no argument is given" do
-      criteria.per_page.should == nil
-      criteria.per_page(10).per_page.should == 10
-    end
-
-    it "should be interchangable with limit" do
-      criteria.limit(15).per_page.should == 15
-    end
-
-    it "should be nil'able" do
-      criteria.per_page(nil).per_page.should be_nil
-    end
-  end
-
-  describe "#paginate" do
-    it "should use criteria" do
-      criteria.paginate.should be_instance_of(::Mongoid::Criteria)
-    end
-
-    it "should not override page number if set earlier in the chain" do
-      criteria.page(3).paginate.current_page.should == 3
-    end
-
-    it "should limit according to per_page parameter" do
-      criteria.paginate(:per_page => 10).options.should include(:limit => 10)
-    end
-
-    it "should skip according to page and per_page parameters" do
-      criteria.paginate(:page => 2, :per_page => 5).options.should include(:skip => 5)
-    end
-
-    specify "first fallback value for per_page option is the current limit" do
-      criteria.limit(12).paginate.options.should include(:limit => 12)
-    end
-
-    specify "second fallback value for per_page option is WillPaginate.per_page" do
-      criteria.paginate.options.should include(:limit => WillPaginate.per_page)
-    end
-
-    specify "page should default to 1" do
-      criteria.paginate.options.should include(:skip => 0)
-    end
-
-    it "should convert strings to integers" do
-      criteria.paginate(:page => "2", :per_page => "3").options.should include(:limit => 3)
-    end
-
-    describe "collection compatibility" do
-      describe "#total_count" do
-        it "should be calculated correctly" do
-          criteria.paginate(:per_page => 1).total_entries.should == 4
-          criteria.paginate(:per_page => 3).total_entries.should == 4
-        end
-
-        it "should be cached" do
-          criteria.expects(:count).once.returns(123)
-          criteria.paginate
-          2.times { criteria.total_entries.should == 123 }
-        end
-      end
-
-      it "should calculate total_pages" do
-        criteria.paginate(:per_page => 1).total_pages.should == 4
-        criteria.paginate(:per_page => 3).total_pages.should == 2
-        criteria.paginate(:per_page => 10).total_pages.should == 1
-      end
-
-      it "should return per_page" do
-        criteria.paginate(:per_page => 1).per_page.should == 1
-        criteria.paginate(:per_page => 5).per_page.should == 5
-      end
-
-      describe "#current_page" do
-        it "should return current_page" do
-          criteria.paginate(:page => 1).current_page.should == 1
-          criteria.paginate(:page => 3).current_page.should == 3
-        end
-
-        it "should be casted to PageNumber" do
-          page = criteria.paginate(:page => 1).current_page
-          (page.instance_of? WillPaginate::PageNumber).should be
-        end
-      end
-
-      it "should return offset" do
-        criteria.paginate(:page => 1).offset.should == 0
-        criteria.paginate(:page => 2, :per_page => 5).offset.should == 5
-        criteria.paginate(:page => 3, :per_page => 10).offset.should == 20
-      end
-
-      it "should not pollute plain mongoid criterias" do
-        %w(total_entries total_pages current_page).each do |method|
-          criteria.should_not respond_to(method)
-        end
-      end
-    end
-  end
-end if mongoid_loaded

data/spec/finders/sequel_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-if !ENV['SKIP_NONRAILS_TESTS']
-  require 'will_paginate/sequel'
-  require File.expand_path('../sequel_test_connector', __FILE__)
-  sequel_loaded = true
-else
-  sequel_loaded = false
-end
-
-describe Sequel::Dataset::Pagination, 'extension' do
-  
-  class Car < Sequel::Model
-    self.dataset = dataset.extension(:pagination)
-  end
-
-  it "should have the #paginate method" do
-    Car.dataset.should respond_to(:paginate)
-  end
-
-  it "should NOT have the #paginate_by_sql method" do
-    Car.dataset.should_not respond_to(:paginate_by_sql)
-  end
-
-  describe 'pagination' do
-    before(:all) do
-      Car.create(:name => 'Shelby', :notes => "Man's best friend")
-      Car.create(:name => 'Aston Martin', :notes => "Woman's best friend")
-      Car.create(:name => 'Corvette', :notes => 'King of the Jungle')
-    end
-
-    it "should imitate WillPaginate::Collection" do
-      result = Car.dataset.paginate(1, 2)
-      
-      result.should_not be_empty
-      result.size.should == 2
-      result.length.should == 2
-      result.total_entries.should == 3
-      result.total_pages.should == 2
-      result.per_page.should == 2
-      result.current_page.should == 1
-    end
-    
-    it "should perform" do
-      Car.dataset.paginate(1, 2).all.should == [Car[1], Car[2]]
-    end
-
-    it "should be empty" do
-      result = Car.dataset.paginate(3, 2)
-      result.should be_empty
-    end
-    
-    it "should perform with #select and #order" do
-      result = Car.select(Sequel.lit("name as foo")).order(:name).paginate(1, 2).all
-      result.size.should == 2
-      result.first.values[:foo].should == "Aston Martin"
-    end
-
-    it "should perform with #filter" do
-      results = Car.filter(:name => 'Shelby').paginate(1, 2).all
-      results.size.should == 1
-      results.first.should == Car.find(:name => 'Shelby')
-    end
-  end
-
-end if sequel_loaded

data/spec/finders/sequel_test_connector.rb

@@ -1,15 +0,0 @@
-require 'sequel'
-
-Symbol.class_eval do
-  # Active Record calculations tries `as` on some objects but chokes when that
-  # object was a Symbol and it gets a Sequel::SQL::AliasedExpression.
-  undef as if method_defined? :as
-end
-
-db = Sequel.sqlite
-
-db.create_table :cars do
-  primary_key :id, :integer, :auto_increment => true
-  column :name, :text
-  column :notes, :text
-end