Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## Version 3.6.0
+
+### Changes
+
+- added arel extra
+- updated Gemfile for development environment
+- docs fixes and improvements
+
+### Commits
+
+- [af0f189](http://github.com/ddnexus/pagy/commit/af0f189): updated minitest and minitest-reporter gems and removed deprecation
+- [6a62de5](http://github.com/ddnexus/pagy/commit/6a62de5): updated Gemfile
+- [4856782](http://github.com/ddnexus/pagy/commit/4856782): Arel Extra (#189)
+- [2a2d9b0](http://github.com/ddnexus/pagy/commit/2a2d9b0): Revert "Added digital-climate-strike banner"This reverts commit 07f7d9256ef9b1cef1c1eaf6da56ebb03daa19d5.
+- [b5c2809](http://github.com/ddnexus/pagy/commit/b5c2809): docs fixes
+- [f8e4f42](http://github.com/ddnexus/pagy/commit/f8e4f42): replaced markdown file link for documentation link in extras
+- [6a5c271](http://github.com/ddnexus/pagy/commit/6a5c271): updated github-pages gem
+- [60d243c](http://github.com/ddnexus/pagy/commit/60d243c): small doc improvement [ci skip]
+- [2feb451](http://github.com/ddnexus/pagy/commit/2feb451): docs changes
+- [07f7d92](http://github.com/ddnexus/pagy/commit/07f7d92): Added digital-climate-strike banner
+- [281da85](http://github.com/ddnexus/pagy/commit/281da85): update grammar (#187)
+- [739f032](http://github.com/ddnexus/pagy/commit/739f032): Update how-to: Correct to require header for API (#188)
+
 ## Version 3.5.1
 
 ### Changes

Gemfile

@@ -4,15 +4,15 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # test
 gem 'rake'
-gem 'minitest'
+gem 'minitest', '~> 5.12'
 gem 'minitest-reporters'
 gem 'rack'
 gem 'i18n'
 
 gem 'oj', require: false     # false is for testing with or without it
 
-gem 'rubocop'
-gem 'rubocop-performance', '~> 1.1.0'
+gem 'rubocop', '~> 0.75.0'
+gem 'rubocop-performance', '~> 1.5.0'
 gem 'simplecov', require: false
 gem 'codecov', :require => false
 
@@ -26,4 +26,4 @@ gem 'codecov', :require => false
 # gem 'memory_profiler'
 
 # docs server
-gem "github-pages", '197', group: :jekyll_plugins
+gem "github-pages", '198', group: :jekyll_plugins

Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     ast (2.4.0)
@@ -23,7 +23,7 @@ GEM
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
-    dnsruby (1.61.2)
+    dnsruby (1.61.3)
       addressable (~> 2.5)
     docile (1.3.1)
     em-websocket (0.5.1)
@@ -35,13 +35,13 @@ GEM
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    github-pages (197)
-      activesupport (= 4.2.10)
+    gemoji (3.0.1)
+    github-pages (198)
+      activesupport (= 4.2.11.1)
       github-pages-health-check (= 1.16.1)
-      jekyll (= 3.7.4)
+      jekyll (= 3.8.5)
       jekyll-avatar (= 0.6.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.5)
@@ -89,14 +89,14 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.11.0)
+    html-pipeline (2.12.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    jekyll (3.7.4)
+    jaro_winkler (1.5.3)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -213,56 +213,54 @@ GEM
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    minitest-reporters (1.3.6)
+    minitest (5.12.2)
+    minitest-reporters (1.4.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    multipart-post (2.0.0)
-    nokogiri (1.10.3)
+    multipart-post (2.1.1)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     oj (3.7.12)
-    parallel (1.17.0)
-    parser (2.6.2.1)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    psych (3.1.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rack (2.0.7)
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (2.2.1)
-    rubocop (0.67.2)
+    rubocop (0.75.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.0)
+      rubocop (>= 0.71.0)
     ruby-enum (0.7.2)
       i18n
-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -275,23 +273,23 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     url (0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   codecov
-  github-pages (= 197)
+  github-pages (= 198)
   i18n
-  minitest
+  minitest (~> 5.12)
   minitest-reporters
   oj
   rack
   rake
-  rubocop
-  rubocop-performance (~> 1.1.0)
+  rubocop (~> 0.75.0)
+  rubocop-performance (~> 1.5.0)
   simplecov
 
 BUNDLED WITH

README.md

@@ -108,6 +108,8 @@ Use the official extras, or write your own in just a few lines. Extras add speci
 
 ### Backend Extras
 
+- [arel](http://ddnexus.github.io/pagy/extras/arel): Better performance of grouped ActiveRecord collections
+Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
 - [array](http://ddnexus.github.io/pagy/extras/array): Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
 - [countless](http://ddnexus.github.io/pagy/extras/countless): Paginate without the need of any count, saving one query per rendering
 - [elasticsearch_rails](http://ddnexus.github.io/pagy/extras/elasticsearch_rails): Paginate `ElasticsearchRails` response objects
@@ -160,6 +162,7 @@ Besides the classic pagination offered by the `pagy_nav` helpers, you can use a
 - [Detailed Gems Comparison](https://ddnexus.github.io/pagination-comparison/gems.html) (charts and analysis)
 - [Benchmarks and Memory Profiles Source](http://github.com/ddnexus/pagination-comparison) (Rails app repository)
 - [日本語の投稿](https://qiita.com/search?q=pagy)
+- [한국어 튜토리얼](https://blog.naver.com/kbs4674/221616865157)
 
 ### Docs
 

docs/_layouts/default.html

@@ -102,6 +102,7 @@ <h1 id="site-title">{{ site.title | default: site.github.repository_name }}
       <a href="{{ site.baseurl }}/api/frontend"><p class="indent1" {% if page.title == 'Pagy::Frontend' %}id="active"{% endif %} >Pagy::Frontend</p></a>
       <a href="{{ site.baseurl }}/api/countless"><p class="indent1" {% if page.title == 'Pagy::Countless' %}id="active"{% endif %} >Pagy::Countless</p></a>
       <a href="{{ site.baseurl }}/extras"><p {% if page.title == 'Extras' %}id="active"{% endif %} >Extras</p></a>
+      <a href="{{ site.baseurl }}/extras/arel"><p class="indent1" {% if page.title == 'Arel' %}id="active"{% endif %} >Arel</p></a>
       <a href="{{ site.baseurl }}/extras/array"><p class="indent1" {% if page.title == 'Array' %}id="active"{% endif %} >Array</p></a>
       <a href="{{ site.baseurl }}/extras/bootstrap"><p class="indent1" {% if page.title == 'Bootstrap' %}id="active"{% endif %} >Bootstrap</p></a>
       <a href="{{ site.baseurl }}/extras/bulma"><p class="indent1" {% if page.title == 'Bulma' %}id="active"{% endif %} >Bulma</p></a>
@@ -149,8 +150,5 @@ <h1 id="site-title">{{ site.title | default: site.github.repository_name }}
   ga('send', 'pageview');
 </script>
 {% endif %}
-
-  <script src="https://assets.digitalclimatestrike.net/widget.js" async></script>
-
 </body>
 </html>