pagy 5.8.1 → 5.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee42bed221d693df78831673e1e0a33c8c0b76ceb826dc1fa022d12a44abfbc
-  data.tar.gz: 5e463d023be1d4fe1613f76b62c3ff3c8cd64da78ac4cc29e51f753c3af0158c
+  metadata.gz: 775a7e4b83ac4efbb428fb2790ed87c9b47461d1e5043bd75fd97dd691690c30
+  data.tar.gz: d35fa0e7bd99a2d000a0b7751e26038a01c543783011c4adb7ed6521b6fb3c6f
 SHA512:
-  metadata.gz: aff49444a6679426a05027e0199913df1da99a636df662a65315852bf2e459d054312635af733a1700fb7408b4e80b9418ff6cf5b33b9308d6bcd86a228c099e
-  data.tar.gz: db463d5e40da9fbe04b79bc26414f0542b20e824018d17dfdcaac767d41f1d6f748b08035abfaf0336d8468073d2e49f8cc4982c0d5b3f184087eb6fb072f568
+  metadata.gz: ef7c6b895f57dfe1051b54198369b5c09ad812471a1af103cfc36bbdf3d506058ca3512372c3ffeb1612485f62cf71586cb5844de14a9acae1451638eca87d52
+  data.tar.gz: d353a2d901de3d4accc8dadbe8c35c7d6728ebbf063ba9f2914ea710439b63f04578efd67614989b892294df0e71d67a50f776962a51bd9dfed62240af4ced06

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.8.1)
+# Pagy initializer file (5.9.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
 
@@ -55,7 +55,6 @@
 #
 # Pagy::Calendar::Week::DEFAULT[:order]     = :asc        # Time direction of pagination
 # Pagy::Calendar::Week::DEFAULT[:format]    = '%Y-%W'     # strftime format
-# Pagy::Calendar::Week::DEFAULT[:offset]    = 0           # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday)
 #
 # Pagy::Calendar::Day::DEFAULT[:order]      = :asc        # Time direction of pagination
 # Pagy::Calendar::Day::DEFAULT[:format]     = '%Y-%m-%d'  # strftime format
@@ -189,12 +188,13 @@
 
 
 # Rails
-
-# Rails: extras assets path required by the helpers that use javascript
+# Enable the .js file required by the helpers that use javascript
 # (pagy*_nav_js, pagy*_combo_nav_js, and pagy_items_selector_js)
 # See https://ddnexus.github.io/pagy/extras#javascript
-# Rails.application.config.assets.paths << Pagy.root.join('javascripts')
 
+# With the asset pipeline
+# Sprockets need to look into the pagy javascripts dir, so add it to the assets paths
+# Rails.application.config.assets.paths << Pagy.root.join('javascripts')
 
 # I18n
 

data/lib/javascripts/pagy-dev.js

@@ -1,34 +1,9 @@
 "use strict";
-const Pagy = {
-    version: "5.8.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;
-        const elements = target.querySelectorAll("[data-pagy]");
-        for (const el of elements) {
-            try {
-                const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), c => c.charCodeAt(0));
-                const [keyword, ...args] = JSON.parse(new TextDecoder().decode(uint8array)); // base64-utf8 JSON -> Array
-                if (keyword === "nav") {
-                    Pagy.initNav(el, args);
-                }
-                else if (keyword === "combo") {
-                    Pagy.initCombo(el, args);
-                }
-                else if (keyword === "selector") {
-                    Pagy.initSelector(el, args);
-                }
-                else {
-                    console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
-                }
-            }
-            catch (err) {
-                console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
-            }
-        }
-    },
+window.Pagy = (() => {
+    // The observer instance for responsive navs
+    const rjsObserver = new ResizeObserver(entries => entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender())));
     // Init the *_nav_js helpers
-    initNav(el, [tags, sequels, labelSequels, trimParam]) {
+    const initNav = (el, [tags, sequels, labelSequels, trimParam]) => {
         const container = el.parentElement ?? el;
         const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
         let lastWidth = -1;
@@ -45,7 +20,7 @@ const Pagy = {
                 const item = series[i];
                 const label = labels[i];
                 if (typeof trimParam === "string" && item === 1) {
-                    html += Pagy.trim(fillIn(tags.link, item.toString(), label), trimParam);
+                    html += trim(fillIn(tags.link, item.toString(), label), trimParam);
                 }
                 else if (typeof item === "number") {
                     html += fillIn(tags.link, item.toString(), label);
@@ -63,27 +38,21 @@ const Pagy = {
             lastWidth = width;
         })();
         if (el.classList.contains("pagy-rjs")) {
-            Pagy.rjsObserver.observe(container);
+            rjsObserver.observe(container);
         }
-    },
-    // The observer instance for responsive navs
-    rjsObserver: new ResizeObserver(entries => {
-        entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender()));
-    }),
+    };
     // Init the *_combo_nav_js helpers
-    initCombo(el, [link, trimParam]) {
-        Pagy.initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);
-    },
+    const initCombo = (el, [link, trimParam]) => initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);
     // Init the items_selector_js helper
-    initSelector(el, [from, link, trimParam]) {
-        Pagy.initInput(el, inputValue => {
+    const initSelector = (el, [from, link, trimParam]) => {
+        initInput(el, inputValue => {
             const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();
             const html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);
             return [page, html];
         }, trimParam);
-    },
+    };
     // Init the input element
-    initInput(el, getVars, trimParam) {
+    const initInput = (el, getVars, trimParam) => {
         const input = el.querySelector("input");
         const initial = input.value;
         const action = function () {
@@ -98,7 +67,7 @@ const Pagy = {
             }
             let [page, html] = getVars(input.value); // eslint-disable-line prefer-const
             if (typeof trimParam === "string" && page === "1") {
-                html = Pagy.trim(html, trimParam);
+                html = trim(html, trimParam);
             }
             el.insertAdjacentHTML("afterbegin", html);
             el.querySelector("a").click();
@@ -108,8 +77,38 @@ const Pagy = {
         input.addEventListener("keypress", e => { if (e.key === "Enter") {
             action();
         } }); // trigger action
-    },
+    };
     // Trim the ${page-param}=1 params in links
-    trim: (link, param) => link.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "")
-};
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs      = readonly [Tags, Sequels, null|LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ninterface Tags {\n    readonly before: string\n    readonly link:   string\n    readonly active: string\n    readonly gap:    string\n    readonly after:  string\n}\ninterface Sequels      { readonly [width:string]: (string|number|\"gap\")[] }\ninterface LabelSequels { readonly [width:string]: string[] }\ninterface NavElement extends Element { pagyRender(): void }\n\nconst Pagy = {\n    version: \"5.8.1\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:Element|never) {\n        const target   = arg instanceof Element ? arg : document;\n        const elements = target.querySelectorAll(\"[data-pagy]\");\n        for (const el of elements) {\n            try {\n                const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                const [keyword, ...args] = JSON.parse(new TextDecoder().decode(uint8array)); // base64-utf8 JSON -> Array\n                if (keyword === \"nav\") {\n                    Pagy.initNav(el as NavElement, args as NavArgs);\n                } else if (keyword === \"combo\") {\n                    Pagy.initCombo(el, args as ComboArgs);\n                } else if (keyword === \"selector\") {\n                    Pagy.initSelector(el, args as SelectorArgs);\n                } else {\n                    console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                }\n            } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n        }\n    },\n\n    // Init the *_nav_js helpers\n    initNav(el:NavElement, [tags, sequels, labelSequels, trimParam]:NavArgs) {\n        const container = el.parentElement ?? el;\n        const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth   = -1;\n        const fillIn    = (link:string, page:string, label:string):string =>\n                              link.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function() {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html     = tags.before;\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item  = series[i];\n                const label = labels[i];\n                if (typeof trimParam === \"string\" && item === 1) {\n                    html += Pagy.trim(fillIn(tags.link, item.toString(), label), trimParam);\n                } else if (typeof item === \"number\") {\n                    html += fillIn(tags.link, item.toString(), label);\n                } else if (item === \"gap\") {\n                    html += tags.gap;\n                } else { // active page\n                    html += fillIn(tags.active, item, label);\n                }\n            }\n            html += tags.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { Pagy.rjsObserver.observe(container) }\n    },\n\n    // The observer instance for responsive navs\n    rjsObserver: new ResizeObserver(entries => {\n        entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(el => el.pagyRender()));\n    }),\n\n    // Init the *_combo_nav_js helpers\n    initCombo(el:Element, [link, trimParam]:ComboArgs) {\n        Pagy.initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);\n    },\n\n    // Init the items_selector_js helper\n    initSelector(el:Element, [from, link, trimParam]:SelectorArgs) {\n        Pagy.initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, html];\n        }, trimParam);\n    },\n\n    // Init the input element\n    initInput(el:Element, getVars:(v:string)=>[string, string], trimParam?:string) {\n        const input   = el.querySelector(\"input\") as HTMLInputElement;\n        const initial = input.value;\n        const action  = function() {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, html] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { html = Pagy.trim(html, trimParam) }\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            (el.querySelector(\"a\") as HTMLAnchorElement).click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    },\n\n    // Trim the ${page-param}=1 params in links\n    trim: (link:string, param:string) => link.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\")\n};\n"]}
+    const trim = (link, param) => link.replace(new RegExp(`(\\?|&)${param}=1\\b(?!&)|\\b${param}=1&`), "");
+    // Public interface
+    return {
+        version: "5.9.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;
+            const elements = target.querySelectorAll("[data-pagy]");
+            for (const el of elements) {
+                try {
+                    const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), c => c.charCodeAt(0));
+                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array
+                    if (keyword === "nav") {
+                        initNav(el, args);
+                    }
+                    else if (keyword === "combo") {
+                        initCombo(el, args);
+                    }
+                    else if (keyword === "selector") {
+                        initSelector(el, args);
+                    }
+                    else {
+                        console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
+                    }
+                }
+                catch (err) {
+                    console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
+                }
+            }
+        }
+    };
+})();
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs      = readonly [Tags, Sequels, null|LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ninterface Tags {\n    readonly before: string\n    readonly link:   string\n    readonly active: string\n    readonly gap:    string\n    readonly after:  string\n}\ninterface Sequels      { readonly [width:string]: (string|number)[] }\ninterface LabelSequels { readonly [width:string]: string[] }\ninterface NavElement extends Element { pagyRender(): void }\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n        entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tags, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth   = -1;\n        const fillIn    = (link:string, page:string, label:string):string =>\n                              link.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function() {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html     = tags.before;\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item  = series[i];\n                const label = labels[i];\n                if (typeof trimParam === \"string\" && item === 1) {\n                    html += trim(fillIn(tags.link, item.toString(), label), trimParam);\n                } else if (typeof item === \"number\") {\n                    html += fillIn(tags.link, item.toString(), label);\n                } else if (item === \"gap\") {\n                    html += tags.gap;\n                } else { // active page\n                    html += fillIn(tags.active, item, label);\n                }\n            }\n            html += tags.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [link, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);\n\n        // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, link, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, html];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string)=>[string, string], trimParam?:string) => {\n        const input   = el.querySelector(\"input\") as HTMLInputElement;\n        const initial = input.value;\n        const action  = function() {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, html] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { html = trim(html, trimParam) }\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            (el.querySelector(\"a\") as HTMLAnchorElement).click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (link:string, param:string) =>\n        link.replace(new RegExp(`(\\\\?|&amp;)${param}=1\\\\b(?!&amp;)|\\\\b${param}=1&amp;`), \"\");\n\n    // Public interface\n    return {\n        version: \"5.9.3\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element|never) {\n            const target   = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]}

data/lib/javascripts/pagy-module.d.ts

@@ -1,30 +1,5 @@
-declare type NavArgs = readonly [Tags, Sequels, null | LabelSequels, string?];
-declare type ComboArgs = readonly [string, string?];
-declare type SelectorArgs = readonly [number, string, string?];
-interface Tags {
-    readonly before: string;
-    readonly link: string;
-    readonly active: string;
-    readonly gap: string;
-    readonly after: string;
-}
-interface Sequels {
-    readonly [width: string]: (string | number | "gap")[];
-}
-interface LabelSequels {
-    readonly [width: string]: string[];
-}
-interface NavElement extends Element {
-    pagyRender(): void;
-}
 declare const Pagy: {
     version: string;
     init(arg?: Element | never): void;
-    initNav(el: NavElement, [tags, sequels, labelSequels, trimParam]: NavArgs): void;
-    rjsObserver: ResizeObserver;
-    initCombo(el: Element, [link, trimParam]: ComboArgs): void;
-    initSelector(el: Element, [from, link, trimParam]: SelectorArgs): void;
-    initInput(el: Element, getVars: (v: string) => [string, string], trimParam?: string): void;
-    trim: (link: string, param: string) => string;
 };
 export default Pagy;

data/lib/javascripts/pagy-module.js

@@ -1,33 +1,8 @@
-const Pagy = {
-    version: "5.8.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;
-        const elements = target.querySelectorAll("[data-pagy]");
-        for (const el of elements) {
-            try {
-                const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), c => c.charCodeAt(0));
-                const [keyword, ...args] = JSON.parse(new TextDecoder().decode(uint8array)); // base64-utf8 JSON -> Array
-                if (keyword === "nav") {
-                    Pagy.initNav(el, args);
-                }
-                else if (keyword === "combo") {
-                    Pagy.initCombo(el, args);
-                }
-                else if (keyword === "selector") {
-                    Pagy.initSelector(el, args);
-                }
-                else {
-                    console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
-                }
-            }
-            catch (err) {
-                console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
-            }
-        }
-    },
+const Pagy = (() => {
+    // The observer instance for responsive navs
+    const rjsObserver = new ResizeObserver(entries => entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender())));
     // Init the *_nav_js helpers
-    initNav(el, [tags, sequels, labelSequels, trimParam]) {
+    const initNav = (el, [tags, sequels, labelSequels, trimParam]) => {
         const container = el.parentElement ?? el;
         const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
         let lastWidth = -1;
@@ -44,7 +19,7 @@ const Pagy = {
                 const item = series[i];
                 const label = labels[i];
                 if (typeof trimParam === "string" && item === 1) {
-                    html += Pagy.trim(fillIn(tags.link, item.toString(), label), trimParam);
+                    html += trim(fillIn(tags.link, item.toString(), label), trimParam);
                 }
                 else if (typeof item === "number") {
                     html += fillIn(tags.link, item.toString(), label);
@@ -62,27 +37,21 @@ const Pagy = {
             lastWidth = width;
         })();
         if (el.classList.contains("pagy-rjs")) {
-            Pagy.rjsObserver.observe(container);
+            rjsObserver.observe(container);
         }
-    },
-    // The observer instance for responsive navs
-    rjsObserver: new ResizeObserver(entries => {
-        entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender()));
-    }),
+    };
     // Init the *_combo_nav_js helpers
-    initCombo(el, [link, trimParam]) {
-        Pagy.initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);
-    },
+    const initCombo = (el, [link, trimParam]) => initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);
     // Init the items_selector_js helper
-    initSelector(el, [from, link, trimParam]) {
-        Pagy.initInput(el, inputValue => {
+    const initSelector = (el, [from, link, trimParam]) => {
+        initInput(el, inputValue => {
             const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();
             const html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);
             return [page, html];
         }, trimParam);
-    },
+    };
     // Init the input element
-    initInput(el, getVars, trimParam) {
+    const initInput = (el, getVars, trimParam) => {
         const input = el.querySelector("input");
         const initial = input.value;
         const action = function () {
@@ -97,7 +66,7 @@ const Pagy = {
             }
             let [page, html] = getVars(input.value); // eslint-disable-line prefer-const
             if (typeof trimParam === "string" && page === "1") {
-                html = Pagy.trim(html, trimParam);
+                html = trim(html, trimParam);
             }
             el.insertAdjacentHTML("afterbegin", html);
             el.querySelector("a").click();
@@ -107,8 +76,38 @@ const Pagy = {
         input.addEventListener("keypress", e => { if (e.key === "Enter") {
             action();
         } }); // trigger action
-    },
+    };
     // Trim the ${page-param}=1 params in links
-    trim: (link, param) => link.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "")
-};
+    const trim = (link, param) => link.replace(new RegExp(`(\\?|&)${param}=1\\b(?!&)|\\b${param}=1&`), "");
+    // Public interface
+    return {
+        version: "5.9.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;
+            const elements = target.querySelectorAll("[data-pagy]");
+            for (const el of elements) {
+                try {
+                    const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), c => c.charCodeAt(0));
+                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array
+                    if (keyword === "nav") {
+                        initNav(el, args);
+                    }
+                    else if (keyword === "combo") {
+                        initCombo(el, args);
+                    }
+                    else if (keyword === "selector") {
+                        initSelector(el, args);
+                    }
+                    else {
+                        console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
+                    }
+                }
+                catch (err) {
+                    console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
+                }
+            }
+        }
+    };
+})();
 export default Pagy;

data/lib/javascripts/pagy.js

@@ -1 +1 @@
-!function(){function n(n){if(Array.isArray(n))return n}function t(n){if(Symbol.iterator in Object(n)||"[object Arguments]"===Object.prototype.toString.call(n))return Array.from(n)}function e(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function r(r,i){return n(r)||t(r)||e()}var i={version:"5.8.1",init:function(r){var a,o=(r instanceof Element?r:document).querySelectorAll("[data-pagy]"),c=!0,u=!1,l=void 0;try{for(var f,p=o[Symbol.iterator]();!(c=(f=p.next()).done);c=!0){var s=f.value;try{var v=Uint8Array.from(atob(s.getAttribute("data-pagy")),(function(n){return n.charCodeAt(0)})),y=n(a=JSON.parse((new TextDecoder).decode(v)))||t(a)||e(),g=y[0],d=y.slice(1);"nav"===g?i.initNav(s,d):"combo"===g?i.initCombo(s,d):"selector"===g?i.initSelector(s,d):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",s,g)}catch(n){console.warn("Skipped Pagy.init() for: %o\n%s",s,n)}}}catch(n){u=!0,l=n}finally{try{c||null==p.return||p.return()}finally{if(u)throw l}}},initNav:function(n,t){var e,a=r(t),o=a[0],c=a[1],u=a[2],l=a[3],f=null!==(e=n.parentElement)&&void 0!==e?e:n,p=Object.keys(c).map((function(n){return parseInt(n)})).sort((function(n,t){return t-n})),s=-1,v=function(n,t,e){return n.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,e)};(n.pagyRender=function(){var t=p.find((function(n){return n<f.clientWidth}))||0;if(t!==s){var e,r=o.before,a=c[t.toString()],y=null!==(e=null==u?void 0:u[t.toString()])&&void 0!==e?e:a.map((function(n){return n.toString()}));for(var g in a){var d=a[g],_=y[g];r+="string"==typeof l&&1===d?i.trim(v(o.link,d.toString(),_),l):"number"==typeof d?v(o.link,d.toString(),_):"gap"===d?o.gap:v(o.active,d,_)}r+=o.after,n.innerHTML="",n.insertAdjacentHTML("afterbegin",r),s=t}})(),n.classList.contains("pagy-rjs")&&i.rjsObserver.observe(f)},rjsObserver:new ResizeObserver((function(n){n.forEach((function(n){return n.target.querySelectorAll(".pagy-rjs").forEach((function(n){return n.pagyRender()}))}))})),initCombo:function(n,t){var e=r(t),a=e[0],o=e[1];i.initInput(n,(function(n){return[n,a.replace(/__pagy_page__/,n)]}),o)},initSelector:function(n,t){var e=r(t),a=e[0],o=e[1],c=e[2];i.initInput(n,(function(n){var t=Math.max(Math.ceil(a/parseInt(n)),1).toString();return[t,o.replace(/__pagy_page__/,t).replace(/__pagy_items__/,n)]}),c)},initInput:function(n,t,e){var a=n.querySelector("input"),o=a.value,c=function(){if(a.value!==o){var c=r([a.min,a.value,a.max].map((function(n){return parseInt(n)||0}))),u=c[0],l=c[1],f=c[2];if(l<u||l>f)return a.value=o,void a.select();var p=r(t(a.value)),s=p[0],v=p[1];"string"==typeof e&&"1"===s&&(v=i.trim(v,e)),n.insertAdjacentHTML("afterbegin",v),n.querySelector("a").click()}};["change","focus"].forEach((function(n){return a.addEventListener(n,a.select)})),a.addEventListener("focusout",c),a.addEventListener("keypress",(function(n){"Enter"===n.key&&c()}))},trim:function(n,t){return n.replace(new RegExp("[?&]".concat(t,"=1\\b(?!&)|\\b").concat(t,"=1&")),"")}},a=i;window.Pagy=a}();
+!function(){function n(n){if(Array.isArray(n))return n}function e(n){if(Symbol.iterator in Object(n)||"[object Arguments]"===Object.prototype.toString.call(n))return Array.from(n)}function t(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function r(r,a){return n(r)||e(r)||t()}var a,o,i,c,u,f,l=(a=new ResizeObserver((function(n){return n.forEach((function(n){return n.target.querySelectorAll(".pagy-rjs").forEach((function(n){return n.pagyRender()}))}))})),o=function(n,e){var t,o=r(e),i=o[0],c=o[1],u=o[2],l=o[3],p=null!==(t=n.parentElement)&&void 0!==t?t:n,s=Object.keys(c).map((function(n){return parseInt(n)})).sort((function(n,e){return e-n})),y=-1,g=function(n,e,t){return n.replace(/__pagy_page__/g,e).replace(/__pagy_label__/g,t)};(n.pagyRender=function(){var e=s.find((function(n){return n<p.clientWidth}))||0;if(e!==y){var t,r=i.before,a=c[e.toString()],o=null!==(t=null==u?void 0:u[e.toString()])&&void 0!==t?t:a.map((function(n){return n.toString()}));for(var v in a){var d=a[v],_=o[v];r+="string"==typeof l&&1===d?f(g(i.link,d.toString(),_),l):"number"==typeof d?g(i.link,d.toString(),_):"gap"===d?i.gap:g(i.active,d,_)}r+=i.after,n.innerHTML="",n.insertAdjacentHTML("afterbegin",r),y=e}})(),n.classList.contains("pagy-rjs")&&a.observe(p)},i=function(n,e){var t=r(e),a=t[0],o=t[1];return u(n,(function(n){return[n,a.replace(/__pagy_page__/,n)]}),o)},c=function(n,e){var t=r(e),a=t[0],o=t[1],i=t[2];u(n,(function(n){var e=Math.max(Math.ceil(a/parseInt(n)),1).toString();return[e,o.replace(/__pagy_page__/,e).replace(/__pagy_items__/,n)]}),i)},u=function(n,e,t){var a=n.querySelector("input"),o=a.value,i=function(){if(a.value!==o){var i=r([a.min,a.value,a.max].map((function(n){return parseInt(n)||0}))),c=i[0],u=i[1],l=i[2];if(u<c||u>l)return a.value=o,void a.select();var p=r(e(a.value)),s=p[0],y=p[1];"string"==typeof t&&"1"===s&&(y=f(y,t)),n.insertAdjacentHTML("afterbegin",y),n.querySelector("a").click()}};["change","focus"].forEach((function(n){return a.addEventListener(n,a.select)})),a.addEventListener("focusout",i),a.addEventListener("keypress",(function(n){"Enter"===n.key&&i()}))},f=function(n,e){return n.replace(new RegExp("(\\?|&amp;)".concat(e,"=1\\b(?!&amp;)|\\b").concat(e,"=1&amp;")),"")},{version:"5.9.3",init:function(r){var a,u=(r instanceof Element?r:document).querySelectorAll("[data-pagy]"),f=!0,l=!1,p=void 0;try{for(var s,y=u[Symbol.iterator]();!(f=(s=y.next()).done);f=!0){var g=s.value;try{var v=Uint8Array.from(atob(g.getAttribute("data-pagy")),(function(n){return n.charCodeAt(0)})),d=n(a=JSON.parse((new TextDecoder).decode(v)))||e(a)||t(),_=d[0],m=d.slice(1);"nav"===_?o(g,m):"combo"===_?i(g,m):"selector"===_?c(g,m):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",g,_)}catch(n){console.warn("Skipped Pagy.init() for: %o\n%s",g,n)}}}catch(n){l=!0,p=n}finally{try{f||null==y.return||y.return()}finally{if(l)throw p}}}});window.Pagy=l}();

data/lib/pagy/calendar/day.rb

@@ -13,16 +13,16 @@ class Pagy # :nodoc:
       # Setup the calendar variables
       def setup_unit_vars
         super
-        @initial = new_time(@starting.year, @starting.month, @starting.day)
-        @final   = new_time(@ending.year, @ending.month, @ending.day) + DAY
-        @pages   = @last = (@final - @initial).to_i / DAY
+        @initial = @starting.beginning_of_day
+        @final   = @ending.tomorrow.beginning_of_day
+        @pages   = @last = (@with_zone ? (@final.time - @initial.time) : (@final - @initial)).to_i / 1.day
         @from    = starting_time_for(@page)
-        @to      = @from + DAY
+        @to      = @from.tomorrow
       end
 
       # Starting time for the page
       def starting_time_for(page)
-        @initial + (offset_units_for(page) * DAY)
+        @initial + offset_units_for(page).days
       end
     end
   end

data/lib/pagy/calendar/month.rb

@@ -1,16 +1,36 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
 # frozen_string_literal: true
 
-require_relative 'month_mixin'
-
 class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar month subclass
     class Month < Calendar
-      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
+      DEFAULT = { order: :asc, # rubocop:disable Style/MutableConstant
                   format: '%Y-%m' }
-      MONTHS  = 1  # number of months in the unit
-      include MonthMixin
+
+      protected
+
+      # Setup the calendar variables
+      def setup_unit_vars
+        super
+        @initial = @starting.beginning_of_month
+        @final   = @ending.next_month.beginning_of_month
+        @pages   = @last = (months_in(@final) - months_in(@initial))
+        @from    = starting_time_for(@page)
+        @to      = @from.next_month
+      end
+
+      # Starting time for the page
+      def starting_time_for(page)
+        @initial + offset_units_for(page).months
+      end
+
+      private
+
+      # Number of months in time
+      def months_in(time)
+        (time.year * 12) + time.month
+      end
     end
   end
 end

data/lib/pagy/calendar/quarter.rb

@@ -1,23 +1,43 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
 # frozen_string_literal: true
 
-require_relative 'month_mixin'
-
 class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar quarter subclass
     class Quarter < Calendar
       DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
                   format: '%Y-Q%q' } # '%q' token
-      MONTHS  = 3  # number of months of the unit
-      include MonthMixin
 
       # The label for any page, with the substitution of the '%q' token
       def label_for(page, opts = {})
         starting_time = starting_time_for(page.to_i)  # page could be a string
-        opts[:format] = (opts[:format] || @vars[:format]).gsub('%q') { (starting_time.month / 4) + 1 }
+        opts[:format] = (opts[:format] || @vars[:format]).gsub('%q') { (starting_time.month / 3.0).ceil }
         localize(starting_time, opts)
       end
+
+      protected
+
+      # Setup the calendar variables
+      def setup_unit_vars
+        super
+        @initial = @starting.beginning_of_quarter
+        @final   = @ending.next_quarter.beginning_of_quarter
+        @pages   = @last = (months_in(@final) - months_in(@initial)) / 3
+        @from    = starting_time_for(@page)
+        @to      = @from.next_quarter
+      end
+
+      # Starting time for the page
+      def starting_time_for(page)
+        @initial + (offset_units_for(page) * 3).months
+      end
+
+      private
+
+      # Number of months in time
+      def months_in(time)
+        (time.year * 12) + time.month
+      end
     end
   end
 end

data/lib/pagy/calendar/week.rb

@@ -5,34 +5,29 @@ class Pagy # :nodoc:
   class Calendar # :nodoc:
     # Calendar week subclass
     class Week < Calendar
-      DEFAULT = { order:  :asc,      # rubocop:disable Style/MutableConstant
-                  format: '%Y-%W',
-                  offset: 0 }
+      DEFAULT  = { order:  :asc,      # rubocop:disable Style/MutableConstant
+                   format: '%Y-%W' }
 
       protected
 
       # Setup the calendar variables
       def setup_unit_vars
-        setup_vars(offset: 0)
         super
-        @initial = unit_starting_time_for(@starting)
-        @final   = unit_starting_time_for(@ending) + WEEK
-        @pages   = @last = (@final - @initial).to_i / WEEK
+        if @vars[:offset]  # remove in pagy 6
+          Warning.warn '[PAGY WARNING] The week :offset variable has been deprecated and will be ignored from pagy 6. ' \
+                       "Set the Date.beginning_of_week variable to be one of #{::Date::DAYS_INTO_WEEK.keys.inspect} instead."
+          Date.beginning_of_week = ::Date::DAYS_INTO_WEEK.keys[@vars[:offset]]
+        end
+        @initial = @starting.beginning_of_week
+        @final   = @ending.next_week.beginning_of_week
+        @pages   = @last = (@with_zone ? (@final.time - @initial.time) : (@final - @initial)).to_i / 1.week
         @from    = starting_time_for(@page)
-        @to      = @from + WEEK
+        @to      = @from.next_week
       end
 
       # Starting time for the page
       def starting_time_for(page)
-        @initial + (offset_units_for(page) * WEEK)
-      end
-
-      private
-
-      # Unit starting time for time
-      def unit_starting_time_for(time)
-        starting_time = time - (((time.wday - @offset) * DAY) % WEEK)
-        new_time(starting_time.year, starting_time.month, starting_time.day)
+        @initial + offset_units_for(page).weeks
       end
     end
   end

data/lib/pagy/calendar/year.rb

@@ -13,16 +13,16 @@ class Pagy # :nodoc:
       # Setup the calendar variables
       def setup_unit_vars
         super
-        @initial = new_time(@starting.year)
-        @final   = new_time(@ending.year + 1)
+        @initial = @starting.beginning_of_year
+        @final   = @ending.next_year.beginning_of_year
         @pages   = @last = @final.year - @initial.year
         @from    = starting_time_for(@page)
-        @to      = new_time(@from.year + 1)
+        @to      = @from.next_year
       end
 
       # Starting time for the page
       def starting_time_for(page)
-        new_time(@initial.year + offset_units_for(page))
+        @initial.years_since(offset_units_for(page))
       end
     end
   end

data/lib/pagy/calendar.rb

@@ -1,6 +1,12 @@
 # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
 # frozen_string_literal: true
 
+require 'active_support'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/date_and_time/calculations'
+require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/integer/time'
+
 require 'pagy'
 
 class Pagy # :nodoc:
@@ -8,8 +14,6 @@ class Pagy # :nodoc:
   class Calendar < Pagy
     # List of units in desc order of duration. It can be used for custom units.
     UNITS = %i[year quarter month week day]  # rubocop:disable Style/MutableConstant
-    DAY   = 60 * 60 * 24  # One day in seconds
-    WEEK  = DAY * 7       # One week in seconds
 
     attr_reader :order
 
@@ -49,8 +53,9 @@ class Pagy # :nodoc:
 
       @starting, @ending = @vars[:period]
       raise VariableError.new(self, :period, 'to be a an Array of min and max local Time instances', @vars[:period]) \
-            unless @starting.is_a?(Time) && @ending.is_a?(Time) && !@starting.utc? && !@ending.utc? && @starting <= @ending \
-                   && (@utc_offset = @starting.utc_offset) == @ending.utc_offset
+            unless @starting.is_a?(Time) && @ending.is_a?(Time) && !@starting.utc? && !@ending.utc? && @starting <= @ending
+
+      @with_zone = @starting.is_a?(ActiveSupport::TimeWithZone) # remove in 6.0 and replace Time in the line above
     end
 
     # Apply the strftime format to the time (overridden by the i18n extra when localization is required)
@@ -64,11 +69,6 @@ class Pagy # :nodoc:
       @order == :asc ? page - 1 : @pages - page
     end
 
-    # Create a new local time at the beginning of the day
-    def new_time(year, month = 1, day = 1)
-      Time.new(year, month, day, 0, 0, 0, @utc_offset)
-    end
-
     # Period of the active page (used internally for nested units)
     def active_period
       [[@starting, @from].max, [@to - 1, @ending].min] # -1 sec: include only last unit day

data/lib/pagy/countless.rb

@@ -11,8 +11,8 @@ class Pagy
       normalize_vars(vars)
       setup_vars(page: 1, outset: 0)
       setup_items_var
+      setup_offset_var
       setup_params_var
-      @offset = (@items * (@page - 1)) + @outset
     end
 
     # Finalize the instance variables based on the fetched size

data/lib/pagy/extras/gearbox.rb

@@ -19,7 +19,7 @@ class Pagy # :nodoc:
       @items = gearbox_items[@page - 1] || gearbox_items.last
     end
 
-    # Setup @pages and @last based on the :gearbox_items variable
+    # Setup @pages and @last based on the :gearbox_items variable (not used by Pagy::Countless)
     def setup_pages_var
       return super if !@vars[:gearbox_extra] || @vars[:items_extra]
 
@@ -37,6 +37,18 @@ class Pagy # :nodoc:
                           [pages, 1].max
                         end)
     end
+
+    # Setup @offset based on the :gearbox_items variable
+    def setup_offset_var
+      return super if !@vars[:gearbox_extra] || @vars[:items_extra]
+
+      gearbox_items = @vars[:gearbox_items]
+      @offset       = if @page <= gearbox_items.count
+                        gearbox_items[0, @page - 1].sum
+                      else
+                        gearbox_items.sum + (gearbox_items.last * (@page - gearbox_items.count - 1))
+                      end + @outset
+    end
   end
   prepend GearboxExtra
 end

data/lib/pagy/extras/standalone.rb

@@ -36,7 +36,7 @@ class Pagy # :nodoc:
     # Return the URL for the page. If there is no pagy.vars[:url]
     # it works exactly as the regular #pagy_url_for, relying on the params method and Rack.
     # If there is a defined pagy.vars[:url] variable it does not need the params method nor Rack.
-    def pagy_url_for(pagy, page, absolute: nil)
+    def pagy_url_for(pagy, page, absolute: false, html_escaped: false)
       return super unless pagy.vars[:url]
 
       vars                = pagy.vars
@@ -48,6 +48,7 @@ class Pagy # :nodoc:
       query_string        = "?#{QueryUtils.build_nested_query(pagy_deprecated_params(pagy, params))}"  # remove in 6.0
       # params              = pagy.params.call(params) if pagy.params.is_a?(Proc)                      # add in 6.0
       # query_string        = "?#{Rack::Utils.build_nested_query(params)}"                             # add in 6.0
+      query_string        = query_string.gsub('&', '&') if html_escaped  # the only unescaped entity
       "#{vars[:url]}#{query_string}#{vars[:fragment]}"
     end
   end

data/lib/pagy/extras/support.rb

@@ -18,7 +18,7 @@ class Pagy # :nodoc:
     def pagy_prev_link(pagy, text: pagy_t('pagy.nav.prev'), link_extra: '')
       if pagy.prev
         %(<span class="page prev"><a href="#{
-            pagy_url_for(pagy, pagy.prev)
+            pagy_url_for(pagy, pagy.prev, html_escaped: true)
           }" rel="prev" aria-label="previous" #{
             pagy.vars[:link_extra]
           } #{link_extra}>#{text}</a></span>)
@@ -31,7 +31,7 @@ class Pagy # :nodoc:
     def pagy_next_link(pagy, text: pagy_t('pagy.nav.next'), link_extra: '')
       if pagy.next
         %(<span class="page next"><a href="#{
-            pagy_url_for(pagy, pagy.next)
+            pagy_url_for(pagy, pagy.next, html_escaped: true)
           }" rel="next" aria-label="next" #{
             pagy.vars[:link_extra]
           } #{link_extra}>#{text}</a></span>)
@@ -42,12 +42,12 @@ class Pagy # :nodoc:
 
     # Return the HTML link tag for the previous page or nil
     def pagy_prev_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy, pagy.prev)}" rel="prev"/>) if pagy.prev
+      %(<link href="#{pagy_url_for(pagy, pagy.prev, html_escaped: true)}" rel="prev"/>) if pagy.prev
     end
 
     # Return the HTML link tag for the next page or nil
     def pagy_next_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy, pagy.next)}" rel="next"/>) if pagy.next
+      %(<link href="#{pagy_url_for(pagy, pagy.next, html_escaped: true)}" rel="next"/>) if pagy.next
     end
   end
   Frontend.prepend SupportExtra

data/lib/pagy/extras/trim.rb

@@ -22,7 +22,7 @@ class Pagy # :nodoc:
 
     # Remove the the :page_param param from the first page link
     def pagy_trim(pagy, link)
-      link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
+      link.sub!(/(\?|&)#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
     end
   end
   Frontend.prepend TrimExtra

data/lib/pagy/frontend.rb

@@ -63,7 +63,7 @@ class Pagy
     def pagy_link_proc(pagy, link_extra: '')
       p_prev      = pagy.prev
       p_next      = pagy.next
-      left, right = %(<a href="#{pagy_url_for pagy, PAGE_PLACEHOLDER}" #{
+      left, right = %(<a href="#{pagy_url_for(pagy, PAGE_PLACEHOLDER, html_escaped: true)}" #{
                         pagy.vars[:link_extra]} #{link_extra}).split(PAGE_PLACEHOLDER, 2)
       lambda do |page, text = pagy.label_for(page), extra_attrs = ''|
         %(#{left}#{page}#{right}#{ case page

data/lib/pagy/url_helpers.rb

@@ -6,7 +6,7 @@ class Pagy
     # Return the URL for the page, relying on the params method and Rack by default.
     # It supports all Rack-based frameworks (Sinatra, Padrino, Rails, ...).
     # For non-rack environments you can use the standalone extra
-    def pagy_url_for(pagy, page, absolute: nil)
+    def pagy_url_for(pagy, page, absolute: false, html_escaped: false)
       vars                = pagy.vars
       page_param          = vars[:page_param].to_s
       items_param         = vars[:items_param].to_s
@@ -17,6 +17,7 @@ class Pagy
       query_string        = "?#{Rack::Utils.build_nested_query(pagy_deprecated_params(pagy, params))}"  # remove in 6.0
       # params              = pagy.params.call(params) if pagy.params.is_a?(Proc)                       # add in 6.0
       # query_string        = "?#{Rack::Utils.build_nested_query(params)}"                              # add in 6.0
+      query_string        = query_string.gsub('&', '&') if html_escaped  # the only unescaped entity
       "#{request.base_url if absolute}#{request.path}#{query_string}#{vars[:fragment]}"
     end
 

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '5.8.1'
+  VERSION = '5.9.3'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -32,10 +32,10 @@ class Pagy
     setup_vars(count: 0, page: 1, outset: 0)
     setup_items_var
     setup_pages_var
+    setup_offset_var
     setup_params_var
     raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
 
-    @offset = (@items * (@page - 1)) + @outset
     @from   = [@offset - @outset + 1, @count].min
     @to     = [@offset - @outset + @items, @count].min
     @in     = [@to - @from + 1, @count].min
@@ -96,17 +96,22 @@ class Pagy
     end
   end
 
-  # Setup and validate the items (overridden by the gearbox extra)
+  # Setup @items (overridden by the gearbox extra)
   def setup_items_var
     setup_vars(items: 1)
   end
 
-  # Setup and validates the pages (overridden by the gearbox extra)
+  # Setup @pages and @last (overridden by the gearbox extra)
   def setup_pages_var
     @pages = @last = [(@count.to_f / @items).ceil, 1].max
   end
 
-  # Setup and validates the params
+  # Setup @offset based on the :gearbox_items variable
+  def setup_offset_var
+    @offset = (@items * (@page - 1)) + @outset  # may be already set from gear_box
+  end
+
+  # Setup and validate @params
   def setup_params_var
     raise VariableError.new(self, :params, 'must be a Hash or a Proc', @params) \
           unless (@params = @vars[:params]).is_a?(Hash) || @params.is_a?(Proc)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 5.9.3
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
-dependencies: []
+date: 2022-01-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
 - dd.nexus@gmail.com
@@ -60,7 +74,6 @@ files:
 - lib/pagy/calendar.rb
 - lib/pagy/calendar/day.rb
 - lib/pagy/calendar/month.rb
-- lib/pagy/calendar/month_mixin.rb
 - lib/pagy/calendar/quarter.rb
 - lib/pagy/calendar/week.rb
 - lib/pagy/calendar/year.rb

data/lib/pagy/calendar/month_mixin.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-class Pagy
-  class Calendar
-    # Mixin for month based unit periods
-    # It is used for month and quarter, but you could use it to implement less common unit of 6, 4, 2 months
-    # (see the https://ddnexus.github.io/pagy/api/calendar#custom-units sections for details).
-    # The including class must set the MONTHS duration for the unit and the usual DEFAULT.
-    module MonthMixin
-      protected
-
-      # Setup the calendar variables
-      def setup_unit_vars
-        super
-        @months  = self.class::MONTHS  # number of months in the unit
-        @initial = unit_starting_time_for(@starting)
-        @final   = add_months_to(unit_starting_time_for(@ending), @months)
-        @pages   = @last = (months_in(@final) - months_in(@initial)) / @months
-        @from    = starting_time_for(@page)
-        @to      = add_months_to(@from, @months)
-      end
-
-      # Starting time for the page
-      def starting_time_for(page)
-        add_months_to(@initial, offset_units_for(page) * @months)
-      end
-
-      private
-
-      # Unit starting time for time
-      def unit_starting_time_for(time)
-        # remove 1 month for 0-11 calculations and add it back for 1-12 conversion
-        starting_month = (@months * ((time.month - 1) / @months)) + 1
-        new_time(time.year, starting_month)
-      end
-
-      # Number of months in time
-      def months_in(time)
-        (time.year * 12) + time.month
-      end
-
-      # Add months to time
-      def add_months_to(time, months)
-        months += months_in(time) - 1             # remove 1 month for 0-11 calculations
-        new_time(months / 12, (months % 12) + 1)  # add 1 month back for 1-12 conversion
-      end
-    end
-  end
-end