pagy 43.6.2 → 43.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b3c2ddfcddfcd9d3b6f239dedcaea1a9a9e2fc90b649514f590731f4c273b289
4
- data.tar.gz: 03526b97bfecfcc087ab5ed74df946a833528949e3695f99d911bf74c1ad63d6
3
+ metadata.gz: acefb70fcb49a67bc580acb08d9d199cc57caecf51721e437cc475051641c555
4
+ data.tar.gz: 6a3bacb516190cd2669ea92c233338043bbe597d674ac0c4ed41799be9be1e2b
5
5
  SHA512:
6
- metadata.gz: b6c667dceaf46a8681e4cffe54bfc3a9b913990f9b5bcd462ff02c65c9f5e3d8b3106a2aed9614acaccdea0de203fca11308bc241891610f63ec3e22b059e074
7
- data.tar.gz: 581756adb642ccd061486404c056d01d5250cde5cf745d4c0e3bd651b31fe202cf49e376d816feb4f6c1dcfd5f2bdd7dc9d868187763f1aff52de7310f0114e8
6
+ metadata.gz: 4bbb2f141e1657e4c6edbb96ba4bf6668c2f449b894f8c1ef5b4ee689f6edd018a71134f0485674bad8276e52dd00ac156bece5e918caa07905bd6db94889d9d
7
+ data.tar.gz: 4d67fb4c5a20e3935734cc63851eee75d2a49d2b1280ed7c5f8874df90429e711c7fe0c605c372b9963639f5dde0711a54ccd2e3ef5706c8123b77fc09a85b75
@@ -0,0 +1,283 @@
1
+ # frozen_string_literal: true
2
+
3
+ # DESCRIPTION
4
+ # Showcase the ActiveSearch pagination (active and passive modes)
5
+ #
6
+ # DOC
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#active-search
8
+ #
9
+ # BIN HELP
10
+ # pagy -h
11
+ #
12
+ # DEV USAGE
13
+ # pagy clone active_search
14
+ # pagy ./active_search.ru
15
+ #
16
+ # URL
17
+ # http://127.0.0.1:8000
18
+
19
+ VERSION = '43.7.0'
20
+
21
+ if VERSION != Pagy::VERSION
22
+ Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
23
+ end
24
+
25
+ # Bundle
26
+ require 'bundler/inline'
27
+ gemfile(!Pagy::ROOT.join('pagy.gemspec').exist?) do
28
+ source 'https://rubygems.org'
29
+ gem 'oj'
30
+ gem 'puma'
31
+ gem 'rails', '~> 8.1'
32
+ gem 'sqlite3'
33
+ gem 'rails-active_search'
34
+ end
35
+
36
+ # require 'rails/all' # too much stuff
37
+ require 'action_controller/railtie'
38
+ require 'active_record'
39
+ require 'rails-active_search'
40
+
41
+ OUTPUT = Rails.env.showcase? ? IO::NULL : $stdout
42
+
43
+ # Rails config
44
+ class PagyActiveSearch < Rails::Application # :nodoc:
45
+ config.root = __dir__
46
+ config.eager_load = false
47
+ config.session_store :cookie_store, key: 'cookie_store_key'
48
+ Rails.application.credentials.secret_key_base = 'absolute_secret'
49
+
50
+ config.logger = Logger.new(OUTPUT)
51
+ Rails.logger = config.logger
52
+ end
53
+
54
+ # Initialize the app in order to run the ActiveSearch engine initializers
55
+ PagyActiveSearch.initialize!
56
+
57
+ # Draw the routes after the initialization, which would otherwise reset them
58
+ PagyActiveSearch.routes.draw do
59
+ root to: 'comments#active'
60
+ get '/comments/active', to: 'comments#active'
61
+ get '/comments/passive', to: 'comments#passive'
62
+ get '/javascripts/:file', to: 'pagy#javascripts', file: /.*/
63
+ end
64
+
65
+ # ActiveSearch reads its stores only from config/search.yml, so we apply the equivalent config directly.
66
+ # The sqlite adapter uses the ActiveRecord connection, so it takes no connection options.
67
+ ActiveSearch.configuration.apply_store_config(adapter: :sqlite)
68
+
69
+ # Activerecord initializer
70
+ ActiveRecord::Base.logger = Logger.new(OUTPUT)
71
+ ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: 'file:memdb1?mode=memory&cache=shared')
72
+ ActiveRecord::Schema.define do
73
+ create_table :posts, force: true do |t|
74
+ t.string :title
75
+ end
76
+
77
+ create_table :comments, force: true do |t|
78
+ t.string :body
79
+ t.integer :post_id
80
+ end
81
+
82
+ # ActiveSearch sqlite documents: a table for the filterable fields and an FTS5 table for the text fields
83
+ create_table :post_documents, force: true do |t|
84
+ t.string :post_id, null: false, index: { unique: true }
85
+ end
86
+ create_virtual_table :post_documents_fts, :fts5, [:title]
87
+
88
+ create_table :comment_documents, force: true do |t|
89
+ t.string :comment_id, null: false, index: { unique: true }
90
+ t.integer :post_id
91
+ end
92
+ create_virtual_table :comment_documents_fts, :fts5, [:body]
93
+ end
94
+
95
+ class ApplicationRecord < ActiveRecord::Base
96
+ primary_abstract_class
97
+ end
98
+
99
+ # ActiveSearch document models (one per index)
100
+ class PostDocument < ApplicationRecord; end
101
+ class CommentDocument < ApplicationRecord; end
102
+
103
+ # Models
104
+ class Post < ApplicationRecord # :nodoc:
105
+ extend Pagy::Search
106
+
107
+ has_many :comments
108
+ has_search async: false
109
+ end
110
+
111
+ # :nodoc:
112
+
113
+ class Comment < ApplicationRecord # :nodoc:
114
+ extend Pagy::Search
115
+
116
+ belongs_to :post
117
+ has_search async: false
118
+ end
119
+
120
+ ActiveSearch.define_index(:posts) do
121
+ text :title
122
+ end
123
+
124
+ ActiveSearch.define_index(:comments) do
125
+ text :body
126
+ integer :post_id
127
+ end
128
+
129
+ # :nodoc:
130
+
131
+ # Unused model, useful to test overriding conflicts
132
+ module Calendar
133
+ end
134
+
135
+ # DB seed
136
+ 1.upto(11) do |pi|
137
+ Post.create(title: "Post #{pi + 1}")
138
+ end
139
+ Post.all.each_with_index do |post, pi|
140
+ 2.times { |ci| Comment.create(post:, body: "Comment #{ci + 1} to Post #{pi + 1}") }
141
+ end
142
+
143
+ # Controllers
144
+ class CommentsController < ActionController::Base # :nodoc:
145
+ include Rails.application.routes.url_helpers
146
+ include Pagy::Method
147
+
148
+ def active
149
+ search = Comment.pagy_search(params[:q])
150
+ @pagy, @comments = pagy(:rails_active_search, search, limit: 10, client_limit: 100)
151
+ # Reload the page in the network tab of the Chrome Inspector to check
152
+ # response.headers.merge!(@pagy.headers_hash)
153
+ render inline: TEMPLATE
154
+ end
155
+
156
+ def passive
157
+ limit = [params[:limit].to_i, 10].max.clamp(..100)
158
+ page = [params[:page].to_i, 1].max
159
+ @comments = Comment.search(params[:q]).limit(limit).offset(limit * (page - 1)).results
160
+ @pagy = pagy(:rails_active_search, @comments, client_limit: 100)
161
+ # Reload the page in the network tab of the Chrome Inspector to check
162
+ # response.headers.merge!(@pagy.headers_hash)
163
+ render inline: TEMPLATE
164
+ end
165
+ end
166
+
167
+ # You don't need this in real rails apps (see https://ddnexus.github.io/pagy/resources/javascripts)
168
+ class PagyController < ActionController::Base
169
+ def javascripts
170
+ format = params[:file].split('.').last
171
+ if format == 'js'
172
+ render js: Pagy::ROOT.join('javascripts', params[:file]).read
173
+ elsif format == 'map'
174
+ render json: Pagy::ROOT.join('javascripts', params[:file]).read
175
+ end
176
+ end
177
+ end
178
+
179
+ run PagyActiveSearch
180
+
181
+ TEMPLATE = <<~ERB
182
+ <!DOCTYPE html>
183
+ <html lang="en">
184
+ <head>
185
+ <title>Pagy ActiveSearch App</title>
186
+ <script src="/javascripts/pagy.js"></script>
187
+ <script>
188
+ window.addEventListener("load", Pagy.init);
189
+ </script>
190
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
191
+ <style type="text/css">
192
+ @media screen { html, body {
193
+ font-size: 1rem;
194
+ line-height: 1.2;
195
+ padding: 0;
196
+ margin: 0;
197
+ } }
198
+ body {
199
+ background: white !important;
200
+ margin: 0 !important;
201
+ font-family: sans-serif !important;
202
+ }
203
+ .main-content {
204
+ padding: 1rem 1.5rem 2rem !important;
205
+ }
206
+ .pagy, .pagy-bootstrap, .pagy-bulma {
207
+ padding: .5em;
208
+ margin: .3em 0;
209
+ width: fit-content;
210
+ box-shadow: 5px 5px 10px 0px rgba(0,0,0,0.2);
211
+ }
212
+
213
+ /* Quick demo for overriding the element style attribute of certain pagy helpers
214
+ .pagy input[style] {
215
+ width: 5rem !important;
216
+ }
217
+ */
218
+
219
+ /*
220
+ If you want to customize the style,
221
+ please replace the line below with the actual file content
222
+ */
223
+ <%== Pagy::ROOT.join('stylesheets/pagy.css').read %>
224
+ </style>
225
+ </head>
226
+
227
+ <body>
228
+
229
+ <div class="main-content">
230
+ <h1>Pagy ActiveSearch App</h1>
231
+ <p> Self-contained, standalone Rails app usable to easily reproduce any rails related pagy issue.</p>
232
+
233
+ <h2>Versions</h2>
234
+ <ul>
235
+ <li>Ruby: <%== RUBY_VERSION %></li>
236
+ <li>Rack: <%== Rack::RELEASE %></li>
237
+ <li>Rails: <%== Rails.version %></li>
238
+ <li>Pagy: <%== Pagy::VERSION %></li>
239
+ </ul>
240
+
241
+ <h3>Active Collection</h3>
242
+ <%= form_with url: { controller: 'comments', action: 'active' }, method: :get, local: true do |form| %>
243
+ <%= form.text_field :q, value: params[:q], placeholder: "Search..." %>
244
+ <%= form.submit "Search" %>
245
+ <% end %>
246
+
247
+ <h3>Passive Collection</h3>
248
+ <%= form_with url: { controller: 'comments', action: 'passive' }, method: :get, local: true do |form| %>
249
+ <%= form.text_field :q, value: params[:q], placeholder: "Search..." %>
250
+ <%= form.submit "Search" %>
251
+ <% end %>
252
+
253
+
254
+ <div id="records" class="collection">
255
+ <% @comments.each do |comment| %>
256
+ <p style="margin: 0;"><%= comment.body %></p>
257
+ <% end %>
258
+ </div>
259
+
260
+ <hr>
261
+
262
+ <h4>@pagy.series_nav</h4>
263
+ <%== @pagy.series_nav(id: 'series-nav',
264
+ aria_label: 'Pages nav') %>
265
+
266
+ <h4>@pagy.series_nav_js</h4>
267
+ <%== @pagy.series_nav_js(id: 'series-nav-js',
268
+ aria_label: 'Pages nav_js') %>
269
+
270
+ <h4>@pagy.input_nav_js</h4>
271
+ <%== @pagy.input_nav_js(id: 'input-nav-js',
272
+ aria_label: 'Pages input_nav_js') %>
273
+
274
+ <h4>@pagy.limit_tag_js</h4>
275
+ <%== @pagy.limit_tag_js(id: 'limit-tag-js') %>
276
+
277
+ <h4>@pagy.info_tag</h4>
278
+ <%== @pagy.info_tag(id: 'pagy-info') %>
279
+ </div>
280
+
281
+ </body>
282
+ </html>
283
+ ERB
data/apps/calendar.ru CHANGED
@@ -4,7 +4,7 @@
4
4
  # Showcase the calendar; reproduce related issues
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#5-calendar-app
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#calendar
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
@@ -16,7 +16,7 @@
16
16
  # URL
17
17
  # http://127.0.0.1:8000
18
18
 
19
- VERSION = '43.6.2'
19
+ VERSION = '43.7.0'
20
20
 
21
21
  if VERSION != Pagy::VERSION
22
22
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -46,6 +46,10 @@ require 'sinatra/base'
46
46
  class PagyCalendar < Sinatra::Base
47
47
  include Pagy::Method
48
48
 
49
+ # Serve one request at a time: concurrent requests calling the groupdate SQLite function
50
+ # on the shared in-memory database deadlock the server
51
+ use Rack::Lock
52
+
49
53
  if ENV['E2E_TEST']
50
54
  get('/assets/:file') do
51
55
  content_type 'text/css'
data/apps/demo.ru CHANGED
@@ -4,7 +4,7 @@
4
4
  # Showcase all the helpers and styles
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#demo-app
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#demo
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
@@ -19,7 +19,7 @@
19
19
  # URL
20
20
  # http://127.0.0.1:8000
21
21
 
22
- VERSION = '43.6.2'
22
+ VERSION = '43.7.0'
23
23
 
24
24
  if VERSION != Pagy::VERSION
25
25
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -46,7 +46,7 @@ SECTIONS = { pagy: { css_anchor: 'pagy-css' },
46
46
  require 'sinatra/base'
47
47
 
48
48
  # Pagy init
49
- Pagy::OPTIONS[:max_limit] = 100
49
+ Pagy::OPTIONS[:client_limit] = 100
50
50
 
51
51
  # Sinatra application
52
52
  class PagyDemo < Sinatra::Base
@@ -47,7 +47,7 @@ class Pagy
47
47
  # Compose the final URL using `url_for`.
48
48
  module LinkableOverride
49
49
  def compose_url(absolute, _path, params, fragment)
50
- params[:anchor] = fragment if fragment
50
+ params[:anchor] = fragment unless fragment.to_s.empty?
51
51
  params[:only_path] = !absolute
52
52
  @context.url_for(params)
53
53
  end
@@ -4,19 +4,19 @@
4
4
  # Showcase the Keynav pagination with independent instances
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#keyset-apps
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#keysets
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
11
11
  #
12
12
  # DEV USAGE
13
- # pagy clone keynav
14
- # pagy ./keynav.ru
13
+ # pagy clone keynav+root_key
14
+ # pagy ./keynav+root_key.ru
15
15
  #
16
16
  # URL
17
17
  # http://127.0.0.1:8000
18
18
 
19
- VERSION = '43.6.2'
19
+ VERSION = '43.7.0'
20
20
 
21
21
  if VERSION != Pagy::VERSION
22
22
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -35,7 +35,7 @@ end
35
35
  # Sinatra setup
36
36
  require 'sinatra/base'
37
37
  # Sinatra application
38
- class PagyKeynav < Sinatra::Base
38
+ class PagyKeynavRootKey < Sinatra::Base
39
39
  include Pagy::Method
40
40
 
41
41
  get('/javascripts/:file') do
@@ -132,7 +132,7 @@ class PagyKeynav < Sinatra::Base
132
132
  template :main do
133
133
  <<~ERB
134
134
  <div class="main-content">
135
- <h1>Pagy Keynav App</h1>
135
+ <h1>Pagy Keynav (root_key) App</h1>
136
136
  <p>Self-contained, standalone app usable to easily reproduce any Keynav related pagy issue
137
137
  with ActiveRecord sets.</p>
138
138
  <p>The panels below show how to use the <code>:root_key</code> option for independent instances in the same request.</p>
@@ -313,4 +313,4 @@ data.each_line(chomp: true) do |pet|
313
313
  end
314
314
  Pet.insert_all(pets)
315
315
 
316
- run PagyKeynav
316
+ run PagyKeynavRootKey
data/apps/keynav.ru CHANGED
@@ -4,7 +4,7 @@
4
4
  # Showcase the Keynav pagination (ActiveRecord example)
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#keyset-apps
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#keysets
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
@@ -16,7 +16,7 @@
16
16
  # URL
17
17
  # http://127.0.0.1:8000
18
18
 
19
- VERSION = '43.6.2'
19
+ VERSION = '43.7.0'
20
20
 
21
21
  if VERSION != Pagy::VERSION
22
22
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -53,9 +53,9 @@ class PagyKeynav < Sinatra::Base
53
53
  Time.zone = 'UTC'
54
54
 
55
55
  @order = { animal: :asc, name: :asc, birthdate: :desc, id: :asc }.freeze
56
- @pagy, @pets = pagy(:keynav_js, Pet.order(@order), limit: 4, max_limit: 100)
56
+ @pagy, @pets = pagy(:keynav_js, Pet.order(@order), limit: 4, client_limit: 100)
57
57
  # Support also root_key for replacing url in javascript
58
- # @pagy, @pets = pagy(:keynav_js, Pet.order(@order), limit: 4, max_limit: 100, root_key: 'animal')
58
+ # @pagy, @pets = pagy(:keynav_js, Pet.order(@order), limit: 4, client_limit: 100, root_key: 'animal')
59
59
  @ids = @pets.pluck(:id)
60
60
  erb :main
61
61
  end
data/apps/keyset.ru CHANGED
@@ -4,7 +4,7 @@
4
4
  # Showcase the Keyset pagination (ActiveRecord example)
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#keyset-apps
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#keysets
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
@@ -16,7 +16,7 @@
16
16
  # URL
17
17
  # http://127.0.0.1:8000
18
18
 
19
- VERSION = '43.6.2'
19
+ VERSION = '43.7.0'
20
20
 
21
21
  if VERSION != Pagy::VERSION
22
22
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -43,10 +43,10 @@ class PagyKeyset < Sinatra::Base
43
43
  Time.zone = 'UTC'
44
44
 
45
45
  @order = { animal: :asc, name: :asc, birthdate: :desc, id: :asc }.freeze
46
- @pagy, @pets = pagy(:keyset, Pet.order(@order), limit: 10, max_limit: 100)
46
+ @pagy, @pets = pagy(:keyset, Pet.order(@order), limit: 10, client_limit: 100)
47
47
  # @pagy, @pets = pagy(:keyset, Pet.order(@order),
48
48
  # jsonapi: true, page_key: 'number', limit_key: 'size', # very customized jsonapi
49
- # limit: 10, max_limit: 100)
49
+ # limit: 10, client_limit: 100)
50
50
  # response.headers.merge!(@pagy.headers_hash)
51
51
  erb :main
52
52
  end
@@ -4,7 +4,7 @@
4
4
  # Showcase the Keyset pagination (Sequel example)
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#keyset-apps
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#keysets
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
@@ -16,7 +16,7 @@
16
16
  # URL
17
17
  # http://127.0.0.1:8000
18
18
 
19
- VERSION = '43.6.2'
19
+ VERSION = '43.7.0'
20
20
 
21
21
  if VERSION != Pagy::VERSION
22
22
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -43,7 +43,7 @@ class PagyKeysetSequel < Sinatra::Base
43
43
  get '/' do
44
44
  @order = { animal: :asc, name: :asc, birthdate: :desc, id: :asc }.freeze
45
45
  @pagy, @pets = pagy(:keyset, Pet.order(:animal, :name, Sequel.desc(:birthdate), :id),
46
- limit: 10, max_limit: 100)
46
+ limit: 10, client_limit: 100)
47
47
  erb :main
48
48
  end
49
49
 
data/apps/rails.ru CHANGED
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # DESCRIPTION
4
- # Reproduce rails related issues
4
+ # Reproduce Rails-related issues
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#rails-app
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#rails
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
@@ -16,7 +16,7 @@
16
16
  # URL
17
17
  # http://127.0.0.1:8000
18
18
 
19
- VERSION = '43.6.2'
19
+ VERSION = '43.7.0'
20
20
 
21
21
  if VERSION != Pagy::VERSION
22
22
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -28,7 +28,7 @@ gemfile(!Pagy::ROOT.join('pagy.gemspec').exist?) do
28
28
  source 'https://rubygems.org'
29
29
  gem 'oj'
30
30
  gem 'puma'
31
- gem 'rails', '~> 8.0'
31
+ gem 'rails', '~> 8.1'
32
32
  gem 'sqlite3'
33
33
  end
34
34
 
@@ -102,7 +102,7 @@ class CommentsController < ActionController::Base # :nodoc:
102
102
  include Pagy::Method
103
103
 
104
104
  def index
105
- @pagy, @comments = pagy(:offset, Comment.all, limit: 10, max_limit: 100)
105
+ @pagy, @comments = pagy(:offset, Comment.all, limit: 10, client_limit: 100)
106
106
  # Reload the page in the network tab of the Chrome Inspector to check
107
107
  # response.headers.merge!(@pagy.headers_hash)
108
108
  render inline: TEMPLATE
data/apps/repro.ru CHANGED
@@ -4,7 +4,7 @@
4
4
  # Reproduce generic/simple issues
5
5
  #
6
6
  # DOC
7
- # https://ddnexus.github.io/pagy/playground/#repro-app
7
+ # https://ddnexus.github.io/pagy/sandbox/playground/#repro
8
8
  #
9
9
  # BIN HELP
10
10
  # pagy -h
@@ -16,7 +16,7 @@
16
16
  # URL
17
17
  # http://127.0.0.1:8000
18
18
 
19
- VERSION = '43.6.2'
19
+ VERSION = '43.7.0'
20
20
 
21
21
  if VERSION != Pagy::VERSION
22
22
  Warning.warn("\n>>> WARNING! '#{File.basename(__FILE__)}-#{VERSION}' running with 'pagy-#{Pagy::VERSION}'! <<< \n\n")
@@ -34,7 +34,7 @@ end
34
34
 
35
35
  # Edit this section adding the legacy as needed
36
36
  # Pagy initializer
37
- Pagy::OPTIONS[:max_limit] = 100
37
+ Pagy::OPTIONS[:client_limit] = 100
38
38
 
39
39
  # Sinatra setup
40
40
  require 'sinatra/base'
@@ -56,7 +56,7 @@ class PagyRepro < Sinatra::Base
56
56
  get '/' do
57
57
  collection = MockCollection.new
58
58
  @pagy, @records = pagy(collection) # simplest form
59
- # @pagy, @records = pagy(:offset, collection, limit: 7, max_limit: 30)
59
+ # @pagy, @records = pagy(:offset, collection, limit: 7, client_limit: 30)
60
60
  # @pagy, @records = pagy(:countish, collection, ttl: 20)
61
61
  # @pagy, @records = pagy(:countless, collection)
62
62
  # @pagy, @records = pagy(Array(1..1000))
data/config/pagy.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Pagy initializer file (43.6.2)
3
+ # Pagy initializer file (43.7.0)
4
4
  # See https://ddnexus.github.io/pagy/toolbox/configuration/initializer/
5
5
 
6
6
 
@@ -9,7 +9,7 @@
9
9
  # Examples:
10
10
  #
11
11
  # Pagy::OPTIONS[:limit] = 10 # Limit the items per page
12
- # Pagy::OPTIONS[:max_limit] = 100 # The client is allowed to request a limit up to 100
12
+ # Pagy::OPTIONS[:client_limit] = 100 # The client is allowed to request a limit up to 100
13
13
  # Pagy::OPTIONS[:jsonapi] = true # Use JSON:API compliant URLs
14
14
 
15
15
  Pagy::OPTIONS.freeze
data/javascripts/pagy.js CHANGED
@@ -135,7 +135,7 @@ var pagy_default = (() => {
135
135
  });
136
136
  };
137
137
  return {
138
- version: "43.6.2",
138
+ version: "43.7.0",
139
139
  init(arg) {
140
140
  const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
141
141
  for (const element of elements) {
@@ -162,5 +162,5 @@ var pagy_default = (() => {
162
162
  // pagy-shim.ts
163
163
  window.Pagy = pagy_default;
164
164
 
165
- //# debugId=142524AA8BD9779264756E2164756E21
166
- //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["pagy.ts", "pagy-shim.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// The syntax used in this file has been carefully composed to minimize\n// the pagy.min.js size and avoid pollution in the window object.\nexport default (() => {\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\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(entries => {\n    entries.forEach(e => {\n      e.target.querySelectorAll<NavJsElement>(\".series-nav-js\").forEach(el => {\n        el.render();\n      });\n    });\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    // eslint-disable-next-line align-assignments/align-assignments\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}+${String(last)}`;      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\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 => `${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    let lastWidth = -1;\n    const parent  = <HTMLElement>nav.parentElement;\n\n    nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (index === -1 || widths[index] === lastWidth) { return }\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] ?? `${String(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\n    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    let   initial = input.value;\n    const 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                      initial   = input.value;\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.6.2\",\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            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\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",
    "import Pagy from \"./pagy.ts\"\nwindow.Pagy = Pagy\n"
  ],
  "mappings": "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",
  "debugId": "142524AA8BD9779264756E2164756E21",
  "names": []
}
165
+ //# debugId=EE64B5BD0D317BA664756E2164756E21
166
+ //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["pagy.ts", "pagy-shim.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// The syntax used in this file has been carefully composed to minimize\n// the pagy.min.js size and avoid pollution in the window object.\nexport default (() => {\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\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(entries => {\n    entries.forEach(e => {\n      e.target.querySelectorAll<NavJsElement>(\".series-nav-js\").forEach(el => {\n        el.render();\n      });\n    });\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    // eslint-disable-next-line align-assignments/align-assignments\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}+${String(last)}`;      }\n    }\n    // @ts-expect-error If it is not assigned it means it supports keynav\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\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 => `${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    let lastWidth = -1;\n    const parent  = <HTMLElement>nav.parentElement;\n\n    nav.render = () => {\n      const index = widths.findIndex(w => w < parent.clientWidth);\n      if (index === -1 || widths[index] === lastWidth) { return }\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] ?? `${String(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\n    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    let   initial = input.value;\n    const 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                      initial   = input.value;\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.7.0\",\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            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\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",
    "import Pagy from \"./pagy.ts\"\nwindow.Pagy = Pagy\n"
  ],
  "mappings": "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",
  "debugId": "EE64B5BD0D317BA664756E2164756E21",
  "names": []
}
@@ -1,2 +1,2 @@
1
- window.Pagy=(()=>{let O="sessionStorage"in window&&"BroadcastChannel"in window,B="pagy",Z,L,W;if(O)Z=sessionStorage,L=new BroadcastChannel(B),W=Date.now(),L.addEventListener("message",(q)=>{if(q.data.from){let z=Z.getItem(q.data.key);if(z)L.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 V=new ResizeObserver((q)=>{q.forEach((z)=>{z.target.querySelectorAll(".series-nav-js").forEach((C)=>{C.render()})})}),_=(q)=>btoa(String.fromCharCode(...new TextEncoder().encode(q))).replace(/[+/=]/g,(z)=>z=="+"?"-":z=="/"?"_":""),T=(q)=>new TextDecoder().decode(Uint8Array.from(atob(q),(z)=>z.charCodeAt(0))),P=()=>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(B+"="))?.split("=")[1]??P();if(document.cookie=`${B}=${X}`,z&&!(z in Z)){if(L.postMessage({from:W,key:z}),await new Promise((M)=>setTimeout(()=>{M("")},100)),!(z in Z))Q=(M)=>`${M}+${String(H)}`}if(!Q){if(!z)do z=P();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 _(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)=>`${String($)}${Q(R)}`);return Q},x=(q,[[z,C,F,H,G],Q,[X,D,E],M])=>{let Y=-1,$=q.parentElement;q.render=()=>{let R=X.findIndex((j)=>j<$.clientWidth);if(R===-1||X[R]===Y)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]??`${String(j)}<`)}),U+=G,q.innerHTML="",q.insertAdjacentHTML("afterbegin",U),Y=X[R],M&&O)J(q,M)},V.observe($)},w=async(q,[z,C,F])=>{let H=F&&O?await J(q,F):(G)=>G;S(q,(G)=>z.replace(C,H(G)))},A=(q,[z,C,F,H])=>{S(q,(G)=>{return C.replace(F,Math.max(Math.ceil(z/parseInt(G)),1)).replace(H,G)})},S=(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}H=C.value,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.6.2",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(T(F.getAttribute("data-pagy")));if(H=="k")J(F,...G);else if(H=="snj")x(F,G);else if(H=="inj")w(F,G);else if(H=="ltj")A(F,G)}catch(H){console.warn(`Pagy.init: %o
1
+ window.Pagy=(()=>{let O="sessionStorage"in window&&"BroadcastChannel"in window,B="pagy",Z,L,W;if(O)Z=sessionStorage,L=new BroadcastChannel(B),W=Date.now(),L.addEventListener("message",(q)=>{if(q.data.from){let z=Z.getItem(q.data.key);if(z)L.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 V=new ResizeObserver((q)=>{q.forEach((z)=>{z.target.querySelectorAll(".series-nav-js").forEach((C)=>{C.render()})})}),_=(q)=>btoa(String.fromCharCode(...new TextEncoder().encode(q))).replace(/[+/=]/g,(z)=>z=="+"?"-":z=="/"?"_":""),T=(q)=>new TextDecoder().decode(Uint8Array.from(atob(q),(z)=>z.charCodeAt(0))),P=()=>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(B+"="))?.split("=")[1]??P();if(document.cookie=`${B}=${X}`,z&&!(z in Z)){if(L.postMessage({from:W,key:z}),await new Promise((M)=>setTimeout(()=>{M("")},100)),!(z in Z))Q=(M)=>`${M}+${String(H)}`}if(!Q){if(!z)do z=P();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 _(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)=>`${String($)}${Q(R)}`);return Q},x=(q,[[z,C,F,H,G],Q,[X,D,E],M])=>{let Y=-1,$=q.parentElement;q.render=()=>{let R=X.findIndex((j)=>j<$.clientWidth);if(R===-1||X[R]===Y)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]??`${String(j)}<`)}),U+=G,q.innerHTML="",q.insertAdjacentHTML("afterbegin",U),Y=X[R],M&&O)J(q,M)},V.observe($)},w=async(q,[z,C,F])=>{let H=F&&O?await J(q,F):(G)=>G;S(q,(G)=>z.replace(C,H(G)))},A=(q,[z,C,F,H])=>{S(q,(G)=>{return C.replace(F,Math.max(Math.ceil(z/parseInt(G)),1)).replace(H,G)})},S=(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}H=C.value,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.7.0",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(T(F.getAttribute("data-pagy")));if(H=="k")J(F,...G);else if(H=="snj")x(F,G);else if(H=="inj")w(F,G);else if(H=="ltj")A(F,G)}catch(H){console.warn(`Pagy.init: %o
2
2
  %s`,F,H)}}}})();
data/javascripts/pagy.mjs CHANGED
@@ -134,7 +134,7 @@ export default (() => {
134
134
  });
135
135
  };
136
136
  return {
137
- version: "43.6.2",
137
+ version: "43.7.0",
138
138
  init(arg) {
139
139
  const target = arg instanceof HTMLElement ? arg : document, elements = target.querySelectorAll("[data-pagy]");
140
140
  for (const element of elements) {
@@ -2,15 +2,31 @@
2
2
 
3
3
  class Pagy
4
4
  module Search
5
- class Arguments < Array
6
- def respond_to_missing?(*) = true
7
-
8
- def method_missing(*) = push(*)
5
+ # Collect the search arguments and record the chained calls, applied later by the paginators.
6
+ # It is not an Array, so methods like filter, reject, sort, etc. get recorded as well
7
+ class Arguments
8
+ def initialize(*arguments)
9
+ @arguments = arguments
10
+ @calls = []
11
+ end
12
+
13
+ # Destructure as [model, arguments, options, block, calls]
14
+ def to_ary = [*@arguments, @calls]
15
+
16
+ # Conversion methods are not recorded
17
+ def respond_to_missing?(name, *) = !name.start_with?('to_')
18
+
19
+ def method_missing(name, *args, **kwargs, &block)
20
+ return super if name.start_with?('to_')
21
+
22
+ @calls << [name, args, kwargs, block]
23
+ self
24
+ end
9
25
  end
10
26
 
11
27
  # Collect the search arguments to pass to the actual search
12
28
  def pagy_search(*arguments, **options, &block)
13
- Arguments.new([self, arguments, options, block])
29
+ Arguments.new(self, arguments, options, block)
14
30
  end
15
31
  end
16
32
 
@@ -20,6 +36,10 @@ class Pagy
20
36
  def search? = true
21
37
  end
22
38
 
39
+ class RailsActiveSearch < SearchBase
40
+ DEFAULT = { search_method: :search }.freeze
41
+ end
42
+
23
43
  class ElasticsearchRails < SearchBase
24
44
  DEFAULT = { search_method: :search,
25
45
  max_result_window: 10_000 }.freeze
@@ -27,13 +27,13 @@ class Pagy
27
27
  end
28
28
 
29
29
  def resolve_limit
30
- default = @options[:limit] || DEFAULT[:limit]
31
- max_limit = @options[:max_limit]
32
- return default unless max_limit
30
+ default = @options[:limit] || DEFAULT[:limit]
31
+ client_limit = @options[:client_limit]
32
+ return default unless client_limit
33
33
 
34
34
  limit_key = @options[:limit_key] || DEFAULT[:limit_key]
35
35
  limit = (@params.dig(@options[:root_key], limit_key) || @params[limit_key]).to_s.to_i
36
- limit.zero? ? default : [limit, max_limit].min
36
+ limit.zero? ? default : [limit, client_limit].min
37
37
  end
38
38
 
39
39
  private
data/lib/pagy/cli.rb CHANGED
@@ -23,7 +23,7 @@ class Pagy
23
23
 
24
24
  parser = OptionParser.new do |opts|
25
25
  opts.banner = <<~BANNER
26
- Pagy #{VERSION} (https://ddnexus.github.io/pagy/playground)
26
+ Pagy #{VERSION} (https://ddnexus.github.io/pagy/sandbox/playground)
27
27
  Playground to showcase, clone and develop Pagy APPs
28
28
 
29
29
  Usage:
@@ -6,9 +6,9 @@
6
6
  class Pagy
7
7
  module Deprecated
8
8
  def self.client_max_limit(options)
9
- if (max_limit = options.delete(:client_max_limit))
10
- options[:max_limit] ||= max_limit
11
- warn '[PAGY] the :client_max_limit option is deprecated: use :max_limit instead.'
9
+ options[:client_limit] ||= options[:max_limit] || options[:client_max_limit]
10
+ %i[max_limit client_max_limit].each do |key|
11
+ warn "[PAGY] the #{key.inspect} option is deprecated: use :client_limit instead." if options.delete(key)
12
12
  end
13
13
  end
14
14
 
@@ -53,7 +53,7 @@ class Pagy
53
53
  end
54
54
 
55
55
  { opts[:page_key] => compose_page_param(page),
56
- opts[:limit_key] => opts[:max_limit] && opts[:limit] }.each do |k, v|
56
+ opts[:limit_key] => opts[:client_limit] && opts[:limit] }.each do |k, v|
57
57
  v ? container[k] = v : container.delete(k)
58
58
  end
59
59
 
@@ -6,15 +6,22 @@ class Pagy
6
6
 
7
7
  # Common search logic
8
8
  def wrap(search_arguments, options)
9
- options[:page] ||= options[:request].resolve_page
10
- options[:limit] = options[:request].resolve_limit
11
-
9
+ resolve(options)
12
10
  pagy, results = yield
11
+ *, calls = search_arguments
12
+
13
+ [pagy, chain(results, calls)]
14
+ end
13
15
 
14
- called = search_arguments[4..]
15
- results = results.send(*called) unless called.empty?
16
+ # Resolve the page and limit from the request
17
+ def resolve(options)
18
+ options[:page] ||= options[:request].resolve_page
19
+ options[:limit] = options[:request].resolve_limit
20
+ end
16
21
 
17
- [pagy, results]
22
+ # Apply the calls recorded by Search::Arguments
23
+ def chain(receiver, calls)
24
+ calls.reduce(receiver) { |object, (name, args, kwargs, block)| object.send(name, *args, **kwargs, &block) }
18
25
  end
19
26
  end
20
27
  end
data/lib/pagy/next.rb CHANGED
@@ -14,7 +14,7 @@ class Pagy
14
14
  module Discontinued
15
15
  # Ensure a discontinued option won't pass unnoticed shadowing a bug
16
16
  def assign_options(**options)
17
- discontinued = options.keys & %i[max_pages client_max_limit]
17
+ discontinued = options.keys & %i[max_pages client_max_limit max_limit]
18
18
  return super if discontinued.empty?
19
19
 
20
20
  raise NextError, "discontinued #{discontinued.map(&:inspect).join(', ')}: " \
@@ -11,7 +11,9 @@ class Pagy
11
11
 
12
12
  # Generate a hash of RFC-8288-compliant http headers
13
13
  def headers_hash(headers_map: @options[:headers_map] || DEFAULT_HEADERS_MAP, **)
14
- links = urls_hash(**, absolute: true).map { %(<#{_2}>; rel="#{_1}") }.join(', ')
14
+ links = urls_hash(**, absolute: true).map do |key, url|
15
+ %(<#{url}>; rel="#{key == :previous ? :prev : key}")
16
+ end.join(', ')
15
17
 
16
18
  headers_map.each_with_object('link' => links) do |(key, name), hash|
17
19
  next unless name
@@ -4,10 +4,10 @@ require_relative 'support/data_pagy_attribute'
4
4
 
5
5
  class Pagy
6
6
  module NumericHelpers
7
- def limit_tag_js(id: nil, item_name: nil, max_limit: @options[:max_limit], **)
8
- raise OptionError.new(self, :max_limit, 'to be truthy', max_limit) unless max_limit
7
+ def limit_tag_js(id: nil, item_name: nil, client_limit: @options[:client_limit], **)
8
+ raise OptionError.new(self, :client_limit, 'to be truthy', client_limit) unless client_limit
9
9
 
10
- limit_input = %(<input name="limit" type="number" min="1" max="#{max_limit}" value="#{
10
+ limit_input = %(<input name="limit" type="number" min="1" max="#{client_limit}" value="#{
11
11
  @limit}" style="padding: 0; text-align: center; width: #{@limit.to_s.length + 1}rem;">#{A_TAG})
12
12
 
13
13
  url_token = compose_page_url(PAGE_TOKEN, limit: LIMIT_TOKEN)
@@ -9,11 +9,11 @@ class Pagy
9
9
  private
10
10
 
11
11
  # The reverse-sorted array of widths, series, and labels generated from the :steps hash.
12
- # If :steps is false it will use the single {0 => @options[:slots]} length
13
- def sequels(steps: @options[:steps] || { 0 => @options[:slots] || SERIES_SLOTS }, **)
12
+ # If :steps is not set it will use the single {0 => slots} step; :compact applies to all the steps
13
+ def sequels(slots: @options[:slots] || SERIES_SLOTS, compact: @options[:compact], steps: @options[:steps] || { 0 => slots }, **)
14
14
  raise OptionError.new(self, :steps, 'to define the 0 width', steps) unless steps.key?(0)
15
15
 
16
- widths, series = steps.sort.reverse.map { |width, slots| [width, series(slots:)] }.transpose
16
+ widths, series = steps.sort.reverse.map { |width, step_slots| [width, series(slots: step_slots, compact:)] }.transpose
17
17
  [widths, series, page_labels(series)]
18
18
  end
19
19
 
@@ -4,9 +4,10 @@ class Pagy
4
4
  def urls_hash(**)
5
5
  template = compose_page_url(PAGE_TOKEN, **)
6
6
 
7
- { first: compose_page_url(nil, **),
8
- previous: @previous && template.sub(PAGE_TOKEN, @previous.to_s),
9
- next: @next && template.sub(PAGE_TOKEN, @next.to_s),
10
- last: @count && template.sub(PAGE_TOKEN, @last.to_s) }.compact
7
+ urls = { first: compose_page_url(nil, **),
8
+ previous: @previous && template.sub(PAGE_TOKEN, @previous.to_s),
9
+ next: @next && template.sub(PAGE_TOKEN, @next.to_s),
10
+ last: @count && template.sub(PAGE_TOKEN, @last.to_s) }.compact
11
+ @options[:jsonapi] ? urls.transform_keys(previous: :prev) : urls # JSON:API requires :prev
11
12
  end
12
13
  end
@@ -11,6 +11,7 @@ class Pagy
11
11
  calendar: :CalendarPaginator,
12
12
  elasticsearch_rails: :ElasticsearchRailsPaginator,
13
13
  meilisearch: :MeilisearchPaginator,
14
+ rails_active_search: :RailsActiveSearchPaginator,
14
15
  searchkick: :SearchkickPaginator,
15
16
  typesense_rails: :TypesenseRailsPaginator }.freeze
16
17
 
@@ -0,0 +1,35 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative '../../modules/searcher'
4
+
5
+ class Pagy
6
+ module RailsActiveSearchPaginator
7
+ module_function
8
+
9
+ def paginate(search, options)
10
+ if search.is_a?(Search::Arguments) # Active mode
11
+ Searcher.resolve(options)
12
+ model, arguments, search_options, block, calls = search
13
+
14
+ method = options[:search_method] || RailsActiveSearch::DEFAULT[:search_method]
15
+ # The chained calls build the ActiveSearch::Query, so they apply before executing it
16
+ query = Searcher.chain(model.send(method, *arguments, **search_options, &block), calls)
17
+ results = query.limit(options[:limit])
18
+ .offset(options[:limit] * (options[:page] - 1))
19
+ .results
20
+ options[:count] = results.total
21
+
22
+ [RailsActiveSearch.new(**options), results]
23
+ else # Passive mode (ActiveSearch::Results)
24
+ # TODO: use the public readers when ActiveSearch::Results will provide them
25
+ limit = search.instance_variable_get(:@limit)
26
+ offset = search.instance_variable_get(:@offset).to_i # nil when not set
27
+ options[:limit] = limit
28
+ options[:page] = (offset / limit) + 1
29
+ options[:count] = search.total
30
+
31
+ RailsActiveSearch.new(**options)
32
+ end
33
+ end
34
+ end
35
+ end
data/lib/pagy.rb CHANGED
@@ -9,7 +9,7 @@ require_relative 'pagy/toolbox/helpers/loaders'
9
9
 
10
10
  # Top superclass
11
11
  class Pagy
12
- VERSION = '43.6.2'
12
+ VERSION = '43.7.0'
13
13
  ROOT = Pathname.new(__dir__).parent.freeze
14
14
  DEFAULT = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
15
15
  PAGE_TOKEN = EscapedValue.new('P ')
@@ -24,6 +24,7 @@ class Pagy
24
24
  autoload :Calendar, path.join('classes/calendar/calendar')
25
25
  autoload :Offset, path.join('classes/offset/offset')
26
26
  autoload :Search, path.join('classes/offset/search')
27
+ autoload :RailsActiveSearch, path.join('classes/offset/search')
27
28
  autoload :ElasticsearchRails, path.join('classes/offset/search')
28
29
  autoload :Meilisearch, path.join('classes/offset/search')
29
30
  autoload :Searchkick, path.join('classes/offset/search')
@@ -74,8 +75,8 @@ class Pagy
74
75
  @request = options.delete(:request) # internal object
75
76
  validate_string_values(options)
76
77
 
77
- default = {}
78
- current = self.class
78
+ default = {}
79
+ current = self.class
79
80
 
80
81
  loop do
81
82
  default = current::DEFAULT.merge(default)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pagy
3
3
  version: !ruby/object:Gem::Version
4
- version: 43.6.2
4
+ version: 43.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Domizio Demichelis
@@ -60,6 +60,7 @@ extensions: []
60
60
  extra_rdoc_files: []
61
61
  files:
62
62
  - LICENSE.txt
63
+ - apps/active_search.ru
63
64
  - apps/calendar.ru
64
65
  - apps/demo.ru
65
66
  - apps/enable_rails_page_segment.rb
@@ -153,6 +154,7 @@ files:
153
154
  - lib/pagy/toolbox/paginators/meilisearch.rb
154
155
  - lib/pagy/toolbox/paginators/method.rb
155
156
  - lib/pagy/toolbox/paginators/offset.rb
157
+ - lib/pagy/toolbox/paginators/rails_active_search.rb
156
158
  - lib/pagy/toolbox/paginators/searchkick.rb
157
159
  - lib/pagy/toolbox/paginators/typesense_rails.rb
158
160
  - locales/ar.yml
@@ -220,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
220
222
  - !ruby/object:Gem::Version
221
223
  version: '0'
222
224
  requirements: []
223
- rubygems_version: 4.0.16
225
+ rubygems_version: 4.0.20
224
226
  specification_version: 4
225
227
  summary: "Pagy \U0001F438 The Leaping Gem!"
226
228
  test_files: []