pagy 9.0.2 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84fb84478a3d43cc133f13476dd6d010e3d84156ff7704796b38beb566539fa8
-  data.tar.gz: 1d694c518d6f5d22fc93336286abda94a881672ef8f4d90079f26a452738dfcf
+  metadata.gz: 5d3cfd3dbf7a81f248f0ea0d6edfa563047f4eead1e7971ae7645c87c6a98018
+  data.tar.gz: b3447de74444e85d27676725d5742af32e902776882c48da97f64c7373f258ed
 SHA512:
-  metadata.gz: 4ecd31ce348069d557454bf751b719fbd05f0f82c08bde7f10ee0ac8aea2c5c2c63c0bbc3e2b03dc9a606102bf4ed319cc1b8b60f6d77635be3d498e275f504b
-  data.tar.gz: 258bcd1fb0b66948aefb1798c9a04b998ce18fffc4ded3bea78c6517a6de33b0bc2f75d429d95025916f6d5621d38420670222ec31683cc66ebbbf68182277d2
+  metadata.gz: 01cfeb6596556a25379b34e737d7093b90dba9ce9431203ba22722ceed1367c6e769865985f23ba9a6c8ddc93117459d9e8a85f86822705c36c05382de116b69
+  data.tar.gz: e12c3f47acf0e0a201897373f4b031c0e349e9c584f4256a5ee5cc6eea3743a6285159817bbb469ccee853d91814c462e21dc04502fcfc1ff10a010d219adc23

data/apps/calendar.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#5-calendar-app
 
-VERSION = '9.0.2'
+VERSION = '9.0.3'
 
 # Gemfile
 require 'bundler/inline'

data/apps/demo.ru

@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#3-demo-app
 
-VERSION = '9.0.2'
+VERSION = '9.0.3'
 
 require 'bundler/inline'
 require 'bundler'

data/apps/rails.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#2-rails-app
 
-VERSION = '9.0.2'
+VERSION = '9.0.3'
 
 # Gemfile
 require 'bundler/inline'

data/apps/repro.ru

@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#1-repro-app
 
-VERSION = '9.0.2'
+VERSION = '9.0.3'
 
 require 'bundler/inline'
 require 'bundler'

data/bin/pagy

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '9.0.2'
+VERSION = '9.0.3'
 APPS    = %w[repro rails demo calendar keyset_ar keyset_s].freeze
 LINUX   = RbConfig::CONFIG['host_os'].include?('linux')
 HOST    = '0.0.0.0'

data/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (9.0.2)
+# Pagy initializer file (9.0.3)
 # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

data/javascripts/pagy.min.js

@@ -1,4 +1,4 @@
-window.Pagy=(()=>{const j=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),x=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,R)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,R);if((B.pagyRender=function(){const H=K.find((Q)=>Q<F.clientWidth)||0;if(H===L)return;let M=D.before;const R=E[H.toString()],X=z?.[H.toString()]??R.map((Q)=>Q.toString());R.forEach((Q,J)=>{const $=X[J];let U;if(typeof Q==="number")U=T(D.a,Q.toString(),$);else if(Q==="gap")U=D.gap;else U=T(D.current,Q,$);M+=typeof G==="string"&&Q==1?Z(U,G):U}),M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))j.observe(F)},A=(B,[D,E])=>Y(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),C=(B,[D,E,z])=>{Y(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_limit__/,G);return[F,K]},z)},Y=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((X)=>parseInt(X)||0);if(T<L||T>H){z.value=F,z.select();return}let[M,R]=D(z.value);if(typeof E==="string"&&M==="1")R=Z(R,E);G.href=R,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,()=>z.select())),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},Z=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"9.0.2",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")x(z,K);else if(F==="combo")A(z,K);else if(F==="selector")C(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})();
+window.Pagy=(()=>{const j=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),x=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,R)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,R);if((B.pagyRender=function(){const H=K.find((Q)=>Q<F.clientWidth)||0;if(H===L)return;let M=D.before;const R=E[H.toString()],X=z?.[H.toString()]??R.map((Q)=>Q.toString());R.forEach((Q,J)=>{const $=X[J];let U;if(typeof Q==="number")U=T(D.a,Q.toString(),$);else if(Q==="gap")U=D.gap;else U=T(D.current,Q,$);M+=typeof G==="string"&&Q==1?Z(U,G):U}),M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))j.observe(F)},A=(B,[D,E])=>Y(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),C=(B,[D,E,z])=>{Y(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_limit__/,G);return[F,K]},z)},Y=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((X)=>parseInt(X)||0);if(T<L||T>H){z.value=F,z.select();return}let[M,R]=D(z.value);if(typeof E==="string"&&M==="1")R=Z(R,E);G.href=R,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,()=>z.select())),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},Z=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"9.0.3",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")x(z,K);else if(F==="combo")A(z,K);else if(F==="selector")C(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})();
 
-//# debugId=F551263AEB70D01764756E2164756E21
+//# debugId=F902131AD289418764756E2164756E21
 //# sourceMappingURL=pagy.min.js.map

data/javascripts/pagy.min.js.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../src/pagy.ts"],
   "sourcesContent": [
-    "type NavArgs      = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ntype JsonArgs     = ['nav', NavArgs] | ['combo', ComboArgs] | ['selector', SelectorArgs]\n\ninterface Tokens {\n  readonly before:string\n  readonly a:string\n  readonly current: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(\n      entries => entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\")\n                                       .forEach(el => el.pagyRender())));\n  // Init the *_nav_js helpers\n  const initNav = (el:NavElement, [tokens, 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    = (a:string, page:string, label:string):string =>\n        a.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     = tokens.before;  // already trimmed in html\n      const series = sequels[width.toString()];\n      const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n      series.forEach((item, i) => {\n        const label = labels[i];\n        let filled;\n        if (typeof item === \"number\") {\n          filled = fillIn(tokens.a, item.toString(), label);\n        } else if (item === \"gap\") {\n          filled = tokens.gap;\n        } else { // active page\n          filled = fillIn(tokens.current, item, label);\n        }\n        html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n      });\n      html        += tokens.after;\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, [url_token, trimParam]:ComboArgs) =>\n      initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n  // Init the limit_selector_js helper\n  const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n    initInput(el, inputValue => {\n      const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n      const url  = url_token.replace(/__pagy_page__/, page).replace(/__pagy_limit__/, inputValue);\n      return [page, url];\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 link    = el.querySelector(\"a\") as HTMLAnchorElement;\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, url] = getVars(input.value);   // eslint-disable-line prefer-const\n      if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n      link.href = url;\n      link.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 = (a:string, param:string) =>\n      a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n  // Public interface\n  return {\n    version: \"9.0.2\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:Element) {\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)) as JsonArgs; // base64-utf8 -> JSON -> Array\n          if (keyword === \"nav\") {\n            initNav(el as NavElement, args as unknown as NavArgs);\n          } else if (keyword === \"combo\") {\n            initCombo(el, args as unknown as ComboArgs);\n          } else if (keyword === \"selector\") {\n            initSelector(el, args as unknown 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\nexport default Pagy;\n"
+    "type NavArgs      = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ntype JsonArgs     = ['nav', NavArgs] | ['combo', ComboArgs] | ['selector', SelectorArgs]\n\ninterface Tokens {\n  readonly before:string\n  readonly a:string\n  readonly current: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(\n      entries => entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\")\n                                       .forEach(el => el.pagyRender())));\n  // Init the *_nav_js helpers\n  const initNav = (el:NavElement, [tokens, 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    = (a:string, page:string, label:string):string =>\n        a.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     = tokens.before;  // already trimmed in html\n      const series = sequels[width.toString()];\n      const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n      series.forEach((item, i) => {\n        const label = labels[i];\n        let filled;\n        if (typeof item === \"number\") {\n          filled = fillIn(tokens.a, item.toString(), label);\n        } else if (item === \"gap\") {\n          filled = tokens.gap;\n        } else { // active page\n          filled = fillIn(tokens.current, item, label);\n        }\n        html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n      });\n      html        += tokens.after;\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, [url_token, trimParam]:ComboArgs) =>\n      initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n  // Init the limit_selector_js helper\n  const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n    initInput(el, inputValue => {\n      const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n      const url  = url_token.replace(/__pagy_page__/, page).replace(/__pagy_limit__/, inputValue);\n      return [page, url];\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 link    = el.querySelector(\"a\") as HTMLAnchorElement;\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, url] = getVars(input.value);   // eslint-disable-line prefer-const\n      if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n      link.href = url;\n      link.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 = (a:string, param:string) =>\n      a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n  // Public interface\n  return {\n    version: \"9.0.3\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:Element) {\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)) as JsonArgs; // base64-utf8 -> JSON -> Array\n          if (keyword === \"nav\") {\n            initNav(el as NavElement, args as unknown as NavArgs);\n          } else if (keyword === \"combo\") {\n            initCombo(el, args as unknown as ComboArgs);\n          } else if (keyword === \"selector\") {\n            initSelector(el, args as unknown 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\nexport default Pagy;\n"
   ],
   "mappings": "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",
-  "debugId": "F551263AEB70D01764756E2164756E21",
+  "debugId": "F902131AD289418764756E2164756E21",
   "names": []
 }

data/javascripts/pagy.mjs

@@ -73,7 +73,7 @@ const Pagy = (() => {
   };
   const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
   return {
-    version: "9.0.2",
+    version: "9.0.3",
     init(arg) {
       const target = arg instanceof Element ? arg : document;
       const elements = target.querySelectorAll("[data-pagy]");

data/lib/pagy/backend.rb

@@ -10,7 +10,10 @@ class Pagy
 
     # Return Pagy object and paginated results
     def pagy(collection, **vars)
-      pagy = Pagy.new(**pagy_get_vars(collection, vars))
+      vars[:count] ||= pagy_get_count(collection, vars)
+      vars[:limit] ||= pagy_get_limit(vars)
+      vars[:page]  ||= pagy_get_page(vars)
+      pagy = Pagy.new(**vars)
       [pagy, pagy_get_items(collection, pagy)]
     end
 
@@ -27,22 +30,15 @@ class Pagy
     end
 
     # Override for limit extra
-    def pagy_get_limit(vars); end
+    def pagy_get_limit(_vars)
+      DEFAULT[:limit]
+    end
 
     # Get the page integer from the params
     # Overridable by the jsonapi extra
-    def pagy_get_page(vars)
-      params[vars[:page_param] || DEFAULT[:page_param]]
-    end
-
-    # Sub-method called only by #pagy: here for easy customization of variables by overriding
-    # You may need to override the count call for non AR collections
-    def pagy_get_vars(collection, vars)
-      vars.tap do |v|
-        v[:count] ||= pagy_get_count(collection, v)
-        v[:limit] ||= pagy_get_limit(v)
-        v[:page]  ||= pagy_get_page(v)
-      end
+    def pagy_get_page(vars, force_integer: true)
+      page = params[vars[:page_param] || DEFAULT[:page_param]]
+      force_integer ? (page || 1).to_i : page
     end
   end
 end

data/lib/pagy/extras/arel.rb

@@ -8,8 +8,8 @@ class Pagy # :nodoc:
 
     # Return Pagy object and paginated collection/results
     def pagy_arel(collection, **vars)
-      pagy = Pagy.new(**pagy_arel_get_vars(collection, vars))
-      [pagy, pagy_get_items(collection, pagy)]
+      vars[:count] ||= pagy_arel_count(collection)
+      pagy(collection, **vars)
     end
 
     # Count using Arel when grouping
@@ -23,12 +23,6 @@ class Pagy # :nodoc:
         collection.unscope(:order).limit(1).pluck(sql).first.to_i
       end
     end
-
-    # Sub-method called only by #pagy_arel: here for easy customization of variables by overriding
-    def pagy_arel_get_vars(collection, vars)
-      vars[:count] ||= pagy_arel_count(collection)
-      pagy_get_vars(collection, vars)
-    end
   end
   Backend.prepend ArelExtra
 end

data/lib/pagy/extras/array.rb

@@ -8,14 +8,11 @@ class Pagy # :nodoc:
 
     # Return Pagy object and paginated items
     def pagy_array(array, **vars)
-      pagy = Pagy.new(**pagy_array_get_vars(array, vars))
-      [pagy, array[pagy.offset, pagy.limit]]
-    end
-
-    # Sub-method called only by #pagy_array: here for easy customization of variables by overriding
-    def pagy_array_get_vars(array, vars)
+      vars[:limit] ||= pagy_get_limit(vars)
+      vars[:page]  ||= pagy_get_page(vars)
       vars[:count] ||= array.size
-      pagy_get_vars(array, vars)
+      pagy = Pagy.new(**vars)
+      [pagy, array[pagy.offset, pagy.limit]]
     end
   end
   Backend.prepend ArrayExtra

data/lib/pagy/extras/countless.rb

@@ -12,7 +12,9 @@ class Pagy # :nodoc:
 
     # Return Pagy object and records
     def pagy_countless(collection, **vars)
-      pagy = Countless.new(**pagy_countless_get_vars(collection, vars))
+      vars[:limit] ||= pagy_get_limit(vars)
+      vars[:page]  ||= pagy_get_page(vars)
+      pagy = Countless.new(**vars)
       [pagy, pagy_countless_get_items(collection, pagy)]
     end
 
@@ -25,15 +27,6 @@ class Pagy # :nodoc:
       pagy.finalize(fetched.size)                                         # finalize the pagy object
       fetched[0, pagy.limit]                                              # ignore eventual extra item
     end
-
-    # Sub-method called only by #pagy: here for easy customization of variables by overriding
-    # You may need to override the count call for non AR collections
-    def pagy_countless_get_vars(_collection, vars)
-      vars.tap do |v|
-        v[:limit] ||= pagy_get_limit(v)
-        v[:page]  ||= pagy_get_page(v)
-      end
-    end
   end
   Backend.prepend CountlessExtra
 end

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -50,13 +50,13 @@ class Pagy # :nodoc:
 
       # Return Pagy object and records
       def pagy_elasticsearch_rails(pagy_search_args, **vars)
-        model, query_or_payload,
-        options, *called = pagy_search_args
-        vars             = pagy_elasticsearch_rails_get_vars(nil, vars)
-        options[:size]   = vars[:limit]
-        options[:from]   = vars[:limit] * ((vars[:page] || 1) - 1)
-        response         = model.send(DEFAULT[:elasticsearch_rails_search], query_or_payload, **options)
-        vars[:count]     = ElasticsearchRailsExtra.total_count(response)
+        vars[:page]  ||= pagy_get_page(vars)
+        vars[:limit] ||= pagy_get_limit(vars)
+        model, query_or_payload, options, *called = pagy_search_args
+        options[:size] = vars[:limit]
+        options[:from] = vars[:limit] * ((vars[:page] || 1) - 1)
+        response       = model.send(DEFAULT[:elasticsearch_rails_search], query_or_payload, **options)
+        vars[:count]   = ElasticsearchRailsExtra.total_count(response)
 
         pagy = ::Pagy.new(**vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
@@ -65,15 +65,6 @@ class Pagy # :nodoc:
 
         [pagy, called.empty? ? response : response.send(*called)]
       end
-
-      # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
-      # the _collection argument is not available when the method is called
-      def pagy_elasticsearch_rails_get_vars(_collection, vars)
-        vars.tap do |v|
-          v[:page]  ||= pagy_get_page(v)
-          v[:limit] ||= pagy_get_limit(v) || DEFAULT[:limit]
-        end
-      end
     end
     Backend.prepend BackendAddOn
   end

data/lib/pagy/extras/jsonapi.rb

@@ -45,11 +45,11 @@ class Pagy # :nodoc:
       end
 
       # Override the Backend method
-      def pagy_get_page(vars)
-        return super if pagy_skip_jsonapi?(vars)
-        return if params[:page].nil?
+      def pagy_get_page(vars, force_integer: true)
+        return super if pagy_skip_jsonapi?(vars) || params[:page].nil?
 
-        params[:page][vars[:page_param] || DEFAULT[:page_param]]
+        page = params[:page][vars[:page_param] || DEFAULT[:page_param]]
+        force_integer ? (page || 1).to_i : page
       end
     end
     Backend.prepend BackendOverride
@@ -61,7 +61,7 @@ class Pagy # :nodoc:
       # Override the LimitExtra::Backend method
       def pagy_get_limit_param(vars)
         return super if pagy_skip_jsonapi?(vars)
-        return if params[:page].nil?
+        return unless params[:page]
 
         params[:page][vars[:limit_param] || DEFAULT[:limit_param]]
       end
@@ -77,11 +77,8 @@ class Pagy # :nodoc:
         return super unless vars[:jsonapi]
 
         query_params['page'] ||= {}
-        query_params['page'][vars[:page_param].to_s]  = page if page
+        query_params['page'][vars[:page_param].to_s]  = page
         query_params['page'][vars[:limit_param].to_s] = vars[:limit] if vars[:limit_extra]
-        # :nocov:
-        query_params.delete(:page) if query_params['page'].empty?
-        # :nocov:
       end
     end
     UrlHelpers.prepend UrlHelperOverride

data/lib/pagy/extras/keyset.rb

@@ -10,18 +10,12 @@ class Pagy # :nodoc:
 
     # Return Pagy::Keyset object and paginated records
     def pagy_keyset(set, **vars)
-      pagy = Keyset.new(set, **pagy_keyset_get_vars(vars))
+      vars[:page]  ||= pagy_get_page(vars, force_integer: false) # allow nil
+      vars[:limit] ||= pagy_get_limit(vars)
+      pagy = Keyset.new(set, **vars)
       [pagy, pagy.records]
     end
 
-    # Sub-method called only by #pagy_keyset: here for easy customization of variables by overriding
-    def pagy_keyset_get_vars(vars)
-      vars.tap do |v|
-        v[:page]  ||= pagy_get_page(v)
-        v[:limit] ||= pagy_get_limit(v)
-      end
-    end
-
     # Return the URL string for the first page
     def pagy_keyset_first_url(pagy, **vars)
       pagy_url_for(pagy, nil, **vars)

data/lib/pagy/extras/limit.rb

@@ -16,8 +16,8 @@ class Pagy # :nodoc:
 
       # Set the limit variable considering the params and other pagy variables
       def pagy_get_limit(vars)
-        return unless vars.key?(:limit_extra) ? vars[:limit_extra] : DEFAULT[:limit_extra] # :limit_extra is false
-        return unless (limit_count = pagy_get_limit_param(vars))                            # no limit from request params
+        return super unless vars.key?(:limit_extra) ? vars[:limit_extra] : DEFAULT[:limit_extra] # :limit_extra is false
+        return super unless (limit_count = pagy_get_limit_param(vars))                            # no limit from request params
 
         vars[:limit] = [limit_count.to_i, vars.key?(:limit_max) ? vars[:limit_max] : DEFAULT[:limit_max]].compact.min
       end

data/lib/pagy/extras/meilisearch.rb

@@ -36,8 +36,9 @@ class Pagy # :nodoc:
 
       # Return Pagy object and results
       def pagy_meilisearch(pagy_search_args, **vars)
+        vars[:page]  ||= pagy_get_page(vars)
+        vars[:limit] ||= pagy_get_limit(vars)
         model, term, options    = pagy_search_args
-        vars                    = pagy_meilisearch_get_vars(nil, vars)
         options[:hits_per_page] = vars[:limit]
         options[:page]          = vars[:page]
         results                 = model.send(:ms_search, term, options)
@@ -50,15 +51,6 @@ class Pagy # :nodoc:
 
         [pagy, results]
       end
-
-      # Sub-method called only by #pagy_meilisearch: here for easy customization of variables by overriding.
-      # The _collection argument is not available when the method is called.
-      def pagy_meilisearch_get_vars(_collection, vars)
-        vars.tap do |v|
-          v[:page]  ||= pagy_get_page(v)
-          v[:limit] ||= pagy_get_limit(v) || DEFAULT[:limit]
-        end
-      end
     end
     Backend.prepend BackendAddOn
   end

data/lib/pagy/extras/searchkick.rb

@@ -38,8 +38,9 @@ class Pagy # :nodoc:
 
       # Return Pagy object and results
       def pagy_searchkick(pagy_search_args, **vars)
+        vars[:page]  ||= pagy_get_page(vars)
+        vars[:limit] ||= pagy_get_limit(vars)
         model, term, options, block, *called = pagy_search_args
-        vars               = pagy_searchkick_get_vars(nil, vars)
         options[:per_page] = vars[:limit]
         options[:page]     = vars[:page]
         results            = model.send(DEFAULT[:searchkick_search], term, **options, &block)
@@ -52,15 +53,6 @@ class Pagy # :nodoc:
 
         [pagy, called.empty? ? results : results.send(*called)]
       end
-
-      # Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
-      # the _collection argument is not available when the method is called
-      def pagy_searchkick_get_vars(_collection, vars)
-        vars.tap do |v|
-          v[:page]  ||= pagy_get_page(v)
-          v[:limit] ||= pagy_get_limit(v) || DEFAULT[:limit]
-        end
-      end
     end
     Backend.prepend BackendAddOn
   end

data/lib/pagy/i18n.rb

@@ -118,7 +118,7 @@ class Pagy
 
     # Stores the i18n DATA structure for each loaded locale
     # default on the first locale DATA
-    DATA = Hash.new { |hash, _| hash.first[1] }
+    DATA = Hash.new { |hash,| hash.first[1] }
 
     private
 

data/lib/pagy.rb

@@ -6,7 +6,7 @@ require_relative 'pagy/shared_methods'
 
 # Top superclass: it should define only what's common to all the subclasses
 class Pagy
-  VERSION = '9.0.2'
+  VERSION = '9.0.3'
 
   # Core default: constant for easy access, but mutable for customizable defaults
   DEFAULT = { count_args: [:all], # rubocop:disable Style/MutableConstant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.0.3
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-20 00:00:00.000000000 Z
+date: 2024-07-28 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -25,19 +25,9 @@ files:
 - apps/keyset_s.ru
 - apps/rails.ru
 - apps/repro.ru
-- apps/tmp/calendar.sqlite3
-- apps/tmp/calendar.sqlite3-shm
-- apps/tmp/calendar.sqlite3-wal
-- apps/tmp/local_secret.txt
-- apps/tmp/pagy-keyset-ar.sqlite3
-- apps/tmp/pagy-keyset-ar.sqlite3-shm
-- apps/tmp/pagy-keyset-ar.sqlite3-wal
-- apps/tmp/pagy-keyset-s.sqlite3
 - bin/pagy
 - config/pagy.rb
-- javascripts/pagy-module.js
 - javascripts/pagy.d.ts
-- javascripts/pagy.js
 - javascripts/pagy.min.js
 - javascripts/pagy.min.js.map
 - javascripts/pagy.mjs

data/apps/tmp/local_secret.txt

@@ -1 +0,0 @@
-0db96a70cc96bc7061757f38eec002ce6b14c6d987c4373d79a9f48bdcb0a26f4e00c88eec7a18c496d2779eb277f8b4a85f41dcac4c85482c7d5dd7cf05ba87

data/javascripts/pagy-module.js

@@ -1,100 +0,0 @@
-const Pagy = (() => {
-  const rjsObserver = new ResizeObserver((entries) => entries.forEach((e) => e.target.querySelectorAll(".pagy-rjs").forEach((el) => el.pagyRender())));
-  const initNav = (el, [tokens, sequels, labelSequels, trimParam]) => {
-    const container = el.parentElement ?? el;
-    const widths = Object.keys(sequels).map((w) => parseInt(w)).sort((a, b) => b - a);
-    let lastWidth = -1;
-    const fillIn = (a, page, label) => a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
-    (el.pagyRender = function() {
-      const width = widths.find((w) => w < container.clientWidth) || 0;
-      if (width === lastWidth) {
-        return;
-      }
-      let html = tokens.before;
-      const series = sequels[width.toString()];
-      const labels = labelSequels?.[width.toString()] ?? series.map((l) => l.toString());
-      series.forEach((item, i) => {
-        const label = labels[i];
-        let filled;
-        if (typeof item === "number") {
-          filled = fillIn(tokens.a, item.toString(), label);
-        } else if (item === "gap") {
-          filled = tokens.gap;
-        } else {
-          filled = fillIn(tokens.current, item, label);
-        }
-        html += typeof trimParam === "string" && item == 1 ? trim(filled, trimParam) : filled;
-      });
-      html += tokens.after;
-      el.innerHTML = "";
-      el.insertAdjacentHTML("afterbegin", html);
-      lastWidth = width;
-    })();
-    if (el.classList.contains("pagy-rjs")) {
-      rjsObserver.observe(container);
-    }
-  };
-  const initCombo = (el, [url_token, trimParam]) => initInput(el, (inputValue) => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);
-  const initSelector = (el, [from, url_token, trimParam]) => {
-    initInput(el, (inputValue) => {
-      const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();
-      const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);
-      return [page, url];
-    }, trimParam);
-  };
-  const initInput = (el, getVars, trimParam) => {
-    const input = el.querySelector("input");
-    const link = el.querySelector("a");
-    const initial = input.value;
-    const action = function() {
-      if (input.value === initial) {
-        return;
-      }
-      const [min, val, max] = [input.min, input.value, input.max].map((n) => parseInt(n) || 0);
-      if (val < min || val > max) {
-        input.value = initial;
-        input.select();
-        return;
-      }
-      let [page, url] = getVars(input.value);
-      if (typeof trimParam === "string" && page === "1") {
-        url = trim(url, trimParam);
-      }
-      link.href = url;
-      link.click();
-    };
-    ["change", "focus"].forEach((e) => input.addEventListener(e, () => input.select()));
-    input.addEventListener("focusout", action);
-    input.addEventListener("keypress", (e) => {
-      if (e.key === "Enter") {
-        action();
-      }
-    });
-  };
-  const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
-  return {
-    version: "8.6.3",
-    init(arg) {
-      const target = arg instanceof Element ? arg : document;
-      const elements = target.querySelectorAll("[data-pagy]");
-      for (const el of elements) {
-        try {
-          const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), (c) => c.charCodeAt(0));
-          const [keyword, ...args] = JSON.parse(new TextDecoder().decode(uint8array));
-          if (keyword === "nav") {
-            initNav(el, args);
-          } else if (keyword === "combo") {
-            initCombo(el, args);
-          } else if (keyword === "selector") {
-            initSelector(el, args);
-          } else {
-            console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
-          }
-        } catch (err) {
-          console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
-        }
-      }
-    }
-  };
-})();
-export default Pagy;

data/javascripts/pagy.js

@@ -1,4 +0,0 @@
-window.Pagy=(()=>{const j=new ResizeObserver((B)=>B.forEach((D)=>D.target.querySelectorAll(".pagy-rjs").forEach((E)=>E.pagyRender()))),x=(B,[D,E,z,G])=>{const F=B.parentElement??B,K=Object.keys(E).map((H)=>parseInt(H)).sort((H,M)=>M-H);let L=-1;const T=(H,M,R)=>H.replace(/__pagy_page__/g,M).replace(/__pagy_label__/g,R);if((B.pagyRender=function(){const H=K.find((Q)=>Q<F.clientWidth)||0;if(H===L)return;let M=D.before;const R=E[H.toString()],X=z?.[H.toString()]??R.map((Q)=>Q.toString());R.forEach((Q,J)=>{const $=X[J];let U;if(typeof Q==="number")U=T(D.a,Q.toString(),$);else if(Q==="gap")U=D.gap;else U=T(D.current,Q,$);M+=typeof G==="string"&&Q==1?Z(U,G):U}),M+=D.after,B.innerHTML="",B.insertAdjacentHTML("afterbegin",M),L=H})(),B.classList.contains("pagy-rjs"))j.observe(F)},A=(B,[D,E])=>Y(B,(z)=>[z,D.replace(/__pagy_page__/,z)],E),C=(B,[D,E,z])=>{Y(B,(G)=>{const F=Math.max(Math.ceil(D/parseInt(G)),1).toString(),K=E.replace(/__pagy_page__/,F).replace(/__pagy_items__/,G);return[F,K]},z)},Y=(B,D,E)=>{const z=B.querySelector("input"),G=B.querySelector("a"),F=z.value,K=function(){if(z.value===F)return;const[L,T,H]=[z.min,z.value,z.max].map((X)=>parseInt(X)||0);if(T<L||T>H){z.value=F,z.select();return}let[M,R]=D(z.value);if(typeof E==="string"&&M==="1")R=Z(R,E);G.href=R,G.click()};["change","focus"].forEach((L)=>z.addEventListener(L,()=>z.select())),z.addEventListener("focusout",K),z.addEventListener("keypress",(L)=>{if(L.key==="Enter")K()})},Z=(B,D)=>B.replace(new RegExp(`[?&]${D}=1\\b(?!&)|\\b${D}=1&`),"");return{version:"8.6.3",init(B){const E=(B instanceof Element?B:document).querySelectorAll("[data-pagy]");for(let z of E)try{const G=Uint8Array.from(atob(z.getAttribute("data-pagy")),(L)=>L.charCodeAt(0)),[F,...K]=JSON.parse((new TextDecoder()).decode(G));if(F==="nav")x(z,K);else if(F==="combo")A(z,K);else if(F==="selector")C(z,K);else console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",z,F)}catch(G){console.warn("Skipped Pagy.init() for: %o\n%s",z,G)}}}})();
-
-//# debugId=B9DC02765C7A5B6764756E2164756E21
-//# sourceMappingURL=pagy.min.js.map