pagy 4.6.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef235bc480391503c4c4c9c0af67f8bf10f62aad86270fc0ae67e1bdd76a0044
-  data.tar.gz: 18c74230a1e88d4875340b4bff63c181fb95998e63ebf83aac51016e5d16bb68
+  metadata.gz: e74b8c735813ad07410c45184e0f8ff345ba104ff3f0bdd75a763a137a63aa53
+  data.tar.gz: b9fc3f608fadcc6be76c1374bded0963a0b45b322321001d8b371148e537e4cd
 SHA512:
-  metadata.gz: add32ab56092596d562d5e90abfeb87a4c66eb2e4c1f0d3b923e0ffc53c20b03a4edba020ebb8a15efd5e089a9d59b059d0bc4f6496c8836eaa5908e4bb2de68
-  data.tar.gz: 268a59ed232635bcf2e41140380b2751bec2bb1ddba2a388ff095f5d8aceda6b455474f46cf069569a83f544c7c983358e9723bdd14c0160ae1b08ba3197be9b
+  metadata.gz: d68129e5f7134cfde1dff25ab00350bf6458f3270e64f154fd621a7cdad946628d3ff1a6dc4af267aab9605162ba1e725ed902fa62a74adc6e2ced3348ed8497
+  data.tar.gz: 33f1f3fba27c3c4e78cfd52649f82aa430e5d5236eb8cf3e9e300a3dc45b8ada546a1a535ceaf4ae65e9f8693ae61d15dad94582a10bdc9643b8d9e3fc76da85

data/LICENSE.txt

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

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.6.0)
+# Pagy initializer file (4.9.0)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

data/lib/javascripts/pagy.js

@@ -2,18 +2,18 @@
 
 function Pagy(){}
 
-Pagy.version = '4.6.0'
+Pagy.version = '4.9.0'
 
 Pagy.delay = 100
 
 Pagy.init =
   function(arg) {
     var target   = arg instanceof Event || arg === undefined ? document : arg,
-        jsonTags = target.getElementsByClassName('pagy-json')
-    for (var i = 0, len = jsonTags.length; i < len; i++) {
-      var args  = JSON.parse(jsonTags[i].innerHTML),
+        elements = target.querySelectorAll('[data-pagy-json]')
+    for (var i = 0, len = elements.length; i < len; i++) {
+      var args  = JSON.parse(elements[i].getAttribute('data-pagy-json')),
           fname = args.shift()
-      args.unshift(jsonTags[i].previousSibling)
+      args.unshift(elements[i])
       Pagy[fname].apply(null, args)
     }
   }

data/lib/locales/bg.yml

@@ -17,6 +17,6 @@ bg:
       single_page: "Показани са <b>%{count}</b> %{item_name}"
       multiple_pages: "Показани са %{item_name} <b>%{from}-%{to}</b> от <b>%{count}</b> общо"
 
-    combo_nav_js: "<label>Страница %{page_input}</label> от %{pages}"
+    combo_nav_js: "<label>Страница %{page_input} от %{pages}</label>"
 
     items_selector_js: "<label>Покажи %{items_input} %{item_name} на страница</label>"

data/lib/locales/bs.yml

@@ -19,6 +19,6 @@ bs:
       single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
       multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
 
-    combo_nav_js: "<label>Stranica %{page_input}</label> od %{pages}"
+    combo_nav_js: "<label>Stranica %{page_input} od %{pages}</label>"
 
     items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"

data/lib/locales/ca.yml

@@ -17,6 +17,6 @@ ca:
       single_page: "Mostrant <b>%{count}</b> %{item_name}"
       multiple_pages: "Mostrant %{item_name} <b>%{from}-%{to}</b> de <b>%{count}</b> en total"
 
-    combo_nav_js: "<label>Pàgina %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Pàgina %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostra %{items_input} %{item_name} per pàgina</label>"

data/lib/locales/cs.yml

@@ -17,6 +17,6 @@ cs:
       single_page: "Zobrazeno <b>%{count}</b> %{item_name}"
       multiple_pages: "Zobrazeno %{item_name} <b>%{from}-%{to}</b> z <b>%{count}</b> celkem"
 
-    combo_nav_js: "<label>Strana %{page_input}</label> z %{pages}"
+    combo_nav_js: "<label>Strana %{page_input} z %{pages}</label>"
 
     items_selector_js: "<label>Zobrazit %{items_input} %{item_name} na stránce</label>"

data/lib/locales/da.yml

@@ -17,6 +17,6 @@ da:
       single_page: "Viser <b>%{count}</b> %{item_name}"
       multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> til <b>%{count}</b> totalt"
 
-    combo_nav_js: "<label>Side %{page_input}</label> of %{pages}"
+    combo_nav_js: "<label>Side %{page_input} of %{pages}</label>"
 
     items_selector_js: "<label>Antal %{items_input} %{item_name} per side</label>"

data/lib/locales/de.yml

@@ -17,6 +17,6 @@ de:
       single_page: "Zeige <b>%{count}</b> %{item_name}"
       multiple_pages: "Zeige %{item_name} <b>%{from}-%{to}</b> von <b>%{count}</b> gesamt"
 
-    combo_nav_js: "<label>Seite %{page_input}</label> von %{pages}"
+    combo_nav_js: "<label>Seite %{page_input} von %{pages}</label>"
 
     items_selector_js: "<label>Zeige %{items_input} %{item_name} pro Seite</label>"

data/lib/locales/en.yml

@@ -17,6 +17,6 @@ en:
       single_page: "Displaying <b>%{count}</b> %{item_name}"
       multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
 
-    combo_nav_js: "<label>Page %{page_input}</label> of %{pages}"
+    combo_nav_js: "<label>Page %{page_input} of %{pages}</label>"
 
     items_selector_js: "<label>Show %{items_input} %{item_name} per page</label>"

data/lib/locales/es.yml

@@ -17,6 +17,6 @@ es:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
 
-    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/fr.yml

@@ -17,6 +17,6 @@ fr:
       single_page: "Affichage de <b>%{count}</b> %{item_name}"
       multiple_pages: "Affichage des %{item_name} <b>%{from} à %{to}</b> sur <b>%{count}</b> au total"
 
-    combo_nav_js: "<label>Page %{page_input}</label> sur %{pages}"
+    combo_nav_js: "<label>Page %{page_input} sur %{pages}</label>"
 
     items_selector_js: "<label>Afficher %{items_input} %{item_name} par page</label>"

data/lib/locales/hr.yml

@@ -19,6 +19,6 @@ hr:
       single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
       multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
 
-    combo_nav_js: "<label>Stranica %{page_input}</label> od %{pages}"
+    combo_nav_js: "<label>Stranica %{page_input} od %{pages}</label>"
 
     items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"

data/lib/locales/id.yml

@@ -15,6 +15,6 @@ id:
       single_page: "Menampilkan <b>%{count}</b> %{item_name}"
       multiple_pages: "Menampilkan %{item_name} <b>%{from}-%{to}</b> dari total <b>%{count}</b>"
 
-    combo_nav_js: "<label>Halaman %{page_input}</label> dari %{pages}"
+    combo_nav_js: "<label>Halaman %{page_input} dari %{pages}</label>"
 
     items_selector_js: "<label>Tampilkan %{items_input} %{item_name} per halaman</label>"

data/lib/locales/it.yml

@@ -17,6 +17,6 @@ it:
       single_page: "Visualizzazione di <b>%{count}</b> %{item_name}"
       multiple_pages: "Visualizzazione %{item_name} <b>%{from}-%{to}</b> di <b>%{count}</b> in totale"
 
-    combo_nav_js: "<label>Pagina %{page_input}</label> di %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input} di %{pages}</label>"
 
     items_selector_js: "<label>Mostra %{items_input} %{item_name} per pagina</label>"

data/lib/locales/ja.yml

@@ -15,6 +15,6 @@ ja:
       single_page: "<b>%{count}</b> 件の%{item_name}"
       multiple_pages: "<b>%{count}</b> 件中 <b>%{from}-%{to}</b> 件目の%{item_name}を表示中"
 
-    combo_nav_js: "<label>%{page_input}</label> / %{pages} ページ"
+    combo_nav_js: "<label>%{page_input} / %{pages} ページ</label>"
 
     items_selector_js: "<label>%{items_input} 件ずつ表示</label>"

data/lib/locales/km.yml

@@ -14,6 +14,6 @@ km:
       single_page: "បង្ហាញ <b>%{count}</b> %{item_name}"
       multiple_pages: "បង្ហាញ %{item_name} <b>%{from}-%{to}</b> នៃ <b>%{count}</b> ជាចំនួនសរុប"
 
-    combo_nav_js: "<label>ទំព័រ %{page_input}</label> នៃ %{pages}"
+    combo_nav_js: "<label>ទំព័រ %{page_input} នៃ %{pages}</label>"
 
     items_selector_js: "<label>បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ</label>"

data/lib/locales/ko.yml

@@ -15,6 +15,6 @@ ko:
       single_page: "<b>%{count}</b>개의 %{item_name} 표시됨"
       multiple_pages: "총 <b>%{count}</b>개의 %{item_name} 중 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>총 %{pages} 중 %{page_input}</label> 페이지"
+    combo_nav_js: "<label>총 %{pages} 중 %{page_input} 페이지</label>"
 
     items_selector_js: "<label>페이지 당 %{items_input}개 표시%</label>"

data/lib/locales/nb.yml

@@ -17,6 +17,6 @@ nb:
       single_page: "Viser <b>%{count}</b> %{item_name}"
       multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> av totalt <b>%{count}</b>"
 
-    combo_nav_js: "<label>Side %{page_input}</label> av %{pages}"
+    combo_nav_js: "<label>Side %{page_input} av %{pages}</label>"
 
     items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"

data/lib/locales/nl.yml

@@ -17,6 +17,6 @@ nl:
       single_page: "Toont <b>%{count}</b> %{item_name}"
       multiple_pages: "Toont <b>%{from}-%{to}</b> %{item_name} van <b>%{count}</b> in totaal"
 
-    combo_nav_js: "<label>Pagina %{page_input}</label> van %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input} van %{pages}</label>"
 
     items_selector_js: "<label>Toont %{items_input} %{item_name} per pagina</label>"

data/lib/locales/pl.yml

@@ -19,6 +19,6 @@ pl:
       single_page: "Wyświetlono <b>%{count}</b> %{item_name}"
       multiple_pages: "Wyświetlono %{item_name} <b>%{from}-%{to}</b> z wszystkich <b>%{count}</b>"
 
-    combo_nav_js: "<label>Strona %{page_input}</label> z %{pages}"
+    combo_nav_js: "<label>Strona %{page_input} z %{pages}</label>"
 
     items_selector_js: "<label>Pokaż %{items_input} %{item_name} na stronie</label>"

data/lib/locales/pt-BR.yml

@@ -17,6 +17,6 @@ pt-BR:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
 
-    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/pt.yml

@@ -17,6 +17,6 @@ pt:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
 
-    combo_nav_js: "<label>Página %{page_input}</label> de %{pages}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
     items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/ru.yml

@@ -19,6 +19,6 @@ ru:
       single_page: "<b>%{count}</b> %{item_name}"
       multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
 
-    combo_nav_js: "<label>Страница %{page_input}</label> из %{pages}"
+    combo_nav_js: "<label>Страница %{page_input} из %{pages}</label>"
 
     items_selector_js: "<label>Показать %{items_input} %{item_name} на странице</label>"

data/lib/locales/sr.yml

@@ -18,6 +18,6 @@ sr:
       single_page: "Приказује се <b>%{count}</b> %{item_name}"
       multiple_pages: "Приказ %{item_name} <b>%{from}-%{to}</b> од <b>%{count}</b> укупно"
 
-    combo_nav_js: "<label>Страниca %{page_input}</label> од %{pages}"
+    combo_nav_js: "<label>Страниca %{page_input} од %{pages}</label>"
 
     items_selector_js: "<label>Прикажи %{items_input} %{item_name} по страниcи</label>"

data/lib/locales/sv-SE.yml

@@ -18,6 +18,6 @@ sv-SE:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "<label>Sida %{page_input}</label> av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
     items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sv.yml

@@ -18,6 +18,6 @@ sv:
       single_page: "Visar <b>%{count}</b> %{item_name}"
       multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
 
-    combo_nav_js: "<label>Sida %{page_input}</label> av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
     items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sw.yml

@@ -17,6 +17,6 @@ sw:
       single_page: "Inaonyesha %{item_name} <b>%{count}</b>"
       multiple_pages: "Inaonyesha %{item_name} <b>%{from}-%{to}</b> ya <b>%{count}</b> kwa jumla"
 
-    combo_nav_js: "<label>Kurasa %{page_input}</label> ya %{pages}"
+    combo_nav_js: "<label>Kurasa %{page_input} ya %{pages}</label>"
 
     items_selector_js: "<label>Onyesha %{items_input} %{item_name} kwa kila ukurasa</label>"

data/lib/locales/tr.yml

@@ -15,6 +15,6 @@ tr:
       single_page: "Toplam <b>%{count}</b> %{item_name} gösteriliyor"
       multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor"
 
-    combo_nav_js: "<label>Sayfa %{page_input}</label> / %{pages}"
+    combo_nav_js: "<label>Sayfa %{page_input} / %{pages}</label>"
 
     items_selector_js: "<label>Sayfada %{items_input} %{item_name} göster</label>"

data/lib/locales/uk.yml

@@ -0,0 +1,24 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+uk:
+  pagy:
+
+    item_name:
+      one: "запис"
+      few: "записів"
+      many: "записів"
+      other: "записів"
+
+    nav:
+      prev: "‹ Назад"
+      next: "Далі ›"
+      gap: "…"
+
+    info:
+      no_items: "Більше %{item_name} немає"
+      single_page: "<b>%{count}</b> %{item_name}"
+      multiple_pages: "Загалом <b>%{count}</b> %{item_name}, показані з <b>%{from}</b> по <b>%{to}</b>"
+
+    combo_nav_js: "<label>Сторінка %{page_input} з %{pages}</label>"
+
+    items_selector_js: "<label>Показати %{items_input} %{item_name} на сторінці</label>"

data/lib/locales/utils/p11n.rb

@@ -85,6 +85,7 @@ plurals = Hash.new(p11n[:one_other]).tap do |hash|
   hash['sv']    = p11n[:one_two_other]
   hash['sv-SE'] = p11n[:one_two_other]
   hash['tr']    = p11n[:other]
+  hash['uk']    = p11n[:east_slavic]
   hash['zh-CN'] = p11n[:other]
   hash['zh-HK'] = p11n[:other]
   hash['zh-TW'] = p11n[:other]

data/lib/locales/zh-CN.yml

@@ -15,6 +15,6 @@ zh-CN:
       single_page: "显示<b>%{count}</b> 项%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 项%{item_name}，显示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 页"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 页</label>"
 
     items_selector_js: "<label>每页显示 %{items_input} 条%</label>"

data/lib/locales/zh-HK.yml

@@ -15,6 +15,6 @@ zh-HK:
       single_page: "顯示 <b>%{count}</b> %{item_name}"
       multiple_pages: "共 <b>%{count}</b>  %{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 頁"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
 
     items_selector_js: "<label>每頁顯示 %{items_input} 記錄</label>"

data/lib/locales/zh-TW.yml

@@ -15,6 +15,6 @@ zh-TW:
       single_page: "顯示 <b>%{count}</b> 項%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 項%{item_name}，顯示 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "<label>第 %{page_input}</label> / %{pages} 頁"
+    combo_nav_js: "<label>第 %{page_input} / %{pages} 頁</label>"
 
-    items_selector_js: "<label>每頁顯示 %{items_input} 項%{item_name}"
+    items_selector_js: "<label>每頁顯示 %{items_input} 項%{item_name}</label>"

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # main class
 class Pagy
-  VERSION = '4.6.0'
+  VERSION = '4.9.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -23,7 +23,7 @@ class Pagy
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
     @vars = VARS.merge( vars.delete_if{|k,v| VARS.key?(k) && (v.nil? || v == '') } )
-    @vars[:fragment] = deprecated_var(:anchor, @vars[:anchor], :fragment, @vars[:fragment]) if @vars[:anchor]
+    @vars[:fragment] = Pagy.deprecated_var(:anchor, @vars[:anchor], :fragment, @vars[:fragment]) if @vars[:anchor]
 
     INSTANCE_VARS_MIN.each do |name,min|
       raise VariableError.new(self), "expected :#{name} >= #{min}; got #{@vars[name].inspect}" \

data/lib/pagy/deprecation.rb

@@ -4,22 +4,22 @@ class Pagy
 
     # deprecated variables
     def deprecated_var(var, val, new_var, new_val)
-      value = new_val || val
-      Warning.warn %([PAGY WARNING] deprecated use of `#{var}` var will not be supported in 5.0! Use `#{new_var}: #{value.inspect}` instead.)
+      value = val || new_val
+      Warning.warn %([PAGY WARNING] deprecated use of '#{var}' var will not be supported in 5.0! Use '#{new_var}: #{value.inspect}' instead.)
       value
     end
 
     # deprecated pagy_url_for argument order
     def deprecated_order(pagy, page)
-      Warning.warn '[PAGY WARNING] inverted use of pagy/page in pagy_url_for will not be supported in 5.0! Use pagy_url_for(pagy, page) instead.'
+      Warning.warn %([PAGY WARNING] inverted use of pagy/page in pagy_url_for will not be supported in 5.0! Use pagy_url_for(pagy, page) instead.)
       [page, pagy]
     end
 
 
     # deprecated posiitioal arguments
     def deprecated_arg(arg, val, new_key, new_val)
-      value = new_val || val  # we use the new_val if present
-      Warning.warn %([PAGY WARNING] deprecated use of positional `#{arg}` arg will not be supported in 5.0! Use only the keyword arg `#{new_key}: #{value.inspect}` instead.)
+      value = val || new_val  # we use the new_val if present
+      Warning.warn %([PAGY WARNING] deprecated use of positional '#{arg}' arg will not be supported in 5.0! Use only the keyword arg '#{new_key}: #{value.inspect}' instead.)
       value
     end
 

data/lib/pagy/exceptions.rb

@@ -16,7 +16,9 @@ class Pagy
       Regexp.last_match(1)&.to_sym
     end
 
-    def value = pagy.vars[variable]
+    def value
+      pagy.vars[variable]
+    end
   end
 
   # specific overflow error

data/lib/pagy/extras/bootstrap.rb

@@ -35,8 +35,7 @@ class Pagy
                'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_bootstrap_next_html pagy, link}</ul>) }
 
-      html = %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager"></nav>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<nav#{p_id} class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -48,7 +47,9 @@ class Pagy
       p_pages = pagy.pages
       input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group" role="group">#{
+      %(<nav#{p_id} class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group" role="group" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           if (p_prev = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
           else
@@ -60,9 +61,7 @@ class Pagy
           else
             %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next' }</a>)
           end
-      }</div></nav>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div></nav>)
     end
 
     private

data/lib/pagy/extras/bulma.rb

@@ -34,8 +34,7 @@ class Pagy
                'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap' }</span></li>),
                'after'  => '</ul>' }
 
-      html = %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"></nav>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<nav#{p_id} class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for Bulma: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -47,7 +46,9 @@ class Pagy
       p_pages = pagy.pages
       input   = %(<input class="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; margin:0 0.3rem;">)
 
-      %(<nav#{p_id} class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group">#{
+      %(<nav#{p_id} class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group" #{
+         pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           if (p_prev  = pagy.prev)
             %(<p class="control">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"'}</p>)
           else
@@ -59,15 +60,13 @@ class Pagy
           else
             %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
           end
-      }</div></nav>#{
-         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div></nav>)
     end
 
     private
 
       def pagy_bulma_prev_next_html(pagy, link)
-        html  = if (p_prev = pagy.prev)
+        html  = +if (p_prev = pagy.prev)
                   link.call p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"'
                 else
                   %(<a class="pagination-previous" disabled>#{pagy_t 'pagy.nav.prev'}</a>)

data/lib/pagy/extras/foundation.rb

@@ -35,8 +35,7 @@ class Pagy
                'gap'    => %(<li class="ellipsis gap" aria-hidden="true"></li>),
                'after'  => %(#{pagy_foundation_next_html pagy, link}</ul>) }
 
-      html = %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination"></nav>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<nav#{p_id} class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination for Foundation: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -48,7 +47,9 @@ class Pagy
       p_pages = pagy.pages
       input   = %(<input class="input-group-field cell shrink" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="width: #{p_pages.to_s.length+1}rem; padding: 0 0.3rem; margin: 0 0.3rem;">)
 
-      %(<nav#{p_id} class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group">#{
+      %(<nav#{p_id} class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           if (p_prev  = pagy.prev)
             link.call p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0" aria-label="previous" class="prev button primary"'
           else
@@ -60,9 +61,7 @@ class Pagy
           else
             %(<a style="margin-bottom: 0" class="next button primary disabled" href="#">#{pagy_t 'pagy.nav.next'}</a>)
           end
-      }</div></nav>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div></nav>)
     end
 
     private

data/lib/pagy/extras/headers.rb

@@ -25,10 +25,10 @@ class Pagy
       rels = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
       rels['last'] = pagy.last unless countless
       url_str = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: true)
-      hash    = { 'Link' => rels.filter_map do |rel, num|
+      hash    = { 'Link' => rels.map do |rel, num| # filter_map if ruby >=2.7
                               next unless num
                               [ rel, url_str.sub(PAGE_PLACEHOLDER, num.to_s) ]
-                            end.to_h }
+                            end.compact.to_h }
       headers = pagy.vars[:headers]
       hash[headers[:page]]  = pagy.page.to_s         if headers[:page]
       hash[headers[:items]] = pagy.vars[:items].to_s if headers[:items]

data/lib/pagy/extras/i18n.rb

@@ -14,7 +14,9 @@ class Pagy
     end
 
     module UseI18nGem
-      def pagy_t(key, **opts) = ::I18n.t(key, **opts)
+      def pagy_t(key, **opts)
+        ::I18n.t(key, **opts)
+      end
     end
     prepend UseI18nGem
 

data/lib/pagy/extras/items.rb

@@ -40,12 +40,12 @@ class Pagy
       link           = pagy_marked_link(pagy_link_proc(pagy, link_extra: link_extra))
       p_vars[:items] = p_items # restore the items
 
-      html  = %(<span#{p_id} class="pagy-items-selector-js">)
+      html  = +%(<span#{p_id} class="pagy-items-selector-js" #{pagy_json_attr pagy, :items_selector, pagy.from, link}>)
       input = %(<input type="number" min="1" max="#{p_vars[:max_items]}" value="#{p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length+1}rem;">)
       html << pagy_t('pagy.items_selector_js', item_name:   item_name || pagy_t(i18n_key || p_vars[:i18n_key], count: p_items),
                                                items_input: input,
                                                count:       p_items)
-      html << %(</span>#{pagy_json_tag pagy, :items_selector, pagy.from, link})
+      html << %(</span>)
     end
 
   end

data/lib/pagy/extras/materialize.rb

@@ -36,8 +36,7 @@ class Pagy
                'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
 
-      html = %(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<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>)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -47,18 +46,18 @@ class Pagy
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      style   = ' style="vertical-align: middle;"'
-      input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 2px; border: none; border-radius: 2px; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      style   = ' style="vertical-align: middle"'
+      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;">)
 
-      %(<div#{p_id} class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="pagy-compact-chip" role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin: 0">#{
+      %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation" aria-label="pager" style="padding-right: 0" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           pagy_materialize_prev_html pagy, link, style
-      }<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{
+      }<li class="pagy-combo-input">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</div>#{
+      }</li>#{
           pagy_materialize_next_html pagy, link, style
-      }</ul></div>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</ul>)
     end
 
     private

data/lib/pagy/extras/meilisearch.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Pagy
+
+  VARS[:meilisearch_search_method] ||= :pagy_search
+
+  module Meilisearch
+    # returns an array used to delay the call of #search
+    # after the pagination variables are merged to the options
+    def pagy_meilisearch(term = nil, **vars)
+      [self, term, vars]
+    end
+    alias_method VARS[:meilisearch_search_method], :pagy_meilisearch
+  end
+
+  # create a Pagy object from a Meilisearch results
+  def self.new_from_meilisearch(results, vars={})
+    vars[:items] = results.raw_answer[:limit]
+    vars[:page]  = [results.raw_answer[:offset] / vars[:items], 1].max
+    vars[:count] = results.raw_answer[:nbHits]
+    new(vars)
+  end
+
+  # Add specialized backend methods to paginate Meilisearch results
+  module Backend
+    private
+
+    # Return Pagy object and results
+    def pagy_meilisearch(pagy_search_args, vars = {})
+      model, term, options = pagy_search_args
+      vars             = pagy_meilisearch_get_vars(nil, vars)
+      options[:limit]  = vars[:items]
+      options[:offset] = (vars[:page] - 1) * vars[:items]
+      results          = model.search(term, **options)
+      vars[:count]     = results.raw_answer[:nbHits]
+
+      pagy = Pagy.new(vars)
+      # with :last_page overflow we need to re-run the method in order to get the hits
+      return pagy_meilisearch(pagy_search_args, vars.merge(page: pagy.page)) \
+        if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
+
+      [ pagy, results ]
+    end
+
+    # Sub-method called only by #pagy_meilisearch: here for easy customization of variables by overriding
+    # the _collection argument is not available when the method is called
+    def pagy_meilisearch_get_vars(_collection, vars)
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
+      vars[:items] ||= VARS[:items]
+      vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
+      vars
+    end
+
+  end
+end

data/lib/pagy/extras/navs.rb

@@ -17,8 +17,7 @@ class Pagy
                'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
                'after'  => pagy_nav_next_html(pagy, link) }
 
-      html = %(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" aria-label="pager"></nav>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<nav#{p_id} class="pagy-njs pagy-nav-js pagination" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></nav>)
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -30,15 +29,15 @@ class Pagy
       p_pages = pagy.pages
       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;">)
 
-      %(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager">#{
+      %(<nav#{p_id} class="pagy-combo-nav-js pagination" aria-label="pager" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
           pagy_nav_prev_html pagy, link
       }<span class="pagy-combo-input" style="margin: 0 0.6rem;">#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</span> #{
           pagy_nav_next_html pagy, link
-      }</nav>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</nav>)
     end
 
     private

data/lib/pagy/extras/overflow.rb

@@ -6,7 +6,9 @@ class Pagy
   module UseOverflowExtra
     VARS[:overflow] = :empty_page
 
-    def overflow? = @overflow
+    def overflow?
+      @overflow
+    end
 
     def initialize(vars)
       @overflow ||= false                         # don't override if :last_page re-run the method after an overflow

data/lib/pagy/extras/semantic.rb

@@ -35,8 +35,7 @@ class Pagy
                'gap'    => %(<div class="disabled item">#{pagy_t('pagy.nav.gap')}</div>),
                'after'  => pagy_semantic_next_html(pagy, link) }
 
-      html = %(<div#{p_id} class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation"></div>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<div#{p_id} class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></div>)
     end
 
     # Combo pagination for semantic: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -48,15 +47,15 @@ class Pagy
       p_pages = pagy.pages
       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; margin: 0 0.3rem">)
 
-      %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation">#{
+      %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
          pagy_semantic_prev_html pagy, link
       }<div class="pagy-combo-input item">#{
          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</div> #{
          pagy_semantic_next_html pagy, link
-      }</div>#{
-         pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</div>)
     end
 
     private

data/lib/pagy/extras/shared.rb

@@ -29,16 +29,16 @@ class Pagy
 
     if defined?(Oj)
       # it returns a script tag with the JSON-serialized args generated with the faster oj gem
-      def pagy_json_tag(pagy, *args)
+      def pagy_json_attr(pagy, *args)
         args << pagy.vars[:page_param] if pagy.vars[:enable_trim_extra]
-        %(<script type="application/json" class="pagy-json">#{Oj.dump(args, mode: :strict)}</script>)
+        %(data-pagy-json="#{Oj.dump(args, mode: :strict).gsub('"', '&quot;')}")
       end
     else
       require 'json'
       # it returns a script tag with the JSON-serialized args generated with the slower to_json
-      def pagy_json_tag(pagy, *args)
+      def pagy_json_attr(pagy, *args)
         args << pagy.vars[:page_param] if pagy.vars[:enable_trim_extra]
-        %(<script type="application/json" class="pagy-json">#{args.to_json}</script>)
+        %(data-pagy-json="#{args.to_json.gsub('"', '&quot;')}")
       end
     end
 

data/lib/pagy/extras/standalone.rb

@@ -46,7 +46,11 @@ class Pagy
       "#{url_string}#{query_string}#{p_vars[:fragment]}"
     end
   end
-  Helpers.prepend UseStandaloneExtra
+
+  #  single line in order to avoid complicating simplecov already tested with other GitHub Actions
+  Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') \
+      && Helpers.prepend(UseStandaloneExtra) \
+      || ( Frontend.prepend(UseStandaloneExtra); Backend.prepend(UseStandaloneExtra) if defined?(Pagy::Backend::METADATA) ) # rubocop:disable Style/Semicolon
 
   # defines a dummy #params method if not already defined in the including module
   module Backend

data/lib/pagy/extras/trim.rb

@@ -12,7 +12,7 @@ class Pagy
       link_proc = super(pagy, link_extra: link_extra)
       return link_proc unless pagy.vars[:enable_trim_extra]
       lambda do |num, text=num, extra=''|
-        link = link_proc.call(num, text, extra)
+        link = +link_proc.call(num, text, extra)
         return link unless num == 1
         link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
       end

data/lib/pagy/extras/uikit.rb

@@ -11,7 +11,7 @@ class Pagy
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
 
-      html = %(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html pagy, link})
+      html = +%(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html pagy, link})
       pagy.series.each do |item|
         html << case    item
                 when Integer then %(<li>#{link.call item}</li>)
@@ -34,8 +34,7 @@ class Pagy
                'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>),
                'after'  => pagy_uikit_next_html(pagy, link) }
 
-      html = %(<ul#{p_id} class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center"></ul>)
-      html << pagy_json_tag(pagy, :nav, tags, pagy.sequels(steps))
+      %(<ul#{p_id} class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></ul>)
     end
 
     # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
@@ -45,29 +44,19 @@ class Pagy
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
-      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="uk-input" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
 
-      %(<div#{p_id} class="pagy-uikit-combo-nav-js uk-button-group">#{
-          if (p_prev = pagy.prev)
-            link.call p_prev, pagy_t('pagy.nav.prev'), 'class="uk-button uk-button-default"'
-          else
-            %(<button class="uk-button uk-button-default" disabled>#{pagy_t 'pagy.nav.prev'}</button>)
-          end
-      }<div class="uk-text-middle uk-margin-left uk-margin-right">#{
+      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
+      }>#{
+          pagy_uikit_prev_html pagy, link
+      }<li>#{
           pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</div>#{
-          if (p_next = pagy.next)
-            link.call p_next, pagy_t('pagy.nav.next'), 'class="uk-button uk-button-default"'
-          else
-            %(<button class="uk-button uk-button-default" disabled>#{pagy_t 'pagy.nav.next'}</button>)
-          end
-      }</div>#{
-          pagy_json_tag pagy, :combo_nav, p_page, pagy_marked_link(link)
-      })
+      }</li>#{
+          pagy_uikit_next_html pagy, link
+      }</ul>)
     end
 
-
-
     private
 
       def pagy_uikit_prev_html(pagy, link)

data/lib/pagy/frontend.rb

@@ -25,7 +25,9 @@ class Pagy
     end
 
     # Sub-method called only by #pagy_url_for: here for easy customization of params by overriding
-    def pagy_get_params(params) = params
+    def pagy_get_params(params)
+      params
+    end
   end
 
   # All the code here has been optimized for performance: it may not look very pretty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.9.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,
@@ -48,6 +48,7 @@ files:
 - lib/locales/sv.yml
 - lib/locales/sw.yml
 - lib/locales/tr.yml
+- lib/locales/uk.yml
 - lib/locales/utils/i18n.rb
 - lib/locales/utils/loader.rb
 - lib/locales/utils/p11n.rb
@@ -71,6 +72,7 @@ files:
 - lib/pagy/extras/i18n.rb
 - lib/pagy/extras/items.rb
 - lib/pagy/extras/materialize.rb
+- lib/pagy/extras/meilisearch.rb
 - lib/pagy/extras/metadata.rb
 - lib/pagy/extras/navs.rb
 - lib/pagy/extras/overflow.rb
@@ -109,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="