pagy 5.10.1 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e572ea500131186f8bec5a83e4faa287d5da1c6d4f3e33105bdd6a566fdcee01
-  data.tar.gz: d531d964d6a73735b3d1ad7e1ec52b9c4955c273ee0631733e0a2ca495f1fd45
+  metadata.gz: 6c68a8e03b4bc9b681122283fd88234ee2b6015df3dd503a8de0478f4b182d80
+  data.tar.gz: a6a1a196507f61d0051317865bfe750100e3dc2a2be5baf2e00b12a17a353cd5
 SHA512:
-  metadata.gz: 74bbcfbd11270579d9200db50f5a87de7e39a76320cb379c5e895d491343bf04364b5c7ff8f17af14921f96185b58a76d526c4eebd288a7dbdf72b6888c0705e
-  data.tar.gz: 5a929cdf68d0d840f92cf97ebd57821578dc668f8c8a25db0c01e104b9f069a73b31cefe39b911a930c8b718137937d9cdb390f1c57cabd1d2bb3ba409a44312
+  metadata.gz: 76de8872aaae91bf28ab28e830e2a11539a34933641c36257725922aa6e4a1407d26ebbc766db956ed89fcf7184ee976ef08b16f4b47d0efc50d175dde85240e
+  data.tar.gz: b76a216ce49eb0904f933417492f7ede7e5833b23acd22603e3a08563aa71b8838ca378a80fe8eb46750ac9d69a03b1e9e348e42862d4cf5a5560f37310faeac

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2022 Domizio Demichelis
+Copyright (c) 2017-2023 Domizio Demichelis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/config/pagy.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (5.10.1)
+# Pagy initializer file (6.0.4)
 # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 
 
 # Pagy DEFAULT Variables
-# See https://ddnexus.github.io/pagy/api/pagy#variables
+# See https://ddnexus.github.io/pagy/docs/api/pagy#variables
 # All the Pagy::DEFAULT are set for all the Pagy instances but can be overridden per instance by just passing them to
 # Pagy.new|Pagy::Countless.new|Pagy::Calendar::*.new or any of the #pagy* controller methods
 
 
 # Instance variables
-# See https://ddnexus.github.io/pagy/api/pagy#instance-variables
+# See https://ddnexus.github.io/pagy/docs/api/pagy#instance-variables
 # Pagy::DEFAULT[:page]   = 1                                  # default
 # Pagy::DEFAULT[:items]  = 20                                 # default
 # Pagy::DEFAULT[:outset] = 0                                  # default
 
 
 # Other Variables
-# See https://ddnexus.github.io/pagy/api/pagy#other-variables
+# See https://ddnexus.github.io/pagy/docs/api/pagy#other-variables
 # Pagy::DEFAULT[:size]       = [1,4,4,1]                       # default
 # Pagy::DEFAULT[:page_param] = :page                           # default
 # The :params can be also set as a lambda e.g ->(params){ params.exclude('useless').merge!('custom' => 'useful') }
@@ -28,20 +28,25 @@
 # Pagy::DEFAULT[:link_extra] = 'data-remote="true"'            # example
 # Pagy::DEFAULT[:i18n_key]   = 'pagy.item_name'                # default
 # Pagy::DEFAULT[:cycle]      = true                            # example
+# Pagy::DEFAULT[:request_path] = "/foo"                        # example
 
 
 # Extras
-# See https://ddnexus.github.io/pagy/extras
+# See https://ddnexus.github.io/pagy/categories/extra
 
 
 # Backend Extras
 
+# Arel extra: For better performance utilizing grouped ActiveRecord collections:
+# See: https://ddnexus.github.io/pagy/docs/extras/arel
+# require 'pagy/extras/arel'
+
 # Array extra: Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
-# See https://ddnexus.github.io/pagy/extras/array
+# See https://ddnexus.github.io/pagy/docs/extras/array
 # require 'pagy/extras/array'
 
 # Calendar extra: Add pagination filtering by calendar time unit (year, quarter, month, week, day)
-# See https://ddnexus.github.io/pagy/extras/calendar
+# See https://ddnexus.github.io/pagy/docs/extras/calendar
 # require 'pagy/extras/calendar'
 # Default for each unit
 # Pagy::Calendar::Year::DEFAULT[:order]     = :asc        # Time direction of pagination
@@ -68,12 +73,12 @@
 # Pagy::Calendar.prepend LocalizePagyCalendar
 
 # Countless extra: Paginate without any count, saving one query per rendering
-# See https://ddnexus.github.io/pagy/extras/countless
+# See https://ddnexus.github.io/pagy/docs/extras/countless
 # require 'pagy/extras/countless'
 # Pagy::DEFAULT[:countless_minimal] = false   # default (eager loading)
 
 # Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects
-# See https://ddnexus.github.io/pagy/extras/elasticsearch_rails
+# See https://ddnexus.github.io/pagy/docs/extras/elasticsearch_rails
 # Default :pagy_search method: change only if you use also
 # the searchkick or meilisearch extra that defines the same
 # Pagy::DEFAULT[:elasticsearch_rails_pagy_search] = :pagy_search
@@ -90,7 +95,7 @@
 #                            pages: 'Total-Pages' }     # default
 
 # Meilisearch extra: Paginate `Meilisearch` result objects
-# See https://ddnexus.github.io/pagy/extras/meilisearch
+# See https://ddnexus.github.io/pagy/docs/extras/meilisearch
 # Default :pagy_search method: change only if you use also
 # the elasticsearch_rails or searchkick extra that define the same method
 # Pagy::DEFAULT[:meilisearch_pagy_search] = :pagy_search
@@ -99,15 +104,15 @@
 # require 'pagy/extras/meilisearch'
 
 # Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
-# See https://ddnexus.github.io/pagy/extras/metadata
-# you must require the shared internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
-# require 'pagy/extras/shared'
+# See https://ddnexus.github.io/pagy/docs/extras/metadata
+# you must require the frontend helpers internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
+# require 'pagy/extras/frontend_helpers'
 # require 'pagy/extras/metadata'
 # For performance reasons, you should explicitly set ONLY the metadata you use in the frontend
 # Pagy::DEFAULT[:metadata] = %i[scaffold_url page prev next last]   # example
 
 # Searchkick extra: Paginate `Searchkick::Results` objects
-# See https://ddnexus.github.io/pagy/extras/searchkick
+# See https://ddnexus.github.io/pagy/docs/extras/searchkick
 # Default :pagy_search method: change only if you use also
 # the elasticsearch_rails or meilisearch extra that defines the same
 # DEFAULT[:searchkick_pagy_search] = :pagy_search
@@ -121,51 +126,51 @@
 # Frontend Extras
 
 # Bootstrap extra: Add nav, nav_js and combo_nav_js helpers and templates for Bootstrap pagination
-# See https://ddnexus.github.io/pagy/extras/bootstrap
+# See https://ddnexus.github.io/pagy/docs/extras/bootstrap
 # require 'pagy/extras/bootstrap'
 
 # Bulma extra: Add nav, nav_js and combo_nav_js helpers and templates for Bulma pagination
-# See https://ddnexus.github.io/pagy/extras/bulma
+# See https://ddnexus.github.io/pagy/docs/extras/bulma
 # require 'pagy/extras/bulma'
 
 # Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination
-# See https://ddnexus.github.io/pagy/extras/foundation
+# See https://ddnexus.github.io/pagy/docs/extras/foundation
 # require 'pagy/extras/foundation'
 
 # Materialize extra: Add nav, nav_js and combo_nav_js helpers for Materialize pagination
-# See https://ddnexus.github.io/pagy/extras/materialize
+# See https://ddnexus.github.io/pagy/docs/extras/materialize
 # require 'pagy/extras/materialize'
 
 # Navs extra: Add nav_js and combo_nav_js javascript helpers
 # Notice: the other frontend extras add their own framework-styled versions,
 # so require this extra only if you need the unstyled version
-# See https://ddnexus.github.io/pagy/extras/navs
+# See https://ddnexus.github.io/pagy/docs/extras/navs
 # require 'pagy/extras/navs'
 
 # Semantic extra: Add nav, nav_js and combo_nav_js helpers for Semantic UI pagination
-# See https://ddnexus.github.io/pagy/extras/semantic
+# See https://ddnexus.github.io/pagy/docs/extras/semantic
 # require 'pagy/extras/semantic'
 
 # UIkit extra: Add nav helper and templates for UIkit pagination
-# See https://ddnexus.github.io/pagy/extras/uikit
+# See https://ddnexus.github.io/pagy/docs/extras/uikit
 # require 'pagy/extras/uikit'
 
 # Multi size var used by the *_nav_js helpers
-# See https://ddnexus.github.io/pagy/extras/navs#steps
+# See https://ddnexus.github.io/pagy/docs/extras/navs#steps
 # Pagy::DEFAULT[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] }   # example
 
 
 # Feature Extras
 
 # Gearbox extra: Automatically change the number of items per page depending on the page number
-# See https://ddnexus.github.io/pagy/extras/gearbox
+# See https://ddnexus.github.io/pagy/docs/extras/gearbox
 # require 'pagy/extras/gearbox'
 # set to false only if you want to make :gearbox_extra an opt-in variable
 # Pagy::DEFAULT[:gearbox_extra] = false               # default true
 # Pagy::DEFAULT[:gearbox_items] = [15, 30, 60, 100]   # default
 
 # Items extra: Allow the client to request a custom number of items per page with an optional selector UI
-# See https://ddnexus.github.io/pagy/extras/items
+# See https://ddnexus.github.io/pagy/docs/extras/items
 # require 'pagy/extras/items'
 # set to false only if you want to make :items_extra an opt-in variable
 # Pagy::DEFAULT[:items_extra] = false    # default true
@@ -173,22 +178,22 @@
 # Pagy::DEFAULT[:max_items]   = 100      # default
 
 # Overflow extra: Allow for easy handling of overflowing pages
-# See https://ddnexus.github.io/pagy/extras/overflow
+# See https://ddnexus.github.io/pagy/docs/extras/overflow
 # require 'pagy/extras/overflow'
 # Pagy::DEFAULT[:overflow] = :empty_page    # default  (other options: :last_page and :exception)
 
 # Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination
-# See https://ddnexus.github.io/pagy/extras/support
+# See https://ddnexus.github.io/pagy/docs/extras/support
 # require 'pagy/extras/support'
 
 # Trim extra: Remove the page=1 param from links
-# See https://ddnexus.github.io/pagy/extras/trim
+# See https://ddnexus.github.io/pagy/docs/extras/trim
 # require 'pagy/extras/trim'
 # set to false only if you want to make :trim_extra an opt-in variable
 # Pagy::DEFAULT[:trim_extra] = false # default true
 
 # Standalone extra: Use pagy in non Rack environment/gem
-# See https://ddnexus.github.io/pagy/extras/standalone
+# See https://ddnexus.github.io/pagy/docs/extras/standalone
 # require 'pagy/extras/standalone'
 # Pagy::DEFAULT[:url] = 'http://www.example.com/subdir'  # optional default
 
@@ -196,7 +201,7 @@
 # Rails
 # Enable the .js file required by the helpers that use javascript
 # (pagy*_nav_js, pagy*_combo_nav_js, and pagy_items_selector_js)
-# See https://ddnexus.github.io/pagy/extras#javascript
+# See https://ddnexus.github.io/pagy/docs/api/javascript
 
 # With the asset pipeline
 # Sprockets need to look into the pagy javascripts dir, so add it to the assets paths
@@ -205,7 +210,7 @@
 # I18n
 
 # Pagy internal I18n: ~18x faster using ~10x less memory than the i18n gem
-# See https://ddnexus.github.io/pagy/api/frontend#i18n
+# See https://ddnexus.github.io/pagy/docs/api/i18n
 # Notice: No need to configure anything in this section if your app uses only "en"
 # or if you use the i18n extra below
 #
@@ -234,7 +239,7 @@
 
 # I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory
 # than the default pagy internal i18n (see above)
-# See https://ddnexus.github.io/pagy/extras/i18n
+# See https://ddnexus.github.io/pagy/docs/extras/i18n
 # require 'pagy/extras/i18n'
 
 # Default i18n key

data/lib/javascripts/pagy-dev.js

@@ -82,7 +82,7 @@ window.Pagy = (() => {
     const trim = (link, param) => link.replace(new RegExp(`(\\?|&)${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "5.10.1",
+        version: "6.0.4",
         // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
         init(arg) {
             const target = arg instanceof Element ? arg : document;
@@ -111,4 +111,4 @@ window.Pagy = (() => {
         }
     };
 })();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs      = readonly [Tags, Sequels, null|LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ninterface Tags {\n    readonly before: string\n    readonly link:   string\n    readonly active: string\n    readonly gap:    string\n    readonly after:  string\n}\ninterface Sequels      { readonly [width:string]: (string|number)[] }\ninterface LabelSequels { readonly [width:string]: string[] }\ninterface NavElement extends Element { pagyRender(): void }\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n        entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tags, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth   = -1;\n        const fillIn    = (link:string, page:string, label:string):string =>\n                              link.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function() {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html     = tags.before;\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item  = series[i];\n                const label = labels[i];\n                if (typeof trimParam === \"string\" && item === 1) {\n                    html += trim(fillIn(tags.link, item.toString(), label), trimParam);\n                } else if (typeof item === \"number\") {\n                    html += fillIn(tags.link, item.toString(), label);\n                } else if (item === \"gap\") {\n                    html += tags.gap;\n                } else { // active page\n                    html += fillIn(tags.active, item, label);\n                }\n            }\n            html += tags.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [link, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);\n\n        // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, link, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, html];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string)=>[string, string], trimParam?:string) => {\n        const input   = el.querySelector(\"input\") as HTMLInputElement;\n        const initial = input.value;\n        const action  = function() {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, html] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { html = trim(html, trimParam) }\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            (el.querySelector(\"a\") as HTMLAnchorElement).click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (link:string, param:string) =>\n        link.replace(new RegExp(`(\\\\?|&amp;)${param}=1\\\\b(?!&amp;)|\\\\b${param}=1&amp;`), \"\");\n\n    // Public interface\n    return {\n        version: \"5.10.1\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element|never) {\n            const target   = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs      = readonly [Tags, Sequels, null|LabelSequels, string?]\ntype ComboArgs    = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\ninterface Tags {\n    readonly before: string\n    readonly link:   string\n    readonly active: string\n    readonly gap:    string\n    readonly after:  string\n}\ninterface Sequels      { readonly [width:string]: (string|number)[] }\ninterface LabelSequels { readonly [width:string]: string[] }\ninterface NavElement extends Element { pagyRender(): void }\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n        entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tags, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths    = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth   = -1;\n        const fillIn    = (link:string, page:string, label:string):string =>\n                              link.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function() {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html     = tags.before;\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item  = series[i];\n                const label = labels[i];\n                if (typeof trimParam === \"string\" && item === 1) {\n                    html += trim(fillIn(tags.link, item.toString(), label), trimParam);\n                } else if (typeof item === \"number\") {\n                    html += fillIn(tags.link, item.toString(), label);\n                } else if (item === \"gap\") {\n                    html += tags.gap;\n                } else { // active page\n                    html += fillIn(tags.active, item, label);\n                }\n            }\n            html += tags.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [link, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, link.replace(/__pagy_page__/, inputValue)], trimParam);\n\n        // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, link, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, html];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string)=>[string, string], trimParam?:string) => {\n        const input   = el.querySelector(\"input\") as HTMLInputElement;\n        const initial = input.value;\n        const action  = function() {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, html] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { html = trim(html, trimParam) }\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            (el.querySelector(\"a\") as HTMLAnchorElement).click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (link:string, param:string) =>\n        link.replace(new RegExp(`(\\\\?|&amp;)${param}=1\\\\b(?!&amp;)|\\\\b${param}=1&amp;`), \"\");\n\n    // Public interface\n    return {\n        version: \"6.0.4\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element|never) {\n            const target   = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array         = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]}

data/lib/javascripts/pagy-module.js

@@ -81,7 +81,7 @@ const Pagy = (() => {
     const trim = (link, param) => link.replace(new RegExp(`(\\?|&)${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "5.10.1",
+        version: "6.0.4",
         // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
         init(arg) {
             const target = arg instanceof Element ? arg : document;

data/lib/javascripts/pagy.js

@@ -1 +1 @@
-!function(){function n(n){if(Array.isArray(n))return n}function e(n){if(Symbol.iterator in Object(n)||"[object Arguments]"===Object.prototype.toString.call(n))return Array.from(n)}function t(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function r(r,a){return n(r)||e(r)||t()}var a,o,i,c,u,f,l=(a=new ResizeObserver((function(n){return n.forEach((function(n){return n.target.querySelectorAll(".pagy-rjs").forEach((function(n){return n.pagyRender()}))}))})),o=function(n,e){var t,o=r(e),i=o[0],c=o[1],u=o[2],l=o[3],p=null!==(t=n.parentElement)&&void 0!==t?t:n,s=Object.keys(c).map((function(n){return parseInt(n)})).sort((function(n,e){return e-n})),y=-1,g=function(n,e,t){return n.replace(/__pagy_page__/g,e).replace(/__pagy_label__/g,t)};(n.pagyRender=function(){var e=s.find((function(n){return n<p.clientWidth}))||0;if(e!==y){var t,r=i.before,a=c[e.toString()],o=null!==(t=null==u?void 0:u[e.toString()])&&void 0!==t?t:a.map((function(n){return n.toString()}));for(var v in a){var d=a[v],_=o[v];r+="string"==typeof l&&1===d?f(g(i.link,d.toString(),_),l):"number"==typeof d?g(i.link,d.toString(),_):"gap"===d?i.gap:g(i.active,d,_)}r+=i.after,n.innerHTML="",n.insertAdjacentHTML("afterbegin",r),y=e}})(),n.classList.contains("pagy-rjs")&&a.observe(p)},i=function(n,e){var t=r(e),a=t[0],o=t[1];return u(n,(function(n){return[n,a.replace(/__pagy_page__/,n)]}),o)},c=function(n,e){var t=r(e),a=t[0],o=t[1],i=t[2];u(n,(function(n){var e=Math.max(Math.ceil(a/parseInt(n)),1).toString();return[e,o.replace(/__pagy_page__/,e).replace(/__pagy_items__/,n)]}),i)},u=function(n,e,t){var a=n.querySelector("input"),o=a.value,i=function(){if(a.value!==o){var i=r([a.min,a.value,a.max].map((function(n){return parseInt(n)||0}))),c=i[0],u=i[1],l=i[2];if(u<c||u>l)return a.value=o,void a.select();var p=r(e(a.value)),s=p[0],y=p[1];"string"==typeof t&&"1"===s&&(y=f(y,t)),n.insertAdjacentHTML("afterbegin",y),n.querySelector("a").click()}};["change","focus"].forEach((function(n){return a.addEventListener(n,a.select)})),a.addEventListener("focusout",i),a.addEventListener("keypress",(function(n){"Enter"===n.key&&i()}))},f=function(n,e){return n.replace(new RegExp("(\\?|&amp;)".concat(e,"=1\\b(?!&amp;)|\\b").concat(e,"=1&amp;")),"")},{version:"5.10.1",init:function(r){var a,u=(r instanceof Element?r:document).querySelectorAll("[data-pagy]"),f=!0,l=!1,p=void 0;try{for(var s,y=u[Symbol.iterator]();!(f=(s=y.next()).done);f=!0){var g=s.value;try{var v=Uint8Array.from(atob(g.getAttribute("data-pagy")),(function(n){return n.charCodeAt(0)})),d=n(a=JSON.parse((new TextDecoder).decode(v)))||e(a)||t(),_=d[0],m=d.slice(1);"nav"===_?o(g,m):"combo"===_?i(g,m):"selector"===_?c(g,m):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",g,_)}catch(n){console.warn("Skipped Pagy.init() for: %o\n%s",g,n)}}}catch(n){l=!0,p=n}finally{try{f||null==y.return||y.return()}finally{if(l)throw p}}}});window.Pagy=l}();
+!function(){var e=(()=>{const e=new ResizeObserver((e=>e.forEach((e=>e.target.querySelectorAll(".pagy-rjs").forEach((e=>e.pagyRender())))))),t=(t,[n,r,a,c])=>{const i=t.parentElement??t,s=Object.keys(r).map((e=>parseInt(e))).sort(((e,t)=>t-e));let p=-1;const l=(e,t,n)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,n);(t.pagyRender=function(){const e=s.find((e=>e<i.clientWidth))||0;if(e===p)return;let g=n.before;const y=r[e.toString()],f=a?.[e.toString()]??y.map((e=>e.toString()));for(const e in y){const t=y[e],r=f[e];g+="string"==typeof c&&1===t?o(l(n.link,t.toString(),r),c):"number"==typeof t?l(n.link,t.toString(),r):"gap"===t?n.gap:l(n.active,t,r)}g+=n.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(i)},n=(e,[t,n])=>a(e,(e=>[e,t.replace(/__pagy_page__/,e)]),n),r=(e,[t,n,r])=>{a(e,(e=>{const r=Math.max(Math.ceil(t/parseInt(e)),1).toString();return[r,n.replace(/__pagy_page__/,r).replace(/__pagy_items__/,e)]}),r)},a=(e,t,n)=>{const r=e.querySelector("input"),a=r.value,c=function(){if(r.value===a)return;const[c,i,s]=[r.min,r.value,r.max].map((e=>parseInt(e)||0));if(i<c||i>s)return r.value=a,void r.select();let[p,l]=t(r.value);"string"==typeof n&&"1"===p&&(l=o(l,n)),e.insertAdjacentHTML("afterbegin",l),e.querySelector("a").click()};["change","focus"].forEach((e=>r.addEventListener(e,r.select))),r.addEventListener("focusout",c),r.addEventListener("keypress",(e=>{"Enter"===e.key&&c()}))},o=(e,t)=>e.replace(new RegExp(`(\\?|&amp;)${t}=1\\b(?!&amp;)|\\b${t}=1&amp;`),"");return{version:"6.0.4",init(e){const a=(e instanceof Element?e:document).querySelectorAll("[data-pagy]");for(const e of a)try{const a=Uint8Array.from(atob(e.getAttribute("data-pagy")),(e=>e.charCodeAt(0))),[o,...c]=JSON.parse((new TextDecoder).decode(a));"nav"===o?t(e,c):"combo"===o?n(e,c):"selector"===o?r(e,c):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",e,o)}catch(t){console.warn("Skipped Pagy.init() for: %o\n%s",e,t)}}}})();window.Pagy=e}();

data/lib/locales/da.yml

@@ -15,8 +15,8 @@ da:
     info:
       no_items: "Ingen %{item_name} fundet"
       single_page: "Viser <b>%{count}</b> %{item_name}"
-      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> til <b>%{count}</b> totalt"
+      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> af <b>%{count}</b> totalt"
 
-    combo_nav_js: "<label>Side %{page_input} of %{pages}</label>"
+    combo_nav_js: "<label>Side %{page_input} af %{pages}</label>"
 
     items_selector_js: "<label>Antal %{items_input} %{item_name} per side</label>"

data/lib/locales/de.yml

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

data/lib/locales/ko.yml

@@ -7,7 +7,7 @@ ko:
 
     nav:
       prev: "‹ 이전"
-      next: "이후 ›"
+      next: "다음 ›"
       gap: "…"
 
     info:

data/lib/locales/nn.yml

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

data/lib/pagy/backend.rb

@@ -1,4 +1,4 @@
-# See Pagy::Backend API documentation: https://ddnexus.github.io/pagy/api/backend
+# See Pagy::Backend API documentation: https://ddnexus.github.io/pagy/docs/api/backend
 # frozen_string_literal: true
 
 class Pagy

data/lib/pagy/calendar/day.rb

@@ -1,4 +1,4 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -15,14 +15,24 @@ class Pagy # :nodoc:
         super
         @initial = @starting.beginning_of_day
         @final   = @ending.tomorrow.beginning_of_day
-        @pages   = @last = (@with_zone ? (@final.time - @initial.time) : (@final - @initial)).to_i / 1.day
+        @pages   = @last = page_offset(@initial, @final)
         @from    = starting_time_for(@page)
         @to      = @from.tomorrow
       end
 
       # Starting time for the page
       def starting_time_for(page)
-        @initial + offset_units_for(page).days
+        @initial.days_since(time_offset_for(page))
+      end
+
+      def page_offset_at(time)
+        page_offset(@initial, time.beginning_of_day)
+      end
+
+      private
+
+      def page_offset(time_a, time_b)  # remove in 6.0
+        (time_b.time - time_a.time).to_i / 1.day
       end
     end
   end

data/lib/pagy/calendar/helper.rb

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

data/lib/pagy/calendar/month.rb

@@ -1,4 +1,4 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -22,7 +22,11 @@ class Pagy # :nodoc:
 
       # Starting time for the page
       def starting_time_for(page)
-        @initial + offset_units_for(page).months
+        @initial.months_since(time_offset_for(page))
+      end
+
+      def page_offset_at(time)
+        months_in(time.beginning_of_month) - months_in(@initial)
       end
 
       private

data/lib/pagy/calendar/quarter.rb

@@ -1,4 +1,4 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -29,7 +29,11 @@ class Pagy # :nodoc:
 
       # Starting time for the page
       def starting_time_for(page)
-        @initial + (offset_units_for(page) * 3).months
+        @initial.months_since(time_offset_for(page) * 3)
+      end
+
+      def page_offset_at(time)
+        (months_in(time.beginning_of_quarter) - months_in(@initial)) / 3
       end
 
       private

data/lib/pagy/calendar/week.rb

@@ -1,4 +1,4 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -13,21 +13,26 @@ class Pagy # :nodoc:
       # Setup the calendar variables
       def setup_unit_vars
         super
-        if @vars[:offset]  # remove in pagy 6
-          Warning.warn '[PAGY WARNING] The week :offset variable has been deprecated and will be ignored from pagy 6. ' \
-                       "Set the Date.beginning_of_week variable to be one of #{::Date::DAYS_INTO_WEEK.keys.inspect} instead."
-          Date.beginning_of_week = ::Date::DAYS_INTO_WEEK.keys[@vars[:offset]]
-        end
         @initial = @starting.beginning_of_week
         @final   = @ending.next_week.beginning_of_week
-        @pages   = @last = (@with_zone ? (@final.time - @initial.time) : (@final - @initial)).to_i / 1.week
+        @pages   = @last = page_offset(@initial, @final)
         @from    = starting_time_for(@page)
         @to      = @from.next_week
       end
 
       # Starting time for the page
       def starting_time_for(page)
-        @initial + offset_units_for(page).weeks
+        @initial.weeks_since(time_offset_for(page))
+      end
+
+      def page_offset_at(time)
+        page_offset(@initial, time.beginning_of_week)
+      end
+
+      private
+
+      def page_offset(time_a, time_b)  # remove in 6.0
+        (time_b.time - time_a.time).to_i / 1.week
       end
     end
   end

data/lib/pagy/calendar/year.rb

@@ -1,4 +1,4 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/api/calendar
+# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -22,7 +22,11 @@ class Pagy # :nodoc:
 
       # Starting time for the page
       def starting_time_for(page)
-        @initial.years_since(offset_units_for(page))
+        @initial.years_since(time_offset_for(page))
+      end
+
+      def page_offset_at(time)
+        time.beginning_of_year.year - @initial.year
       end
     end
   end