pagy 43.2.4 → 43.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb42c6368e3fa431f97d6be3b7f89122ae7b3e4cf2bff5748fb7ea978c2382b
-  data.tar.gz: 465601dc8f911ef033ca3aa18dc714515c840a2cf8fdcd005fc2e82be99b9d96
+  metadata.gz: 0e875b9703ce63e0ea0fb713757bebbb752f17a80b7414e8b88ef1abbc9d3446
+  data.tar.gz: e6ea0a3dfcae811e97dd851c00ecb5089c4700d70763c6ef37112486bf129d97
 SHA512:
-  metadata.gz: 59459274129f2b25073ccdaf5bc1bd0323f5cfa95fefb69121e51e08e6ad84254524e4c708cea293920bc693187fff0806244d82d497d44513d97463aa2e2647
-  data.tar.gz: 1c2b1356ec82ce9a582f2ea75bcb9e7340ec9d3ff6f190858b2af039d3f361c350d779db5e170003318624af3c53c974c00cf5865eb0915318dca8da576da59a
+  metadata.gz: 5da60ae142b168c6f0d465a88fa7938fd23c9bb832fb4da5afcb2bd87d113238796bb1a01f37a304db4a0d77e90b59ad10847ac33403dd596f8c02a8d6a38f60
+  data.tar.gz: 0a914f93b8d74895ce872812f50e7d5f9a883f0fc848bb077f452a389817078ace734cdbb1592d0aaab43f4fb4dff948732a16b4b11dd1a9bbdebf7a163f417b

data/apps/calendar.ru

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

data/apps/enable_rails_page_segment.rb

@@ -28,13 +28,17 @@ require_relative '../lib/pagy/modules/abilities/linkable'
 class Pagy
   # Switch to the `request.params` to get access to rails-added path parameters
   module RequestOverride
-    def get_params(request) = request.params
+    def get_params(request)
+      request.params
+    end
   end
   Request.prepend RequestOverride
 
   # Inject the caller context into the Pagy instance
   module MethodOverride
-    def pagy(...) = super.tap { |result| result[0].instance_variable_set(:@context, self) }
+    def pagy(...)
+      super.tap { _1[0].instance_variable_set(:@context, self) }
+    end
   end
   Method.prepend MethodOverride
 

data/apps/keynav+root_key.ru

@@ -16,7 +16,7 @@
 # URL
 #    http://127.0.0.1:8000
 
-VERSION = '43.2.4'
+VERSION = '43.2.5'
 
 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.4'
+VERSION = '43.2.5'
 
 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.4'
+VERSION = '43.2.5'
 
 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.4'
+VERSION = '43.2.5'
 
 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.4'
+VERSION = '43.2.5'
 
 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.4'
+VERSION = '43.2.5'
 
 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.4)
+# Pagy initializer file (43.2.5)
 # See https://ddnexus.github.io/pagy/resources/initializer/
 
 ############ Global Options ################################################################

data/javascripts/pagy.js

@@ -126,7 +126,7 @@ window.Pagy = (() => {
     });
   };
   return {
-    version: "43.2.4",
+    version: "43.2.5",
     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=5554FC8F70F87D9964756E2164756E21
+//# debugId=9616AB509F644C8D64756E2164756E21
 //# 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.4\",\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.5\",\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": "5554FC8F70F87D9964756E2164756E21",
+  "debugId": "9616AB509F644C8D64756E2164756E21",
   "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.4",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.5",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.4",
+    version: "43.2.5",
     init(arg) {
       const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
       for (const element of elements) {

data/lib/pagy/classes/calendar/calendar.rb

@@ -36,26 +36,25 @@ class Pagy
       private
 
       # Return calendar, from, to
-      def init(...)
-        new.send(:init, ...)
-      end
+      def init(...) = new.send(:init, ...)
     end
 
     # Return the current time of the smallest time unit shown
-    def showtime
-      self[@units.last].from
-    end
+    def showtime = self[@units.last].from
 
     # Return the url for the calendar (shortest unit) page at time
     def url_at(time, **)
-      conf      = Marshal.load(Marshal.dump(@conf))
       page_keys = {}
-      @units.inject(nil) do |object, unit|
-        conf[unit][:period]  = object&.send(:active_period) || @period
-        conf[unit][:page]    = page_keys["#{unit}_#{@page_key}"] \
-                             = create(unit, **conf[unit]).send(:page_at, time, **)
-        conf[unit][:querify] = ->(params) { params.merge!(page_keys) }
-        create(unit, **conf[unit])
+
+      @units.inject(nil) do |parent, unit|
+        unit_conf          = @conf[unit]
+        unit_conf[:period] = parent&.send(:active_period) || @period
+        unit_conf[:page]   = page = create(unit, **unit_conf).send(:page_at, time, **)
+
+        page_keys["#{unit}_#{@page_key}"] = page
+        unit_conf[:querify] = ->(params) { params.merge!(page_keys) }
+
+        create(unit, **unit_conf)
       end.send(:compose_page_url, 1, **)
     end
 
@@ -63,34 +62,41 @@ class Pagy
 
     # Create the calendar
     def init(conf, period, params)
-      @conf     = Marshal.load(Marshal.dump(conf)) # store a copy
-      @units    = Calendar::UNITS & @conf.keys # get the units in time length desc order
+      @conf     = conf
+      @units    = Calendar::UNITS & conf.keys # get the units in time length desc order
       @period   = period
       @params   = params
       @page_key = conf[:offset][:page_key] || DEFAULT[:page_key]
+
       # set all the :page_key options for later deletion
       @units.each { |unit| conf[unit][:page_key] = "#{unit}_#{@page_key}" }
-      calendar = {}
-      object   = nil
+
+      calendar    = {}
+      unit_object = nil
+
       @units.each_with_index do |unit, index|
-        params_to_delete     = @units[(index + 1), @units.length].map { |sub| conf[sub][:page_key] } + [@page_key]
-        conf[unit][:querify] = ->(up) { up.except!(*params_to_delete.map(&:to_s)) }
-        conf[unit][:period]  = object&.send(:active_period) || @period
-        conf[unit][:page]    = @params["#{unit}_#{@page_key}"] # requested page
+        params_to_delete    = @units[(index + 1)..].map { conf[_1][:page_key] } + [@page_key]
+        unit_conf           = conf[unit]
+        unit_conf[:querify] = ->(up) { up.except!(*params_to_delete.map(&:to_s)) }
+        unit_conf[:period]  = unit_object&.send(:active_period) || @period
+        unit_conf[:page]    = @params[unit_conf[:page_key]] # requested page
         # :nocov:
         # simplecov doesn't need to fail block_given?
-        conf[unit][:counts] = yield(unit, conf[unit][:period]) if block_given?
+        unit_conf[:counts] = yield(unit, unit_conf[:period]) if block_given?
         # :nocov:
-        calendar[unit] = object = create(unit, **conf[unit])
+        calendar[unit] = unit_object = create(unit, **unit_conf)
       end
-      [replace(calendar), object.from, object.to]
+
+      [replace(calendar), unit_object.from, unit_object.to]
     end
 
     # Create a unit subclass instance by using the unit name (internal use)
     def create(unit, **)
       raise InternalError, "unit must be in #{UNITS.inspect}; got #{unit}" unless UNITS.include?(unit)
 
-      Pagy::Calendar.const_get(unit.to_s.capitalize).new(**, request: @conf[:request])
+      unit_class = Pagy::Calendar.const_get(unit.to_s.capitalize)
+
+      unit_class.new(**, request: @conf[:request])
     end
   end
 end

data/lib/pagy/classes/calendar/unit.rb

@@ -21,7 +21,10 @@ class Pagy
         assign_options(**)
         assign_and_check(page: 1)
         assign_unit_variables
-        return unless in_range? { @page <= @last }
+        unless in_range? { @page <= @last }
+          assign_empty_page_variables
+          return
+        end
 
         assign_previous_and_next
       end

data/lib/pagy/classes/exceptions.rb

@@ -10,6 +10,7 @@ class Pagy
       @pagy   = pagy
       @option = option
       @value  = value
+
       super("expected :#{@option} #{description}; got #{@value.inspect}")
     end
   end

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

@@ -13,7 +13,9 @@ class Pagy
         end
 
         # Get the keyset attributes from a record
-        def keyset_attributes_from(record) = record.slice(*@keyset.keys)
+        def keyset_attributes_from(record)
+          record.slice(*@keyset.keys)
+        end
 
         # Get the hash of quoted keyset identifiers
         def quoted_identifiers(table)

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

@@ -22,7 +22,9 @@ class Pagy
         end
 
         # Get the keyset attributes from a record
-        def keyset_attributes_from(record) = record.to_hash.slice(*@keyset.keys)
+        def keyset_attributes_from(record)
+          record.to_hash.slice(*@keyset.keys)
+        end
 
         # Get the hash of quoted keyset identifiers
         def quoted_identifiers(table)

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

@@ -52,6 +52,7 @@ class Pagy
         else
           @page = @last = 1
         end
+
         @update = [storage_key, @options[:root_key], @options[:page_key]]
       end
 
@@ -62,11 +63,13 @@ class Pagy
         # Compound predicate for visited pages
         predicate = +''
         arguments = {}
+
         if @prior_cutoff # not the first page
           # Include the records after @prior_cutoff
           predicate << "(#{compose_predicate(PRIOR_PREFIX)}) AND "
           arguments.merge!(arguments_from(@prior_cutoff, PRIOR_PREFIX))
         end
+
         # Exclude the records after @page_cutoff
         predicate << "NOT (#{compose_predicate(PAGE_PREFIX)})"
         arguments.merge!(arguments_from(@page_cutoff, PAGE_PREFIX))

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

@@ -13,7 +13,7 @@ class Pagy
       autoload :Sequel,       path.join('adapters/sequel')
     end
 
-    autoload :Keynav,  Pathname.new(__dir__).join('keynav')
+    autoload :Keynav, Pathname.new(__dir__).join('keynav')
 
     # Define empty subclasses to allow specific typing without triggering autoload
     class ActiveRecord < self; end
@@ -27,28 +27,24 @@ class Pagy
       if /::(?:ActiveRecord|Sequel)$/.match?(name)
         # Ensure the adapter is mixed in (lazy load)
         mix_in_adapter(name.split('::').last)
-        return allocate.tap { |instance| instance.send(:initialize, set, **) }
+        return allocate.tap { _1.send(:initialize, set, **) }
       end
 
       # 2. Handle Factory usage (Pagy::Keyset.new)
-      orm_name = if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
-                   :ActiveRecord
-                 elsif defined?(::Sequel) && set.is_a?(::Sequel::Dataset)
-                   :Sequel
-                 else
-                   raise TypeError, "expected an ActiveRecord::Relation or Sequel::Dataset; got #{set.class}"
-                 end
-
-      # Get the specific subclass (self::ActiveRecord)
-      subclass = const_get(orm_name)
-      # Ensure the adapter is mixed in (lazy load)
-      subclass.mix_in_adapter(orm_name)
-      subclass.new(set, **)
+      adapter = if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
+                  :ActiveRecord
+                elsif defined?(::Sequel) && set.is_a?(::Sequel::Dataset)
+                  :Sequel
+                else
+                  raise TypeError, "expected an ActiveRecord::Relation or Sequel::Dataset; got #{set.class}"
+                end
+
+      const_get(adapter).tap { _1.mix_in_adapter(adapter) }.new(set, **)
     end
 
     # Helper to lazy-include the adapter module
-    def self.mix_in_adapter(orm_name)
-      adapter_module = Pagy::Keyset::Adapters.const_get(orm_name)
+    def self.mix_in_adapter(adapter)
+      adapter_module = Adapters.const_get(adapter)
       include(adapter_module) unless self < adapter_module
     end
 

data/lib/pagy/classes/offset/countless.rb

@@ -34,7 +34,11 @@ class Pagy
       def finalize(fetched_size)
         # empty records (trigger the right info message for known 0 count)
         @count = 0 if fetched_size.zero? && @page == 1
-        return self unless in_range? { fetched_size.positive? || @page == 1 }
+
+        unless in_range? { fetched_size.positive? || @page == 1 }
+          assign_empty_page_variables
+          return self
+        end
 
         past  = @last && @page < @last # current page is before the known last page
         more  = fetched_size > @limit  # more pages after this one
@@ -43,6 +47,7 @@ class Pagy
         @from = @in.zero? ? 0 : @offset + 1
         @to   = @offset + @in
         assign_previous_and_next
+
         self
       end
 
@@ -55,7 +60,9 @@ class Pagy
       end
 
       # Support easy countless page param overriding (for legacy param and behavior)
-      def compose_page_param(page) = EscapedValue.new("#{page || 1}+#{@last}")
+      def compose_page_param(page)
+        EscapedValue.new("#{page || 1}+#{@last}")
+      end
     end
   end
 end

data/lib/pagy/classes/offset/offset.rb

@@ -19,11 +19,16 @@ class Pagy
       assign_and_check(limit: 1, count: 0, page: 1)
       assign_last
       assign_offset
-      return unless in_range? { @page <= @last }
+
+      unless in_range? { @page <= @last }
+        assign_empty_page_variables
+        return
+      end
 
       @from = [@offset + 1, @count].min
       @to   = [@offset + @limit, @count].min
       @in   = [@to - @from + 1, @count].min
+
       assign_previous_and_next
     end
 

data/lib/pagy/classes/request.rb

@@ -13,6 +13,7 @@ class Pagy
         else
           [request.base_url, request.path, get_params(request), request.cookies['pagy']]
         end
+      freeze
     end
 
     attr_reader :base_url, :path, :params, :cookie
@@ -25,15 +26,18 @@ class Pagy
 
     def resolve_limit
       limit_key = @options[:limit_key] || DEFAULT[:limit_key]
-      return @options[:limit] || DEFAULT[:limit] \
-             unless @options[:client_max_limit] &&
-                    (requested_limit = @params.dig(@options[:root_key], limit_key) || @params[limit_key])
+      default   = @options[:limit] || DEFAULT[:limit]
+      max_limit = @options[:client_max_limit]
+      return default unless max_limit
 
-      [requested_limit.to_i, @options[:client_max_limit]].min
+      limit = @params.dig(@options[:root_key], limit_key) || @params[limit_key]
+      limit ? [limit.to_i, max_limit].min : default
     end
 
     private
 
-    def get_params(request) = request.GET.merge(request.POST).to_h
+    def get_params(request)
+      request.GET.merge(request.POST).to_h.freeze
+    end
   end
 end

data/lib/pagy/modules/abilities/countable.rb

@@ -17,6 +17,7 @@ class Pagy
               else
                 collection.count(:all)
               end
+
       count.is_a?(Hash) ? count.size : count
     end
   end

data/lib/pagy/modules/abilities/linkable.rb

@@ -43,21 +43,28 @@ class Pagy
 
     # Return the URL for the page, relying on the Pagy::Request
     def compose_page_url(page, **options)
-      root_key, page_key, limit_key, client_max_limit, limit, querify, absolute, path, fragment =
-        @options.merge(options)
-                .values_at(:root_key, :page_key, :limit_key, :client_max_limit, :limit, :querify, :absolute, :path, :fragment)
-      params = @request.params.clone(freeze: false)
-      (root_key ? params[root_key] = params[root_key]&.clone(freeze: false) || {} : params).tap do |h|
-        { page_key  => compose_page_param(page),
-          limit_key => client_max_limit && limit }.each { |k, v| v ? h[k] = v : h.delete(k) }
+      opts      = @options.merge(options)
+      params    = @request.params.clone(freeze: false)
+      root_key  = opts[:root_key]
+      container = if root_key
+                    params[root_key] = params[root_key]&.clone(freeze: false) || {}
+                  else
+                    params
+                  end
+
+      { opts[:page_key]  => compose_page_param(page),
+        opts[:limit_key] => opts[:client_max_limit] && opts[:limit] }.each do |k, v|
+        v ? container[k] = v : container.delete(k)
       end
-      querify&.(params) # Must modify the params: the returned value is ignored
-      fragment &&= "##{fragment.delete_prefix('#')}"
-      compose_url(absolute, path, params, fragment)
+
+      opts[:querify]&.(params) # Must modify the params: the returned value is ignored
+      fragment = opts[:fragment].to_s.sub(/\A(?=[^#])/, '#') # conditionally prepend '#'
+
+      compose_url(opts[:absolute], opts[:path], params, fragment)
     end
 
     def compose_url(absolute, path, params, fragment)
-      query_string = QueryUtils.build_nested_query(params).sub(/\A(?=.)/, '?')
+      query_string = QueryUtils.build_nested_query(params).sub(/\A(?=.)/, '?') # conditionally prepend '?'
       "#{@request.base_url if absolute}#{path || @request.path}#{query_string}#{fragment}"
     end
   end

data/lib/pagy/modules/abilities/rangeable.rb

@@ -9,7 +9,6 @@ class Pagy
       return true if (@in_range = yield)
       raise RangeError.new(self, :page, "in 1..#{@last}", @page) if @options[:raise_range_error]
 
-      assign_empty_page_variables
       @in_range = false
     end
   end

data/lib/pagy/modules/b64.rb

@@ -5,14 +5,19 @@ class Pagy
   module B64
     module_function
 
-    def encode(bin) = [bin].pack('m0')
+    def encode(bin)
+      [bin].pack('m0')
+    end
 
-    def decode(str) = str.unpack1('m0')
+    def decode(str)
+      str.unpack1('m0')
+    end
 
     def urlsafe_encode(bin)
       str = encode(bin)
       str.chomp!('==') or str.chomp!('=')
       str.tr!('+/', '-_')
+
       str
     end
 
@@ -23,6 +28,7 @@ class Pagy
       else
         str = str.tr('-_', '+/')
       end
+
       decode(str)
     end
   end

data/lib/pagy/modules/console.rb

@@ -9,16 +9,25 @@ class Pagy
         @collection = clone
       end
 
-      def offset(value) = tap { @collection = self[value..] }
-      def limit(value)  = @collection[0, value]
-      def count(*)      = size
+      def offset(value)
+        tap { @collection = self[value..] }
+      end
+
+      def limit(value)
+        @collection[0, value]
+      end
+
+      def count(*) = size
     end
 
     include Method
 
-    # Direct reference to request.params via a method
-    def request    = @request ||= { base_url: 'http://www.example.com', path: '/path', params: { example: '123' } }
-    def params     = request[:params]
+    def request
+      @request ||= { base_url: 'http://www.example.com', path: '/path', params: { example: '123' } }
+    end
+
+    def params = request[:params]
+
     def collection = Collection
   end
 end

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

@@ -8,15 +8,22 @@ class Pagy
   module I18n
     extend self
 
-    def pathnames = @pathnames ||= [ROOT.join('locales')]
-    def locales   = @locales   ||= {}
+    def pathnames
+      @pathnames ||= [ROOT.join('locales')]
+    end
+
+    def locales
+      @locales   ||= {}
+    end
 
     # Store the variable for the duration of a single request
     def locale=(value)
-      Thread.current[:pagy_locale] = value
+      Thread.current[:pagy_locale] = value.to_s
     end
 
-    def locale = Thread.current[:pagy_locale] || 'en'
+    def locale
+      Thread.current[:pagy_locale] || 'en'
+    end
 
     # Translate and pluralize the key with the locale entries
     def translate(key, **options)

data/lib/pagy/modules/searcher.rb

@@ -6,12 +6,16 @@ class Pagy
     module_function
 
     # Common search logic
-    def wrap(pagy_search_args, options)
+    def wrap(search_arguments, options)
       options[:page] ||= options[:request].resolve_page
       options[:limit]  = options[:request].resolve_limit
-      pagy, results    = yield
-      calling          = pagy_search_args[4..]
-      [pagy, calling.empty? ? results : results.send(*calling)]
+
+      pagy, results = yield
+
+      arguments = search_arguments[4..]
+      results   = results.send(*arguments) unless arguments.empty?
+
+      [pagy, results]
     end
   end
 end

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

@@ -9,6 +9,7 @@ class Pagy
     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|
       value = case key
               when :url_template           then template

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

@@ -4,7 +4,7 @@ require_relative 'urls_hash'
 
 # Add pagination response headers
 class Pagy
-  DEFAULT_HEADERS_MAP = { page: 'current-page',
+  DEFAULT_HEADERS_MAP = { page:  'current-page',
                           limit: 'page-limit',
                           count: 'total-count',
                           pages: 'total-pages' }.freeze
@@ -12,6 +12,7 @@ class Pagy
   # Generate a hash of RFC-8288-compliant http headers
   def headers_hash(headers_map: @options[:headers_map] || DEFAULT_HEADERS_MAP, **)
     links = urls_hash(**, absolute: true).map { %(<#{_2}>; rel="#{_1}") }.join(', ')
+
     headers_map.each_with_object('link' => links) do |(key, name), hash|
       next unless name
 

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

@@ -13,6 +13,7 @@ class Pagy
                 else
                   'pagy.info_tag.multiple_pages'
                 end
+
     info_data = if @count.nil?
                   { page: @page, pages: @last }
                 else
@@ -21,6 +22,7 @@ class Pagy
                     from:      @from,
                     to:        @to }
                 end
+
     %(<span#{%( id="#{id}") if id} class="pagy info">#{I18n.translate(i18n_key, **info_data)}</span>)
   end
 end

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

@@ -13,6 +13,7 @@ class Pagy
     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
 end

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

@@ -11,6 +11,7 @@ class Pagy
              when :last           then @last
              else                      page
              end
+
     compose_page_url(target, **) if target || page == :first
   end
 end

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

@@ -23,6 +23,7 @@ class Pagy
               end
     end
     html << next_tag(a_lambda)
+
     wrap_series_nav(html, 'pagy series-nav', **)
   end
 end

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

@@ -13,6 +13,7 @@ class Pagy
                  current: %(<a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a>),
                  gap:     %(<a role="separator" aria-disabled="true">#{I18n.translate('pagy.gap')}</a>),
                  after:   next_tag(a_lambda) }
+
     wrap_series_nav_js(tokens, 'pagy series-nav-js', **)
   end
 end

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

@@ -12,15 +12,18 @@ class Pagy
               unless config.is_a?(Hash) && (config.keys - allowed_options).empty?
 
         config[:offset] ||= {}
+
         unless config[:disabled]
-          calendar, from, to =
-            Calendar.send(:init, config,
-                          pagy_calendar_period(collection),
-                          config[:request].params) do |unit, period|
-              pagy_calendar_counts(collection, unit, *period) if respond_to?(:pagy_calendar_counts)
-            end
+          period = pagy_calendar_period(collection)
+          params = config[:request].params
+
+          calendar, from, to = Calendar.send(:init, config, period, params) do |unit, unit_period|
+                                 pagy_calendar_counts(collection, unit, *unit_period) if respond_to?(:pagy_calendar_counts)
+                               end
+
           collection = pagy_calendar_filter(collection, from, to)
         end
+
         pagy, records = pagy(:offset, collection, **config[:offset])
         [calendar, pagy, records]
       end

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

@@ -9,26 +9,29 @@ class Pagy
     # Return the Offset::Countish instance and records
     def paginate(collection, options)
       options[:page] ||= options[:request].resolve_page(force_integer: false)
+
       if options[:page].is_a?(String)
         page, count, epoch = options[:page].split.map(&:to_i)
         options[:page]     = page
       end
+
       setup_options(count, epoch, collection, options)
       options[:limit] = options[:request].resolve_limit
-      pagy            = Offset::Countish.new(**options)
+
+      pagy = Offset::Countish.new(**options)
       [pagy, pagy.records(collection)]
     end
 
     # 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
+
       if !options[:count] && count && (!options[:ttl] ||
          (epoch && epoch <= now && now < (epoch + options[:ttl]))) # ongoing
-        # puts 'ongoing'
         options[:count] = count
         options[:epoch] = epoch if options[:ttl]
+
       else # recount
-        # puts 'recount'
         options[:count] ||= Countable.get_count(collection, options)
         options[:epoch]   = now if options[:ttl]
       end

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

@@ -7,13 +7,16 @@ class Pagy
     # Return the Offset::Countless instance and records
     def paginate(collection, options)
       options[:page] ||= options[:request].resolve_page(force_integer: false) # accept nil and strings
+
       if options[:page].is_a?(String)
-        page, last     = options[:page].split.map(&:to_i) # decoded '+' added by the compose_page_url
+        page, last     = options[:page].split.map(&:to_i) # ' ' separator, (encoded as '+' by Countless#compose_page_param)
         options[:page] = page
         options[:last] = last if last&.positive?
       end
+
       options[:limit] = options[:request].resolve_limit
-      pagy            = Offset::Countless.new(**options)
+
+      pagy = Offset::Countless.new(**options)
       [pagy, pagy.records(collection)]
     end
   end

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

@@ -8,22 +8,26 @@ class Pagy
 
     # Paginate from the search object
     def paginate(search, options)
-      if search.is_a?(Search::Arguments)
-        # The search is the array of pagy_search arguments
+      if search.is_a?(Search::Arguments)  # Active mode
+
         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)
-          response_object       = model.send(options[:search_method] || ElasticsearchRails::DEFAULT[:search_method],
-                                             query_or_payload, **search_options)
-          options[:count]       = total_count_from(response_object)
+
+          method          = options[:search_method] || ElasticsearchRails::DEFAULT[:search_method]
+          response_object = model.send(method, query_or_payload, **search_options)
+          options[:count] = total_count_from(response_object)
+
           [ElasticsearchRails.new(**options), response_object]
         end
-      else
+
+      else # Passive mode
         from, size      = pagination_params_from(search)
         options[:limit] = size
         options[:page]  = ((from || 0) / options[:limit]) + 1
         options[:count] = total_count_from(search)
+
         ElasticsearchRails.new(**options)
       end
     end
@@ -36,6 +40,7 @@ class Pagy
       from       = (container[:from] || container['from']).to_i
       size       = (container[:size] || container['size']).to_i
       size       = 10 if size.zero?
+
       [from, size]
     end
 
@@ -44,6 +49,7 @@ class Pagy
       total = response_object.instance_eval do
                 respond_to?(:response) ? response['hits']['total'] : raw_response['hits']['total']
               end
+
       total.is_a?(Hash) ? total['value'] : total
     end
   end

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

@@ -10,15 +10,17 @@ class Pagy
     # Fall back to :countless if the :page has no client data.
     def paginate(set, options)
       page = options[:request].resolve_page(force_integer: false) # allow nil
-      if page&.match(' ')       # countless page -> no augmentation -> fallback
-        return CountlessPaginator.paginate(set, page:, **options)
-      elsif page.is_a?(String)  # keynav page param
+
+      return CountlessPaginator.paginate(set, page:, **options) if page&.match(' ')  # countless fallback
+
+      if page.is_a?(String)  # keynav page param
         page_arguments = JSON.parse(B64.urlsafe_decode(page))
         # Restart the pagination from page 1/nil if the url has been requested from another browser
         options[:page] = page_arguments if options[:request].cookie == page_arguments.shift
       end
 
       options[:limit] = options[:request].resolve_limit
+
       pagy = Keyset::Keynav.new(set, **options)
       [pagy, pagy.records]
     end

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

@@ -8,7 +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

@@ -8,22 +8,25 @@ class Pagy
 
     # Paginate from the search object
     def paginate(search, options)
-      if search.is_a?(Search::Arguments)
-        # The search is the array of pagy_search arguments
+      if search.is_a?(Search::Arguments) # Active mode
+
         Searcher.wrap(search, options) do
           model, term, search_options    = search
           search_options[:hits_per_page] = options[:limit]
           search_options[:page]          = options[:page]
-          results                        = model.send(options[:search_method] || Meilisearch::DEFAULT[:search_method],
-                                                      term, search_options)
-          options[:count]                = results.raw_answer['totalHits']
+
+          method          = options[:search_method] || Meilisearch::DEFAULT[:search_method]
+          results         = model.send(method, term, search_options)
+          options[:count] = results.raw_answer['totalHits']
+
           [Meilisearch.new(**options), results]
         end
-      else
-        # The search is a meilisearch results object
+
+      else # Passive mode
         options[:limit] = search.raw_answer['hitsPerPage']
         options[:page]  = search.raw_answer['page']
         options[:count] = search.raw_answer['totalHits']
+
         Meilisearch.new(**options)
       end
     end

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

@@ -21,14 +21,16 @@ class Pagy
              protected
 
              define_method :pagy do |paginator = :offset, collection, **options|
-               arguments           = if paginator == :calendar
-                                       [self, collection, options]
-                                     else
-                                       [collection, options = Pagy.options.merge(options)]
-                                     end
+               arguments = if paginator == :calendar
+                             [self, collection, options]
+                           else
+                             [collection, options = Pagy.options.merge(options)]
+                           end
+
                options[:root_key]  = 'page' if options[:jsonapi] # enforce 'page' root_key for JSON:API
                options[:request] ||= request                     # user set request or self.request
                options[:request]   = Request.new(options)        # Pagy::Request
+
                Pagy.const_get(paginators[paginator]).paginate(*arguments)
              end
            end

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

@@ -11,8 +11,15 @@ class Pagy
       options[:page]  ||= options[:request].resolve_page
       options[:limit]   = options[:request].resolve_limit
       options[:count] ||= Countable.get_count(collection, options)
-      pagy = Offset.new(**options)
-      [pagy, collection.instance_of?(Array) ? collection[pagy.offset, pagy.limit] : pagy.records(collection)]
+
+      pagy    = Offset.new(**options)
+      records = if collection.instance_of?(Array)
+                  collection[pagy.offset, pagy.limit]
+                else
+                  pagy.records(collection)
+                end
+
+      [pagy, records]
     end
   end
 end

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

@@ -8,22 +8,25 @@ class Pagy
 
     # Paginate from the search object
     def paginate(search, options)
-      if search.is_a?(Search::Arguments)
-        # The search is the array of pagy_search arguments
+      if search.is_a?(Search::Arguments) # Active mode
+
         Searcher.wrap(search, options) do
           model, term, search_options, block = search
-          search_options[:per_page] = options[:limit]
-          search_options[:page]     = options[:page]
-          results                   = model.send(options[:search_method] || Searchkick::DEFAULT[:search_method],
-                                                 term || '*', **search_options, &block)
-          options[:count]           = results.total_count
+          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)
+          options[:count] = results.total_count
+
           [Searchkick.new(**options), results]
         end
-      else
-        # The search is a searchkick results object
+
+      else # Passive mode
         options[:limit] = search.respond_to?(:options) ? search.options[:per_page] : search.per_page
         options[:page]  = search.respond_to?(:options) ? search.options[:page]     : search.current_page
         options[:count] = search.total_count
+
         Searchkick.new(**options)
       end
     end

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.4'
+  VERSION     = '43.2.5'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = EscapedValue.new('P ')

metadata

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