pagy 8.0.1 → 8.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (94) hide show
  1. checksums.yaml +4 -4
  2. data/{gem/apps → apps}/calendar.ru +1 -1
  3. data/{gem/apps → apps}/demo.ru +1 -1
  4. data/{gem/apps → apps}/rails.ru +10 -10
  5. data/{gem/apps → apps}/repro.ru +1 -1
  6. data/{gem/bin → bin}/pagy +1 -1
  7. data/{gem/config → config}/pagy.rb +9 -9
  8. data/javascripts/pagy-dev.js +114 -0
  9. data/{gem/javascripts → javascripts}/pagy-module.js +4 -2
  10. data/javascripts/pagy.js +1 -0
  11. data/{gem/lib → lib}/pagy/calendar/day.rb +1 -1
  12. data/{gem/lib → lib}/pagy/calendar/month.rb +1 -1
  13. data/{gem/lib → lib}/pagy/calendar/quarter.rb +1 -1
  14. data/{gem/lib → lib}/pagy/calendar/week.rb +1 -1
  15. data/{gem/lib → lib}/pagy/calendar/year.rb +1 -1
  16. data/{gem/lib → lib}/pagy/calendar.rb +4 -4
  17. data/{gem/lib → lib}/pagy/console.rb +2 -2
  18. data/{gem/lib → lib}/pagy/countless.rb +10 -7
  19. data/{gem/lib → lib}/pagy/extras/bootstrap.rb +2 -2
  20. data/{gem/lib → lib}/pagy/extras/bulma.rb +3 -2
  21. data/{gem/lib → lib}/pagy/extras/calendar.rb +2 -2
  22. data/{gem/lib → lib}/pagy/extras/countless.rb +1 -1
  23. data/{gem/lib → lib}/pagy/extras/foundation.rb +2 -2
  24. data/lib/pagy/extras/gearbox.rb +55 -0
  25. data/{gem/lib → lib}/pagy/extras/headers.rb +1 -1
  26. data/{gem/lib → lib}/pagy/extras/items.rb +2 -2
  27. data/{gem/lib → lib}/pagy/extras/js_tools.rb +3 -0
  28. data/{gem/lib → lib}/pagy/extras/jsonapi.rb +1 -1
  29. data/{gem/lib → lib}/pagy/extras/materialize.rb +3 -2
  30. data/{gem/lib → lib}/pagy/extras/metadata.rb +1 -1
  31. data/{gem/lib → lib}/pagy/extras/pagy.rb +2 -2
  32. data/{gem/lib → lib}/pagy/extras/semantic.rb +3 -2
  33. data/{gem/lib → lib}/pagy/extras/standalone.rb +2 -2
  34. data/{gem/lib → lib}/pagy/extras/uikit.rb +2 -2
  35. data/{gem/lib → lib}/pagy/frontend.rb +2 -2
  36. data/{gem/lib → lib}/pagy/url_helpers.rb +8 -8
  37. data/{gem/lib → lib}/pagy.rb +26 -28
  38. data/{gem/locales → locales}/ru.yml +5 -7
  39. metadata +93 -93
  40. data/gem/javascripts/pagy-dev.js +0 -112
  41. data/gem/javascripts/pagy.js +0 -1
  42. data/gem/lib/pagy/extras/gearbox.rb +0 -54
  43. /data/{gem/javascripts → javascripts}/pagy-module.d.ts +0 -0
  44. /data/{gem/lib → lib}/optimist.rb +0 -0
  45. /data/{gem/lib → lib}/pagy/backend.rb +0 -0
  46. /data/{gem/lib → lib}/pagy/calendar/helper.rb +0 -0
  47. /data/{gem/lib → lib}/pagy/exceptions.rb +0 -0
  48. /data/{gem/lib → lib}/pagy/extras/arel.rb +0 -0
  49. /data/{gem/lib → lib}/pagy/extras/array.rb +0 -0
  50. /data/{gem/lib → lib}/pagy/extras/elasticsearch_rails.rb +0 -0
  51. /data/{gem/lib → lib}/pagy/extras/i18n.rb +0 -0
  52. /data/{gem/lib → lib}/pagy/extras/meilisearch.rb +0 -0
  53. /data/{gem/lib → lib}/pagy/extras/overflow.rb +0 -0
  54. /data/{gem/lib → lib}/pagy/extras/searchkick.rb +0 -0
  55. /data/{gem/lib → lib}/pagy/extras/trim.rb +0 -0
  56. /data/{gem/lib → lib}/pagy/i18n.rb +0 -0
  57. /data/{gem/locales → locales}/ar.yml +0 -0
  58. /data/{gem/locales → locales}/be.yml +0 -0
  59. /data/{gem/locales → locales}/bg.yml +0 -0
  60. /data/{gem/locales → locales}/bs.yml +0 -0
  61. /data/{gem/locales → locales}/ca.yml +0 -0
  62. /data/{gem/locales → locales}/ckb.yml +0 -0
  63. /data/{gem/locales → locales}/cs.yml +0 -0
  64. /data/{gem/locales → locales}/da.yml +0 -0
  65. /data/{gem/locales → locales}/de.yml +0 -0
  66. /data/{gem/locales → locales}/en.yml +0 -0
  67. /data/{gem/locales → locales}/es.yml +0 -0
  68. /data/{gem/locales → locales}/fr.yml +0 -0
  69. /data/{gem/locales → locales}/hr.yml +0 -0
  70. /data/{gem/locales → locales}/id.yml +0 -0
  71. /data/{gem/locales → locales}/it.yml +0 -0
  72. /data/{gem/locales → locales}/ja.yml +0 -0
  73. /data/{gem/locales → locales}/km.yml +0 -0
  74. /data/{gem/locales → locales}/ko.yml +0 -0
  75. /data/{gem/locales → locales}/nb.yml +0 -0
  76. /data/{gem/locales → locales}/nl.yml +0 -0
  77. /data/{gem/locales → locales}/nn.yml +0 -0
  78. /data/{gem/locales → locales}/pl.yml +0 -0
  79. /data/{gem/locales → locales}/pt-BR.yml +0 -0
  80. /data/{gem/locales → locales}/pt.yml +0 -0
  81. /data/{gem/locales → locales}/sr.yml +0 -0
  82. /data/{gem/locales → locales}/sv-SE.yml +0 -0
  83. /data/{gem/locales → locales}/sv.yml +0 -0
  84. /data/{gem/locales → locales}/sw.yml +0 -0
  85. /data/{gem/locales → locales}/ta.yml +0 -0
  86. /data/{gem/locales → locales}/tr.yml +0 -0
  87. /data/{gem/locales → locales}/uk.yml +0 -0
  88. /data/{gem/locales → locales}/vi.yml +0 -0
  89. /data/{gem/locales → locales}/zh-CN.yml +0 -0
  90. /data/{gem/locales → locales}/zh-HK.yml +0 -0
  91. /data/{gem/locales → locales}/zh-TW.yml +0 -0
  92. /data/{gem/stylesheets → stylesheets}/pagy.css +0 -0
  93. /data/{gem/stylesheets → stylesheets}/pagy.scss +0 -0
  94. /data/{gem/stylesheets → stylesheets}/pagy.tailwind.css +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d43138bcedb3ad5c8a1ef97c80e2ebf873f592407d77e725cde2dae8be507472
4
- data.tar.gz: b92dc21e1d2aecd759a7b3caea7a2f32888fa61332690dd567255c2b3474d049
3
+ metadata.gz: 58dd8aedfd3cbff422189cea6a6ce7741a789648f637d81cbf2393c1d7f367bf
4
+ data.tar.gz: aa2e1eb12fbb6e4eb8c044f16ef88c1ec21eb12b2953c5d243ec1be3e89fbc1c
5
5
  SHA512:
6
- metadata.gz: c96cd67017eadce0279b19bcfa4e251424043264b9eae220d0136fa8820e01f7ec3a2911a0e99b17b0e9fca561114c5bcd91b5d81f884ab77e8ba77e77042321
7
- data.tar.gz: dec54c4ba97e64802a99dd25d753fc6c254a9ab336b17b668103e3d1c914e248830ff174c8965c46fda8c993ebab41c9ffdb4d51b1547c5e58ad925651895b21
6
+ metadata.gz: 7cbbd1cb07fce3aa859454fecb96db8d9011b258320304352d5df5c8e8489ac1a6d9bdbbbf63bcc67bab89fa36e46449999e1f8c333bb07613fbed53e10db88f
7
+ data.tar.gz: 561333556eda4acf895b0cca0ca45b7a23207ba6e5536f3c3cb288f1901a6f2b6d5b78e7c879450c256a81017633b68db6629b595a1a70dc0f00f64b4f126d01
@@ -18,7 +18,7 @@
18
18
  # DOC
19
19
  # https://ddnexus.github.io/pagy/playground/#4-calendar-app
20
20
 
21
- VERSION = '8.0.1'
21
+ VERSION = '8.1.0'
22
22
 
23
23
  require 'bundler/inline'
24
24
  gemfile(true) do
@@ -18,7 +18,7 @@
18
18
  # DOC
19
19
  # https://ddnexus.github.io/pagy/playground/#3-demo-app
20
20
 
21
- VERSION = '8.0.1'
21
+ VERSION = '8.1.0'
22
22
 
23
23
  require 'bundler/inline'
24
24
  gemfile(true) do
@@ -15,7 +15,7 @@
15
15
  # DOC
16
16
  # https://ddnexus.github.io/pagy/playground/#2-rails-app
17
17
 
18
- VERSION = '8.0.1'
18
+ VERSION = '8.1.0'
19
19
 
20
20
  # Gemfile
21
21
  require 'bundler/inline'
@@ -27,15 +27,6 @@ gemfile(true) do
27
27
  gem 'sqlite3'
28
28
  end
29
29
 
30
- # Pagy initializer
31
- require 'pagy/extras/pagy'
32
- require 'pagy/extras/items'
33
- require 'pagy/extras/overflow'
34
- Pagy::DEFAULT[:size] = [1, 4, 4, 1]
35
- Pagy::DEFAULT[:items] = 10
36
- Pagy::DEFAULT[:overflow] = :empty_page
37
- Pagy::DEFAULT.freeze
38
-
39
30
  # require 'rails/all' # too much stuff
40
31
  require 'action_controller/railtie'
41
32
  require 'active_record'
@@ -64,6 +55,15 @@ unless File.writable?(dir)
64
55
  exit 1
65
56
  end
66
57
 
58
+ # Pagy initializer
59
+ require 'pagy/extras/pagy'
60
+ require 'pagy/extras/items'
61
+ require 'pagy/extras/overflow'
62
+ Pagy::DEFAULT[:size] = [1, 4, 4, 1]
63
+ Pagy::DEFAULT[:items] = 10
64
+ Pagy::DEFAULT[:overflow] = :empty_page
65
+ Pagy::DEFAULT.freeze
66
+
67
67
  ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: "#{dir}/tmp/pagy-rails.sqlite3")
68
68
  ActiveRecord::Schema.define do
69
69
  create_table :posts, force: true do |t|
@@ -15,7 +15,7 @@
15
15
  # DOC
16
16
  # https://ddnexus.github.io/pagy/playground/#1-repro-app
17
17
 
18
- VERSION = '8.0.1'
18
+ VERSION = '8.1.0'
19
19
 
20
20
  require 'bundler/inline'
21
21
  gemfile(true) do
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env ruby
2
2
  # frozen_string_literal: true
3
3
 
4
- VERSION = '8.0.1'
4
+ VERSION = '8.1.0'
5
5
  APPS = %w[repro rails demo calendar].freeze
6
6
 
7
7
  require_relative '../lib/optimist'
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Pagy initializer file (8.0.1)
3
+ # Pagy initializer file (8.1.0)
4
4
  # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
5
5
  # Should you just cherry pick part of this file, please maintain the require-order of the extras
6
6
 
@@ -18,14 +18,14 @@
18
18
 
19
19
  # Other Variables
20
20
  # See https://ddnexus.github.io/pagy/docs/api/pagy#other-variables
21
- # Pagy::DEFAULT[:size] = [1,4,4,1] # default in pagy < 7.0
22
- # Pagy::DEFAULT[:page_param] = :page # default
23
- # Pagy::DEFAULT[:fragment] = '#fragment' # example
24
- # Pagy::DEFAULT[:link_extra] = 'data-remote="true"' # example
25
- # Pagy::DEFAULT[:cycle] = true # example
26
- # Pagy::DEFAULT[:request_path] = '/foo' # example
27
- # Pagy::DEFAULT[:count_args] = [] # example for non AR ORMs
28
- # Pagy::DEFAULT[:params] = {} # default
21
+ # Pagy::DEFAULT[:size] = [1,4,4,1] # default in pagy < 7.0
22
+ # Pagy::DEFAULT[:page_param] = :page # default
23
+ # Pagy::DEFAULT[:fragment] = '#fragment' # example
24
+ # Pagy::DEFAULT[:anchor_string] = 'data-remote="true"' # example
25
+ # Pagy::DEFAULT[:cycle] = true # example
26
+ # Pagy::DEFAULT[:request_path] = '/foo' # example
27
+ # Pagy::DEFAULT[:count_args] = [] # example for non AR ORMs
28
+ # Pagy::DEFAULT[:params] = {} # default
29
29
  # NOTICE: The :params can be also set as a lambda e.g:
30
30
  # ->(params){ params.exclude('useless').merge!('custom' => 'useful') }
31
31
 
@@ -0,0 +1,114 @@
1
+ "use strict";
2
+ window.Pagy = (() => {
3
+ // The observer instance for responsive navs
4
+ const rjsObserver = new ResizeObserver(entries => entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender())));
5
+ // Init the *_nav_js helpers
6
+ const initNav = (el, [tokens, sequels, labelSequels, trimParam]) => {
7
+ const container = el.parentElement ?? el;
8
+ const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
9
+ let lastWidth = -1;
10
+ const fillIn = (a, page, label) => a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
11
+ (el.pagyRender = function () {
12
+ const width = widths.find(w => w < container.clientWidth) || 0;
13
+ if (width === lastWidth) {
14
+ return;
15
+ } // no change: abort
16
+ let html = tokens.before; // already trimmed in html
17
+ const series = sequels[width.toString()];
18
+ const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());
19
+ for (const i in series) {
20
+ const item = series[i];
21
+ const label = labels[i];
22
+ let filled;
23
+ if (typeof item === "number") {
24
+ filled = fillIn(tokens.a, item.toString(), label);
25
+ }
26
+ else if (item === "gap") {
27
+ filled = tokens.gap;
28
+ }
29
+ else { // active page
30
+ filled = fillIn(tokens.current, item, label);
31
+ }
32
+ html += (typeof trimParam === "string" && item == 1) ? trim(filled, trimParam) : filled;
33
+ }
34
+ html += tokens.after; // eslint-disable-line align-assignments/align-assignments
35
+ el.innerHTML = "";
36
+ el.insertAdjacentHTML("afterbegin", html);
37
+ lastWidth = width;
38
+ })();
39
+ if (el.classList.contains("pagy-rjs")) {
40
+ rjsObserver.observe(container);
41
+ }
42
+ };
43
+ // Init the *_combo_nav_js helpers
44
+ const initCombo = (el, [url_token, trimParam]) => initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);
45
+ // Init the items_selector_js helper
46
+ const initSelector = (el, [from, url_token, trimParam]) => {
47
+ initInput(el, inputValue => {
48
+ const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();
49
+ const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);
50
+ return [page, url];
51
+ }, trimParam);
52
+ };
53
+ // Init the input element
54
+ const initInput = (el, getVars, trimParam) => {
55
+ const input = el.querySelector("input");
56
+ const link = el.querySelector("a");
57
+ const initial = input.value;
58
+ const action = function () {
59
+ if (input.value === initial) {
60
+ return;
61
+ } // not changed
62
+ const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);
63
+ if (val < min || val > max) { // reset invalid/out-of-range
64
+ input.value = initial;
65
+ input.select();
66
+ return;
67
+ }
68
+ let [page, url] = getVars(input.value); // eslint-disable-line prefer-const
69
+ if (typeof trimParam === "string" && page === "1") {
70
+ url = trim(url, trimParam);
71
+ }
72
+ link.href = url;
73
+ link.click();
74
+ };
75
+ ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select
76
+ input.addEventListener("focusout", action); // trigger action
77
+ input.addEventListener("keypress", e => { if (e.key === "Enter") {
78
+ action();
79
+ } }); // trigger action
80
+ };
81
+ // Trim the ${page-param}=1 params in links
82
+ const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
83
+ // Public interface
84
+ return {
85
+ version: "8.1.0",
86
+ // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
87
+ init(arg) {
88
+ const target = arg instanceof Element ? arg : document;
89
+ const elements = target.querySelectorAll("[data-pagy]");
90
+ for (const el of elements) {
91
+ try {
92
+ const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), c => c.charCodeAt(0));
93
+ const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array
94
+ if (keyword === "nav") {
95
+ initNav(el, args);
96
+ }
97
+ else if (keyword === "combo") {
98
+ initCombo(el, args);
99
+ }
100
+ else if (keyword === "selector") {
101
+ initSelector(el, args);
102
+ }
103
+ else {
104
+ console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
105
+ }
106
+ }
107
+ catch (err) {
108
+ console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
109
+ }
110
+ }
111
+ }
112
+ };
113
+ })();
114
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n    readonly before:string\n    readonly a:string\n    readonly current:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\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(\n                                                   el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth = -1;\n        const fillIn = (a:string, page:string, label:string):string =>\n            a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function () {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html = tokens.before;  // already trimmed in html\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item = series[i];\n                const label = labels[i];\n                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tokens.a, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tokens.gap;\n                } else { // active page\n                    filled = fillIn(tokens.current, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n            }\n            html += tokens.after;   // 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, [url_token, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n    // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, url];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n        const input = el.querySelector(\"input\") as HTMLInputElement;\n        const link = el.querySelector(\"a\") as HTMLAnchorElement;\n        const initial = input.value;\n        const action = function () {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n            link.href = url;\n            link.click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (a:string, param:string) =>\n        a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"8.1.0\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element | never) {\n            const target = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]}
@@ -52,6 +52,7 @@ const Pagy = (() => {
52
52
  // Init the input element
53
53
  const initInput = (el, getVars, trimParam) => {
54
54
  const input = el.querySelector("input");
55
+ const link = el.querySelector("a");
55
56
  const initial = input.value;
56
57
  const action = function () {
57
58
  if (input.value === initial) {
@@ -67,7 +68,8 @@ const Pagy = (() => {
67
68
  if (typeof trimParam === "string" && page === "1") {
68
69
  url = trim(url, trimParam);
69
70
  }
70
- window.location.href = url;
71
+ link.href = url;
72
+ link.click();
71
73
  };
72
74
  ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select
73
75
  input.addEventListener("focusout", action); // trigger action
@@ -79,7 +81,7 @@ const Pagy = (() => {
79
81
  const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
80
82
  // Public interface
81
83
  return {
82
- version: "8.0.1",
84
+ version: "8.1.0",
83
85
  // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
84
86
  init(arg) {
85
87
  const target = arg instanceof Element ? arg : document;
@@ -0,0 +1 @@
1
+ !function(){let e=(()=>{let e=new ResizeObserver(e=>e.forEach(e=>e.target.querySelectorAll(".pagy-rjs").forEach(e=>e.pagyRender()))),t=(t,[r,a,n,l])=>{let i=t.parentElement??t,c=Object.keys(a).map(e=>parseInt(e)).sort((e,t)=>t-e),p=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=c.find(e=>e<i.clientWidth)||0;if(e===p)return;let g=r.before,y=a[e.toString()],f=n?.[e.toString()]??y.map(e=>e.toString());for(let e in y){let t;let a=y[e],n=f[e];t="number"==typeof a?s(r.a,a.toString(),n):"gap"===a?r.gap:s(r.current,a,n),g+="string"==typeof l&&1==a?o(t,l):t}g+=r.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(i)},r=(e,[t,r])=>n(e,e=>[e,t.replace(/__pagy_page__/,e)],r),a=(e,[t,r,a])=>{n(e,e=>{let a=Math.max(Math.ceil(t/parseInt(e)),1).toString(),n=r.replace(/__pagy_page__/,a).replace(/__pagy_items__/,e);return[a,n]},a)},n=(e,t,r)=>{let a=e.querySelector("input"),n=e.querySelector("a"),l=a.value,i=function(){if(a.value===l)return;let[e,i,c]=[a.min,a.value,a.max].map(e=>parseInt(e)||0);if(i<e||i>c){a.value=l,a.select();return}let[p,s]=t(a.value);"string"==typeof r&&"1"===p&&(s=o(s,r)),n.href=s,n.click()};["change","focus"].forEach(e=>a.addEventListener(e,a.select)),a.addEventListener("focusout",i),a.addEventListener("keypress",e=>{"Enter"===e.key&&i()})},o=(e,t)=>e.replace(RegExp(`[?&]${t}=1\\b(?!&)|\\b${t}=1&`),"");return{version:"8.1.0",init(e){for(let n of(e instanceof Element?e:document).querySelectorAll("[data-pagy]"))try{let e=Uint8Array.from(atob(n.getAttribute("data-pagy")),e=>e.charCodeAt(0)),[o,...l]=JSON.parse(new TextDecoder().decode(e));"nav"===o?t(n,l):"combo"===o?r(n,l):"selector"===o?a(n,l):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",n,o)}catch(e){console.warn("Skipped Pagy.init() for: %o\n%s",n,e)}}}})();window.Pagy=e}();
@@ -16,7 +16,7 @@ class Pagy # :nodoc:
16
16
  super
17
17
  @initial = @starting.beginning_of_day
18
18
  @final = @ending.tomorrow.beginning_of_day
19
- @pages = @last = page_offset(@initial, @final)
19
+ @last = page_offset(@initial, @final)
20
20
  @from = starting_time_for(@page)
21
21
  @to = @from.tomorrow
22
22
  end
@@ -16,7 +16,7 @@ class Pagy # :nodoc:
16
16
  super
17
17
  @initial = @starting.beginning_of_month
18
18
  @final = @ending.next_month.beginning_of_month
19
- @pages = @last = (months_in(@final) - months_in(@initial))
19
+ @last = (months_in(@final) - months_in(@initial))
20
20
  @from = starting_time_for(@page)
21
21
  @to = @from.next_month
22
22
  end
@@ -23,7 +23,7 @@ class Pagy # :nodoc:
23
23
  super
24
24
  @initial = @starting.beginning_of_quarter
25
25
  @final = @ending.next_quarter.beginning_of_quarter
26
- @pages = @last = (months_in(@final) - months_in(@initial)) / 3
26
+ @last = (months_in(@final) - months_in(@initial)) / 3
27
27
  @from = starting_time_for(@page)
28
28
  @to = @from.next_quarter
29
29
  end
@@ -15,7 +15,7 @@ class Pagy # :nodoc:
15
15
  super
16
16
  @initial = @starting.beginning_of_week
17
17
  @final = @ending.next_week.beginning_of_week
18
- @pages = @last = page_offset(@initial, @final)
18
+ @last = page_offset(@initial, @final)
19
19
  @from = starting_time_for(@page)
20
20
  @to = @from.next_week
21
21
  end
@@ -16,7 +16,7 @@ class Pagy # :nodoc:
16
16
  super
17
17
  @initial = @starting.beginning_of_year
18
18
  @final = @ending.next_year.beginning_of_year
19
- @pages = @last = @final.year - @initial.year
19
+ @last = @final.year - @initial.year
20
20
  @from = starting_time_for(@page)
21
21
  @to = @from.next_year
22
22
  end
@@ -7,7 +7,7 @@ require 'active_support/core_ext/date_and_time/calculations'
7
7
  require 'active_support/core_ext/numeric/time'
8
8
  require 'active_support/core_ext/integer/time'
9
9
 
10
- require 'pagy'
10
+ require_relative '../pagy'
11
11
 
12
12
  class Pagy # :nodoc:
13
13
  # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
@@ -67,14 +67,14 @@ class Pagy # :nodoc:
67
67
  Warning.warn "Pagy::Calendar#page_at: Rescued #{time} out of range by returning the #{ordinal} page."
68
68
  end
69
69
  offset = page_offset_at(fit_time) # offset starts from 0
70
- @order == :asc ? offset + 1 : @pages - offset
70
+ @order == :asc ? offset + 1 : @last - offset
71
71
  end
72
72
 
73
73
  # Base class method for the setup of the unit variables (subclasses must implement it and call super)
74
74
  def setup_unit_vars
75
75
  raise VariableError.new(self, :format, 'to be a strftime format', @vars[:format]) unless @vars[:format].is_a?(String)
76
76
  raise VariableError.new(self, :order, 'to be in [:asc, :desc]', @order) \
77
- unless %i[asc desc].include?(@order = @vars[:order])
77
+ unless %i[asc desc].include?((@order = @vars[:order]))
78
78
 
79
79
  @starting, @ending = @vars[:period]
80
80
  raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \
@@ -90,7 +90,7 @@ class Pagy # :nodoc:
90
90
  # Number of time units to offset from the @initial time, in order to get the ordered starting time for the page.
91
91
  # Used in starting_time_for(page) where page starts from 1 (e.g. page to starting_time means subtracting 1)
92
92
  def time_offset_for(page)
93
- @order == :asc ? page - 1 : @pages - page
93
+ @order == :asc ? page - 1 : @last - page
94
94
  end
95
95
 
96
96
  # Period of the active page (used internally for nested units)
@@ -1,8 +1,8 @@
1
1
  # See Pagy::Console API documentation: https://ddnexus.github.io/pagy/docs/api/console
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy' # so you can require just the extra in the console
5
- require 'pagy/extras/standalone'
4
+ require_relative '../pagy' # so you can require just the extra in the console
5
+ require_relative 'extras/standalone'
6
6
 
7
7
  class Pagy
8
8
  # Provide a ready to use pagy environment when included in irb/rails console
@@ -1,7 +1,7 @@
1
1
  # See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/countless
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy'
4
+ require_relative '../pagy'
5
5
 
6
6
  class Pagy
7
7
  # No need to know the count to paginate
@@ -19,12 +19,15 @@ class Pagy
19
19
  def finalize(fetched_size)
20
20
  raise OverflowError.new(self, :page, "to be < #{@page}", @page) if fetched_size.zero? && @page > 1
21
21
 
22
- @pages = @last = (fetched_size > @items ? @page + 1 : @page)
23
- @in = [fetched_size, @items].min
24
- @from = @in.zero? ? 0 : @offset - @outset + 1
25
- @to = @offset - @outset + @in
26
- @prev = (@page - 1 unless @page == 1)
27
- @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
22
+ @last = fetched_size > @items ? @page + 1 : @page
23
+ @last = vars[:max_pages] if vars[:max_pages] && @last > vars[:max_pages]
24
+ raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
25
+
26
+ @in = [fetched_size, @items].min
27
+ @from = @in.zero? ? 0 : @offset - @outset + 1
28
+ @to = @offset - @outset + @in
29
+ @prev = (@page - 1 unless @page == 1)
30
+ @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
28
31
  self
29
32
  end
30
33
 
@@ -1,7 +1,7 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bootstrap
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/extras/js_tools'
4
+ require_relative 'js_tools'
5
5
 
6
6
  class Pagy # :nodoc:
7
7
  # Frontend modules are specially optimized for performance.
@@ -57,7 +57,7 @@ class Pagy # :nodoc:
57
57
 
58
58
  page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
59
59
  %(style="text-align: center; width: #{pages.to_s.length + 1}rem; padding: 0; ) <<
60
- %(border: none; display: inline-block;" class="page-link active">)
60
+ %(border: none; display: inline-block;" class="page-link active">#{JSTools::A_TAG})
61
61
 
62
62
  %(<nav#{id} class="pagy-bootstrap combo-nav-js" #{
63
63
  nav_aria_label(pagy, aria_label:)} #{
@@ -1,7 +1,7 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bulma
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/extras/js_tools'
4
+ require_relative 'js_tools'
5
5
 
6
6
  class Pagy # :nodoc:
7
7
  # Frontend modules are specially optimized for performance.
@@ -56,7 +56,8 @@ class Pagy # :nodoc:
56
56
 
57
57
  page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page") <<
58
58
  %(style="text-align: center; width: #{pages.to_s.length + 1}rem; height: 1.7rem; margin:0 0.3rem; ) <<
59
- %(border: none; border-radius: 4px; padding: 0; font-size: 1.1rem; color: white; background-color: #485fc7;">)
59
+ %(border: none; border-radius: 4px; padding: 0; font-size: 1.1rem; color: white; ) <<
60
+ %(background-color: #485fc7;">#{JSTools::A_TAG})
60
61
 
61
62
  %(<nav#{id} class="#{classes}" #{
62
63
  nav_aria_label(pagy, aria_label:)} #{
@@ -1,8 +1,8 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/calendar
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/calendar'
5
- require 'pagy/calendar/helper'
4
+ require_relative '../calendar'
5
+ require_relative '../calendar/helper'
6
6
 
7
7
  class Pagy # :nodoc:
8
8
  # Add pagination filtering by calendar unit (:year, :quarter, :month, :week, :day) to the regular pagination
@@ -1,7 +1,7 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/countless
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/countless'
4
+ require_relative '../countless'
5
5
 
6
6
  class Pagy # :nodoc:
7
7
  DEFAULT[:countless_minimal] = false
@@ -1,7 +1,7 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/foundation
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/extras/js_tools'
4
+ require_relative 'js_tools'
5
5
 
6
6
  class Pagy # :nodoc:
7
7
  # Frontend modules are specially optimized for performance.
@@ -55,7 +55,7 @@ class Pagy # :nodoc:
55
55
 
56
56
  page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
57
57
  %(style="text-align: center; width: #{pages.to_s.length + 1}rem; ) <<
58
- %(height: 1.5rem; padding: .5rem; margin: 0 .4rem; font-size: .875rem;" class="current">)
58
+ %(height: 1.5rem; padding: .5rem; margin: 0 .4rem; font-size: .875rem;" class="current">#{JSTools::A_TAG})
59
59
 
60
60
  %(<nav#{id} class="pagy-foundation-combo-nav-js" #{
61
61
  nav_aria_label(pagy, aria_label:)} #{
@@ -0,0 +1,55 @@
1
+ # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/gearbox
2
+ # frozen_string_literal: true
3
+
4
+ class Pagy # :nodoc:
5
+ DEFAULT[:gearbox_extra] = true # extra enabled by default
6
+ DEFAULT[:gearbox_items] = [15, 30, 60, 100]
7
+
8
+ # Automatically change the number of items per page depending on the page number
9
+ # accepts an array as the :gearbox_items variable, that will determine the items for the first pages
10
+ module GearboxExtra
11
+ # Setup @items based on the :gearbox_items variable
12
+ def setup_items_var
13
+ return super if !@vars[:gearbox_extra] || @vars[:items_extra]
14
+
15
+ gears = @vars[:gearbox_items]
16
+ raise VariableError.new(self, :gearbox_items, 'to be an Array of positives', gears) \
17
+ unless gears.is_a?(Array) && gears.all? { |num| num.positive? rescue false } # rubocop:disable Style/RescueModifier
18
+
19
+ @items = gears[@page - 1] || gears.last
20
+ end
21
+
22
+ # Setup Pagy @last based on the :gearbox_items variable and @count
23
+ def setup_last_var
24
+ return super if !@vars[:gearbox_extra] || @vars[:items_extra]
25
+
26
+ gears = @vars[:gearbox_items]
27
+ # This algorithm is thousands of times faster than the one in the geared_pagination gem
28
+ @last = (if count > (sum = gears.sum)
29
+ [((count - sum).to_f / gears.last).ceil, 1].max + gears.count
30
+ else
31
+ pages = 0
32
+ remainder = count
33
+ while remainder.positive?
34
+ pages += 1
35
+ remainder -= gears[pages - 1]
36
+ end
37
+ [pages, 1].max
38
+ end)
39
+ @last = vars[:max_pages] if vars[:max_pages] && @last > vars[:max_pages]
40
+ end
41
+
42
+ # Setup @offset based on the :gearbox_items variable
43
+ def setup_offset_var
44
+ return super if !@vars[:gearbox_extra] || @vars[:items_extra]
45
+
46
+ gears = @vars[:gearbox_items]
47
+ @offset = if @page <= gears.count
48
+ gears[0, @page - 1].sum
49
+ else
50
+ gears.sum + (gears.last * (@page - gears.count - 1))
51
+ end + @outset
52
+ end
53
+ end
54
+ prepend GearboxExtra
55
+ end
@@ -1,7 +1,7 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/headers
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/url_helpers'
4
+ require_relative '../url_helpers'
5
5
 
6
6
  class Pagy # :nodoc:
7
7
  DEFAULT[:headers] = { page: 'current-page',
@@ -1,7 +1,7 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/items
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/extras/js_tools'
4
+ require_relative 'js_tools'
5
5
 
6
6
  class Pagy # :nodoc:
7
7
  DEFAULT[:items_param] = :items
@@ -47,7 +47,7 @@ class Pagy # :nodoc:
47
47
  vars[:items] = items # restore the items
48
48
 
49
49
  items_input = %(<input name="items" type="number" min="1" max="#{vars[:max_items]}" value="#{
50
- items}" style="padding: 0; text-align: center; width: #{items.to_s.length + 1}rem;">)
50
+ items}" style="padding: 0; text-align: center; width: #{items.to_s.length + 1}rem;">#{JSTools::A_TAG})
51
51
 
52
52
  %(<span#{id} class="pagy items-selector-js" #{
53
53
  pagy_data(pagy, :selector, pagy.from, url_token)
@@ -5,6 +5,9 @@ class Pagy # :nodoc:
5
5
 
6
6
  # Private module documented in the main classes
7
7
  module JSTools
8
+ # Dummy tag for input helpers: needed because Turbo does not intercept window.location changes
9
+ A_TAG = '<a href="#" style="display: none;">#</a>'
10
+
8
11
  # Additions for the Pagy class
9
12
  module PagyAddOn
10
13
  # `Pagy` instance method used by the `pagy*_nav_js` helpers.
@@ -1,7 +1,7 @@
1
1
  # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/jsonapi
2
2
  # frozen_string_literal: true
3
3
 
4
- require 'pagy/url_helpers'
4
+ require_relative '../url_helpers'
5
5
 
6
6
  class Pagy # :nodoc:
7
7
  DEFAULT[:jsonapi] = true