Merge branch 'dev'

ddnexus · Jun 19, 2024 · 270993c · 270993c
2 parents 5ebace7 + 13ce374
commit 270993c
Show file tree

Hide file tree

Showing 62 changed files with 109 additions and 95 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Code.yml b/.github/ISSUE_TEMPLATE/Code.yml
@@ -19,7 +19,7 @@ body:
     attributes:
       label: 👀 Before submitting...
       options:
-        - label: I upgraded to pagy version 8.4.4
+        - label: I upgraded to pagy version 8.4.5
           required: true
         - label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
           required: true

diff --git a/.github/latest_release_body.md b/.github/latest_release_body.md
@@ -8,10 +8,15 @@
   the [details](https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328))
 - See the [CHANGELOG](https://ddnexus.github.io/pagy/changelog) for possible breaking changes
 
-### Changes in 8.4.4
+### Changes in 8.4.5
 
 <!-- changes start -->
-- Update eslint: new configuration, stricter rules and javascript code
+- Fix pluralization rule link on locale files (#716)
+- Install gems in pagy CI
+- Indentation changes
+- Remove :cycle false default
+- Fill aria_label.nav ca pluralized entry (#715) (Fixes #581)
+- Fix typos (#710)
 <!-- changes end -->
 
 [CHANGELOG](https://ddnexus.github.io/pagy/changelog)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,15 @@ If you upgrade from version `< 8.0.0` see the following:
   - `pagy-module.d.ts`: use `pagy.d.ts`
 <hr>
 
+## Version 8.4.5
+
+- Fix pluralization rule link on locale files (#716)
+- Install gems in pagy CI
+- Indentation changes
+- Remove :cycle false default
+- Fill aria_label.nav ca pluralized entry (#715) (Fixes #581)
+- Fix typos (#710)
+
 ## Version 8.4.4
 
 - Update eslint: new configuration, stricter rules and javascript code

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: gem
   specs:
-    pagy (8.4.4)
+    pagy (8.4.5)
 
 GEM
   remote: https://rubygems.org/
@@ -94,7 +94,7 @@ GEM
     docile (1.4.0)
     domain_name (0.6.20240107)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
@@ -114,7 +114,7 @@ GEM
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
@@ -145,7 +145,7 @@ GEM
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.2.0)
-    net-imap (0.4.12)
+    net-imap (0.4.13)
       date
       net-protocol
     net-pop (0.1.2)
@@ -155,23 +155,23 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     oj (3.16.4)
       bigdecimal (>= 3.0)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (5.1.1)
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.8.0)
-    rack (3.1.0)
+    rack (3.1.3)
     rack-protection (4.0.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0, < 4)
@@ -219,14 +219,14 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     rematch (2.1.0)
     rerun (0.14.0)
       listen (~> 3.0)
     rexml (3.3.0)
       strscan
-    rouge (4.2.1)
+    rouge (4.3.0)
     rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -245,7 +245,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
@@ -271,7 +271,7 @@ GEM
       sinatra (= 4.0.0)
       tilt (~> 2.0)
     sqlite3 (1.4.4)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     thor (1.3.1)
     tilt (2.3.0)
@@ -283,7 +283,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   x86_64-darwin-21

diff --git a/README.md b/README.md
diff --git a/bun.lockb b/bun.lockb
diff --git a/e2e/snapshots.js b/e2e/snapshots.js
diff --git a/gem/apps/calendar.ru b/gem/apps/calendar.ru
@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#4-calendar-app
 
-VERSION = '8.4.4'
+VERSION = '8.4.5'
 
 require 'bundler/inline'
 require 'bundler'

diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru
@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#3-demo-app
 
-VERSION = '8.4.4'
+VERSION = '8.4.5'
 
 require 'bundler/inline'
 require 'bundler'

diff --git a/gem/apps/rails.ru b/gem/apps/rails.ru
@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#2-rails-app
 
-VERSION = '8.4.4'
+VERSION = '8.4.5'
 
 # Gemfile
 require 'bundler/inline'

diff --git a/gem/apps/repro.ru b/gem/apps/repro.ru
@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#1-repro-app
 
-VERSION = '8.4.4'
+VERSION = '8.4.5'
 
 require 'bundler/inline'
 require 'bundler'

diff --git a/gem/bin/pagy b/gem/bin/pagy
@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '8.4.4'
+VERSION = '8.4.5'
 APPS    = %w[repro rails demo calendar].freeze
 LINUX   = RbConfig::CONFIG['host_os'].include?('linux')
+DIR     = __dir__ || ''
 
 require_relative '../lib/optimist'
 opts = Optimist.options do
@@ -40,9 +41,9 @@ opts = Optimist.options do
 end
 Optimist.educate if ARGV.empty?
 
-run_from_repo = File.exist?(File.expand_path('../pagy.gemspec', __dir__))
+run_from_repo = File.exist?(File.expand_path('../pagy.gemspec', DIR))
 # Never install if run from pagy repo (for pagy devs)
-opts[:install] = false if run_from_repo
+opts[:install] = false if run_from_repo && !ENV['CI']
 
 # Handles gems
 require 'bundler/inline'
@@ -54,7 +55,7 @@ gemfile(opts[:install]) do
   gem 'rerun' if LINUX
 end
 
-path = ->(app) { File.expand_path("../apps/#{app}.ru", __dir__) }
+path = ->(app) { File.expand_path("../apps/#{app}.ru", DIR) }
 arg  = ARGV.shift
 if arg.eql?('clone')
   arg = ARGV.shift
@@ -81,7 +82,7 @@ else
   end
   Optimist.die("#{file.inspect} app not found") unless File.exist?(file)
   # Run command
-  gem_dir = File.expand_path('..', __dir__)
+  gem_dir = File.expand_path('..', DIR)
   rackup  = "rackup -I #{gem_dir}/lib -r pagy -o #{opts[:host]} -p #{opts[:port]} -E #{opts[:env]} #{file}"
   rackup << ' -q' if opts[:quiet]
   if opts[:rerun]

diff --git a/gem/config/pagy.rb b/gem/config/pagy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (8.4.4)
+# Pagy initializer file (8.4.5)
 # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

diff --git a/gem/javascripts/pagy-module.js b/gem/javascripts/pagy-module.js
@@ -73,7 +73,7 @@ const Pagy = (() => {
   };
   const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
   return {
-    version: "8.4.4",
+    version: "8.4.5",
     init(arg) {
       const target = arg instanceof Element ? arg : document;
       const elements = target.querySelectorAll("[data-pagy]");

diff --git a/gem/javascripts/pagy.js b/gem/javascripts/pagy.js
diff --git a/gem/javascripts/pagy.min.js b/gem/javascripts/pagy.min.js