pagy 7.0.5 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ed181d6c937abde5035fce2fcc73ffdc41553461302f87ada5886db077b583
-  data.tar.gz: 5bddf3a36fc0b47c2f15501f55045f45b16d2419a160352616cb918f75ab47a7
+  metadata.gz: ad56d9989566c41b48046508ab040e26c8a6350c1c433ce1a341d5ac8d624f97
+  data.tar.gz: dbaafa022867515e0912d80751244386e3026c0fa5de774f2014e80f1a26eb5f
 SHA512:
-  metadata.gz: 3e727425a8e7efb69a4e2aa8cdf05d07233da12e7bb1859f6d1c757b863f18218bea4aec8be1f09b88496fe39c3bc1268c6c50db9afb2a56b2c680b1f997615c
-  data.tar.gz: 8e67bdc30add6a250c66e22ab9ec4129214bca152718abf0bc9282b423d836874971a7e418eeac1e5e8f2fee197b1b24662468a6debb53b2eaf4791d5e3aabb4
+  metadata.gz: bb54413602bd78d87cb84a604d4a025dabae7a73cf54bbb0b5054d68f20119a6d9166188cf555f28f23659c6b375e55ade74429fdd042a8f1ac6c482112b69d5
+  data.tar.gz: e9083757c4cac1b40110d41ada75e13d626f8d0949486b32104a359653a61cf08bb384a1fcb674088ead0fb021528fd26dcbd1541d4dcd382ab8d6925734fec3

data/lib/config/pagy.rb

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

data/lib/javascripts/pagy-dev.js

@@ -13,24 +13,23 @@ window.Pagy = (() => {
             if (width === lastWidth) {
                 return;
             } // no change: abort
-            let html = tags.before;
+            let html = tags.before; // already trimmed in html
             const series = sequels[width.toString()];
             const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());
             for (const i in series) {
                 const item = series[i];
                 const label = labels[i];
-                if (typeof trimParam === "string" && item === 1) {
-                    html += trim(fillIn(tags.link, item.toString(), label), trimParam);
-                }
-                else if (typeof item === "number") {
-                    html += fillIn(tags.link, item.toString(), label);
+                let filled;
+                if (typeof item === "number") {
+                    filled = fillIn(tags.link, item.toString(), label);
                 }
                 else if (item === "gap") {
-                    html += tags.gap;
+                    filled = tags.gap;
                 }
                 else { // active page
-                    html += fillIn(tags.active, item, label);
+                    filled = fillIn(tags.active, item, label);
                 }
+                html += (typeof trimParam === "string" && item == 1) ? trim(filled, trimParam) : filled;
             }
             html += tags.after; // eslint-disable-line align-assignments/align-assignments
             el.innerHTML = "";
@@ -82,7 +81,7 @@ window.Pagy = (() => {
     const trim = (link, param) => link.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "7.0.5",
+        version: "7.0.7",
         // 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;
@@ -111,4 +110,4 @@ window.Pagy = (() => {
         }
     };
 })();
-//# 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?]\n\ninterface Tags {\n    readonly before:string\n    readonly link:string\n    readonly active:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\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(\n                                                   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(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"7.0.5\",\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"]}
+//# 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?]\n\ninterface Tags {\n    readonly before:string\n    readonly link:string\n    readonly active:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\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(\n                                                   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;  // already trimmed in html\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                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tags.link, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tags.gap;\n                } else { // active page\n                    filled = fillIn(tags.active, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\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(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"7.0.7\",\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.js

@@ -12,24 +12,23 @@ const Pagy = (() => {
             if (width === lastWidth) {
                 return;
             } // no change: abort
-            let html = tags.before;
+            let html = tags.before; // already trimmed in html
             const series = sequels[width.toString()];
             const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());
             for (const i in series) {
                 const item = series[i];
                 const label = labels[i];
-                if (typeof trimParam === "string" && item === 1) {
-                    html += trim(fillIn(tags.link, item.toString(), label), trimParam);
-                }
-                else if (typeof item === "number") {
-                    html += fillIn(tags.link, item.toString(), label);
+                let filled;
+                if (typeof item === "number") {
+                    filled = fillIn(tags.link, item.toString(), label);
                 }
                 else if (item === "gap") {
-                    html += tags.gap;
+                    filled = tags.gap;
                 }
                 else { // active page
-                    html += fillIn(tags.active, item, label);
+                    filled = fillIn(tags.active, item, label);
                 }
+                html += (typeof trimParam === "string" && item == 1) ? trim(filled, trimParam) : filled;
             }
             html += tags.after; // eslint-disable-line align-assignments/align-assignments
             el.innerHTML = "";
@@ -81,7 +80,7 @@ const Pagy = (() => {
     const trim = (link, param) => link.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "7.0.5",
+        version: "7.0.7",
         // 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;

data/lib/javascripts/pagy.js

@@ -1 +1 @@
-!function(){let e=(()=>{let e=new ResizeObserver(e=>e.forEach(e=>e.target.querySelectorAll(".pagy-rjs").forEach(e=>e.pagyRender()))),t=(t,[r,n,a,i])=>{let l=t.parentElement??t,c=Object.keys(n).map(e=>parseInt(e)).sort((e,t)=>t-e),p=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=c.find(e=>e<l.clientWidth)||0;if(e===p)return;let g=r.before,y=n[e.toString()],f=a?.[e.toString()]??y.map(e=>e.toString());for(let e in y){let t=y[e],n=f[e];"string"==typeof i&&1===t?g+=o(s(r.link,t.toString(),n),i):"number"==typeof t?g+=s(r.link,t.toString(),n):"gap"===t?g+=r.gap:g+=s(r.active,t,n)}g+=r.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(l)},r=(e,[t,r])=>a(e,e=>[e,t.replace(/__pagy_page__/,e)],r),n=(e,[t,r,n])=>{a(e,e=>{let n=Math.max(Math.ceil(t/parseInt(e)),1).toString(),a=r.replace(/__pagy_page__/,n).replace(/__pagy_items__/,e);return[n,a]},n)},a=(e,t,r)=>{let n=e.querySelector("input"),a=n.value,i=function(){if(n.value===a)return;let[i,l,c]=[n.min,n.value,n.max].map(e=>parseInt(e)||0);if(l<i||l>c){n.value=a,n.select();return}let[p,s]=t(n.value);"string"==typeof r&&"1"===p&&(s=o(s,r)),e.insertAdjacentHTML("afterbegin",s),e.querySelector("a").click()};["change","focus"].forEach(e=>n.addEventListener(e,n.select)),n.addEventListener("focusout",i),n.addEventListener("keypress",e=>{"Enter"===e.key&&i()})},o=(e,t)=>e.replace(RegExp(`[?&]${t}=1\\b(?!&)|\\b${t}=1&`),"");return{version:"7.0.5",init(e){for(let a of(e instanceof Element?e:document).querySelectorAll("[data-pagy]"))try{let e=Uint8Array.from(atob(a.getAttribute("data-pagy")),e=>e.charCodeAt(0)),[o,...i]=JSON.parse(new TextDecoder().decode(e));"nav"===o?t(a,i):"combo"===o?r(a,i):"selector"===o?n(a,i):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",a,o)}catch(e){console.warn("Skipped Pagy.init() for: %o\n%s",a,e)}}}})();window.Pagy=e}();
+!function(){let e=(()=>{let e=new ResizeObserver(e=>e.forEach(e=>e.target.querySelectorAll(".pagy-rjs").forEach(e=>e.pagyRender()))),t=(t,[r,a,n,i])=>{let l=t.parentElement??t,c=Object.keys(a).map(e=>parseInt(e)).sort((e,t)=>t-e),p=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=c.find(e=>e<l.clientWidth)||0;if(e===p)return;let g=r.before,y=a[e.toString()],f=n?.[e.toString()]??y.map(e=>e.toString());for(let e in y){let t;let a=y[e],n=f[e];t="number"==typeof a?s(r.link,a.toString(),n):"gap"===a?r.gap:s(r.active,a,n),g+="string"==typeof i&&1==a?o(t,i):t}g+=r.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(l)},r=(e,[t,r])=>n(e,e=>[e,t.replace(/__pagy_page__/,e)],r),a=(e,[t,r,a])=>{n(e,e=>{let a=Math.max(Math.ceil(t/parseInt(e)),1).toString(),n=r.replace(/__pagy_page__/,a).replace(/__pagy_items__/,e);return[a,n]},a)},n=(e,t,r)=>{let a=e.querySelector("input"),n=a.value,i=function(){if(a.value===n)return;let[i,l,c]=[a.min,a.value,a.max].map(e=>parseInt(e)||0);if(l<i||l>c){a.value=n,a.select();return}let[p,s]=t(a.value);"string"==typeof r&&"1"===p&&(s=o(s,r)),e.insertAdjacentHTML("afterbegin",s),e.querySelector("a").click()};["change","focus"].forEach(e=>a.addEventListener(e,a.select)),a.addEventListener("focusout",i),a.addEventListener("keypress",e=>{"Enter"===e.key&&i()})},o=(e,t)=>e.replace(RegExp(`[?&]${t}=1\\b(?!&)|\\b${t}=1&`),"");return{version:"7.0.7",init(e){for(let n of(e instanceof Element?e:document).querySelectorAll("[data-pagy]"))try{let e=Uint8Array.from(atob(n.getAttribute("data-pagy")),e=>e.charCodeAt(0)),[o,...i]=JSON.parse(new TextDecoder().decode(e));"nav"===o?t(n,i):"combo"===o?r(n,i):"selector"===o?a(n,i):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",n,o)}catch(e){console.warn("Skipped Pagy.init() for: %o\n%s",n,e)}}}})();window.Pagy=e}();

data/lib/pagy/extras/bootstrap.rb

@@ -21,9 +21,10 @@ class Pagy # :nodoc:
                 when Integer
                   %(<li class="page-item">#{link.call(item)}</li>)
                 when String
-                  %(<li class="page-item active">#{link.call(item)}</li>)
+                  %(<li class="page-item active"><a role="link" class="page-link" aria-current="page" aria-disabled="true">#{
+                      pagy.label_for(item)}</a></li>)
                 when :gap
-                  %(<li class="page-item gap disabled"><a href="#" class="page-link" aria-disabled="true">#{
+                  %(<li class="page-item gap disabled"><a role="link" class="page-link" aria-disabled="true">#{
                       pagy_t 'pagy.gap'}</a></li>)
                 else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
@@ -39,9 +40,10 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
       tags = { 'before' => %(<ul class="pagination">#{bootstrap_prev_html pagy, link}),
-               'link'   => %(<li class="page-item">#{html = link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="page-item active">#{html}</li>),
-               'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link" aria-disabled="true">#{
+               'link'   => %(<li class="page-item">#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+               'active' => %(<li class="page-item active"><a role="link" class="page-link" ) +
+                           %(aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
+               'gap'    => %(<li class="page-item gap disabled"><a role="link" class="page-link" aria-disabled="true">#{
                                pagy_t 'pagy.gap'}</a></li>),
                'after'  => %(#{bootstrap_next_html pagy, link}</ul>) }
 
@@ -68,7 +70,7 @@ class Pagy # :nodoc:
           if (p_prev = pagy.prev)
             link.call(p_prev, pagy_t('pagy.prev'), %(class="prev btn btn-primary" #{prev_aria_label_attr}))
           else
-            %(<a class="prev btn btn-primary disabled" href="#" aria-disabled="true" #{
+            %(<a role="link" class="prev btn btn-primary disabled" aria-disabled="true" #{
                 prev_aria_label_attr}>#{pagy_t('pagy.prev')}</a>)
           end
         }<div class="pagy-combo-input btn btn-secondary" style="white-space: nowrap;">#{
@@ -76,7 +78,7 @@ class Pagy # :nodoc:
           if (p_next = pagy.next)
             link.call(p_next, pagy_t('pagy.next'), %(class="next btn btn-primary" #{next_aria_label_attr}))
           else
-            %(<a class="next btn btn-primary disabled" href="#" aria-disabled="true" #{
+            %(<a role="link" class="next btn btn-primary disabled" aria-disabled="true" #{
                 next_aria_label_attr}>#{pagy_t 'pagy.next'}</a>)
           end
         }</div></nav>)
@@ -88,7 +90,7 @@ class Pagy # :nodoc:
       if (p_prev = pagy.prev)
         %(<li class="page-item prev">#{link.call(p_prev, pagy_t('pagy.prev'), prev_aria_label_attr)}</li>)
       else
-        %(<li class="page-item prev disabled"><a href="#" class="page-link" aria-disabled="true" #{
+        %(<li class="page-item prev disabled"><a role="link"class="page-link" aria-disabled="true" #{
             prev_aria_label_attr}>#{pagy_t('pagy.prev')}</a></li>)
       end
     end
@@ -97,7 +99,7 @@ class Pagy # :nodoc:
       if (p_next = pagy.next)
         %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.next'), next_aria_label_attr}</li>)
       else
-        %(<li class="page-item next disabled"><a href="#" class="page-link" aria-disabled="true" #{
+        %(<li class="page-item next disabled"><a role="link" class="page-link" aria-disabled="true" #{
             next_aria_label_attr}>#{pagy_t('pagy.next')}</a></li>)
       end
     end

data/lib/pagy/extras/bulma.rb

@@ -24,7 +24,8 @@ class Pagy # :nodoc:
                 when Integer
                   %(<li>#{link.call(item, pagy.label_for(item), %(class="pagination-link"))}</li>)
                 when String
-                  %(<li>#{link.call(item, pagy.label_for(item), %(class="pagination-link is-current"))}</li>)
+                  %(<li><a role="link" class="pagination-link is-current" aria-current="page" aria-disabled="true">#{
+                      pagy.label_for(item)}</a></li>)
                 when :gap
                   %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.gap'}</span></li>)
                 else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
@@ -40,8 +41,9 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra:)
       tags = { 'before' => %(#{bulma_prev_next_html(pagy, link)}<ul class="pagination-list">),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER, %(class="pagination-link"))}</li>),
-               'active' => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER, %(class="pagination-link is-current"))}</li>),
+               'link'   => %(<li>#{link.call(PAGE_TOKEN, LABEL_TOKEN, %(class="pagination-link"))}</li>),
+               'active' => %(<li><a role="link" class="pagination-link is-current" aria-current="page" aria-disabled="true">#{
+                               LABEL_TOKEN}</a></li>),
                'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.gap'}</span></li>),
                'after'  => '</ul>' }
 
@@ -68,7 +70,7 @@ class Pagy # :nodoc:
           if (p_prev  = pagy.prev)
             %(<p class="control">#{link.call(p_prev, pagy_t('pagy.prev'), %(class="button" #{prev_aria_label_attr}))}</p>)
           else
-            %(<p class="control"><a class="button" disabled aria-disabled="true" #{
+            %(<p class="control"><a role="link" class="button" disabled aria-disabled="true" #{
                 prev_aria_label_attr}>#{pagy_t 'pagy.prev'}</a></p>)
           end
         }<div class="pagy-combo-input control level is-mobile">#{
@@ -76,7 +78,7 @@ class Pagy # :nodoc:
           if (p_next  = pagy.next)
             %(<p class="control">#{link.call(p_next, pagy_t('pagy.next'), %(class="button" #{next_aria_label_attr}))}</p>)
           else
-            %(<p class="control"><a class="button" disabled aria-disabled="true"#{
+            %(<p class="control"><a role="link" class="button" disabled aria-disabled="true"#{
                 next_aria_label_attr}>#{pagy_t 'pagy.next'}</a></p>)
           end
         }</div></nav>)
@@ -88,13 +90,13 @@ class Pagy # :nodoc:
       html = +if (p_prev = pagy.prev)
                 link.call(p_prev, pagy_t('pagy.prev'), %(#{prev_aria_label_attr} class="pagination-previous"))
               else
-                %(<a class="pagination-previous" disabled aria-disabled="true" #{
+                %(<a role="link" class="pagination-previous" disabled aria-disabled="true" #{
                     prev_aria_label_attr}>#{pagy_t 'pagy.prev'}</a>)
               end
       html << if (p_next = pagy.next)
                 link.call(p_next, pagy_t('pagy.next'), %(#{next_aria_label_attr} class="pagination-next"))
               else
-                %(<a class="pagination-next" disabled aria-disabled="true" #{
+                %(<a role="link" class="pagination-next" disabled aria-disabled="true" #{
                     next_aria_label_attr}>#{pagy_t('pagy.next')}</a>)
               end
     end

data/lib/pagy/extras/foundation.rb

@@ -39,8 +39,8 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra:)
       tags = { 'before' => %(<ul class="pagination">#{foundation_prev_html pagy, link}),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{LABEL_PLACEHOLDER}</li>),
+               'link'   => %(<li>#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+               'active' => %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</li>),
                'gap'    => %(<li class="ellipsis gap"></li>),
                'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 

data/lib/pagy/extras/frontend_helpers.rb

@@ -64,7 +64,7 @@ class Pagy # :nodoc:
 
       # Return the marked link used by pagy.js
       def pagy_marked_link(link)
-        link.call PAGE_PLACEHOLDER, '', 'style="display: none;"'
+        link.call PAGE_TOKEN, '', 'style="display: none;"'
       end
     end
     Frontend.prepend FrontendAddOn

data/lib/pagy/extras/headers.rb

@@ -31,10 +31,10 @@ class Pagy # :nodoc:
       countless             = defined?(Countless) && pagy.is_a?(Countless)
       rel                   = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
       rel['last']           = pagy.last unless countless
-      url_str               = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: true)
+      url_str               = pagy_url_for(pagy, PAGE_TOKEN, absolute: true)
       link                  = rel.filter_map do |r, num|
                                 next unless num # rubocop:disable Layout/EmptyLineAfterGuardClause
-                                [r, url_str.sub(PAGE_PLACEHOLDER, num.to_s)]
+                                [r, url_str.sub(PAGE_TOKEN, num.to_s)]
                               end.compact.to_h
       hash                  = { 'link' => link }
       headers               = pagy.vars[:headers]

data/lib/pagy/extras/materialize.rb

@@ -21,9 +21,9 @@ class Pagy # :nodoc:
                 when Integer
                   %(<li class="waves-effect">#{link.call(item)}</li>)
                 when String
-                  %(<li class="active">#{link.call(item)}</li>)
+                  %(<li class="active"><a role="link" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</a></li>)
                 when :gap
-                  %(<li class="gap disabled"><a href="#" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>)
+                  %(<li class="gap disabled"><a role="link" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>)
                 else
                   raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
@@ -40,9 +40,9 @@ class Pagy # :nodoc:
       link = pagy_link_proc(pagy, link_extra:)
 
       tags = { 'before' => %(<ul class="pagination">#{materialize_prev_html pagy, link}),
-               'link'   => %(<li class="waves-effect">#{html = link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="active">#{html}</li>),
-               'gap'    => %(<li class="gap disabled"><a href="#" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>),
+               'link'   => %(<li class="waves-effect">#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+               'active' => %(<li class="active"><a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
+               'gap'    => %(<li class="gap disabled"><a role="link" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>),
                'after'  => %(#{materialize_next_html pagy, link}</ul>) }
 
       %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize-nav-js" role="navigation" #{
@@ -77,7 +77,7 @@ class Pagy # :nodoc:
         %(<li class="waves-effect prev"#{style}>#{
             link.call(p_prev, '<i class="material-icons">chevron_left</i>', prev_aria_label_attr)}</li>)
       else
-        %(<li class="prev disabled"#{style}><a href="#" aria-disabled="true" #{
+        %(<li class="prev disabled"#{style}><a role="link" aria-disabled="true" #{
             prev_aria_label_attr}><i class="material-icons">chevron_left</i></a></li>)
       end
     end
@@ -87,7 +87,7 @@ class Pagy # :nodoc:
         %(<li class="waves-effect next"#{style}>#{
             link.call(p_next, '<i class="material-icons">chevron_right</i>', next_aria_label_attr)}</li>)
       else
-        %(<li class="next disabled"#{style}><a href="#" aria-disabled="true" #{
+        %(<li class="next disabled"#{style}><a role="link" aria-disabled="true" #{
             next_aria_label_attr}><i class="material-icons">chevron_right</i></a></li>)
       end
     end

data/lib/pagy/extras/metadata.rb

@@ -15,17 +15,17 @@ class Pagy # :nodoc:
 
     # Return the metadata hash
     def pagy_metadata(pagy, absolute: nil)
-      scaffold_url = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute:)
+      scaffold_url = pagy_url_for(pagy, PAGE_TOKEN, absolute:)
       {}.tap do |metadata|
         keys = defined?(Calendar) && pagy.is_a?(Calendar) ? pagy.vars[:metadata] - %i[count items] : pagy.vars[:metadata]
         keys.each do |key|
           metadata[key] = case key
                           when :scaffold_url then scaffold_url
-                          when :first_url    then scaffold_url.sub(PAGE_PLACEHOLDER, 1.to_s)
-                          when :prev_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.prev.to_s)
-                          when :page_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.page.to_s)
-                          when :next_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.next.to_s)
-                          when :last_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.last.to_s)
+                          when :first_url    then scaffold_url.sub(PAGE_TOKEN, 1.to_s)
+                          when :prev_url     then scaffold_url.sub(PAGE_TOKEN, pagy.prev.to_s)
+                          when :page_url     then scaffold_url.sub(PAGE_TOKEN, pagy.page.to_s)
+                          when :next_url     then scaffold_url.sub(PAGE_TOKEN, pagy.next.to_s)
+                          when :last_url     then scaffold_url.sub(PAGE_TOKEN, pagy.last.to_s)
                           else pagy.send(key)
                           end
         rescue NoMethodError

data/lib/pagy/extras/navs.rb

@@ -14,9 +14,9 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra:)
       tags = { 'before' => prev_html(pagy, link),
-               'link'   => %(<span class="page">#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</span>),
+               'link'   => %(<span class="page">#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</span>),
                'active' => %(<span class="page active">) +
-                           %(<a role="link" aria-current="page" aria-disabled="true">#{LABEL_PLACEHOLDER}</a></span>),
+                           %(<a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></span>),
                'gap'    => %(<span class="page gap">#{pagy_t 'pagy.gap'}</span>),
                'after'  => next_html(pagy, link) }
 

data/lib/pagy/extras/semantic.rb

@@ -21,7 +21,7 @@ class Pagy # :nodoc:
                 when Integer
                   link.call(item, pagy.label_for(item), %(class="item"))
                 when String
-                  link.call(item, pagy.label_for(item), %(class="item active"))
+                  %(<a role="link" class="item active" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</a>)
                 when :gap
                   %(<div class="disabled item">#{pagy_t 'pagy.gap'}</div>)
                 else
@@ -39,8 +39,8 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra:)
       tags = { 'before' => semantic_prev_html(pagy, link),
-               'link'   => link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER, %(class="item")),
-               'active' => link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER, %(class="item active")),
+               'link'   => link.call(PAGE_TOKEN, LABEL_TOKEN, %(class="item")),
+               'active' => %(<a role="link" class="item active" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a>),
                'gap'    => %(<div class="disabled item">#{pagy_t('pagy.gap')}</div>),
                'after'  => semantic_next_html(pagy, link) }
 

data/lib/pagy/extras/uikit.rb

@@ -40,9 +40,9 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra:)
       tags = { 'before' => uikit_prev_html(pagy, link),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
+               'link'   => %(<li>#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
                'active' => %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
-                               LABEL_PLACEHOLDER}</span></li>),
+                               LABEL_TOKEN}</span></li>),
                'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>),
                'after'  => uikit_next_html(pagy, link) }
 

data/lib/pagy/frontend.rb

@@ -6,8 +6,8 @@ require 'pagy/i18n'
 
 class Pagy
   # Used for search and replace, hardcoded also in the pagy.js file
-  PAGE_PLACEHOLDER  = '__pagy_page__'
-  LABEL_PLACEHOLDER = '__pagy_label__'
+  PAGE_TOKEN  = '__pagy_page__'
+  LABEL_TOKEN = '__pagy_label__'
 
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
@@ -59,8 +59,8 @@ class Pagy
       p_prev      = pagy.prev
       p_next      = pagy.next
       p_page      = pagy.page.to_s
-      left, right = %(<a href="#{pagy_url_for(pagy, PAGE_PLACEHOLDER)}" #{
-                        pagy.vars[:link_extra]} #{link_extra}).split(PAGE_PLACEHOLDER, 2)
+      left, right = %(<a href="#{pagy_url_for(pagy, PAGE_TOKEN)}" #{
+                        pagy.vars[:link_extra]} #{link_extra}).split(PAGE_TOKEN, 2)
       # lambda used by all the helpers
       lambda do |page, text = pagy.label_for(page), extra_attrs = ''|
         %(#{left}#{page}#{right}#{ case page

data/lib/pagy.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.0.7
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email: