pagy 43.2.6 → 43.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2cea241fa37b5ad6a230e342a2d317dee750bd834fbfc7bc80c2bbea4df581a
-  data.tar.gz: 5073e531947cea02f78748b662643c6ade3f7cf412ed96431da5f283ac18e33e
+  metadata.gz: 17c8ff1175a4401c1b0491a11369da541e0d55a6cb5590af9840a815c5453358
+  data.tar.gz: c04ad1216d0b0672100c7b7b04e839b74aca129c3cc7044a6d10a781e3d31d00
 SHA512:
-  metadata.gz: 436d39d4742c8360267346b3e277679a6d25243f4a5a7cf6b44cde048aac33d011a51d90f42f7c3f620c25ebc30952ffcaf159907fb296c5bf22622a53afd096
-  data.tar.gz: af0603b45ba5d37bd505582af5a215e8695ed39bf7dd860a63e643f151ab4cb7073a1830bc1069abe925526c1d40863cac2649b92174dd909bf24bea664c138d
+  metadata.gz: 8f79a780b5f763eef0829c60b584f91a22757cc714a83f71f69215d654b2de9f6beaa76486ce58b1fa75f8a542fdebea51fcaac3ddac970e9f791a7fca5a6511
+  data.tar.gz: 136b87f07fd0ad161e03ae8cd689eee102a02c2296426bf7fc28c34421c27ca99927fdacab69f419f45a39e99fcc71201fb448a35336c14b652240a0fa0051c8

data/apps/calendar.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/demo.ru

@@ -19,7 +19,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/keynav+root_key.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/keynav.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/keyset.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/keyset_sequel.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/rails.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/apps/repro.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.6'
+VERSION = '43.2.7'
 
 if VERSION != Pagy::VERSION
   Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")

data/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (43.2.6)
+# Pagy initializer file (43.2.7)
 # See https://ddnexus.github.io/pagy/resources/initializer/
 
 ############ Global Options ################################################################

data/javascripts/pagy.js

@@ -126,7 +126,7 @@ window.Pagy = (() => {
     });
   };
   return {
-    version: "43.2.6",
+    version: "43.2.7",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {
@@ -150,5 +150,5 @@ window.Pagy = (() => {
   };
 })();
 
-//# debugId=A3F308FA5DB8330B64756E2164756E21
+//# debugId=2F5F1987603BEC1464756E2164756E21
 //# sourceMappingURL=pagy.js.map

data/javascripts/pagy.js.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../src/pagy.ts"],
   "sourcesContent": [
-    "interface SyncData {\n  from?: number\n  to?:   number\n  key:   string\n  str?:  string\n}\ntype InitArgs = [\"k\",  KeynavArgs] |          // series_nav[_js] with keynav instance\n                [\"snj\", SeriesNavJsArgs] |    // series_nav_js\n                [\"inj\", InputNavJsArgs] |     // input_nav_js\n                [\"ltj\", LimitTagJsArgs]       // limit_tag_js\ntype AugmentKeynav = (nav:HTMLElement, keynavArgs:KeynavArgs) => Promise<((page: string) => string)>\ntype KeynavArgs = readonly [storageKey:  string | null,\n                            rootKey:     string | null,\n                            pageKey:     string,\n                            last:        number,\n                            spliceArgs?: SpliceArgs]\ntype SpliceArgs = readonly [start:       number,\n                            deleteCount: number,     // it would be optional, but ts complains\n                            ...items:    Cutoff[]]\ntype Cutoff = readonly (string | number | boolean)[]\ntype AugmentedPage = [browserId:   string,\n                      storageKey:  string,\n                      pageNumber:  number,\n                      pages:       number,\n                      priorCutoff: Cutoff | null,\n                      pageCutoff:  Cutoff | null]\ntype SeriesNavJsArgs = readonly [NavJsTokens, pageToken: string, NavJsSeries, KeynavArgs?]\ntype NavJsSeries = readonly [widths: number[],\n                             series: (string | number)[][],\n                             labels: string[][] | null]\ntype InputNavJsArgs = readonly [urlToken:  string,\n                                pageToken: string,\n                                KeynavArgs?]\ntype LimitTagJsArgs = readonly [from:     number,\n                                urlToken: string,\n                                pageToken: string,\n                                limitToken: string]\ntype NavJsTokens = readonly [before:  string,\n                             anchor:  string,\n                             current: string,\n                             gap:     string,\n                             after:   string]\ninterface NavJsElement extends HTMLElement {\n  render(): void\n}\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst Pagy = (() => {\n  const storageSupport = 'sessionStorage' in window && 'BroadcastChannel' in window;\n  // eslint-disable-next-line prefer-const\n  let pagy = \"pagy\", storage: Storage, sync: BroadcastChannel, tabId: number;\n  if (storageSupport) {\n    storage = sessionStorage; // shorten the compiled size\n    sync    = new BroadcastChannel(pagy);\n    tabId   = Date.now();\n    // Sync the sessionStorage keys for the cutoffs opened in a new tab/window\n    sync.addEventListener(\"message\", (e:MessageEvent<SyncData>) => {\n      if (e.data.from) { // request cutoffs\n        const cutoffs = storage.getItem(e.data.key);\n        if (cutoffs) {\n          sync.postMessage(<SyncData>{to: e.data.from, key: e.data.key, str: cutoffs});\n        } // send response\n      } else if (e.data.to) {  // receive cutoffs\n        if (e.data.to == tabId) {\n          storage.setItem(e.data.key, <string>e.data.str);\n        }\n      }\n    });\n  }\n  // The observer instance for responsive navs\n  const rjsObserver = new ResizeObserver(\n      entries => entries.forEach(e => {\n        e.target.querySelectorAll<NavJsElement>(\".pagy-rjs\").forEach(el => el.render());\n      }));\n\n  /* Full set of B64 functions\n  const B64Encode     = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode))),\n        B64Safe       = (unsafe:string)  => unsafe.replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64SafeEncode = (unicode:string) => B64Safe(B64Encode(unicode)),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0))),\n        B64Unsafe     = (safe:string)    => safe.replace(/[-_]/g, (match) => match == \"-\" ? \"+\" : \"/\"),\n        B64SafeDecode = (base64:string)  => B64Decode(B64Unsafe(base64))\n  */\n  const B64SafeEncode = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode)))\n                                            .replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0)));\n\n  // Return a random key: 3 chars max, base-36 number < 36**3\n  const randKey = () => Math.floor(Math.random() * 36 ** 3).toString(36);\n\n  // Manage the page augmentation for Keynav, called only if storageSupport\n  const augmentKeynav: AugmentKeynav = async (nav, [storageKey, rootKey, pageKey, last, spliceArgs]) => {\n    let augmentPage:(page: string) => string;\n    const browserKey = document.cookie.split(/;\\s+/)  // it works even if malformed\n                               .find((row) => row.startsWith(pagy + \"=\"))\n                               ?.split(\"=\")[1] ?? randKey();\n    document.cookie = pagy + \"=\" + browserKey;  // Smaller .min size: set the cookie without checking\n    if (storageKey && !(storageKey in storage)) {\n      // Sync the sessiongStorage from other tabs/windows (e.g., open page in the new tab/window)\n      sync.postMessage(<SyncData>{ from: tabId, key: storageKey });\n      // Wait for the listener to copy the cutoffs in the current sessionStorage\n      await new Promise<string|null>((resolve) => setTimeout(() => resolve(\"\"), 100));\n      if (!(storageKey in storage)) { // the storageKey didn't get copied: fallback to countless pagination\n        augmentPage = (page: string) => page + '+' + last;\n      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    if (!augmentPage) { // regular keynav pagination\n      if (!storageKey) { do { storageKey = randKey() } while (storageKey in storage) } // no dup keys\n      const data = storage.getItem(storageKey),\n          cutoffs = <Cutoff[]>(data ? JSON.parse(data) : [undefined]);\n      if (spliceArgs) {\n        cutoffs.splice(...spliceArgs);\n        storage.setItem(storageKey, JSON.stringify(cutoffs));\n      }\n      // Augment function\n      augmentPage = (page:string) => {\n        const pageNum = parseInt(page);\n        return B64SafeEncode(JSON.stringify(\n            <AugmentedPage>[browserKey,\n                            storageKey,\n                            pageNum,\n                            cutoffs.length,       // pages/last\n                            cutoffs[pageNum - 1], // priorCutoff\n                            cutoffs[pageNum]]));  // pageCutoff\n      };\n    }\n    const search = (rootKey) ? `${rootKey}%5B${pageKey}%5D` : pageKey;\n    const re     = new RegExp(`(?<=\\\\?.*)(\\\\b${search}=)(\\\\d+)`);\n    // Augment the page param of each href\n    for (const a of <NodeListOf<HTMLAnchorElement>><unknown>nav.querySelectorAll('a[href]')) {\n      a.href = a.href.replace(re, (_match, prefix, digit): string => `${prefix}${augmentPage(<string>digit)}`);\n    }\n    // Return the augment function for further augmentation (i.e., url token in input_nav_js)\n    return augmentPage;\n  };\n\n  // Build the series_nav_js helper\n  const buildNavJs = (nav:NavJsElement, [[before, anchor, current, gap, after], pageToken,\n                                        [widths, series, labels], keynavArgs]:SeriesNavJsArgs) => {\n    const  parent = <HTMLElement>nav.parentElement;\n    let lastWidth = -1;\n    (nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (widths[index] === lastWidth) { return } // no change: abort\n\n      let html = before;\n      series[index].forEach((item, i) => {\n        // Avoid the if blocks and chain the results (shorter pagy.min.js and easier reading)\n        html += item == \"gap\" ? gap :\n                // @ts-expect-error the item may be a number, but the 'replace' converts it to string (shorter pagy.min.js)\n                (typeof item == \"number\" ? anchor.replace(pageToken, item) : current)\n                    .replace(\"L<\", labels?.[index][i] ?? item + \"<\");\n      });\n      html         += after;\n      nav.innerHTML = \"\";\n      nav.insertAdjacentHTML(\"afterbegin\", html);\n      lastWidth = widths[index];\n      if (keynavArgs && storageSupport) { void augmentKeynav(nav, keynavArgs) }\n    })();\n    if (nav.classList.contains(pagy + \"-rjs\")) { rjsObserver.observe(parent) }\n  };\n\n  // Init the input_nav_js helpers\n  const initInputNavJs = async (nav:HTMLElement, [url_token, pageToken, keynavArgs]:InputNavJsArgs) => {\n    const augment = keynavArgs && storageSupport\n                    ? await augmentKeynav(nav, keynavArgs)\n                    : (page: string) => page;\n    initInput(nav, inputValue => url_token.replace(pageToken, augment(inputValue)));\n  };\n\n  // Init the limit_tag_js helper\n  const initLimitTagJs = (span:HTMLSpanElement, [from, url_token, page_token, limitToken]:LimitTagJsArgs) => {\n    initInput(span, inputValue => {\n      // @ts-expect-error the page is a number, but the 'replace' converts it to string (shorter pagy.min.js)\n      return url_token.replace(page_token, Math.max(Math.ceil(from / parseInt(inputValue)), 1))\n                      .replace(limitToken, inputValue);\n    });\n  };\n\n  // Init the input element\n  const initInput = (element:HTMLElement, getUrl:(v:string) => string) => {\n    const input   = <HTMLInputElement>element.querySelector(\"input\"),\n          link    = <HTMLAnchorElement>element.querySelector(\"a\"),\n          initial = input.value,\n          action  = () => {\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                      link.href = getUrl(input.value);\n                      link.click();\n                    };\n    input.addEventListener(\"focus\", () => input.select());\n    input.addEventListener(\"focusout\", action);\n    input.addEventListener(\"keypress\", e => { if (e.key == \"Enter\") { action() } });\n  };\n\n  // Public interface\n  return {\n    version: \"43.2.6\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:HTMLElement) {\n      const target   = arg instanceof HTMLElement ? arg : document,\n            elements = target.querySelectorAll(\"[data-pagy]\");\n      for (const element of <NodeListOf<HTMLElement>>elements) {\n        try {\n          const [helperId, ...args] = <InitArgs>JSON.parse(B64Decode(<string>element.getAttribute(\"data-pagy\")));\n          if (helperId == \"k\") {\n            // @ts-expect-error spread 2 arguments, not 3 as it complains about\n            void augmentKeynav(element, ...<KeynavArgs><unknown>args);\n          } else if (helperId == \"snj\") {\n            buildNavJs(<NavJsElement>element, <SeriesNavJsArgs><unknown>args);\n          } else if (helperId == \"inj\") {\n            void initInputNavJs(element, <InputNavJsArgs><unknown>args);\n          } else if (helperId == \"ltj\") {\n            initLimitTagJs(element, <LimitTagJsArgs><unknown>args);\n          }\n          // else { console.warn(\"Pagy.init: %o\\nUnknown helperId '%s'\", element, helperId) }\n        } catch (err) { console.warn(\"Pagy.init: %o\\n%s\", element, err) }\n      }\n    }\n  };\n})();\n"
+    "interface SyncData {\n  from?: number\n  to?:   number\n  key:   string\n  str?:  string\n}\ntype InitArgs = [\"k\",  KeynavArgs] |          // series_nav[_js] with keynav instance\n                [\"snj\", SeriesNavJsArgs] |    // series_nav_js\n                [\"inj\", InputNavJsArgs] |     // input_nav_js\n                [\"ltj\", LimitTagJsArgs]       // limit_tag_js\ntype AugmentKeynav = (nav:HTMLElement, keynavArgs:KeynavArgs) => Promise<((page: string) => string)>\ntype KeynavArgs = readonly [storageKey:  string | null,\n                            rootKey:     string | null,\n                            pageKey:     string,\n                            last:        number,\n                            spliceArgs?: SpliceArgs]\ntype SpliceArgs = readonly [start:       number,\n                            deleteCount: number,     // it would be optional, but ts complains\n                            ...items:    Cutoff[]]\ntype Cutoff = readonly (string | number | boolean)[]\ntype AugmentedPage = [browserId:   string,\n                      storageKey:  string,\n                      pageNumber:  number,\n                      pages:       number,\n                      priorCutoff: Cutoff | null,\n                      pageCutoff:  Cutoff | null]\ntype SeriesNavJsArgs = readonly [NavJsTokens, pageToken: string, NavJsSeries, KeynavArgs?]\ntype NavJsSeries = readonly [widths: number[],\n                             series: (string | number)[][],\n                             labels: string[][] | null]\ntype InputNavJsArgs = readonly [urlToken:  string,\n                                pageToken: string,\n                                KeynavArgs?]\ntype LimitTagJsArgs = readonly [from:     number,\n                                urlToken: string,\n                                pageToken: string,\n                                limitToken: string]\ntype NavJsTokens = readonly [before:  string,\n                             anchor:  string,\n                             current: string,\n                             gap:     string,\n                             after:   string]\ninterface NavJsElement extends HTMLElement {\n  render(): void\n}\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst Pagy = (() => {\n  const storageSupport = 'sessionStorage' in window && 'BroadcastChannel' in window;\n  // eslint-disable-next-line prefer-const\n  let pagy = \"pagy\", storage: Storage, sync: BroadcastChannel, tabId: number;\n  if (storageSupport) {\n    storage = sessionStorage; // shorten the compiled size\n    sync    = new BroadcastChannel(pagy);\n    tabId   = Date.now();\n    // Sync the sessionStorage keys for the cutoffs opened in a new tab/window\n    sync.addEventListener(\"message\", (e:MessageEvent<SyncData>) => {\n      if (e.data.from) { // request cutoffs\n        const cutoffs = storage.getItem(e.data.key);\n        if (cutoffs) {\n          sync.postMessage(<SyncData>{to: e.data.from, key: e.data.key, str: cutoffs});\n        } // send response\n      } else if (e.data.to) {  // receive cutoffs\n        if (e.data.to == tabId) {\n          storage.setItem(e.data.key, <string>e.data.str);\n        }\n      }\n    });\n  }\n  // The observer instance for responsive navs\n  const rjsObserver = new ResizeObserver(\n      entries => entries.forEach(e => {\n        e.target.querySelectorAll<NavJsElement>(\".pagy-rjs\").forEach(el => el.render());\n      }));\n\n  /* Full set of B64 functions\n  const B64Encode     = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode))),\n        B64Safe       = (unsafe:string)  => unsafe.replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64SafeEncode = (unicode:string) => B64Safe(B64Encode(unicode)),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0))),\n        B64Unsafe     = (safe:string)    => safe.replace(/[-_]/g, (match) => match == \"-\" ? \"+\" : \"/\"),\n        B64SafeDecode = (base64:string)  => B64Decode(B64Unsafe(base64))\n  */\n  const B64SafeEncode = (unicode:string) => btoa(String.fromCharCode(...(new TextEncoder).encode(unicode)))\n                                            .replace(/[+/=]/g, (m) => m == \"+\" ? \"-\" : m == \"/\" ? \"_\" : \"\"),\n        B64Decode     = (base64:string)  => (new TextDecoder()).decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0)));\n\n  // Return a random key: 3 chars max, base-36 number < 36**3\n  const randKey = () => Math.floor(Math.random() * 36 ** 3).toString(36);\n\n  // Manage the page augmentation for Keynav, called only if storageSupport\n  const augmentKeynav: AugmentKeynav = async (nav, [storageKey, rootKey, pageKey, last, spliceArgs]) => {\n    let augmentPage:(page: string) => string;\n    const browserKey = document.cookie.split(/;\\s+/)  // it works even if malformed\n                               .find((row) => row.startsWith(pagy + \"=\"))\n                               ?.split(\"=\")[1] ?? randKey();\n    document.cookie = pagy + \"=\" + browserKey;  // Smaller .min size: set the cookie without checking\n    if (storageKey && !(storageKey in storage)) {\n      // Sync the sessiongStorage from other tabs/windows (e.g., open page in the new tab/window)\n      sync.postMessage(<SyncData>{ from: tabId, key: storageKey });\n      // Wait for the listener to copy the cutoffs in the current sessionStorage\n      await new Promise<string|null>((resolve) => setTimeout(() => resolve(\"\"), 100));\n      if (!(storageKey in storage)) { // the storageKey didn't get copied: fallback to countless pagination\n        augmentPage = (page: string) => page + '+' + last;\n      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    if (!augmentPage) { // regular keynav pagination\n      if (!storageKey) { do { storageKey = randKey() } while (storageKey in storage) } // no dup keys\n      const data = storage.getItem(storageKey),\n          cutoffs = <Cutoff[]>(data ? JSON.parse(data) : [undefined]);\n      if (spliceArgs) {\n        cutoffs.splice(...spliceArgs);\n        storage.setItem(storageKey, JSON.stringify(cutoffs));\n      }\n      // Augment function\n      augmentPage = (page:string) => {\n        const pageNum = parseInt(page);\n        return B64SafeEncode(JSON.stringify(\n            <AugmentedPage>[browserKey,\n                            storageKey,\n                            pageNum,\n                            cutoffs.length,       // pages/last\n                            cutoffs[pageNum - 1], // priorCutoff\n                            cutoffs[pageNum]]));  // pageCutoff\n      };\n    }\n    const search = (rootKey) ? `${rootKey}%5B${pageKey}%5D` : pageKey;\n    const re     = new RegExp(`(?<=\\\\?.*)(\\\\b${search}=)(\\\\d+)`);\n    // Augment the page param of each href\n    for (const a of <NodeListOf<HTMLAnchorElement>><unknown>nav.querySelectorAll('a[href]')) {\n      a.href = a.href.replace(re, (_match, prefix, digit): string => `${prefix}${augmentPage(<string>digit)}`);\n    }\n    // Return the augment function for further augmentation (i.e., url token in input_nav_js)\n    return augmentPage;\n  };\n\n  // Build the series_nav_js helper\n  const buildNavJs = (nav:NavJsElement, [[before, anchor, current, gap, after], pageToken,\n                                        [widths, series, labels], keynavArgs]:SeriesNavJsArgs) => {\n    const  parent = <HTMLElement>nav.parentElement;\n    let lastWidth = -1;\n    (nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (widths[index] === lastWidth) { return } // no change: abort\n\n      let html = before;\n      series[index].forEach((item, i) => {\n        // Avoid the if blocks and chain the results (shorter pagy.min.js and easier reading)\n        html += item == \"gap\" ? gap :\n                // @ts-expect-error the item may be a number, but the 'replace' converts it to string (shorter pagy.min.js)\n                (typeof item == \"number\" ? anchor.replace(pageToken, item) : current)\n                    .replace(\"L<\", labels?.[index][i] ?? item + \"<\");\n      });\n      html         += after;\n      nav.innerHTML = \"\";\n      nav.insertAdjacentHTML(\"afterbegin\", html);\n      lastWidth = widths[index];\n      if (keynavArgs && storageSupport) { void augmentKeynav(nav, keynavArgs) }\n    })();\n    if (nav.classList.contains(pagy + \"-rjs\")) { rjsObserver.observe(parent) }\n  };\n\n  // Init the input_nav_js helpers\n  const initInputNavJs = async (nav:HTMLElement, [url_token, pageToken, keynavArgs]:InputNavJsArgs) => {\n    const augment = keynavArgs && storageSupport\n                    ? await augmentKeynav(nav, keynavArgs)\n                    : (page: string) => page;\n    initInput(nav, inputValue => url_token.replace(pageToken, augment(inputValue)));\n  };\n\n  // Init the limit_tag_js helper\n  const initLimitTagJs = (span:HTMLSpanElement, [from, url_token, page_token, limitToken]:LimitTagJsArgs) => {\n    initInput(span, inputValue => {\n      // @ts-expect-error the page is a number, but the 'replace' converts it to string (shorter pagy.min.js)\n      return url_token.replace(page_token, Math.max(Math.ceil(from / parseInt(inputValue)), 1))\n                      .replace(limitToken, inputValue);\n    });\n  };\n\n  // Init the input element\n  const initInput = (element:HTMLElement, getUrl:(v:string) => string) => {\n    const input   = <HTMLInputElement>element.querySelector(\"input\"),\n          link    = <HTMLAnchorElement>element.querySelector(\"a\"),\n          initial = input.value,\n          action  = () => {\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                      link.href = getUrl(input.value);\n                      link.click();\n                    };\n    input.addEventListener(\"focus\", () => input.select());\n    input.addEventListener(\"focusout\", action);\n    input.addEventListener(\"keypress\", e => { if (e.key == \"Enter\") { action() } });\n  };\n\n  // Public interface\n  return {\n    version: \"43.2.7\",\n\n    // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n    init(arg?:HTMLElement) {\n      const target   = arg instanceof HTMLElement ? arg : document,\n            elements = target.querySelectorAll(\"[data-pagy]\");\n      for (const element of <NodeListOf<HTMLElement>>elements) {\n        try {\n          const [helperId, ...args] = <InitArgs>JSON.parse(B64Decode(<string>element.getAttribute(\"data-pagy\")));\n          if (helperId == \"k\") {\n            // @ts-expect-error spread 2 arguments, not 3 as it complains about\n            void augmentKeynav(element, ...<KeynavArgs><unknown>args);\n          } else if (helperId == \"snj\") {\n            buildNavJs(<NavJsElement>element, <SeriesNavJsArgs><unknown>args);\n          } else if (helperId == \"inj\") {\n            void initInputNavJs(element, <InputNavJsArgs><unknown>args);\n          } else if (helperId == \"ltj\") {\n            initLimitTagJs(element, <LimitTagJsArgs><unknown>args);\n          }\n          // else { console.warn(\"Pagy.init: %o\\nUnknown helperId '%s'\", element, helperId) }\n        } catch (err) { console.warn(\"Pagy.init: %o\\n%s\", element, err) }\n      }\n    }\n  };\n})();\n"
   ],
   "mappings": "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",
-  "debugId": "A3F308FA5DB8330B64756E2164756E21",
+  "debugId": "2F5F1987603BEC1464756E2164756E21",
   "names": []
 }

data/javascripts/pagy.min.js

@@ -1,2 +1,2 @@
-window.Pagy=(()=>{let B="sessionStorage"in window&&"BroadcastChannel"in window,L="pagy",Z,O,W;if(B)Z=sessionStorage,O=new BroadcastChannel(L),W=Date.now(),O.addEventListener("message",(q)=>{if(q.data.from){let z=Z.getItem(q.data.key);if(z)O.postMessage({to:q.data.from,key:q.data.key,str:z})}else if(q.data.to){if(q.data.to==W)Z.setItem(q.data.key,q.data.str)}});let P=new ResizeObserver((q)=>q.forEach((z)=>{z.target.querySelectorAll(".pagy-rjs").forEach((C)=>C.render())})),V=(q)=>btoa(String.fromCharCode(...new TextEncoder().encode(q))).replace(/[+/=]/g,(z)=>z=="+"?"-":z=="/"?"_":""),_=(q)=>new TextDecoder().decode(Uint8Array.from(atob(q),(z)=>z.charCodeAt(0))),S=()=>Math.floor(Math.random()*46656).toString(36),J=async(q,[z,C,F,H,G])=>{let Q,X=document.cookie.split(/;\s+/).find((M)=>M.startsWith(L+"="))?.split("=")[1]??S();if(document.cookie=L+"="+X,z&&!(z in Z)){if(O.postMessage({from:W,key:z}),await new Promise((M)=>setTimeout(()=>M(""),100)),!(z in Z))Q=(M)=>M+"+"+H}if(!Q){if(!z)do z=S();while(z in Z);let M=Z.getItem(z),Y=M?JSON.parse(M):[void 0];if(G)Y.splice(...G),Z.setItem(z,JSON.stringify(Y));Q=($)=>{let R=parseInt($);return V(JSON.stringify([X,z,R,Y.length,Y[R-1],Y[R]]))}}let D=C?`${C}%5B${F}%5D`:F,E=new RegExp(`(?<=\\?.*)(\\b${D}=)(\\d+)`);for(let M of q.querySelectorAll("a[href]"))M.href=M.href.replace(E,(Y,$,R)=>`${$}${Q(R)}`);return Q},x=(q,[[z,C,F,H,G],Q,[X,D,E],M])=>{let Y=q.parentElement,$=-1;if((q.render=()=>{let R=X.findIndex((j)=>j<Y.clientWidth);if(X[R]===$)return;let U=z;if(D[R].forEach((j,I)=>{U+=j=="gap"?H:(typeof j=="number"?C.replace(Q,j):F).replace("L<",E?.[R][I]??j+"<")}),U+=G,q.innerHTML="",q.insertAdjacentHTML("afterbegin",U),$=X[R],M&&B)J(q,M)})(),q.classList.contains(L+"-rjs"))P.observe(Y)},T=async(q,[z,C,F])=>{let H=F&&B?await J(q,F):(G)=>G;N(q,(G)=>z.replace(C,H(G)))},A=(q,[z,C,F,H])=>{N(q,(G)=>{return C.replace(F,Math.max(Math.ceil(z/parseInt(G)),1)).replace(H,G)})},N=(q,z)=>{let C=q.querySelector("input"),F=q.querySelector("a"),H=C.value,G=()=>{if(C.value===H)return;let[Q,X,D]=[C.min,C.value,C.max].map((E)=>parseInt(E)||0);if(X<Q||X>D){C.value=H,C.select();return}F.href=z(C.value),F.click()};C.addEventListener("focus",()=>C.select()),C.addEventListener("focusout",G),C.addEventListener("keypress",(Q)=>{if(Q.key=="Enter")G()})};return{version:"43.2.6",init(q){let z=q instanceof HTMLElement?q:document,C=z.querySelectorAll("[data-pagy]");for(let F of C)try{let[H,...G]=JSON.parse(_(F.getAttribute("data-pagy")));if(H=="k")J(F,...G);else if(H=="snj")x(F,G);else if(H=="inj")T(F,G);else if(H=="ltj")A(F,G)}catch(H){console.warn(`Pagy.init: %o
+window.Pagy=(()=>{let B="sessionStorage"in window&&"BroadcastChannel"in window,L="pagy",Z,O,W;if(B)Z=sessionStorage,O=new BroadcastChannel(L),W=Date.now(),O.addEventListener("message",(q)=>{if(q.data.from){let z=Z.getItem(q.data.key);if(z)O.postMessage({to:q.data.from,key:q.data.key,str:z})}else if(q.data.to){if(q.data.to==W)Z.setItem(q.data.key,q.data.str)}});let P=new ResizeObserver((q)=>q.forEach((z)=>{z.target.querySelectorAll(".pagy-rjs").forEach((C)=>C.render())})),V=(q)=>btoa(String.fromCharCode(...new TextEncoder().encode(q))).replace(/[+/=]/g,(z)=>z=="+"?"-":z=="/"?"_":""),_=(q)=>new TextDecoder().decode(Uint8Array.from(atob(q),(z)=>z.charCodeAt(0))),S=()=>Math.floor(Math.random()*46656).toString(36),J=async(q,[z,C,F,H,G])=>{let Q,X=document.cookie.split(/;\s+/).find((M)=>M.startsWith(L+"="))?.split("=")[1]??S();if(document.cookie=L+"="+X,z&&!(z in Z)){if(O.postMessage({from:W,key:z}),await new Promise((M)=>setTimeout(()=>M(""),100)),!(z in Z))Q=(M)=>M+"+"+H}if(!Q){if(!z)do z=S();while(z in Z);let M=Z.getItem(z),Y=M?JSON.parse(M):[void 0];if(G)Y.splice(...G),Z.setItem(z,JSON.stringify(Y));Q=($)=>{let R=parseInt($);return V(JSON.stringify([X,z,R,Y.length,Y[R-1],Y[R]]))}}let D=C?`${C}%5B${F}%5D`:F,E=new RegExp(`(?<=\\?.*)(\\b${D}=)(\\d+)`);for(let M of q.querySelectorAll("a[href]"))M.href=M.href.replace(E,(Y,$,R)=>`${$}${Q(R)}`);return Q},x=(q,[[z,C,F,H,G],Q,[X,D,E],M])=>{let Y=q.parentElement,$=-1;if((q.render=()=>{let R=X.findIndex((j)=>j<Y.clientWidth);if(X[R]===$)return;let U=z;if(D[R].forEach((j,I)=>{U+=j=="gap"?H:(typeof j=="number"?C.replace(Q,j):F).replace("L<",E?.[R][I]??j+"<")}),U+=G,q.innerHTML="",q.insertAdjacentHTML("afterbegin",U),$=X[R],M&&B)J(q,M)})(),q.classList.contains(L+"-rjs"))P.observe(Y)},T=async(q,[z,C,F])=>{let H=F&&B?await J(q,F):(G)=>G;N(q,(G)=>z.replace(C,H(G)))},A=(q,[z,C,F,H])=>{N(q,(G)=>{return C.replace(F,Math.max(Math.ceil(z/parseInt(G)),1)).replace(H,G)})},N=(q,z)=>{let C=q.querySelector("input"),F=q.querySelector("a"),H=C.value,G=()=>{if(C.value===H)return;let[Q,X,D]=[C.min,C.value,C.max].map((E)=>parseInt(E)||0);if(X<Q||X>D){C.value=H,C.select();return}F.href=z(C.value),F.click()};C.addEventListener("focus",()=>C.select()),C.addEventListener("focusout",G),C.addEventListener("keypress",(Q)=>{if(Q.key=="Enter")G()})};return{version:"43.2.7",init(q){let z=q instanceof HTMLElement?q:document,C=z.querySelectorAll("[data-pagy]");for(let F of C)try{let[H,...G]=JSON.parse(_(F.getAttribute("data-pagy")));if(H=="k")J(F,...G);else if(H=="snj")x(F,G);else if(H=="inj")T(F,G);else if(H=="ltj")A(F,G)}catch(H){console.warn(`Pagy.init: %o
 %s`,F,H)}}}})();

data/javascripts/pagy.mjs

@@ -125,7 +125,7 @@ const Pagy = (() => {
     });
   };
   return {
-    version: "43.2.6",
+    version: "43.2.7",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {

data/lib/pagy/classes/keyset/keyset.rb

@@ -55,6 +55,8 @@ class Pagy
       @keyset = @options[:keyset] || extract_keyset
       raise InternalError, 'the set must be ordered' if @keyset.empty?
 
+      @identifiers = quoted_identifiers(@set.model.table_name)
+
       assign_page
       self.next
     end
@@ -109,22 +111,28 @@ class Pagy
     def compose_predicate(prefix = nil)
       operator    = { asc: '>', desc: '<' }
       directions  = @keyset.values
-      identifier  = quoted_identifiers(@set.model.table_name)
+      identifier  = @identifiers
       placeholder = @keyset.to_h { |column| [column, ":#{prefix}#{column}"] }
+
       if @options[:tuple_comparison] && (directions.all?(:asc) || directions.all?(:desc))
         "(#{identifier.values.join(', ')}) #{operator[directions.first]} (#{placeholder.values.join(', ')})"
       else
         keyset = @keyset.to_a
-        union  = []
+        ors    = []
+
         until keyset.empty?
-          last_column, last_direction = keyset.pop
-          intersection = +'('
-          intersection << (keyset.map { |column, _d| "#{identifier[column]} = #{placeholder[column]}" } \
-          << "#{identifier[last_column]} #{operator[last_direction]} #{placeholder[last_column]}").join(' AND ')
-          intersection << ')'
-          union << intersection
+          column, direction = keyset.pop
+          ands = keyset.map { |k, _| "#{identifier[k]} = #{placeholder[k]}" }
+          ands << "#{identifier[column]} #{operator[direction]} #{placeholder[column]}"
+          ors << "(#{ands.join(' AND ')})"
         end
-        union.join(' OR ')
+        query = ors.join(' OR ')
+        return query unless @keyset.size > 1
+
+        # Add hint predicate for DB optimizers that struggle with ORs
+        column, direction = @keyset.first
+        hint = "#{identifier[column]} #{operator[direction]}= #{placeholder[column]}"
+        "#{hint} AND (#{query})"
       end
     end
 

data/lib/pagy/modules/b64.rb

@@ -15,8 +15,8 @@ class Pagy
 
     def urlsafe_encode(bin)
       str = encode(bin)
-      str.chomp!('==') or str.chomp!('=')
       str.tr!('+/', '-_')
+      str.delete!('=')
 
       str
     end

data/lib/pagy/modules/i18n/p11n/arabic.rb

@@ -8,6 +8,7 @@ class Pagy
 
         def plural_for(n = 0)
           mod100 = n % 100
+
           case
           when n == 0  # rubocop:disable Style/NumericPredicate
             :zero

data/lib/pagy/modules/i18n/p11n/east_slavic.rb

@@ -9,6 +9,7 @@ class Pagy
         def plural_for(n = 0)
           mod10  = n % 10
           mod100 = n % 100
+
           case
           when mod10 == 1 && mod100 != 11
             :one

data/lib/pagy/modules/i18n/p11n/polish.rb

@@ -9,6 +9,7 @@ class Pagy
         def plural_for(n = 0)
           mod10  = n % 10
           mod100 = n % 100
+
           case
           when n == 1
             :one

data/lib/pagy/toolbox/helpers/anchor_tags.rb

@@ -4,22 +4,18 @@ require_relative 'support/a_lambda' # inheritable
 
 class Pagy
   # Return the enabled/disabled previous page anchor tag
-  def previous_tag(a = nil, text: I18n.translate('pagy.previous'),
-                   aria_label: I18n.translate('pagy.aria_label.previous'), **)
-    if @previous
-      (a || a_lambda(**)).(@previous, text, aria_label:)
-    else
-      %(<a role="link" aria-disabled="true" aria-label="#{aria_label}">#{text}</a>)
-    end
-  end
+  def previous_tag(...) = anchor_tag_for(:previous, ...)
 
   # Return the enabled/disabled next page anchor tag
-  def next_tag(a = nil, text: I18n.translate('pagy.next'),
-               aria_label: I18n.translate('pagy.aria_label.next'), **)
-    if @next
-      (a || a_lambda(**)).(@next, text, aria_label:)
-    else
-      %(<a role="link" aria-disabled="true" aria-label="#{aria_label}">#{text}</a>)
-    end
+  def next_tag(...) = anchor_tag_for(:next, ...)
+
+  private
+
+  def anchor_tag_for(which, a = nil, text: I18n.translate("pagy.#{which}"),
+                     aria_label: I18n.translate("pagy.aria_label.#{which}"), **)
+    page = send(which)
+    return (a || a_lambda(**)).(page.to_i, text, aria_label:) if page
+
+    %(<a role="link" aria-disabled="true" aria-label="#{aria_label}">#{text}</a>)
   end
 end

data/lib/pagy/toolbox/helpers/bootstrap/input_nav_js.rb

@@ -9,9 +9,11 @@ class Pagy
   # Javascript combo pagination for bootstrap: it returns a nav with a data-pagy attribute used by the pagy.js file
   def bootstrap_input_nav_js(classes: 'pagination', **)
     a_lambda = a_lambda(**)
+
     input    = %(<input name="page" type="number" min="1" max="#{last}" value="#{@page}" aria-current="page" ) +
                %(style="text-align: center; width: #{@page.to_s.length + 1}rem; padding: 0; border-radius: .25rem; ) +
                %(border: none; display: inline-block;" class="page-link active">#{A_TAG})
+
     html     = %(<ul class="#{classes}">#{
                  bootstrap_html_for(:previous, a_lambda)
                  }<li class="page-item"><label class="page-link">#{
@@ -19,6 +21,7 @@ class Pagy
                  }</label></li>#{
                  bootstrap_html_for(:next, a_lambda)
                  }</ul>)
+
     wrap_input_nav_js(html, 'pagy-bootstrap input-nav-js', **)
   end
 end

data/lib/pagy/toolbox/helpers/bootstrap/series_nav.rb

@@ -9,7 +9,8 @@ class Pagy
   # Pagination for bootstrap: it returns the html with the series of links to the pages
   def bootstrap_series_nav(classes: 'pagination', **)
     a_lambda = a_lambda(**)
-    html     = %(<ul class="#{classes}">#{bootstrap_html_for(:previous, a_lambda)})
+
+    html = %(<ul class="#{classes}">#{bootstrap_html_for(:previous, a_lambda)})
     series(**).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
       html << case item
               when Integer
@@ -24,6 +25,7 @@ class Pagy
               end
     end
     html << %(#{bootstrap_html_for(:next, a_lambda)}</ul>)
+
     wrap_series_nav(html, 'pagy-bootstrap series-nav', **)
   end
 end

data/lib/pagy/toolbox/helpers/bootstrap/series_nav_js.rb

@@ -9,6 +9,7 @@ class Pagy
   # Javascript pagination for bootstrap: it returns a nav with a data-pagy attribute used by the pagy.js file
   def bootstrap_series_nav_js(classes: 'pagination', **)
     a_lambda = a_lambda(**)
+
     tokens   = { before:  %(<ul class="#{classes}">#{bootstrap_html_for(:previous, a_lambda)}),
                  anchor:  %(<li class="page-item">#{a_lambda.(PAGE_TOKEN, LABEL_TOKEN, classes: 'page-link')}</li>),
                  current: %(<li class="page-item active"><a role="link" class="page-link" ) +
@@ -16,6 +17,7 @@ class Pagy
                  gap:     %(<li class="page-item gap disabled"><a role="link" class="page-link" aria-disabled="true">#{
                             I18n.translate('pagy.gap')}</a></li>),
                  after:   %(#{bootstrap_html_for(:next, a_lambda)}</ul>) }
+
     wrap_series_nav_js(tokens, 'pagy-bootstrap series-nav-js', **)
   end
 end

data/lib/pagy/toolbox/helpers/bulma/input_nav_js.rb

@@ -9,13 +9,16 @@ class Pagy
   # Javascript combo pagination for bulma: it returns a nav with a data-pagy attribute used by the pagy.js file
   def bulma_input_nav_js(classes: 'pagination', **)
     a_lambda = a_lambda(**)
+
     input    = %(<input name="page" type="number" min="1" max="#{@last}" value="#{@page}" aria-current="page") +
                %(style="text-align: center; width: #{@page.to_s.length + 1}rem; line-height: 1.2rem; ) +
                %(border: none; border-radius: .25rem; padding: .0625rem; color: white; ) +
                %(background-color: #485fc7;">#{A_TAG})
+
     html     = %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)}<li class="pagination-link"><label>#{
                  I18n.translate('pagy.input_nav_js', page_input: input, pages: @last)
                  }</label></li>#{bulma_html_for(:next, a_lambda)}</ul>)
+
     wrap_input_nav_js(html, "pagy-bulma input-nav-js #{classes}", **)
   end
 end

data/lib/pagy/toolbox/helpers/bulma/series_nav.rb

@@ -9,7 +9,8 @@ class Pagy
   # Pagination for bulma: it returns the html with the series of links to the pages
   def bulma_series_nav(classes: 'pagination', **)
     a_lambda = a_lambda(**)
-    html     = %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)})
+
+    html = %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)})
     series(**).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
       html << case item
               when Integer
@@ -23,6 +24,7 @@ class Pagy
               end
     end
     html << %(#{bulma_html_for(:next, a_lambda)}</ul>)
+
     wrap_series_nav(html, "pagy-bulma series-nav #{classes}", **)
   end
 end

data/lib/pagy/toolbox/helpers/bulma/series_nav_js.rb

@@ -9,12 +9,14 @@ class Pagy
   # Javascript pagination for bulma: it returns a nav with a data-pagy attribute used by the Pagy.nav javascript
   def bulma_series_nav_js(classes: 'pagination', **)
     a_lambda = a_lambda(**)
+
     tokens   = { before:  %(<ul class="pagination-list">#{bulma_html_for(:previous, a_lambda)}),
                  anchor:  %(<li>#{a_lambda.(PAGE_TOKEN, LABEL_TOKEN, classes: 'pagination-link')}</li>),
                  current: %(<li><a role="link" class="pagination-link is-current" ) +
                           %(aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
                  gap:     %(<li><span class="pagination-ellipsis">#{I18n.translate('pagy.gap')}</span></li>),
                  after:   %(#{bulma_html_for(:next, a_lambda)}</ul>) }
+
     wrap_series_nav_js(tokens, "pagy-bulma series-nav-js #{classes}", **)
   end
 end

data/lib/pagy/toolbox/helpers/data_hash.rb

@@ -6,8 +6,9 @@ class Pagy
 
   # Generate a hash of the wanted internal data
   def data_hash(data_keys: @options[:data_keys] || DEFAULT_DATA_KEYS, **)
-    template   = compose_page_url(PAGE_TOKEN, **)
-    to_url     = ->(page) { template.sub(PAGE_TOKEN, page.to_s) if page }
+    template = compose_page_url(PAGE_TOKEN, **)
+    to_url   = ->(page) { template.sub(PAGE_TOKEN, page.to_s) if page }
+
     data_keys -= %i[count limit] if calendar?
 
     data_keys.each_with_object({}) do |key, data|

data/lib/pagy/toolbox/helpers/input_nav_js.rb

@@ -8,11 +8,13 @@ class Pagy
     return send(:"#{style}_input_nav_js", **) if style
 
     a_lambda = a_lambda(**)
-    input    = %(<input name="page" type="number" min="1" max="#{@last}" value="#{@page}" aria-current="page" ) +
-               %(style="text-align: center; width: #{@page.to_s.length + 1}rem; padding: 0;">#{A_TAG})
-    html     = %(#{previous_tag(a_lambda)}<label>#{
-                 I18n.translate('pagy.input_nav_js', page_input: input, pages: @last)}</label>#{
-                 next_tag(a_lambda)})
+
+    input = %(<input name="page" type="number" min="1" max="#{@last}" value="#{@page}" aria-current="page" ) +
+            %(style="text-align: center; width: #{@page.to_s.length + 1}rem; padding: 0;">#{A_TAG})
+
+    html  = %(#{previous_tag(a_lambda)}<label>#{
+              I18n.translate('pagy.input_nav_js', page_input: input, pages: @last)}</label>#{
+              next_tag(a_lambda)})
 
     wrap_input_nav_js(html, 'pagy input-nav-js', **)
   end

data/lib/pagy/toolbox/helpers/limit_tag_js.rb

@@ -9,7 +9,8 @@ class Pagy
 
     limit_input = %(<input name="limit" type="number" min="1" max="#{client_max_limit}" value="#{
                     @limit}" style="padding: 0; text-align: center; width: #{@limit.to_s.length + 1}rem;">#{A_TAG})
-    url_token   = compose_page_url(PAGE_TOKEN, limit: LIMIT_TOKEN)
+
+    url_token = compose_page_url(PAGE_TOKEN, limit: LIMIT_TOKEN)
 
     %(<span#{%( id="#{id}") if id} class="pagy limit-tag-js" #{
       data_pagy_attribute(:ltj, @from, url_token, PAGE_TOKEN, LIMIT_TOKEN)

data/lib/pagy/toolbox/helpers/series_nav.rb

@@ -8,9 +8,9 @@ class Pagy
     return send(:"#{style}_series_nav", **) if style
 
     a_lambda = a_lambda(**)
-    html     = previous_tag(a_lambda)
-    series(**).each do |item|
-      # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+
+    html = previous_tag(a_lambda)
+    series(**).each do |item|   # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
       html << case item
               when Integer
                 a_lambda.(item)

data/lib/pagy/toolbox/helpers/support/a_lambda.rb

@@ -24,10 +24,12 @@ class Pagy
                 info_key = count.zero? ? 'pagy.info_tag.no_items' : 'pagy.info_tag.single_page'
                 %( title="#{I18n.translate(info_key, item_name: I18n.translate('pagy.item_name', count:), count:)}")
               end
-      rel   = case page
-              when @previous then %( rel="prev")
-              when @next     then %( rel="next")
-              end
+
+      rel = case page
+            when @previous then %( rel="prev")
+            when @next     then %( rel="next")
+            end
+
       %(#{left}#{page}#{right}#{title}#{
         %( class="#{classes}") if classes}#{rel}#{%( aria-label="#{aria_label}") if aria_label}>#{text}</a>)
     end

data/lib/pagy/toolbox/helpers/support/data_pagy_attribute.rb

@@ -9,7 +9,12 @@ class Pagy
 
   # Compose the data-pagy attribute, with the base64 encoded JSON-serialized args. Use the faster oj gem if defined.
   def data_pagy_attribute(*args)
-    data = defined?(Oj) ? Oj.dump(args, mode: :compat) : JSON.dump(args)
+    data = if defined?(Oj)
+             Oj.dump(args, mode: :compat)
+           else
+             JSON.dump(args)
+           end
+
     %(data-pagy="#{B64.encode(data)}")
   end
 end

data/lib/pagy/toolbox/helpers/support/nav_aria_label_attribute.rb

@@ -5,8 +5,7 @@ class Pagy
   private
 
   # Compose the aria label attribute for the nav
-  def nav_aria_label_attribute(aria_label: nil)
-    aria_label ||= I18n.translate('pagy.aria_label.nav', count: @last)
+  def nav_aria_label_attribute(aria_label: I18n.translate('pagy.aria_label.nav', count: @last))
     %(aria-label="#{aria_label}")
   end
 end

data/lib/pagy/toolbox/helpers/support/series.rb

@@ -7,8 +7,7 @@ class Pagy
 
   # Return the array of page numbers and :gap e.g. [1, :gap, 8, "9", 10, :gap, 36]
   def series(slots: @options[:slots] || SERIES_SLOTS, compact: @options[:compact], **)
-    raise OptionError.new(self, :slots, 'to be an Integer >= 0', slots) \
-          unless slots.is_a?(Integer) && slots >= 0
+    raise OptionError.new(self, :slots, 'to be an Integer >= 0', slots) unless slots.is_a?(Integer) && slots >= 0
     return [] if slots.zero?
 
     [].tap do |series|

data/lib/pagy/toolbox/helpers/support/wrap_series_nav.rb

@@ -12,6 +12,7 @@ class Pagy
   # Build the nav tag, with the specific inner html for the style
   def wrap_series_nav(html, nav_classes, id: nil, aria_label: nil, **)
     data = %( #{data_pagy_attribute(:k, @update)}) if keynav?
+
     %(<nav#{%( id="#{id}") if id} class="#{nav_classes}" #{nav_aria_label_attribute(aria_label:)}#{data}>#{html}</nav>)
   end
 end

data/lib/pagy/toolbox/helpers/support/wrap_series_nav_js.rb

@@ -20,13 +20,18 @@ class Pagy
 
   # Support for the Calendar API
   def page_labels(series)
-    series.map { |s| s.map { |item| item == :gap ? :gap : page_label(item) } } if calendar?
+    return unless calendar?
+
+    series.map do |s|
+      s.map { _1 == :gap ? :gap : page_label(_1) }
+    end
   end
 
   # Build the nav_js tag, with the specific tokens for the style
   def wrap_series_nav_js(tokens, nav_classes, id: nil, aria_label: nil, **)
-    sequels = sequels(**)
+    sequels     = sequels(**)
     nav_classes = "pagy-rjs #{nav_classes}" if sequels[0].size > 1
+
     %(<nav#{%( id="#{id}") if id} class="#{nav_classes}" #{
       nav_aria_label_attribute(aria_label:)} #{
       data = [:snj, tokens.values, PAGE_TOKEN, sequels]

data/lib/pagy/toolbox/paginators/calendar.rb

@@ -8,8 +8,10 @@ class Pagy
     def paginate(context, collection, config)
       context.instance_eval do
         allowed_options = Calendar::UNITS + %i[offset disabled request]
-        raise ArgumentError, "keys must be in #{allowed_options.inspect}" \
-              unless config.is_a?(Hash) && (config.keys - allowed_options).empty?
+
+        unless config.is_a?(Hash) && (config.keys - allowed_options).empty?
+          raise ArgumentError, "keys must be in #{allowed_options.inspect}"
+        end
 
         config[:offset] ||= {}
 

data/lib/pagy/toolbox/paginators/countish.rb

@@ -15,8 +15,8 @@ class Pagy
         options[:page]     = page
       end
 
-      setup_options(count, epoch, collection, options)
       options[:limit] = options[:request].resolve_limit
+      setup_options(count, epoch, collection, options)
 
       pagy = Offset::Countish.new(**options)
       [pagy, pagy.records(collection)]
@@ -24,13 +24,12 @@ class Pagy
 
     # Get the count from the page and set epoch when ttl (Time To Live) requires it
     def setup_options(count, epoch, collection, options)
-      now = Time.now.to_i
+      now     = Time.now.to_i
+      ongoing = !options[:ttl] || (epoch && epoch <= now && now < (epoch + options[:ttl]))
 
-      if !options[:count] && count && (!options[:ttl] ||
-         (epoch && epoch <= now && now < (epoch + options[:ttl]))) # ongoing
+      if !options[:count] && count && ongoing
         options[:count] = count
         options[:epoch] = epoch if options[:ttl]
-
       else # recount
         options[:count] ||= Countable.get_count(collection, options)
         options[:epoch]   = now if options[:ttl]

data/lib/pagy/toolbox/paginators/elasticsearch_rails.rb

@@ -12,6 +12,7 @@ class Pagy
 
         Searcher.wrap(search, options) do
           model, query_or_payload, search_options = search
+
           search_options[:size] = options[:limit]
           search_options[:from] = options[:limit] * ((options[:page] || 1) - 1)
 

data/lib/pagy/toolbox/paginators/keyset.rb

@@ -8,8 +8,8 @@ class Pagy
     def paginate(set, options)
       options[:page] ||= options[:request].resolve_page(force_integer: false) # allow nil
       options[:limit]  = options[:request].resolve_limit
-      pagy             = Keyset.new(set, **options)
 
+      pagy = Keyset.new(set, **options)
       [pagy, pagy.records]
     end
   end

data/lib/pagy/toolbox/paginators/meilisearch.rb

@@ -12,6 +12,7 @@ class Pagy
 
         Searcher.wrap(search, options) do
           model, term, search_options    = search
+
           search_options[:hits_per_page] = options[:limit]
           search_options[:page]          = options[:page]
 

data/lib/pagy/toolbox/paginators/searchkick.rb

@@ -12,8 +12,9 @@ class Pagy
 
         Searcher.wrap(search, options) do
           model, term, search_options, block = search
-          search_options[:per_page]          = options[:limit]
-          search_options[:page]              = options[:page]
+
+          search_options[:per_page] = options[:limit]
+          search_options[:page]     = options[:page]
 
           method          = options[:search_method] || Searchkick::DEFAULT[:search_method]
           results         = model.send(method, term || '*', **search_options, &block)

data/lib/pagy.rb

@@ -8,7 +8,7 @@ require_relative 'pagy/toolbox/helpers/loader'
 
 # Top superclass: it defines only what's common to all the subclasses
 class Pagy
-  VERSION     = '43.2.6'
+  VERSION     = '43.2.7'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = EscapedValue.new('P ')
@@ -49,8 +49,13 @@ class Pagy
   # Validates and assign the passed options: they must be present and value.to_i must be >= min
   def assign_and_check(name_min)
     name_min.each do |name, min|
-      raise OptionError.new(self, name, ">= #{min}", @options[name]) \
-            unless @options[name].respond_to?(:to_i) && instance_variable_set(:"@#{name}", @options[name].to_i) >= min
+      value = @options[name]
+
+      if value.respond_to?(:to_i) && (integer = value.to_i) >= min
+        instance_variable_set(:"@#{name}", integer)
+      else
+        raise OptionError.new(self, name, ">= #{min}", value)
+      end
     end
   end
 
@@ -59,10 +64,13 @@ class Pagy
     @request = options.delete(:request) # internal object
     default  = {}
     current  = self.class
+
     begin
       default = current::DEFAULT.merge(default)
       current = current.superclass
     end until current == Object  # rubocop:disable Lint/Loop  -- see https://github.com/rubocop/rubocop-performance/issues/362
-    @options = default.merge!(options.delete_if { |k, v| default.key?(k) && (v.nil? || v == '') }).freeze
+
+    clean_options = options.delete_if { |k, v| default.key?(k) && (v.nil? || v == '') }
+    @options      = default.merge!(clean_options).freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 43.2.6
+  version: 43.2.7
 platform: ruby
 authors:
 - Domizio Demichelis