Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mislav/will_paginate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.3
Choose a base ref
...
head repository: mislav/will_paginate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jun 8, 2015

  1. Copy the full SHA
    20ce1b5 View commit details

Commits on Mar 16, 2016

  1. removing start from previous rel

    Bernardo Srulzon committed Mar 16, 2016
    Copy the full SHA
    c4ca882 View commit details
  2. removes references to rel=start

    Bernardo Srulzon committed Mar 16, 2016
    Copy the full SHA
    177f904 View commit details
  3. fixing specs

    Bernardo Srulzon committed Mar 16, 2016
    Copy the full SHA
    60fb6e9 View commit details

Commits on Sep 16, 2016

  1. Correct word

    Morgan authored Sep 16, 2016
    Copy the full SHA
    26336cf View commit details

Commits on Oct 15, 2016

  1. Merge pull request #503 from mlaco/patch-1

    Correct word
    mislav authored Oct 15, 2016
    Copy the full SHA
    f359752 View commit details
  2. Copy the full SHA
    7a6e49c View commit details
  3. Merge pull request #474 from bernardosrulzon/fixing-rel

    Fixes the incorrect "rel = prev start" relation
    mislav authored Oct 15, 2016
    Copy the full SHA
    96b7032 View commit details
  4. Merge pull request #443 from substrakt/master

    refactor out unless/else statement
    mislav authored Oct 15, 2016
    Copy the full SHA
    0c17a39 View commit details
  5. Copy the full SHA
    895e37b View commit details
  6. will_paginate 3.1.5

    mislav committed Oct 15, 2016
    Copy the full SHA
    18626f5 View commit details

Commits on May 30, 2017

  1. Update unit test configuration

    Signed-off-by: Florian Wininger <fw.centrale@gmail.com>
    fwininger committed May 30, 2017
    Copy the full SHA
    546d05c View commit details

Commits on Jun 2, 2017

  1. Supporting MS SQL Server.

    Signed-off-by: MORITA Shintaro <shin@sysphonic.com>
    MORITA Shintaro committed Jun 2, 2017
    Copy the full SHA
    6aa4e93 View commit details

Commits on Jun 7, 2017

  1. Copy the full SHA
    3e1a366 View commit details
  2. Copy the full SHA
    32d08e0 View commit details
  3. Bring back "mysql" testing for Rails 4.0 and Rails 4.1

    Rails 4.2 is not possible because we need to test it against Ruby 2.4,
    and "mysql" is not compatible with Ruby 2.4.
    mislav committed Jun 7, 2017
    Copy the full SHA
    ca6585c View commit details
  4. Remove build status image from Readme

    I don't do build status images in my projects.
    mislav committed Jun 7, 2017
    Copy the full SHA
    336f2af View commit details
  5. changed the Ruby 2.4 deprecated Fixnum constant to Integer

    Patrycjusz R. Łogiewa authored and mislav committed Jun 7, 2017
    Copy the full SHA
    c1be8a7 View commit details
  6. Fix connecting to local mysql

    mislav committed Jun 7, 2017
    Copy the full SHA
    c4a854b View commit details
  7. Copy the full SHA
    7a2da51 View commit details
  8. Merge branch 'fix-unit-test'

    Closes #522, closes #531, closes #538, fixes #523
    mislav committed Jun 7, 2017
    2
    Copy the full SHA
    8f8a71c View commit details
  9. will_paginate 3.1.6

    mislav committed Jun 7, 2017
    Copy the full SHA
    0b93300 View commit details

Commits on Jun 8, 2017

  1. Merge branch 'master_src_base' into sqlserver

    Merging will_paginate 3.1.6.
    MORITA Shintaro committed Jun 8, 2017
    Copy the full SHA
    00145b4 View commit details

Commits on Jun 27, 2017

  1. support for Hanami View

    phoffer committed Jun 27, 2017
    Copy the full SHA
    c7b6ffe View commit details

Commits on Jun 28, 2017

  1. add Hanami::View to readme

    phoffer committed Jun 28, 2017
    Copy the full SHA
    94a7e4f View commit details
  2. Copy the full SHA
    74347b9 View commit details

Commits on Aug 14, 2017

  1. Fix wrong syntax in #paginated_section documentation

    Mateusz Luterek committed Aug 14, 2017
    Copy the full SHA
    49a08c7 View commit details

Commits on Apr 17, 2018

  1. Add total_entries support for Mongoid

    Roman Gaufman committed Apr 17, 2018
    Copy the full SHA
    66f3a42 View commit details

Commits on Aug 6, 2018

  1. There is no mailing list anymore

    Mailing list was not very useful and I've decided not to maintain and moderate it anymore.
    mislav authored Aug 6, 2018
    Copy the full SHA
    4f74fc8 View commit details
  2. Copy the full SHA
    0fa1311 View commit details
  3. Test against Ruby 2.5

    mislav committed Aug 6, 2018
    Copy the full SHA
    a7d348c View commit details
  4. Copy the full SHA
    91db6a2 View commit details
  5. Fix primary key for MySQL 5.7

    mislav committed Aug 6, 2018
    Copy the full SHA
    797e74d View commit details
  6. Merge branch 'ci-versions'

    mislav committed Aug 6, 2018
    Copy the full SHA
    b828d8c View commit details

Commits on Feb 14, 2019

  1. Copy the full SHA
    9c9d737 View commit details

Commits on Mar 4, 2019

  1. Copy the full SHA
    9936d2c View commit details

Commits on Mar 18, 2019

  1. Fix test_all for Ruby 2.5

    mislav committed Mar 18, 2019
    Copy the full SHA
    02eea15 View commit details
  2. Test against Rails 6 beta

    mislav committed Mar 18, 2019
    Copy the full SHA
    df2e01e View commit details
  3. Compatibility with Rails 6

    Active Record 6 introduces a private method `select_for_count` which
    conflicts with the one from will_paginate.
    mislav committed Mar 18, 2019
    1
    Copy the full SHA
    c00a841 View commit details
  4. Update PostgreSQL in Travis CI

    Fixes:
    
        Your version of PostgreSQL (90224) is too old.
        Active Record supports PostgreSQL >= 9.3. (RuntimeError)
    
    https://travis-ci.org/mislav/will_paginate/jobs/507978180
    mislav committed Mar 18, 2019
    Copy the full SHA
    9b22d48 View commit details
  5. Merge branch 'rails6'

    Closes #587
    mislav committed Mar 18, 2019
    Copy the full SHA
    b6fb7b0 View commit details
  6. Merge pull request #585 from coderhs/patch-1

    [DOC] README: latest hash format convention in examples.
    mislav authored Mar 18, 2019
    Copy the full SHA
    2956393 View commit details
  7. will_paginate 3.1.7

    mislav committed Mar 18, 2019
    Copy the full SHA
    63e84fb View commit details

Commits on May 4, 2019

  1. Copy the full SHA
    5d3ba62 View commit details

Commits on Aug 15, 2019

  1. Fix warnings on Ruby 2.7

    Ruby 2.7 emits warnings when using `Proc.new` with no block.  This
    commit just converts the code to use `&block` to avoid the warning.
    tenderlove committed Aug 15, 2019
    Copy the full SHA
    0f1416c View commit details

Commits on Aug 19, 2019

  1. Merge pull request #597 from tenderlove/fix-warnings-2.7

    Fix warnings on Ruby 2.7
    
    Fixes #595
    mislav authored Aug 19, 2019
    Copy the full SHA
    27654c1 View commit details
  2. will_paginate 3.1.8

    mislav committed Aug 19, 2019
    Copy the full SHA
    04b9895 View commit details
  3. Copy the full SHA
    171d9ec View commit details
  4. Tweak Ruby versions for CI

    mislav committed Aug 19, 2019
    Copy the full SHA
    b3118d9 View commit details
  5. Tweak Ruby versions for CI

    mislav committed Aug 19, 2019
    Copy the full SHA
    e628d5f View commit details
Showing with 1,174 additions and 1,354 deletions.
  1. +13 −0 .envrc
  2. +6 −0 .github/dependabot.yml
  3. +154 −0 .github/workflows/test.yml
  4. +1 −0 .gitignore
  5. +0 −43 .travis.yml
  6. +2 −2 Brewfile
  7. +9 −0 CONTRIBUTING.md
  8. +7 −21 Gemfile
  9. +0 −24 Gemfile.rails-edge
  10. +0 −23 Gemfile.rails3.0
  11. +0 −24 Gemfile.rails3.1
  12. +0 −24 Gemfile.rails3.2
  13. +0 −21 Gemfile.rails4.1
  14. +0 −22 Gemfile.rails4.2
  15. +0 −22 Gemfile.rails5.0
  16. +8 −11 README.md
  17. +21 −0 docker-compose.yml
  18. +9 −0 environments/Gemfile.non-rails.rb
  19. +14 −0 environments/Gemfile.rails-edge.rb
  20. +18 −0 environments/Gemfile.rails5.0.rb
  21. +17 −0 environments/Gemfile.rails5.1.rb
  22. +16 −0 environments/Gemfile.rails5.2.rb
  23. +14 −0 environments/Gemfile.rails6.0.rb
  24. +14 −0 environments/Gemfile.rails6.1.rb
  25. +14 −0 environments/Gemfile.rails7.0.rb
  26. +0 −12 lib/will_paginate.rb
  27. +7 −11 lib/will_paginate/active_record.rb
  28. +0 −100 lib/will_paginate/data_mapper.rb
  29. +2 −2 lib/will_paginate/deprecation.rb
  30. +3 −3 lib/will_paginate/i18n.rb
  31. +4 −0 lib/will_paginate/locale/en.yml
  32. +2 −0 lib/will_paginate/mongoid.rb
  33. +7 −11 lib/will_paginate/page_number.rb
  34. +11 −6 lib/will_paginate/railtie.rb
  35. +3 −3 lib/will_paginate/version.rb
  36. +8 −4 lib/will_paginate/view_helpers/action_view.rb
  37. +41 −0 lib/will_paginate/view_helpers/hanami.rb
  38. +21 −17 lib/will_paginate/view_helpers/link_renderer.rb
  39. +1 −1 lib/will_paginate/view_helpers/link_renderer_base.rb
  40. +0 −26 lib/will_paginate/view_helpers/merb.rb
  41. +8 −11 script/bootstrap
  42. +44 −0 script/ci-matrix
  43. +0 −12 script/each-gemfile
  44. +13 −0 script/release
  45. +13 −13 script/test_all
  46. +141 −0 spec-non-rails/mongoid_spec.rb
  47. +66 −0 spec-non-rails/sequel_spec.rb
  48. +11 −0 spec-non-rails/spec_helper.rb
  49. +33 −33 spec/collection_spec.rb
  50. +1 −3 spec/console
  51. +11 −11 spec/database.yml
  52. +0 −18 spec/fake_rubygems.rb
  53. +153 −147 spec/finders/active_record_spec.rb
  54. +51 −36 spec/finders/activerecord_test_connector.rb
  55. +0 −116 spec/finders/data_mapper_spec.rb
  56. +0 −54 spec/finders/data_mapper_test_connector.rb
  57. +0 −140 spec/finders/mongoid_spec.rb
  58. +0 −67 spec/finders/sequel_spec.rb
  59. +0 −15 spec/finders/sequel_test_connector.rb
  60. +5 −5 spec/fixtures/replies.yml
  61. +4 −4 spec/fixtures/topics.yml
  62. +0 −27 spec/matchers/deprecation_matcher.rb
  63. +0 −19 spec/matchers/phrase_matcher.rb
  64. +11 −16 spec/matchers/query_count_matcher.rb
  65. +30 −22 spec/page_number_spec.rb
  66. +6 −6 spec/per_page_spec.rb
  67. +13 −26 spec/spec_helper.rb
  68. +63 −37 spec/view_helpers/action_view_spec.rb
  69. +18 −17 spec/view_helpers/base_spec.rb
  70. +9 −9 spec/view_helpers/link_renderer_base_spec.rb
  71. +11 −54 spec/view_helpers/view_example_group.rb
  72. +12 −3 will_paginate.gemspec
13 changes: 13 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
PATH_add ./bin

# shellcheck shell=bash
export MYSQL_HOST=127.0.0.1
export MYSQL_PORT=3307

export POSTGRES_HOST=localhost
export POSTGRES_PORT=5433
export POSTGRES_USER=postgres
export POSTGRES_PASSWORD=postgres

export MONGODB_HOST=localhost
export MONGODB_PORT=27018
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
154 changes: 154 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
---
name: Test Suite
'on':
- push
- pull_request
jobs:
test-rails:
strategy:
fail-fast: false
matrix:
ruby:
- '2.4'
- '2.5'
- '2.6'
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'
gemfile:
- Gemfile
- environments/Gemfile.rails5.0.rb
- environments/Gemfile.rails5.1.rb
- environments/Gemfile.rails5.2.rb
- environments/Gemfile.rails6.0.rb
- environments/Gemfile.rails6.1.rb
- environments/Gemfile.rails-edge.rb
exclude:
- ruby: '2.4'
gemfile: Gemfile
- ruby: '2.5'
gemfile: Gemfile
- ruby: '2.6'
gemfile: Gemfile
- ruby: '3.0'
gemfile: environments/Gemfile.rails5.0.rb
- ruby: '3.1'
gemfile: environments/Gemfile.rails5.0.rb
- ruby: '3.2'
gemfile: environments/Gemfile.rails5.0.rb
- ruby: '3.3'
gemfile: environments/Gemfile.rails5.0.rb
- ruby: '3.0'
gemfile: environments/Gemfile.rails5.1.rb
- ruby: '3.1'
gemfile: environments/Gemfile.rails5.1.rb
- ruby: '3.2'
gemfile: environments/Gemfile.rails5.1.rb
- ruby: '3.3'
gemfile: environments/Gemfile.rails5.1.rb
- ruby: '3.0'
gemfile: environments/Gemfile.rails5.2.rb
- ruby: '3.1'
gemfile: environments/Gemfile.rails5.2.rb
- ruby: '3.2'
gemfile: environments/Gemfile.rails5.2.rb
- ruby: '3.3'
gemfile: environments/Gemfile.rails5.2.rb
- ruby: '2.4'
gemfile: environments/Gemfile.rails6.0.rb
- ruby: '2.4'
gemfile: environments/Gemfile.rails6.1.rb
- ruby: '2.4'
gemfile: environments/Gemfile.rails-edge.rb
- ruby: '2.5'
gemfile: environments/Gemfile.rails-edge.rb
- ruby: '2.6'
gemfile: environments/Gemfile.rails-edge.rb
- ruby: '2.7'
gemfile: environments/Gemfile.rails-edge.rb
- ruby: '3.0'
gemfile: environments/Gemfile.rails-edge.rb
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
services:
mysql:
image: mysql:5.7
env:
MYSQL_DATABASE: will_paginate
MYSQL_ALLOW_EMPTY_PASSWORD: true
ports:
- 3306:3306
postgres:
image: postgres:11
env:
POSTGRES_DB: will_paginate
POSTGRES_PASSWORD: postgres
ports:
- 5432:5432
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: "${{ matrix.ruby }}"
bundler-cache: true
- name: Run tests
env:
MYSQL_HOST: 127.0.0.1
MYSQL_PORT: 3306
POSTGRES_HOST: localhost
POSTGRES_PORT: 5432
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
run: |
docker-wait() {
local container
container="$(docker ps -q -f ancestor=$1)"
timeout 90s bash -c "until docker exec $container $2; do sleep 5; done"
}
docker-wait postgres:11 "pg_isready"
docker-wait mysql:5.7 "mysqladmin ping"
bundler binstubs rspec-core
script/test_all
test-nonrails:
strategy:
fail-fast: false
matrix:
ruby:
- '2.4'
- '2.5'
- '2.6'
- '2.7'
- '3.0'
- '3.1'
- '3.2'
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: environments/Gemfile.non-rails.rb
services:
mongodb:
image: mongo:4.2
ports:
- 27017:27017
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: "${{ matrix.ruby }}"
bundler-cache: true
- name: Run tests
run: |
docker-wait() {
local container
container="$(docker ps -q -f ancestor=$1)"
timeout 90s bash -c "until docker exec $container $2; do sleep 5; done"
}
docker-wait mongo:4.2 "mongo --quiet"
bundler binstubs rspec-core
script/test_all
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Gemfile*.lock
Brewfile.lock.json
.bundle
doc
*.gem
43 changes: 0 additions & 43 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
brew 'mongodb', restart_service: true
brew 'mysql56', restart_service: true
# brew 'mongodb/brew/mongodb-community@4.0', restart_service: true
brew 'mysql@5.7', restart_service: true
brew 'postgresql', restart_service: true
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
How to set up your environment for running tests:

1. Run `script/bootstrap`

**Note:** on systems without Homebrew, you must ensure that MySQL 5.7, PostgreSQL 12, and MongoDB 4.x Community Edition are up and running.

2. Run `script/test_all`

This ensures that the Active Record part of the suite is run across `sqlite3`, `mysql`, and `postgres` database adapters.
28 changes: 7 additions & 21 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
source 'https://rubygems.org'

rails_version = '~> 4.0.0'
# We test against other Rails versions, too. See `environments/`
rails_version = '~> 7.1.3'

gem 'activerecord', rails_version
gem 'actionpack', rails_version

gem 'rspec', '~> 2.6.0'
gem 'mocha', '~> 0.9.8'
gem 'rspec', '~> 3.12'
gem 'mocha', '~> 2.0'

gem 'sqlite3', '~> 1.3.6'
gem 'sequel', '~> 3.8'
gem 'dm-core'
gem 'dm-aggregates'
gem 'dm-migrations'
gem 'dm-sqlite-adapter'
gem 'mongoid'

group :mysql do
gem 'mysql', '~> 2.9'
gem 'mysql2', '~> 0.3.10'
end
gem 'pg', '~> 0.11', :group => :pg

group :development do
gem 'ruby-debug', :platforms => :mri_18
gem 'debugger', :platforms => :mri_19
end
gem 'sqlite3', '~> 1.5.0'
gem 'mysql2', '~> 0.5.2', :group => :mysql
gem 'pg', '~> 1.2', :group => :pg
24 changes: 0 additions & 24 deletions Gemfile.rails-edge

This file was deleted.

23 changes: 0 additions & 23 deletions Gemfile.rails3.0

This file was deleted.

24 changes: 0 additions & 24 deletions Gemfile.rails3.1

This file was deleted.

24 changes: 0 additions & 24 deletions Gemfile.rails3.2

This file was deleted.

21 changes: 0 additions & 21 deletions Gemfile.rails4.1

This file was deleted.

Loading