pagy 3.8.0 → 4.10.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE.txt +1 -1
- data/lib/config/pagy.rb +36 -25
- data/lib/javascripts/pagy.js +104 -93
- data/lib/locales/ar.yml +26 -0
- data/lib/locales/bg.yml +2 -2
- data/lib/locales/bs.yml +24 -0
- data/lib/locales/ca.yml +2 -2
- data/lib/locales/cs.yml +22 -0
- data/lib/locales/da.yml +2 -2
- data/lib/locales/de.yml +2 -2
- data/lib/locales/en.yml +2 -2
- data/lib/locales/es.yml +2 -2
- data/lib/locales/fr.yml +2 -2
- data/lib/locales/hr.yml +24 -0
- data/lib/locales/id.yml +2 -2
- data/lib/locales/it.yml +2 -2
- data/lib/locales/ja.yml +2 -2
- data/lib/locales/km.yml +2 -2
- data/lib/locales/ko.yml +2 -2
- data/lib/locales/nb.yml +2 -2
- data/lib/locales/nl.yml +2 -2
- data/lib/locales/pl.yml +2 -2
- data/lib/locales/pt-BR.yml +2 -2
- data/lib/locales/pt.yml +22 -0
- data/lib/locales/ru.yml +2 -2
- data/lib/locales/sr.yml +23 -0
- data/lib/locales/sv-SE.yml +2 -2
- data/lib/locales/sv.yml +2 -2
- data/lib/locales/sw.yml +22 -0
- data/lib/locales/tr.yml +2 -2
- data/lib/locales/uk.yml +24 -0
- data/lib/locales/utils/i18n.rb +3 -11
- data/lib/locales/utils/loader.rb +7 -10
- data/lib/locales/utils/p11n.rb +49 -17
- data/lib/locales/zh-CN.yml +2 -2
- data/lib/locales/zh-HK.yml +2 -2
- data/lib/locales/zh-TW.yml +3 -3
- data/lib/pagy.rb +50 -26
- data/lib/pagy/backend.rb +5 -3
- data/lib/pagy/console.rb +21 -0
- data/lib/pagy/countless.rb +13 -10
- data/lib/pagy/deprecation.rb +27 -0
- data/lib/pagy/exceptions.rb +7 -2
- data/lib/pagy/extras/arel.rb +4 -3
- data/lib/pagy/extras/array.rb +4 -3
- data/lib/pagy/extras/bootstrap.rb +61 -30
- data/lib/pagy/extras/bulma.rb +60 -38
- data/lib/pagy/extras/countless.rb +7 -8
- data/lib/pagy/extras/elasticsearch_rails.rb +28 -17
- data/lib/pagy/extras/foundation.rb +61 -32
- data/lib/pagy/extras/headers.rb +13 -9
- data/lib/pagy/extras/i18n.rb +11 -5
- data/lib/pagy/extras/items.rb +21 -34
- data/lib/pagy/extras/materialize.rb +58 -35
- data/lib/pagy/extras/meilisearch.rb +55 -0
- data/lib/pagy/extras/metadata.rb +27 -21
- data/lib/pagy/extras/navs.rb +44 -20
- data/lib/pagy/extras/overflow.rb +52 -48
- data/lib/pagy/extras/searchkick.rb +27 -16
- data/lib/pagy/extras/semantic.rb +55 -30
- data/lib/pagy/extras/shared.rb +14 -15
- data/lib/pagy/extras/standalone.rb +62 -0
- data/lib/pagy/extras/support.rb +26 -9
- data/lib/pagy/extras/trim.rb +12 -11
- data/lib/pagy/extras/uikit.rb +54 -35
- data/lib/pagy/frontend.rb +64 -32
- metadata +16 -7
- data/lib/locales/README.md +0 -35
- data/lib/pagy/extras/pagy_search.rb +0 -18
- data/pagy.gemspec +0 -16
@@ -1,5 +1,4 @@
|
|
1
1
|
# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/materialize
|
2
|
-
# encoding: utf-8
|
3
2
|
# frozen_string_literal: true
|
4
3
|
|
5
4
|
require 'pagy/extras/shared'
|
@@ -8,52 +7,76 @@ class Pagy
|
|
8
7
|
module Frontend
|
9
8
|
|
10
9
|
# Pagination for materialize: it returns the html with the series of links to the pages
|
11
|
-
def pagy_materialize_nav(pagy)
|
12
|
-
|
13
|
-
|
14
|
-
|
10
|
+
def pagy_materialize_nav(pagy, pagy_id: nil, link_extra: '')
|
11
|
+
p_id = %( id="#{pagy_id}") if pagy_id
|
12
|
+
link = pagy_link_proc(pagy, link_extra: link_extra)
|
13
|
+
|
14
|
+
html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">)
|
15
|
+
html << pagy_materialize_prev_html(pagy, link)
|
15
16
|
pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
|
16
|
-
html <<
|
17
|
-
|
18
|
-
|
17
|
+
html << case item
|
18
|
+
when Integer then %(<li class="waves-effect">#{link.call item}</li>) # page link
|
19
|
+
when String then %(<li class="active">#{link.call item}</li>) # active page
|
20
|
+
when :gap then %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>) # page gap
|
19
21
|
end
|
20
22
|
end
|
21
|
-
html << (
|
22
|
-
|
23
|
-
%(<div class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></div>)
|
23
|
+
html << pagy_materialize_next_html(pagy, link)
|
24
|
+
html << %(</ul></div>)
|
24
25
|
end
|
25
26
|
|
26
27
|
# Javascript pagination for materialize: it returns a nav and a JSON tag used by the Pagy.nav javascript
|
27
|
-
def pagy_materialize_nav_js(pagy,
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
28
|
+
def pagy_materialize_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
|
29
|
+
pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
|
30
|
+
p_id = %( id="#{pagy_id}") if pagy_id
|
31
|
+
link = pagy_link_proc(pagy, link_extra: link_extra)
|
32
|
+
|
33
|
+
tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html pagy, link}),
|
32
34
|
'link' => %(<li class="waves-effect">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
|
33
35
|
'active' => %(<li class="active">#{mark}</li>),
|
34
|
-
'gap' => %(<li class="gap disabled"><a href="#">#{pagy_t
|
35
|
-
'after' =>
|
36
|
-
|
37
|
-
|
38
|
-
%(<div id="#{id}" class="pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>#{pagy_json_tag(:nav, id, tags, pagy.sequels, defined?(TRIM) && pagy.vars[:page_param])})
|
36
|
+
'gap' => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
|
37
|
+
'after' => %(#{pagy_materialize_next_html pagy, link}</ul>) }
|
38
|
+
|
39
|
+
%(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></div>)
|
39
40
|
end
|
40
41
|
|
41
42
|
# Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
|
42
|
-
def pagy_materialize_combo_nav_js(pagy,
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
43
|
+
def pagy_materialize_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
|
44
|
+
pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
|
45
|
+
p_id = %( id="#{pagy_id}") if pagy_id
|
46
|
+
link = pagy_link_proc(pagy, link_extra: link_extra)
|
47
|
+
p_page = pagy.page
|
48
|
+
p_pages = pagy.pages
|
49
|
+
style = ' style="vertical-align: middle"'
|
50
|
+
input = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
|
51
|
+
|
52
|
+
%(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation" aria-label="pager" style="padding-right: 0" #{
|
53
|
+
pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
|
54
|
+
}>#{
|
55
|
+
pagy_materialize_prev_html pagy, link, style
|
56
|
+
}<li class="pagy-combo-input">#{
|
57
|
+
pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
|
58
|
+
}</li>#{
|
59
|
+
pagy_materialize_next_html pagy, link, style
|
60
|
+
}</ul>)
|
56
61
|
end
|
57
62
|
|
63
|
+
private
|
64
|
+
|
65
|
+
def pagy_materialize_prev_html(pagy, link, style='')
|
66
|
+
if (p_prev = pagy.prev)
|
67
|
+
%(<li class="waves-effect prev"#{style}>#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
|
68
|
+
else
|
69
|
+
%(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
def pagy_materialize_next_html(pagy, link, style='')
|
74
|
+
if (p_next = pagy.next)
|
75
|
+
%(<li class="waves-effect next"#{style}>#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
|
76
|
+
else
|
77
|
+
%(<li class="next disabled"#{style}><a href="#"><i class="material-icons">chevron_right</i></a></li>)
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
58
81
|
end
|
59
82
|
end
|
@@ -0,0 +1,55 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class Pagy
|
4
|
+
|
5
|
+
VARS[:meilisearch_search_method] ||= :pagy_search
|
6
|
+
|
7
|
+
module Meilisearch
|
8
|
+
# returns an array used to delay the call of #search
|
9
|
+
# after the pagination variables are merged to the options
|
10
|
+
def pagy_meilisearch(term = nil, **vars)
|
11
|
+
[self, term, vars]
|
12
|
+
end
|
13
|
+
alias_method VARS[:meilisearch_search_method], :pagy_meilisearch
|
14
|
+
end
|
15
|
+
|
16
|
+
# create a Pagy object from a Meilisearch results
|
17
|
+
def self.new_from_meilisearch(results, vars={})
|
18
|
+
vars[:items] = results.raw_answer['limit']
|
19
|
+
vars[:page] = [results.raw_answer['offset'] / vars[:items], 1].max
|
20
|
+
vars[:count] = results.raw_answer['nbHits']
|
21
|
+
new(vars)
|
22
|
+
end
|
23
|
+
|
24
|
+
# Add specialized backend methods to paginate Meilisearch results
|
25
|
+
module Backend
|
26
|
+
private
|
27
|
+
|
28
|
+
# Return Pagy object and results
|
29
|
+
def pagy_meilisearch(pagy_search_args, vars = {})
|
30
|
+
model, term, options = pagy_search_args
|
31
|
+
vars = pagy_meilisearch_get_vars(nil, vars)
|
32
|
+
options[:limit] = vars[:items]
|
33
|
+
options[:offset] = (vars[:page] - 1) * vars[:items]
|
34
|
+
results = model.search(term, **options)
|
35
|
+
vars[:count] = results.raw_answer['nbHits']
|
36
|
+
|
37
|
+
pagy = Pagy.new(vars)
|
38
|
+
# with :last_page overflow we need to re-run the method in order to get the hits
|
39
|
+
return pagy_meilisearch(pagy_search_args, vars.merge(page: pagy.page)) \
|
40
|
+
if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
|
41
|
+
|
42
|
+
[ pagy, results ]
|
43
|
+
end
|
44
|
+
|
45
|
+
# Sub-method called only by #pagy_meilisearch: here for easy customization of variables by overriding
|
46
|
+
# the _collection argument is not available when the method is called
|
47
|
+
def pagy_meilisearch_get_vars(_collection, vars)
|
48
|
+
pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
|
49
|
+
vars[:items] ||= VARS[:items]
|
50
|
+
vars[:page] ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
|
51
|
+
vars
|
52
|
+
end
|
53
|
+
|
54
|
+
end
|
55
|
+
end
|
data/lib/pagy/extras/metadata.rb
CHANGED
@@ -1,36 +1,42 @@
|
|
1
1
|
# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/metadata
|
2
|
-
# encoding: utf-8
|
3
2
|
# frozen_string_literal: true
|
4
3
|
|
5
4
|
class Pagy
|
6
5
|
# Add a specialized backend method for pagination metadata
|
7
|
-
module Backend
|
6
|
+
module Backend
|
7
|
+
private
|
8
8
|
|
9
|
-
METADATA = [
|
10
|
-
|
11
|
-
|
9
|
+
METADATA = %i[ scaffold_url first_url prev_url page_url next_url last_url
|
10
|
+
count page items vars pages last from to prev next series
|
11
|
+
].tap do |metadata|
|
12
|
+
metadata << :sequels if VARS.key?(:steps) # :steps gets defined along with the #sequels method
|
13
|
+
end.freeze
|
12
14
|
|
13
15
|
VARS[:metadata] = METADATA.dup
|
14
16
|
|
15
17
|
include Helpers
|
16
18
|
|
17
|
-
def pagy_metadata(pagy,
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
metadata
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
19
|
+
def pagy_metadata(pagy, deprecated_url=nil, absolute: nil)
|
20
|
+
absolute = Pagy.deprecated_arg(:url, deprecated_url, :absolute, absolute) if deprecated_url
|
21
|
+
names = pagy.vars[:metadata]
|
22
|
+
unknown = names - METADATA
|
23
|
+
raise VariableError.new(pagy), "unknown metadata #{unknown.inspect}" \
|
24
|
+
unless unknown.empty?
|
25
|
+
|
26
|
+
scaffold_url = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: absolute)
|
27
|
+
{}.tap do |metadata|
|
28
|
+
names.each do |key|
|
29
|
+
metadata[key] = case key
|
30
|
+
when :scaffold_url then scaffold_url
|
31
|
+
when :first_url then scaffold_url.sub(PAGE_PLACEHOLDER, 1.to_s)
|
32
|
+
when :prev_url then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.prev.to_s)
|
33
|
+
when :page_url then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.page.to_s)
|
34
|
+
when :next_url then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.next.to_s)
|
35
|
+
when :last_url then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.last.to_s)
|
36
|
+
else pagy.send(key)
|
37
|
+
end
|
38
|
+
end
|
32
39
|
end
|
33
|
-
metadata
|
34
40
|
end
|
35
41
|
|
36
42
|
end
|
data/lib/pagy/extras/navs.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/navs
|
2
|
-
# encoding: utf-8
|
3
2
|
# frozen_string_literal: true
|
4
3
|
|
5
4
|
require 'pagy/extras/shared'
|
@@ -8,31 +7,56 @@ class Pagy
|
|
8
7
|
module Frontend
|
9
8
|
|
10
9
|
# Javascript pagination: it returns a nav and a JSON tag used by the Pagy.nav javascript
|
11
|
-
def pagy_nav_js(pagy,
|
12
|
-
|
13
|
-
|
14
|
-
|
10
|
+
def pagy_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
|
11
|
+
pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
|
12
|
+
p_id = %( id="#{pagy_id}") if pagy_id
|
13
|
+
link = pagy_link_proc(pagy, link_extra: link_extra)
|
14
|
+
tags = { 'before' => pagy_nav_prev_html(pagy, link),
|
15
15
|
'link' => %(<span class="page">#{link.call(PAGE_PLACEHOLDER)}</span> ),
|
16
16
|
'active' => %(<span class="page active">#{pagy.page}</span> ),
|
17
|
-
'gap' => %(<span class="page gap">#{pagy_t
|
18
|
-
'after' =>
|
19
|
-
|
20
|
-
%(<nav
|
17
|
+
'gap' => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
|
18
|
+
'after' => pagy_nav_next_html(pagy, link) }
|
19
|
+
|
20
|
+
%(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
|
21
21
|
end
|
22
22
|
|
23
23
|
# Javascript combo pagination: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
|
24
|
-
def pagy_combo_nav_js(pagy,
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
input
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
24
|
+
def pagy_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
|
25
|
+
pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
|
26
|
+
p_id = %( id="#{pagy_id}") if pagy_id
|
27
|
+
link = pagy_link_proc(pagy, link_extra: link_extra)
|
28
|
+
p_page = pagy.page
|
29
|
+
p_pages = pagy.pages
|
30
|
+
input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
|
31
|
+
|
32
|
+
%(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager" #{
|
33
|
+
pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
|
34
|
+
}>#{
|
35
|
+
pagy_nav_prev_html pagy, link
|
36
|
+
}<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{
|
37
|
+
pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
|
38
|
+
}</span> #{
|
39
|
+
pagy_nav_next_html pagy, link
|
40
|
+
}</nav>)
|
35
41
|
end
|
36
42
|
|
43
|
+
private
|
44
|
+
|
45
|
+
def pagy_nav_prev_html(pagy, link)
|
46
|
+
if (p_prev = pagy.prev)
|
47
|
+
%(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
|
48
|
+
else
|
49
|
+
%(<span class="page prev disabled">#{pagy_t 'pagy.nav.prev'}</span> )
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
def pagy_nav_next_html(pagy, link)
|
54
|
+
if (p_next = pagy.next)
|
55
|
+
%(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
|
56
|
+
else
|
57
|
+
%(<span class="page next disabled">#{pagy_t 'pagy.nav.next'}</span>)
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
37
61
|
end
|
38
62
|
end
|
data/lib/pagy/extras/overflow.rb
CHANGED
@@ -1,71 +1,75 @@
|
|
1
1
|
# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/overflow
|
2
|
-
# encoding: utf-8
|
3
2
|
# frozen_string_literal: true
|
4
3
|
|
5
4
|
class Pagy
|
6
5
|
|
7
|
-
|
6
|
+
module UseOverflowExtra
|
7
|
+
VARS[:overflow] = :empty_page
|
8
8
|
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
def overflow?
|
10
|
+
@overflow
|
11
|
+
end
|
12
12
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
13
|
+
def initialize(vars)
|
14
|
+
@overflow ||= false # don't override if :last_page re-run the method after an overflow
|
15
|
+
super
|
16
|
+
rescue OverflowError
|
17
|
+
@overflow = true # add the overflow flag
|
18
|
+
case @vars[:overflow]
|
19
|
+
when :exception
|
20
|
+
raise # same as without the extra
|
21
|
+
when :last_page
|
22
|
+
initial_page = @vars[:page] # save the very initial page (even after re-run)
|
23
|
+
initialize vars.merge!(page: @last) # re-run with the last page
|
24
|
+
@vars[:page] = initial_page # restore the inital page
|
25
|
+
when :empty_page
|
26
|
+
@offset = @items = @from = @to = 0 # vars relative to the actual page
|
27
|
+
@prev = @last # prev relative to the actual page
|
28
|
+
extend Series # special series for :empty_page
|
29
|
+
else
|
30
|
+
raise VariableError.new(self), "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
|
31
|
+
end
|
32
32
|
end
|
33
|
-
end
|
34
|
-
alias_method :initialize, :initialize_with_overflow
|
35
33
|
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
34
|
+
module Series
|
35
|
+
def series(size=@vars[:size])
|
36
|
+
@page = @last # series for last page
|
37
|
+
super(size).tap do |s| # call original series
|
38
|
+
s[s.index(@page.to_s)] = @page # string to integer (i.e. no current page)
|
39
|
+
@page = @vars[:page] # restore the actual page
|
40
|
+
end
|
42
41
|
end
|
43
42
|
end
|
43
|
+
|
44
44
|
end
|
45
|
+
prepend UseOverflowExtra
|
45
46
|
|
46
47
|
|
47
48
|
# support for Pagy::Countless
|
48
49
|
if defined?(Pagy::Countless)
|
49
50
|
class Countless
|
50
51
|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
52
|
+
module UseOverflowExtra
|
53
|
+
|
54
|
+
def finalize(items)
|
55
|
+
@overflow = false
|
56
|
+
super
|
57
|
+
rescue OverflowError
|
58
|
+
@overflow = true # add the overflow flag
|
59
|
+
case @vars[:overflow]
|
60
|
+
when :exception
|
61
|
+
raise # same as without the extra
|
62
|
+
when :empty_page
|
63
|
+
@offset = @items = @from = @to = 0 # vars relative to the actual page
|
64
|
+
@vars[:size] = [] # no page in the series
|
65
|
+
self
|
66
|
+
else
|
67
|
+
raise VariableError.new(self), "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
|
68
|
+
end
|
66
69
|
end
|
70
|
+
|
67
71
|
end
|
68
|
-
|
72
|
+
prepend UseOverflowExtra
|
69
73
|
|
70
74
|
end
|
71
75
|
end
|
@@ -1,13 +1,21 @@
|
|
1
1
|
# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/searchkick
|
2
|
-
# encoding: utf-8
|
3
2
|
# frozen_string_literal: true
|
4
3
|
|
5
|
-
require 'pagy/extras/pagy_search'
|
6
|
-
|
7
4
|
class Pagy
|
8
5
|
|
9
|
-
|
10
|
-
|
6
|
+
VARS[:searchkick_search_method] ||= :pagy_search
|
7
|
+
|
8
|
+
module Searchkick
|
9
|
+
# returns an array used to delay the call of #search
|
10
|
+
# after the pagination variables are merged to the options
|
11
|
+
# it also pushes to the same array an eventually called method
|
12
|
+
def pagy_searchkick(term = '*', **options, &block)
|
13
|
+
[self, term, options, block].tap do |args|
|
14
|
+
args.define_singleton_method(:method_missing){|*a| args += a}
|
15
|
+
end
|
16
|
+
end
|
17
|
+
alias_method VARS[:searchkick_search_method], :pagy_searchkick
|
18
|
+
end
|
11
19
|
|
12
20
|
# create a Pagy object from a Searchkick::Results object
|
13
21
|
def self.new_from_searchkick(results, vars={})
|
@@ -18,27 +26,30 @@ class Pagy
|
|
18
26
|
end
|
19
27
|
|
20
28
|
# Add specialized backend methods to paginate Searchkick::Results
|
21
|
-
module Backend
|
29
|
+
module Backend
|
30
|
+
private
|
22
31
|
|
23
32
|
# Return Pagy object and results
|
24
33
|
def pagy_searchkick(pagy_search_args, vars={})
|
25
|
-
model,
|
26
|
-
vars
|
27
|
-
|
28
|
-
|
29
|
-
results
|
30
|
-
vars[:count]
|
34
|
+
model, term, options, block, *called = pagy_search_args
|
35
|
+
vars = pagy_searchkick_get_vars(nil, vars)
|
36
|
+
options[:per_page] = vars[:items]
|
37
|
+
options[:page] = vars[:page]
|
38
|
+
results = model.search(term, **options, &block)
|
39
|
+
vars[:count] = results.total_count
|
40
|
+
|
31
41
|
pagy = Pagy.new(vars)
|
32
42
|
# with :last_page overflow we need to re-run the method in order to get the hits
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
43
|
+
return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page)) \
|
44
|
+
if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
|
45
|
+
|
46
|
+
[ pagy, called.empty? ? results : results.send(*called) ]
|
37
47
|
end
|
38
48
|
|
39
49
|
# Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
|
40
50
|
# the _collection argument is not available when the method is called
|
41
51
|
def pagy_searchkick_get_vars(_collection, vars)
|
52
|
+
pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
|
42
53
|
vars[:items] ||= VARS[:items]
|
43
54
|
vars[:page] ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
|
44
55
|
vars
|