Merge branch 'dev'

.github/.env

@@ -1,2 +1,2 @@
 GEM=pagy
-VERSION=6.4.0
+VERSION=6.4.1

CHANGELOG.md

@@ -25,6 +25,11 @@ None
 
 <hr>
 
+## Version 6.4.1
+
+- Remove dependency on base64 (#618)Ruby 3.3 prints a warning if base64 is used without specifying it in the gemfile.
+Ruby 3.4 will error
+
 ## Version 6.4.0
 
 - Implement JSON:API specifications

lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (6.4.0)
+# Pagy initializer file (6.4.1)
 # 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
 

lib/javascripts/pagy-module.js

@@ -81,7 +81,7 @@ const Pagy = (() => {
     const trim = (link, param) => link.replace(new RegExp(`(\\?|&)${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "6.4.0",
+        version: "6.4.1",
         // 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;

lib/pagy.rb

@@ -5,7 +5,7 @@
 
 # Core class
 class Pagy
-  VERSION = '6.4.0'
+  VERSION = '6.4.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

lib/pagy/extras/frontend_helpers.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
-
 class Pagy # :nodoc:
   DEFAULT[:steps] = false # default false will use {0 => @vars[:size]}
 
@@ -48,15 +46,17 @@ module Frontend
         # Base64 encoded JSON is smaller than HTML escaped JSON
         def pagy_data(pagy, *args)
           args << pagy.vars[:page_param] if pagy.vars[:trim_extra]
-          %(data-pagy="#{Base64.strict_encode64(Oj.dump(args, mode: :strict))}")
+          strict_base64_encoded = [Oj.dump(args, mode: :strict)].pack('m0')
+          %(data-pagy="#{strict_base64_encoded}")
         end
       else
         require 'json'
         # Return a data tag with the base64 encoded JSON-serialized args generated with the slower to_json
         # Base64 encoded JSON is smaller than HTML escaped JSON
         def pagy_data(pagy, *args)
           args << pagy.vars[:page_param] if pagy.vars[:trim_extra]
-          %(data-pagy="#{Base64.strict_encode64(args.to_json)}")
+          strict_base64_encoded = [args.to_json].pack('m0')
+          %(data-pagy="#{strict_base64_encoded}")
         end
       end
 

retype.yml

@@ -4,7 +4,7 @@ url: https://ddnexus.github.io/pagy
 
 branding:
   title: Pagy
-  label: 6.4.0
+  label: 6.4.1
   colors:
     label:
       text: "#FFFFFF"

src/pagy.ts

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