kaminari 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e144bce9eea3099a5710a63f8a359dc57d88d3c48c52be0726d8f7d6b09b6a
-  data.tar.gz: 41fe275044253ff7e99d514da2acc1a77ea47492483bc1fcfadd521a3d9618b9
+  metadata.gz: 62a37b3deee187d19c0346edd24a455460fcbd9aa22a1759d72a6df40faf2285
+  data.tar.gz: e4094f7511aa1e57a3abab885f6c071685f31d0e6f04b7827a218ad2d23df8d0
 SHA512:
-  metadata.gz: e424967795237e20c69fc7cc7115f9956a24d48e79b4593f47aee25c22b31715801a7b59fc8d82859ccaf2655a4e58dea41878811117adba019d3a03a201d9ff
-  data.tar.gz: 7e3abbde2657bdbb5898a28513e8e7c6a11ba1ce99792aa1a76a2dab24aff571cca16a1a832690acb389b2898e7dd56da981fe45e40ac63f33d6020c5edc9abe
+  metadata.gz: 163a7121c51a8a653ea4e29f6fd11375eebd4f24a38cf2f7022d8abe077d774993e2c2651e729ef868c8eb43e9517760210474d6568428193f170d6e708b3445
+  data.tar.gz: d9e0d3e3d9647da5d1791117d05c6543c5a59bf0a92d6e6f4c585cc1f23f3f8f13e27c07eaeb1c4e90d3e1c23a6452ae2fa03bf0e0027976f8d4161e7b91e42f

data/.travis.yml

@@ -1,13 +1,23 @@
 language: ruby
 
+dist: xenial
+
+services:
+  - postgresql
+  - mysql
+
 rvm:
-  - 2.4.2
-  - 2.3.5
-  - ruby-head
-  - jruby-9.1.13.0
+  - 2.7.0
+  - 2.6.3
+  - 2.5.5
+  - 2.4.5
+  - 2.3.8
+  - jruby-9.2.9.0
   # - rbx-3
 
 gemfile:
+  - gemfiles/active_record_60.gemfile
+  - gemfiles/active_record_52.gemfile
   - gemfiles/active_record_51.gemfile
   - gemfiles/active_record_50.gemfile
   - gemfiles/active_record_42.gemfile
@@ -19,27 +29,59 @@ env:
   - DB=postgresql
   - DB=mysql
 
-sudo: false
-
 before_install:
-  - gem update --system
-  - gem update bundler --no-document
+  # install older versions of rubygems and bundler only on Ruby < 2.7
+  - if [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i rubygems-update -v '<3' && update_rubygems; fi;
+  - if [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i bundler -v '<2'; fi;
 script: 'bundle exec rake test'
 
 cache: bundler
 
 matrix:
   exclude:
-    - rvm: 2.4.2
+    - rvm: 2.7.0
+      gemfile: gemfiles/active_record_52.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/active_record_51.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/active_record_50.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/active_record_42.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/active_record_41.gemfile
+    - rvm: 2.6.3
+      gemfile: gemfiles/active_record_42.gemfile
+    - rvm: 2.6.3
+      gemfile: gemfiles/active_record_41.gemfile
+    - rvm: 2.5.5
+      gemfile: gemfiles/active_record_42.gemfile
+    - rvm: 2.5.5
+      gemfile: gemfiles/active_record_41.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/active_record_60.gemfile
+    - rvm: 2.4.5
       gemfile: gemfiles/active_record_42.gemfile
-    - rvm: 2.4.2
+    - rvm: 2.4.5
       gemfile: gemfiles/active_record_41.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/active_record_60.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/active_record_42.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/active_record_41.gemfile
+    - rvm: jruby-9.2.9.0
+      gemfile: gemfiles/active_record_42.gemfile
+    - rvm: jruby-9.2.9.0
+      gemfile: gemfiles/active_record_41.gemfile
   include:
-    - rvm: 2.2.8
+    - rvm: ruby-head
+      gemfile: gemfiles/active_record_edge.gemfile
+      env: DB=sqlite3
+    - rvm: 2.2.10
       gemfile: gemfiles/active_record_51.gemfile
       env: DB=sqlite3
     - rvm: 2.1.10
@@ -50,7 +92,7 @@ matrix:
       env: DB=sqlite3
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.9.0
     # - rvm: rbx-3
     - gemfile: gemfiles/active_record_edge.gemfile
   fast_finish: true

data/CHANGELOG.md

@@ -1,9 +1,43 @@
+## 1.2.1
+
+### Security Fixes:
+
+* Added `original_script_name` parameter to the ignore list: #1020 [@viseztrance]
+  See CVE-2020-11082 for full details.
+
+### Bug Fixes:
+
+* Fixed a couple of grouped `total_count` regressions by reverting #979
+
+
+## 1.2.0
+
+### Deprecations:
+
+* Deprecated `current_per_page` in favor of `limit_value`
+
+### Enhancements:
+
+* Added `#url_to_next_page` and `#url_to_prev_page` helper methods: [38e95a2](https://github.com/kaminari/kaminari/commit/38e95a262a210548c4f892aaa69d09ca8ecdce7f)
+* Extracted url helper methods and packed them in `Kaminari::Helpers::UrlHelper`: [ff38bee](https://github.com/kaminari/kaminari/commit/ff38bee54b5be1a948f1118c0bfd829a72a1a502)
+* Improved performance of `total_count` for grouped queries by explicitly giving SQL `select` clause #979 [@MmKolodziej]
+* Added `LIMIT` to `total_count` query when `max_pages` presents #981 [@rymai]
+
+### Bug Fixes:
+
+* Fixed a bug where the `kaminari-mongoid` gem was not loaded properly: kaminari/kaminari-mongoid#9 [@DenniJensen]
+* Fixed a bug where the `#total_count` method incorrectly calculates the total count: #932 [@tumayun]
+* Fixed a bug where `empty?` breaks subsequent `last_page?` in without_count mode #1009 [@montdidier]
+* Fixed kwargs warnings on Ruby 2.7 #1010 [@connorshea]
+
+
 ## 1.1.1
 
 ### Bug Fixes:
 
 * Fixed a bug where `paginate ..., params: { controller: ..., action: ... }` didn't override the `params[:controller]` and `params[:action]` #919 [@chao-mu]
 
+
 ## 1.1.0
 
 ### Enhancements:
@@ -63,6 +97,8 @@
 
 * Renamed the model class method for configuring `max_pages` from `max_pages_per` to `max_pages`
 
+* Raise ZeroPerPageOperation when The number of pages was incalculable of `total_pages`, `current_page` methods
+
 ### Enhancements:
 
 * Exposed `path_to_prev_page`, `path_to_next_page` helpers as public API #683 [@neilang]

data/CONTRIBUTING.md

@@ -11,6 +11,12 @@ __*We only accept bug reports and pull requests in GitHub*__. Join the team!
 * Feature requests should be accompanied by a patch, that includes tests.
 * We won't accept any feature requests that come without a patch.
 
+In addition, we generally don't accept requests that fall within one or more of the following categories:
+
+ * Requests without any legitimate use cases
+ * Requests for which the primary goal is to make a certain piece of code consistent
+ * [Cosmetic changes](https://github.com/rails/rails/pull/13771#issuecomment-32746700)
+
 Thanks! :heart: :heart: :heart:
 
 Kaminari Team

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kaminari.gemspec

data/README.md

@@ -30,11 +30,11 @@ The pagination helper outputs the HTML5 `` tag by default. Plus, the helper
 
 ## Supported Versions
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5
+* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.x, 2.8
 
-* Rails 4.1, 4.2, 5.0, 5.1, 5.2
+* Rails 4.1, 4.2, 5.0, 5.1, 5.2, 6.0, 6.1
 
-* Sinatra 1.4
+* Sinatra 1.4, 2.0
 
 * Haml 3+
 
@@ -118,6 +118,14 @@ User.page(7).per(50).padding(3)
 
 Note that the `padding` scope also is not directly defined on the models.
 
+### Unscoping
+
+If for some reason you need to unscope `page` and `per` methods you can call `except(:limit, :offset)`
+
+```ruby
+users = User.page(7).per(50)
+unpaged_users = users.except(:limit, :offset) # unpaged_users will not use the kaminari scopes
+```
 
 ## Configuring Kaminari
 
@@ -441,6 +449,13 @@ You can specify the `total_count` value through options Hash. This would be help
 @paginatable_array = Kaminari.paginate_array([], total_count: 145).page(params[:page]).per(10)
 ```
 
+or, in the case of using an external API to source the page of data:
+```ruby
+page_size = 10
+one_page = get_page_of_data params[:page], page_size
+@paginatable_array = Kaminari.paginate_array(one_page.data, total_count: one_page.total_count).page(params[:page]).per(page_size)
+```
+
 
 ## Creating Friendly URLs and Caching
 

data/Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
@@ -18,6 +17,8 @@ task default: "test:all"
 namespace :test do
   mappers = %w(
     active_record_edge
+    active_record_60
+    active_record_52
     active_record_51
     active_record_50
     active_record_42

data/gemfiles/active_record_41.gemfile

@@ -5,12 +5,12 @@ gem 'activerecord', '~> 4.1.0', require: 'active_record'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
-    gem 'sqlite3', require: false
+    gem 'sqlite3', '~> 1.3.13', require: false
   else
     gem 'sqlite3', '1.3.8', require: false
     gem 'nokogiri', '~> 1.6.8'
   end
-  gem 'pg', require: false
+  gem 'pg', '< 1.0.0', require: false
   gem 'mysql2', '< 0.4', require: false
 end
 platforms :jruby do

data/gemfiles/active_record_42.gemfile

@@ -5,13 +5,13 @@ gem 'activerecord', '~> 4.2.0', require: 'active_record'
 
 platforms :ruby do
   if RUBY_VERSION > "2.1.0"
-    gem 'sqlite3', require: false
+    gem 'sqlite3', '~> 1.3.13', require: false
   else
     gem 'sqlite3', '1.3.8', require: false
     gem 'nokogiri', '~> 1.6.8'
   end
-  gem 'pg', require: false
-  gem 'mysql2', require: false
+  gem 'pg', '< 1.0.0', require: false
+  gem 'mysql2', '< 0.4', require: false
 end
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', require: false

data/gemfiles/active_record_50.gemfile

@@ -5,8 +5,8 @@ gem 'activerecord', '~> 5.0.0', require: 'active_record'
 gem 'actionview', '~> 5.0.0', require: 'action_view'
 
 platforms :ruby do
-  gem 'sqlite3', require: false
-  gem 'pg', require: false
+  gem 'sqlite3', '~> 1.3.13', require: false
+  gem 'pg', '< 1.0.0', require: false
   gem 'mysql2', require: false
 end
 platforms :jruby do

data/gemfiles/active_record_51.gemfile

@@ -5,7 +5,7 @@ gem 'activerecord', '~> 5.1.0', require: 'active_record'
 gem 'actionview', '~> 5.1.0', require: 'action_view'
 
 platforms :ruby do
-  gem 'sqlite3', require: false
+  gem 'sqlite3', '~> 1.3.13', require: false
   gem 'pg', require: false
   gem 'mysql2', require: false
 end

data/gemfiles/active_record_52.gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0', require: 'active_record'
+gem 'actionview', '~> 5.2.0', require: 'action_view'
+
+platforms :ruby do
+  gem 'sqlite3', '~> 1.3.13', require: false
+  gem 'pg', require: false
+  gem 'mysql2', require: false
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', require: false
+  gem 'activerecord-jdbcpostgresql-adapter', require: false
+  gem 'activerecord-jdbcmysql-adapter', require: false
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec path: '../'

data/gemfiles/active_record_60.gemfile

@@ -0,0 +1,26 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 6.0.0'
+gem 'activerecord', '~> 6.0.0', require: 'active_record'
+gem 'actionview', '~> 6.0.0', require: 'action_view'
+
+gem 'selenium-webdriver'
+
+platforms :ruby do
+  gem 'sqlite3', require: false
+  gem 'pg', require: false
+  gem 'mysql2', require: false
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+  gem 'activerecord-jdbcpostgresql-adapter', require: false
+  gem 'activerecord-jdbcmysql-adapter', require: false
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec path: '../'

data/gemfiles/active_record_edge.gemfile

@@ -11,15 +11,10 @@ github 'rails/rails' do
   gem 'actionview', require: 'action_view'
 end
 
-gem 'rack', github: 'rack/rack'
-gem 'arel', github: 'rails/arel'
+gem 'selenium-webdriver'
 
 platforms :ruby do
-  if RUBY_VERSION > "2.1.0"
-    gem 'sqlite3', require: false
-  else
-    gem 'sqlite3', '1.3.8', require: false
-  end
+  gem 'sqlite3', require: false
   gem 'pg', require: false
   gem 'mysql2', require: false
 end

data/kaminari.gemspec

@@ -1,5 +1,5 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 require "kaminari/version"
 

data/lib/kaminari.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kaminari/core'
 require 'kaminari/actionview'
 require 'kaminari/activerecord'

data/lib/kaminari/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

data/misc/bug_report_template.rb

@@ -11,8 +11,8 @@ gemfile(true) do
   gem "railties", "5.0.1"
   gem "activerecord", "5.0.1"
   gem "sqlite3"
-  gem "kaminari-core", "1.0.1"
-  gem "kaminari-activerecord", "1.0.1"
+  gem "kaminari-core"
+  gem "kaminari-activerecord"
 end
 
 require "active_record"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Akira Matsuda
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -33,42 +33,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari-actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,8 @@ files:
 - gemfiles/active_record_42.gemfile
 - gemfiles/active_record_50.gemfile
 - gemfiles/active_record_51.gemfile
+- gemfiles/active_record_52.gemfile
+- gemfiles/active_record_60.gemfile
 - gemfiles/active_record_edge.gemfile
 - kaminari.gemspec
 - lib/kaminari.rb
@@ -185,8 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: A pagination engine plugin for Rails 4+ and other modern frameworks