RubyGems - pagy - Versions diffs - 5.10.1 → 6.0.0 - Mend

pagy 5.10.1 → 6.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

checksums.yaml +4 -4
data/lib/config/pagy.rb +4 -3
data/lib/javascripts/pagy-dev.js +2 -2
data/lib/javascripts/pagy-module.js +1 -1
data/lib/javascripts/pagy.js +1 -1
data/lib/locales/de.yml +1 -1
data/lib/locales/ko.yml +1 -1
data/lib/locales/nn.yml +22 -0
data/lib/pagy/calendar/day.rb +12 -2
data/lib/pagy/calendar/helper.rb +61 -0
data/lib/pagy/calendar/month.rb +5 -1
data/lib/pagy/calendar/quarter.rb +5 -1
data/lib/pagy/calendar/week.rb +12 -7
data/lib/pagy/calendar/year.rb +5 -1
data/lib/pagy/calendar.rb +17 -7
data/lib/pagy/countless.rb +1 -1
data/lib/pagy/extras/bootstrap.rb +3 -3
data/lib/pagy/extras/calendar.rb +9 -26
data/lib/pagy/extras/elasticsearch_rails.rb +1 -10
data/lib/pagy/extras/materialize.rb +3 -3
data/lib/pagy/extras/meilisearch.rb +14 -20
data/lib/pagy/extras/navs.rb +2 -2
data/lib/pagy/extras/searchkick.rb +2 -10
data/lib/pagy/extras/standalone.rb +4 -3
data/lib/pagy/frontend.rb +1 -1
data/lib/pagy/url_helpers.rb +4 -19
data/lib/pagy.rb +16 -4
data/lib/templates/bootstrap_nav.html.erb +1 -1
data/lib/templates/bootstrap_nav.html.haml +1 -1
data/lib/templates/bootstrap_nav.html.slim +1 -1
data/lib/templates/nav.html.erb +1 -1
data/lib/templates/nav.html.haml +1 -1
data/lib/templates/nav.html.slim +1 -1
metadata +7 -19

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e572ea500131186f8bec5a83e4faa287d5da1c6d4f3e33105bdd6a566fdcee01
-  data.tar.gz: d531d964d6a73735b3d1ad7e1ec52b9c4955c273ee0631733e0a2ca495f1fd45
+  metadata.gz: 445ffb4fc0af5e397872edbaddd6ecee7e3815243b367000c70beb7a344ea95c
+  data.tar.gz: a968e0aa93a07c5ab101499284851be9080907f80435ac1e4d3e223e271e14eb
 SHA512:
-  metadata.gz: 74bbcfbd11270579d9200db50f5a87de7e39a76320cb379c5e895d491343bf04364b5c7ff8f17af14921f96185b58a76d526c4eebd288a7dbdf72b6888c0705e
-  data.tar.gz: 5a929cdf68d0d840f92cf97ebd57821578dc668f8c8a25db0c01e104b9f069a73b31cefe39b911a930c8b718137937d9cdb390f1c57cabd1d2bb3ba409a44312
+  metadata.gz: f16a561a6b5bec95ea89de6c23d114e3f01deddfb67689c54d8a5d469e9ddc40bae870daa4dcc433e68ebe4609d14cc53106da36a25e7077bdbeb098ecc350a8
+  data.tar.gz: dc4af89758e166dfac07d8dc0484a801e05c6dec15684c2957b8a943301999fd56ddff80459a7ceccfdf95707ec19f334c9c08297678431f5aee8ce09bc0da64

data/lib/config/pagy.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-# Pagy initializer file (5.10.1)
+# Pagy initializer file (6.0.0)
 # 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
@@ -28,6 +28,7 @@
 # Pagy::DEFAULT[:link_extra] = 'data-remote="true"'            # example
 # Pagy::DEFAULT[:i18n_key]   = 'pagy.item_name'                # default
 # Pagy::DEFAULT[:cycle]      = true                            # example
+# Pagy::DEFAULT[:request_path] = "/foo"                        # example
 # Extras
@@ -100,8 +101,8 @@
 # Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
 # See https://ddnexus.github.io/pagy/extras/metadata
-# you must require the shared internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
-# require 'pagy/extras/shared'
+# you must require the frontend helpers internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
+# require 'pagy/extras/frontend_helpers'
 # require 'pagy/extras/metadata'
 # For performance reasons, you should explicitly set ONLY the metadata you use in the frontend
 # Pagy::DEFAULT[:metadata] = %i[scaffold_url page prev next last]   # example

data/lib/javascripts/pagy-dev.js CHANGED Viewed

@@ -82,7 +82,7 @@ window.Pagy = (() => {
     const trim = (link, param) => link.replace(new RegExp(`(\\?|&amp;)${param}=1\\b(?!&amp;)|\\b${param}=1&amp;`), "");
     // Public interface
     return {
-        version: "5.10.1",
+        version: "6.0.0",
         // 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 +111,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?]\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.10.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                        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?]\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: \"6.0.0\",\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 CHANGED Viewed

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

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

data/lib/locales/de.yml CHANGED Viewed

@@ -13,7 +13,7 @@ de:
       gap: "&hellip;"
     info:
-      no_items: "Kein %{item_name} gefunden"
+      no_items: "Keine %{item_name} gefunden"
       single_page: "Zeige <b>%{count}</b> %{item_name}"
       multiple_pages: "Zeige %{item_name} <b>%{from}-%{to}</b> von <b>%{count}</b> gesamt"

data/lib/locales/ko.yml CHANGED Viewed

@@ -7,7 +7,7 @@ ko:
     nav:
       prev: "&lsaquo;&nbsp;이전"
-      next: "이후&nbsp;&rsaquo;"
+      next: "다음&nbsp;&rsaquo;"
       gap: "&hellip;"
     info:

data/lib/locales/nn.yml ADDED Viewed

@@ -0,0 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+nn:
+  pagy:
+    item_name:
+      one: "resultat"
+      other: "resultat"
+    nav:
+      prev: "&lsaquo;&nbsp;Førre"
+      next: "Neste&nbsp;&rsaquo;"
+      gap: "&hellip;"
+    info:
+      no_items: "Ingen %{item_name} funne"
+      single_page: "Viser <b>%{count}</b> %{item_name}"
+      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> av totalt <b>%{count}</b>"
+    combo_nav_js: "<label>Side %{page_input} av %{pages}</label>"
+    items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"

data/lib/pagy/calendar/day.rb CHANGED Viewed

@@ -15,14 +15,24 @@ class Pagy # :nodoc:
         super
         @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
+        @pages   = @last = page_offset(@initial, @final)
         @from    = starting_time_for(@page)
         @to      = @from.tomorrow
       end
       # Starting time for the page
       def starting_time_for(page)
-        @initial + offset_units_for(page).days
+        @initial.days_since(time_offset_for(page))
+      end
+      def page_offset_at(time)
+        page_offset(@initial, time.beginning_of_day)
+      end
+      private
+      def page_offset(time_a, time_b)  # remove in 6.0
+        (time_b.time - time_a.time).to_i / 1.day
       end
     end
   end

data/lib/pagy/calendar/helper.rb ADDED Viewed

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+class Pagy # :nodoc:
+  class Calendar # :nodoc:
+    # Initializes the calendar objects, reducing complexity in the extra
+    # The returned calendar is a simple hash of units/objects with an added helper
+    # returning the last_object_at(time) used in the extra
+    class Helper < Hash
+      class << self
+        private
+        def init(conf, period, params)
+          new.send(:init, conf, period, params)
+        end
+      end
+      private
+      def init(conf, period, params)
+        @units = Calendar::UNITS & conf.keys # get the units in time length desc order
+        raise ArgumentError, 'no calendar unit found in pagy_calendar @configuration' if @units.empty?
+        @period     = period
+        @params     = params
+        @page_param = conf[:pagy][:page_param] || DEFAULT[:page_param]
+        @conf       = Marshal.load(Marshal.dump(conf))  # store a copy
+        @units.each do |unit|  # set all the :page_param vars for later deletion
+          unit_page_param         = :"#{unit}_#{@page_param}"
+          conf[unit][:page_param] = unit_page_param
+          conf[unit][:page]       = @params[unit_page_param]
+        end
+        calendar = {}
+        object   = nil
+        @units.each_with_index do |unit, index|
+          params_to_delete    = @units[(index + 1), @units.size].map { |sub| conf[sub][:page_param] } + [@page_param]
+          conf[unit][:params] = lambda do |unit_params|  # delete page_param from the sub-units
+                                  # Hash#except missing from ruby 2.5 baseline
+                                  params_to_delete.each { |p| unit_params.delete(p.to_s) }
+                                  unit_params
+                                end
+          conf[unit][:period] = object&.send(:active_period) || @period
+          calendar[unit]      = object = Calendar.send(:create, unit, conf[unit])
+        end
+        [replace(calendar), object.from, object.to]
+      end
+      def last_object_at(time)
+        conf        = Marshal.load(Marshal.dump(@conf))
+        page_params = {}
+        @units.inject(nil) do |object, unit|
+          conf[unit][:period] = object&.send(:active_period) || @period
+          conf[unit][:page]   = page_params[:"#{unit}_#{@page_param}"] \
+                              = Calendar.send(:create, unit, conf[unit]).send(:page_at, time)
+          conf[unit][:params] ||= {}
+          conf[unit][:params].merge!(page_params)
+          Calendar.send(:create, unit, conf[unit])
+        end
+      end
+    end
+  end
+end

data/lib/pagy/calendar/month.rb CHANGED Viewed

@@ -22,7 +22,11 @@ class Pagy # :nodoc:
       # Starting time for the page
       def starting_time_for(page)
-        @initial + offset_units_for(page).months
+        @initial.months_since(time_offset_for(page))
+      end
+      def page_offset_at(time)
+        months_in(time.beginning_of_month) - months_in(@initial)
       end
       private

data/lib/pagy/calendar/quarter.rb CHANGED Viewed

@@ -29,7 +29,11 @@ class Pagy # :nodoc:
       # Starting time for the page
       def starting_time_for(page)
-        @initial + (offset_units_for(page) * 3).months
+        @initial.months_since(time_offset_for(page) * 3)
+      end
+      def page_offset_at(time)
+        (months_in(time.beginning_of_quarter) - months_in(@initial)) / 3
       end
       private

data/lib/pagy/calendar/week.rb CHANGED Viewed

@@ -13,21 +13,26 @@ class Pagy # :nodoc:
       # Setup the calendar variables
       def setup_unit_vars
         super
-        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
+        @pages   = @last = page_offset(@initial, @final)
         @from    = starting_time_for(@page)
         @to      = @from.next_week
       end
       # Starting time for the page
       def starting_time_for(page)
-        @initial + offset_units_for(page).weeks
+        @initial.weeks_since(time_offset_for(page))
+      end
+      def page_offset_at(time)
+        page_offset(@initial, time.beginning_of_week)
+      end
+      private
+      def page_offset(time_a, time_b)  # remove in 6.0
+        (time_b.time - time_a.time).to_i / 1.week
       end
     end
   end

data/lib/pagy/calendar/year.rb CHANGED Viewed

@@ -22,7 +22,11 @@ class Pagy # :nodoc:
       # Starting time for the page
       def starting_time_for(page)
-        @initial.years_since(offset_units_for(page))
+        @initial.years_since(time_offset_for(page))
+      end
+      def page_offset_at(time)
+        time.beginning_of_year.year - @initial.year
       end
     end
   end

data/lib/pagy/calendar.rb CHANGED Viewed

@@ -12,6 +12,9 @@ require 'pagy'
 class Pagy # :nodoc:
   # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
   class Calendar < Pagy
+    # Specific out of range error
+    class OutOfRangeError < StandardError; end
     # 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
@@ -45,6 +48,14 @@ class Pagy # :nodoc:
     protected
+    # The page that includes time
+    def page_at(time)
+      raise OutOfRangeError unless time.between?(@initial, @final)
+      offset = page_offset_at(time)   # offset starts from 0
+      @order == :asc ? offset + 1 : @pages - offset
+    end
     # Base class method for the setup of the unit variables (subclasses must implement it and call super)
     def setup_unit_vars
       raise VariableError.new(self, :format, 'to be a strftime format', @vars[:format]) unless @vars[:format].is_a?(String)
@@ -52,10 +63,9 @@ class Pagy # :nodoc:
             unless %i[asc desc].include?(@order = @vars[:order])
       @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
-      @with_zone = @starting.is_a?(ActiveSupport::TimeWithZone) # remove in 6.0 and replace Time in the line above
+      raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \
+            unless @starting.is_a?(ActiveSupport::TimeWithZone) \
+                && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
     end
     # Apply the strftime format to the time (overridden by the i18n extra when localization is required)
@@ -63,9 +73,9 @@ class Pagy # :nodoc:
       time.strftime(opts[:format])
     end
-    # Number of units to offset from the @initial time, in order to get the ordered starting time for the page.
-    # Used in starting_time_for(page) with a logic equivalent to: @initial + (offset_units_for(page) * unit_time_length)
-    def offset_units_for(page)
+    # Number of time units to offset from the @initial time, in order to get the ordered starting time for the page.
+    # Used in starting_time_for(page) where page starts from 1 (e.g. page to starting_time means subtracting 1)
+    def time_offset_for(page)
       @order == :asc ? page - 1 : @pages - page
     end

data/lib/pagy/countless.rb CHANGED Viewed

@@ -30,7 +30,7 @@ class Pagy
     # Override the original series.
     # Return nil if :countless_minimal is enabled
-    def series(*)
+    def series(*, **)
       super unless @vars[:countless_minimal]
     end
   end

data/lib/pagy/extras/bootstrap.rb CHANGED Viewed

@@ -12,7 +12,7 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: %(class="page-link" #{link_extra}))
-      html = +%(<nav#{p_id} class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination">)
+      html = +%(<nav#{p_id} class="pagy-bootstrap-nav"><ul class="pagination">)
       html << pagy_bootstrap_prev_html(pagy, link)
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
@@ -40,7 +40,7 @@ class Pagy # :nodoc:
                'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
-      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap-nav-js" aria-label="pager" #{
+      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-bootstrap-nav-js" #{
         pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
@@ -54,7 +54,7 @@ class Pagy # :nodoc:
                     p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{
                     p_pages.to_s.length + 1}rem;">)
-      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group" role="group" #{
+      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination"><div class="btn-group" role="group" #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           if (p_prev = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'

data/lib/pagy/extras/calendar.rb CHANGED Viewed

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 require 'pagy/calendar'
+require 'pagy/calendar/helper'
 class Pagy # :nodoc:
   # Add pagination filtering by calendar unit (:year, :quarter, :month, :week, :day) to the regular pagination
@@ -18,35 +19,17 @@ class Pagy # :nodoc:
           raise ArgumentError, "keys must be in #{CONF_KEYS.inspect} and object values must be Hashes; got #{conf.inspect}"
         end
-        conf[:pagy]          = {} unless conf[:pagy]  # use default Pagy object when omitted
-        calendar, collection = pagy_setup_calendar(collection, conf) unless conf.key?(:active) && !conf[:active]
-        pagy, results        = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
+        conf[:pagy] = {} unless conf[:pagy]  # use default Pagy object when omitted
+        unless conf.key?(:active) && !conf[:active]
+          calendar, from, to = Calendar::Helper.send(:init, conf, pagy_calendar_period(collection), params)
+          collection         = pagy_calendar_filter(collection, from, to)
+        end
+        pagy, results = send(conf[:pagy][:backend] || :pagy, collection, conf[:pagy])  # use backend: :pagy when omitted
         [calendar, pagy, results]
       end
-      # Setup and return the calendar objects and the filtered collection
-      def pagy_setup_calendar(collection, conf)
-        units = Calendar::UNITS & conf.keys # get the units in time length desc order
-        raise ArgumentError, 'no calendar unit found in pagy_calendar configuration' if units.empty?
-        page_param = conf[:pagy][:page_param] || DEFAULT[:page_param]
-        units.each do |unit|  # set all the :page_param vars for later deletion
-          unit_page_param         = :"#{unit}_#{page_param}"
-          conf[unit][:page_param] = unit_page_param
-          conf[unit][:page]       = params[unit_page_param]
-        end
-        calendar = {}
-        last_obj = nil
-        units.each_with_index do |unit, index|
-          params_to_delete    = units[(index + 1), units.size].map { |sub| conf[sub][:page_param] } + [page_param]
-          conf[unit][:params] = lambda do |params|  # delete page_param from the sub-units
-                                  params_to_delete.each { |p| params.delete(p.to_s) } # Hash#except missing from ruby 2.5 baseline
-                                  params
-                                end
-          conf[unit][:period] = last_obj&.send(:active_period) || pagy_calendar_period(collection)
-          calendar[unit]      = last_obj = Calendar.send(:create, unit, conf[unit])
-        end
-        [calendar, pagy_calendar_filter(collection, last_obj.from, last_obj.to)]
+      def pagy_calendar_url_at(calendar, time)
+        pagy_url_for(calendar.send(:last_object_at, time), 1)
       end
       # This method must be implemented by the application

data/lib/pagy/extras/elasticsearch_rails.rb CHANGED Viewed

@@ -3,16 +3,7 @@
 class Pagy # :nodoc:
   DEFAULT[:elasticsearch_rails_search]      ||= :search
-  DEFAULT[:elasticsearch_rails_pagy_search] ||= if DEFAULT[:elasticsearch_rails_search_method]  #  remove in 6.0
-                                                  # :nocov:
-                                                  Warning.warn '[PAGY WARNING] The :elasticsearch_rails_search_method variable ' \
-                                                               'has been deprecated and will be ignored from pagy 6. ' \
-                                                               'Use :elasticsearch_rails_pagy_search instead.'
-                                                  DEFAULT[:elasticsearch_rails_search_method]
-                                                  # :nocov:
-                                                else
-                                                  :pagy_search
-                                                end
+  DEFAULT[:elasticsearch_rails_pagy_search] ||= :pagy_search
   # Paginate ElasticsearchRails response objects
   module ElasticsearchRailsExtra

data/lib/pagy/extras/materialize.rb CHANGED Viewed

@@ -12,7 +12,7 @@ class Pagy # :nodoc:
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
-      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">)
+      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation"><ul class="pagination">)
       html << pagy_materialize_prev_html(pagy, link)
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
@@ -38,7 +38,7 @@ class Pagy # :nodoc:
                'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
-      %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize-nav-js" role="navigation" aria-label="pager" #{
+      %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize-nav-js" role="navigation" #{
         pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
     end
@@ -53,7 +53,7 @@ class Pagy # :nodoc:
                     p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
       html = %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation")
-      %(#{html} aria-label="pager" style="padding-right: 0" #{
+      %(#{html} style="padding-right: 0" #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           pagy_materialize_prev_html pagy, link, style}<li class="pagy-combo-input">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</li>#{

data/lib/pagy/extras/meilisearch.rb CHANGED Viewed

@@ -2,16 +2,8 @@
 class Pagy # :nodoc:
   DEFAULT[:meilisearch_search]      ||= :ms_search
-  DEFAULT[:meilisearch_pagy_search] ||= if DEFAULT[:meilisearch_search_method]   # remove in 6.0
-                                          # :nocov:
-                                          Warning.warn '[PAGY WARNING] The :meilisearch_search_method variable ' \
-                                                       'has been deprecated and will be ignored from pagy 6. ' \
-                                                       'Use :meilisearch_pagy_search instead.'
-                                          DEFAULT[:meilisearch_search_method]
-                                          # :nocov:
-                                        else
-                                          :pagy_search
-                                        end
+  DEFAULT[:meilisearch_pagy_search] ||= :pagy_search
   # Paginate Meilisearch results
   module MeilisearchExtra
     module Meilisearch # :nodoc:
@@ -27,9 +19,10 @@ class Pagy # :nodoc:
     module Pagy
       # Create a Pagy object from a Meilisearch results
       def new_from_meilisearch(results, vars = {})
-        vars[:items] = results.raw_answer['limit']
-        vars[:page]  = (results.raw_answer['offset'] / vars[:items]) + 1
-        vars[:count] = results.raw_answer['nbHits']
+        vars[:items] = results.raw_answer['hitsPerPage']
+        vars[:page]  = results.raw_answer['page']
+        vars[:count] = results.raw_answer['totalHits']
         new(vars)
       end
     end
@@ -40,13 +33,14 @@ class Pagy # :nodoc:
       # Return Pagy object and results
       def pagy_meilisearch(pagy_search_args, vars = {})
-        model, term, options = pagy_search_args
-        vars                 = pagy_meilisearch_get_vars(nil, vars)
-        options[:limit]      = vars[:items]
-        options[:offset]     = (vars[:page] - 1) * vars[:items]
-        results              = model.send(DEFAULT[:meilisearch_search], term, **options)
-        vars[:count]         = results.raw_answer['nbHits']
-        pagy                 = ::Pagy.new(vars)
+        model, term, options    = pagy_search_args
+        vars                    = pagy_meilisearch_get_vars(nil, vars)
+        options[:hits_per_page] = vars[:items]
+        options[:page]          = vars[:page]
+        results                 = model.send(:ms_search, term, **options)
+        vars[:count]            = results.raw_answer['totalHits']
+        pagy                    = ::Pagy.new(vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
         return pagy_meilisearch(pagy_search_args, vars.merge(page: pagy.page)) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page

data/lib/pagy/extras/navs.rb CHANGED Viewed

@@ -18,7 +18,7 @@ class Pagy # :nodoc:
                'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
                'after'  => pagy_nav_next_html(pagy, link) }
-      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-nav-js pagination" aria-label="pager" #{
+      %(<nav#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-nav-js pagination" #{
         pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></nav>)
     end
@@ -31,7 +31,7 @@ class Pagy # :nodoc:
       input   = %(<input type="number" min="1" max="#{p_pages}" value="#{
                     p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
-      %(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager" #{
+      %(<nav#{p_id} class="pagy-combo-nav-js pagination" #{
           pagy_data(pagy, :combo, pagy_marked_link(link))}>#{
           pagy_nav_prev_html pagy, link
         }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{

data/lib/pagy/extras/searchkick.rb CHANGED Viewed

@@ -3,16 +3,8 @@
 class Pagy # :nodoc:
   DEFAULT[:searchkick_search]      ||= :search
-  DEFAULT[:searchkick_pagy_search] ||= if DEFAULT[:searchkick_search_method]   # remove in 6.0
-                                         # :nocov:
-                                         Warning.warn '[PAGY WARNING] The :searchkick_search_method variable ' \
-                                                      'has been deprecated and will be ignored from pagy 6. ' \
-                                                      'Use :searchkick_pagy_search instead.'
-                                         DEFAULT[:searchkick_search_method]
-                                         # :nocov:
-                                       else
-                                         :pagy_search
-                                       end
+  DEFAULT[:searchkick_pagy_search] ||= :pagy_search
   # Paginate Searchkick::Results objects
   module SearchkickExtra
     module Searchkick # :nodoc:

data/lib/pagy/extras/standalone.rb CHANGED Viewed

@@ -8,6 +8,7 @@ class Pagy # :nodoc:
   # even in the irb/rails console without any app or config.
   module StandaloneExtra
     # Extracted from Rack::Utils and reformatted for rubocop
+    # :nocov:
     module QueryUtils
       module_function
@@ -32,6 +33,7 @@ class Pagy # :nodoc:
         end
       end
     end
+    # :nocov:
     # 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.
@@ -45,9 +47,8 @@ class Pagy # :nodoc:
       params              = pagy.params.is_a?(Hash) ? pagy.params.clone : {}  # safe when it gets reused
       params[page_param]  = page
       params[items_param] = vars[:items] if vars[:items_extra]
-      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
+      params              = pagy.params.call(params) if pagy.params.is_a?(Proc)
+      query_string        = "?#{Rack::Utils.build_nested_query(params)}"
       query_string        = query_string.gsub('&', '&amp;') if html_escaped  # the only unescaped entity
       "#{vars[:url]}#{query_string}#{vars[:fragment]}"
     end

data/lib/pagy/frontend.rb CHANGED Viewed

@@ -21,7 +21,7 @@ class Pagy
       p_prev = pagy.prev
       p_next = pagy.next
-      html = +%(<nav#{p_id} class="pagy-nav pagination" aria-label="pager">)
+      html = +%(<nav#{p_id} class="pagy-nav pagination">)
       html << if p_prev
                 %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
               else

data/lib/pagy/url_helpers.rb CHANGED Viewed

@@ -8,32 +8,17 @@ class Pagy
     # For non-rack environments you can use the standalone extra
     def pagy_url_for(pagy, page, absolute: false, html_escaped: false)
       vars                = pagy.vars
+      request_path        = vars[:request_path].to_s.empty? ? request.path : vars[:request_path]
       page_param          = vars[:page_param].to_s
       items_param         = vars[:items_param].to_s
       params              = pagy.params.is_a?(Hash) ? pagy.params.transform_keys(&:to_s) : {}
       params              = request.GET.merge(params)
       params[page_param]  = page
       params[items_param] = vars[:items] if vars[:items_extra]
-      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
+      params              = pagy.params.call(params) if pagy.params.is_a?(Proc)
+      query_string        = "?#{Rack::Utils.build_nested_query(params)}"
       query_string        = query_string.gsub('&', '&amp;') if html_escaped  # the only unescaped entity
-      "#{request.base_url if absolute}#{request.path}#{query_string}#{vars[:fragment]}"
-    end
-    private
-    # Transitional code to handle params deprecations. It will be removed in version 6.0
-    def pagy_deprecated_params(pagy, params)    # remove in 6.0
-      if pagy.params.is_a?(Proc)                # new code
-        pagy.params.call(params)
-      elsif respond_to?(:pagy_massage_params)   # deprecated code
-        Warning.warn '[PAGY WARNING] The pagy_massage_params method has been deprecated and it will be ignored from version 6. ' \
-                     'Set the :params variable to a Proc with the same code as the pagy_massage_params method.'
-        pagy_massage_params(params)
-      else
-        params                                  # no massage params
-      end
+      "#{request.base_url if absolute}#{request_path}#{query_string}#{vars[:fragment]}"
     end
   end
 end

data/lib/pagy.rb CHANGED Viewed

@@ -5,7 +5,7 @@ require 'pathname'
 # Core class
 class Pagy
-  VERSION = '5.10.1'
+  VERSION = '6.0.0'
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -22,9 +22,10 @@ class Pagy
               fragment:   '',
               link_extra: '',
               i18n_key:   'pagy.item_name',
-              cycle:      false }
+              cycle:      false,
+              request_path: '' }
-  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params
+  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params, :request_path
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
@@ -34,6 +35,7 @@ class Pagy
     setup_pages_var
     setup_offset_var
     setup_params_var
+    setup_request_path_var
     raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
     @from   = [@offset - @outset + 1, @count].min
@@ -92,7 +94,7 @@ class Pagy
   def setup_vars(name_min)
     name_min.each do |name, min|
       raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
-            unless @vars[name] && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
+            unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
     end
   end
@@ -116,6 +118,16 @@ class Pagy
     raise VariableError.new(self, :params, 'must be a Hash or a Proc', @params) \
           unless (@params = @vars[:params]).is_a?(Hash) || @params.is_a?(Proc)
   end
+  def setup_request_path_var
+    request_path = @vars[:request_path]
+    return if request_path.to_s.empty?
+    raise VariableError.new(self, :request_path, 'must be a bare path like "/foo"', request_path) \
+          if !request_path.start_with?('/') || request_path.include?('?')
+    @request_path = request_path
+  end
 end
 require 'pagy/backend'

data/lib/templates/bootstrap_nav.html.erb CHANGED Viewed

@@ -6,7 +6,7 @@
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
 <% link = pagy_link_proc(pagy, link_extra: 'class="page-link"') -%>
-<%#                            -%><nav aria-label="pager"  class="pagy-bootstrap-nav" role="navigation">
+<%#                            -%><nav class="pagy-bootstrap-nav" role="navigation">
 <%#                            -%>  <ul class="pagination">
 <% if pagy.prev                -%>    <li class="page-item prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></li>
 <% else                        -%>    <li class="page-item prev disabled"><a href="#" class="page-link"><%== pagy_t('pagy.nav.prev') %></a></li>

data/lib/templates/bootstrap_nav.html.haml CHANGED Viewed

@@ -6,7 +6,7 @@
 - link = pagy_link_proc(pagy, link_extra: 'class="page-link"')
-%nav.pagy-bootstrap-nav{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy-bootstrap-nav{:role => "navigation"}
   %ul.pagination

data/lib/templates/bootstrap_nav.html.slim CHANGED Viewed

@@ -6,7 +6,7 @@
 - link = pagy_link_proc(pagy, link_extra: 'class="page-link"')
-nav.pagy-bootstrap-nav role="navigation" aria-label="pager"
+nav.pagy-bootstrap-nav role="navigation"
   ul.pagination

data/lib/templates/nav.html.erb CHANGED Viewed

@@ -6,7 +6,7 @@
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
 <% link = pagy_link_proc(pagy) -%>
-<%#                            -%><nav aria-label="pager" class="pagy_nav pagination" role="navigation">
+<%#                            -%><nav class="pagy_nav pagination" role="navigation">
 <% if pagy.prev                -%>  <span class="page prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></span>
 <% else                        -%>  <span class="page prev disabled"><%== pagy_t('pagy.nav.prev') %></span>
 <% end                         -%>

data/lib/templates/nav.html.haml CHANGED Viewed

@@ -6,7 +6,7 @@
 - link = pagy_link_proc(pagy)
-%nav.pagy_nav.pagination{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy_nav.pagination{:role => "navigation"}
   - if pagy.prev
     %span.page.prev!= link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')

data/lib/templates/nav.html.slim CHANGED Viewed

@@ -6,7 +6,7 @@
 - link = pagy_link_proc(pagy)
-nav.pagy_nav.pagination role="navigation" aria-label="pager"
+nav.pagy_nav.pagination role="navigation"
   - if pagy.prev
     span.page.prev ==> link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')

metadata CHANGED Viewed

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 5.10.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 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'
+date: 2022-12-22 00:00:00.000000000 Z
+dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
 - dd.nexus@gmail.com
@@ -55,6 +41,7 @@ files:
 - lib/locales/ko.yml
 - lib/locales/nb.yml
 - lib/locales/nl.yml
+- lib/locales/nn.yml
 - lib/locales/pl.yml
 - lib/locales/pt-BR.yml
 - lib/locales/pt.yml
@@ -73,6 +60,7 @@ files:
 - lib/pagy/backend.rb
 - lib/pagy/calendar.rb
 - lib/pagy/calendar/day.rb
+- lib/pagy/calendar/helper.rb
 - lib/pagy/calendar/month.rb
 - lib/pagy/calendar/quarter.rb
 - lib/pagy/calendar/week.rb
@@ -131,7 +119,7 @@ metadata:
   documentation_uri: https://ddnexus.github.io/pagy
   bug_tracker_uri: https://github.com/ddnexus/pagy/issues
   changelog_uri: https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md
-  live_support: https://gitter.im/ruby-pagy/Lobby
+  support: https://github.com/ddnexus/pagy/discussions/categories/q-a
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -147,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: The kick-ass pagination ruby gem