Merge branch 'dev'

ddnexus · Jan 18, 2024 · 757d2e3 · 757d2e3
2 parents 25fe110 + a369429
commit 757d2e3
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 16 deletions.
diff --git a/.github/.env b/.github/.env
@@ -1,2 +1,2 @@
 GEM=pagy
-VERSION=6.4.2
+VERSION=6.4.3
diff --git a/.github/workflows/pagy-ci.yml b/.github/workflows/pagy-ci.yml
@@ -34,9 +34,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - ruby-version: '3.0'
-            env:
-              BUNDLE_GEMFILE: .github/gemfiles/default
           - ruby-version: '3.1'
             env:
               BUNDLE_GEMFILE: .github/gemfiles/default

diff --git a/.github/workflows/release-gem.yml b/.github/workflows/release-gem.yml
@@ -16,7 +16,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
       - run: bundle install
 
       - name: Dotenv Action

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,10 @@ None
 
 <hr>
 
+## Version 6.4.3
+
+- Exclude coverage for prepend conditional, ruby < 3.0 syntax for prepend
+
 ## Version 6.4.2
 
 - Better module overrides in jsonapi

diff --git a/lib/config/pagy.rb b/lib/config/pagy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (6.4.2)
+# Pagy initializer file (6.4.3)
 # 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/lib/javascripts/pagy-dev.js b/lib/javascripts/pagy-dev.js
diff --git a/lib/javascripts/pagy-module.js b/lib/javascripts/pagy-module.js
@@ -81,7 +81,7 @@ const Pagy = (() => {
     const trim = (link, param) => link.replace(new RegExp(`(\\?|&amp;)${param}=1\\b(?!&amp;)|\\b${param}=1&amp;`), "");
     // Public interface
     return {
-        version: "6.4.2",
+        version: "6.4.3",
         // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
         init(arg) {
             const target = arg instanceof Element ? arg : document;

diff --git a/lib/javascripts/pagy.js b/lib/javascripts/pagy.js
diff --git a/lib/pagy.rb b/lib/pagy.rb
@@ -5,7 +5,7 @@
 
 # Core class
 class Pagy
-  VERSION = '6.4.2'
+  VERSION = '6.4.3'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

diff --git a/lib/pagy/extras/jsonapi.rb b/lib/pagy/extras/jsonapi.rb
@@ -61,7 +61,9 @@ def pagy_get_items_size(vars)
     end
     # Swap the next lines in ruby 3.0+ baseline
     # ItemsExtra::Backend.prepend ItemsExtraOverride if defined?(ItemsExtra::Backend)
+    # :nocov:
     Backend.prepend ItemsExtraOverride if defined?(ItemsExtra::Backend)
+    # :nocov:
 
     # Module overriding UrlHelper
     module UrlHelperOverride
@@ -75,8 +77,8 @@ def pagy_set_query_params(page, vars, params)
       end
     end
     # Swap the next lines in ruby 3.0+ baseline
-    UrlHelpers.prepend UrlHelperOverride
-    # Backend.prepend UrlHelperOverride
-    # Frontend.prepend UrlHelperOverride
+    # UrlHelpers.prepend UrlHelperOverride
+    Backend.prepend UrlHelperOverride
+    Frontend.prepend UrlHelperOverride
   end
 end
diff --git a/retype.yml b/retype.yml
@@ -4,7 +4,7 @@ url: https://ddnexus.github.io/pagy
 
 branding:
   title: Pagy
-  label: 6.4.2
+  label: 6.4.3
   colors:
     label:
       text: "#FFFFFF"

diff --git a/src/pagy.ts b/src/pagy.ts
@@ -92,7 +92,7 @@ const Pagy = (() => {
 
     // Public interface
     return {
-        version: "6.4.2",
+        version: "6.4.3",
 
         // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
         init(arg?:Element|never) {