pagy 8.6.0 → 9.0.2

data/lib/pagy.rb

@@ -2,48 +2,77 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require_relative 'pagy/shared_methods'
 
-# Core class
+# Top superclass: it should define only what's common to all the subclasses
 class Pagy
-  VERSION = '8.6.0'
+  VERSION = '9.0.2'
+
+  # Core default: constant for easy access, but mutable for customizable defaults
+  DEFAULT = { count_args: [:all], # rubocop:disable Style/MutableConstant
+              ends:       true,
+              limit:      20,
+              outset:     0,
+              page:       1,
+              page_param: :page,
+              size:       7 }  # AR friendly
 
   # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root
     @root ||= Pathname.new(__dir__).parent.freeze
   end
 
-  # Core default: constant for easy access, but mutable for customizable defaults
-  DEFAULT = { page:       1, # rubocop:disable Style/MutableConstant
-              items:      20,
-              outset:     0,
-              size:       7,
-              ends:       true,
-              count_args: [:all],  # AR friendly
-              page_param: :page }
+  include SharedMethods
 
-  attr_reader :count, :page, :items, :vars, :last, :offset, :in, :from, :to, :prev, :next
+  attr_reader :count, :from, :in, :last, :next, :offset, :prev, :to
   alias pages last
 
   # Merge and validate the options, do some simple arithmetic and set the instance variables
-  def initialize(vars)
-    normalize_vars(vars)
-    setup_vars(count: 0, page: 1, outset: 0)
-    setup_items_var
-    setup_last_var
-    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
-
-    setup_offset_var
+  def initialize(**vars)
+    assign_vars(DEFAULT, vars)
+    assign_and_check(count: 0, page: 1, outset: 0)
+    assign_limit
+    assign_offset
+    assign_last
+    check_overflow
     @from = [@offset - @outset + 1, @count].min
-    @to   = [@offset - @outset + @items, @count].min
+    @to   = [@offset - @outset + @limit, @count].min
     @in   = [@to - @from + 1, @count].min
+    assign_prev_and_next
+  end
+
+  # Setup @last (overridden by the gearbox extra)
+  def assign_last
+    @last = [(@count.to_f / @limit).ceil, 1].max
+    @last = @vars[:max_pages] if @vars[:max_pages] && @last > vars[:max_pages]
+  end
+
+  # Assign @offset (overridden by the gearbox extra)
+  def assign_offset
+    @offset = (@limit * (@page - 1)) + @outset  # may be already set from gear_box
+  end
+
+  # Assign @prev and @next
+  def assign_prev_and_next
     @prev = (@page - 1 unless @page == 1)
     @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
   end
 
-  # Return the array of page numbers and :gap items e.g. [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+  # Checks the @page <= @last
+  def check_overflow
+    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
+  end
+
+  # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
+  def label = @page.to_s
+
+  # Label for any page. Allow the customization of the output (overridden by the calendar extra)
+  def label_for(page) = page.to_s
+
+  # Return the array of page numbers and :gap e.g. [1, :gap, 8, "9", 10, :gap, 36]
   def series(size: @vars[:size], **_)
-    raise VariableError.new(self, :size, 'to be a positive Integer or 0', size) \
-          unless size.is_a?(Integer)
+    raise VariableError.new(self, :size, 'to be an Integer >= 0', size) \
+    unless size.is_a?(Integer) && size >= 0
     return [] if size.zero?
 
     [].tap do |series|
@@ -53,13 +82,13 @@ class Pagy
         left  = ((size - 1) / 2.0).floor             # left half might be 1 page shorter for even size
         start = if @page <= left                     # beginning pages
                   1
-                elsif @page > @last - (size - left)  # end pages
+                elsif @page > (@last - size + left)  # end pages
                   @last - size + 1
                 else                                 # intermediate pages
                   @page - left
                 end
         series.push(*start...start + size)
-        # Insert first and last ends plus gaps when needed
+        # Set first and last pages plus gaps when needed, respecting the size
         if vars[:ends] && size >= 7
           series[0]  = 1     unless series[0]  == 1
           series[1]  = :gap  unless series[1]  == 2
@@ -70,51 +99,8 @@ class Pagy
       series[series.index(@page)] = @page.to_s
     end
   end
-
-  # Label for any page. Allow the customization of the output (overridden by the calendar extra)
-  def label_for(page)
-    page.to_s
-  end
-
-  # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
-  def label
-    @page.to_s
-  end
-
-  protected
-
-  # Apply defaults, cleanup blanks and set @vars
-  def normalize_vars(vars)
-    @vars = DEFAULT.merge(vars.delete_if { |k, v| DEFAULT.key?(k) && (v.nil? || v == '') })
-  end
-
-  # Setup and validates the passed vars: var must be present and value.to_i must be >= to min
-  def setup_vars(name_min)
-    name_min.each do |name, min|
-      raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
-            unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
-    end
-  end
-
-  # Setup @items (overridden by the gearbox extra)
-  def setup_items_var
-    setup_vars(items: 1)
-  end
-
-  # Setup @last (overridden by the gearbox extra)
-  def setup_last_var
-    @last = [(@count.to_f / @items).ceil, 1].max
-    @last = vars[:max_pages] if vars[:max_pages] && @last > vars[:max_pages]
-  end
-  alias setup_pages_var setup_last_var
-
-  # Setup @offset based on the :gearbox_items variable
-  def setup_offset_var
-    @offset = (@items * (@page - 1)) + @outset  # may be already set from gear_box
-  end
 end
 
-require_relative 'pagy/extras/size' # will be opt in in v9.0
 require_relative 'pagy/backend'
 require_relative 'pagy/frontend'
 require_relative 'pagy/exceptions'

data/locales/ar.yml

@@ -8,6 +8,7 @@ ar:
         two: "صفحتين"
         few: "صفحات"
         many: "صفحات"
+        other: "صفحات"
       prev: "السابق"
       next: "التالي"
     prev: "<"
@@ -25,4 +26,4 @@ ar:
       single_page: "عرض %{count} %{item_name}"
       multiple_pages: "عرض %{item_name} %{from}-%{to} من اجمالي %{count}"
     combo_nav_js: "الصفحة %{page_input} من %{pages}"
-    items_selector_js: "عرض %{items_input} %{item_name} لكل صفحة"
+    limit_selector_js: "عرض %{limit_input} %{item_name} لكل صفحة"

data/locales/be.yml

@@ -22,4 +22,4 @@ be:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Усяго %{count} %{item_name}, паказаны з %{from} па %{to}"
     combo_nav_js: "Старонка %{page_input} з %{pages}"
-    items_selector_js: "Паказаць %{items_input} %{item_name} на старонцы"
+    limit_selector_js: "Паказаць %{limit_input} %{item_name} на старонцы"

data/locales/bg.yml

@@ -18,4 +18,4 @@ bg:
       single_page: "Показани са %{count} %{item_name}"
       multiple_pages: "Показани са %{item_name} %{from}-%{to} от %{count} общо"
     combo_nav_js: "Страница %{page_input} от %{pages}"
-    items_selector_js: "Покажи %{items_input} %{item_name} на страница"
+    limit_selector_js: "Покажи %{limit_input} %{item_name} на страница"

data/locales/bs.yml

@@ -22,4 +22,4 @@ bs:
       single_page: "Prikazuje se %{count} %{item_name}"
       multiple_pages: "Prikaz %{item_name} %{from}-%{to} od %{count} ukupno"
     combo_nav_js: "Stranica %{page_input} od %{pages}"
-    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"
+    limit_selector_js: "Prikaži %{limit_input} %{item_name} po stranici"

data/locales/ca.yml

@@ -18,4 +18,4 @@ ca:
       single_page: "Mostrant %{count} %{item_name}"
       multiple_pages: "Mostrant %{item_name} %{from}-%{to} de %{count} en total"
     combo_nav_js: "Pàgina %{page_input} de %{pages}"
-    items_selector_js: "Mostra %{items_input} %{item_name} per pàgina"
+    limit_selector_js: "Mostra %{limit_input} %{item_name} per pàgina"

data/locales/ckb.yml

@@ -15,4 +15,4 @@ ckb:
       single_page: "پیشاندانی %{count} %{item_name}"
       multiple_pages: "پشاندانی %{item_name}ی %{from}-%{to} لە کۆی %{count} بە گشتی"
     combo_nav_js: "پەڕی %{page_input} لە %{pages}"
-    items_selector_js: "نیشاندانی %{items_input} %{item_name} لە هەر پەڕێک"
+    limit_selector_js: "نیشاندانی %{limit_input} %{item_name} لە هەر پەڕێک"

data/locales/cs.yml

@@ -20,4 +20,4 @@ cs:
       single_page: "Zobrazeno %{count} %{item_name}"
       multiple_pages: "Zobrazeny položky %{from}-%{to} z %{count} celkem"
     combo_nav_js: "Strana %{page_input} z %{pages}"
-    items_selector_js: "Zobrazit %{items_input} %{item_name} na stránce"
+    limit_selector_js: "Zobrazit %{limit_input} %{item_name} na stránce"

data/locales/da.yml

@@ -18,4 +18,4 @@ da:
       single_page: "Viser %{count} %{item_name}"
       multiple_pages: "Viser %{item_name} %{from}-%{to} af %{count} totalt"
     combo_nav_js: "Side %{page_input} af %{pages}"
-    items_selector_js: "Antal %{items_input} %{item_name} per side"
+    limit_selector_js: "Antal %{limit_input} %{item_name} per side"

data/locales/de.yml

@@ -18,4 +18,4 @@ de:
       single_page: "Zeige %{count} %{item_name}"
       multiple_pages: "Zeige %{item_name} %{from}-%{to} von %{count} gesamt"
     combo_nav_js: "Seite %{page_input} von %{pages}"
-    items_selector_js: "Zeige %{items_input} %{item_name} pro Seite"
+    limit_selector_js: "Zeige %{limit_input} %{item_name} pro Seite"

data/locales/en.yml

@@ -18,4 +18,4 @@ en:
       single_page: "Displaying %{count} %{item_name}"
       multiple_pages: "Displaying %{item_name} %{from}-%{to} of %{count} in total"
     combo_nav_js: "Page %{page_input} of %{pages}"
-    items_selector_js: "Show %{items_input} %{item_name} per page"
+    limit_selector_js: "Show %{limit_input} %{item_name} per page"

data/locales/es.yml

@@ -18,4 +18,4 @@ es:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/locales/fr.yml

@@ -18,4 +18,4 @@ fr:
       single_page: "Affichage de %{count} %{item_name}"
       multiple_pages: "Affichage des %{item_name} %{from} à %{to} sur %{count} au total"
     combo_nav_js: "Page %{page_input} sur %{pages}"
-    items_selector_js: "Afficher %{items_input} %{item_name} par page"
+    limit_selector_js: "Afficher %{limit_input} %{item_name} par page"

data/locales/hr.yml

@@ -22,4 +22,4 @@ hr:
       single_page: "Prikazuje se %{count} %{item_name}"
       multiple_pages: "Prikaz %{item_name} %{from}-%{to} od %{count} ukupno"
     combo_nav_js: "Stranica %{page_input} od %{pages}"
-    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"
+    limit_selector_js: "Prikaži %{limit_input} %{item_name} po stranici"

data/locales/id.yml

@@ -16,4 +16,4 @@ id:
       single_page: "Menampilkan %{count} %{item_name}"
       multiple_pages: "Menampilkan %{item_name} %{from}-%{to} dari total %{count}"
     combo_nav_js: "Halaman %{page_input} dari %{pages}"
-    items_selector_js: "Tampilkan %{items_input} %{item_name} per halaman"
+    limit_selector_js: "Tampilkan %{limit_input} %{item_name} per halaman"

data/locales/it.yml

@@ -18,4 +18,4 @@ it:
       single_page: "Visualizzazione di %{count} %{item_name}"
       multiple_pages: "Visualizzazione %{item_name} %{from}-%{to} di %{count} in totale"
     combo_nav_js: "Pagina %{page_input} di %{pages}"
-    items_selector_js: "Mostra %{items_input} %{item_name} per pagina"
+    limit_selector_js: "Mostra %{limit_input} %{item_name} per pagina"

data/locales/ja.yml

@@ -16,4 +16,4 @@ ja:
       single_page: "%{count} 件の%{item_name}"
       multiple_pages: "%{count} 件中 %{from}-%{to} 件目の%{item_name}を表示中"
     combo_nav_js: "%{page_input} / %{pages} ページ"
-    items_selector_js: "%{items_input} 件ずつ表示"
+    limit_selector_js: "%{limit_input} 件ずつ表示"

data/locales/km.yml

@@ -16,4 +16,4 @@ km:
       single_page: "បង្ហាញ %{count} %{item_name}"
       multiple_pages: "បង្ហាញ %{item_name} %{from}-%{to} នៃ %{count} ជាចំនួនសរុប"
     combo_nav_js: "ទំព័រ %{page_input} នៃ %{pages}"
-    items_selector_js: "បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ"
+    limit_selector_js: "បង្ហាញ %{limit_input} %{item_name} ក្នុង ១ ទំព័រ"

data/locales/ko.yml

@@ -14,4 +14,4 @@ ko:
       single_page: "%{count}개의 %{item_name} 표시됨"
       multiple_pages: "총 %{count}개의 %{item_name} 중 %{from}-%{to}"
     combo_nav_js: "총 %{pages} 중 %{page_input} 페이지"
-    items_selector_js: "페이지 당 %{items_input}개 표시%"
+    limit_selector_js: "페이지 당 %{limit_input}개 표시%"

data/locales/nb.yml

@@ -18,4 +18,4 @@ nb:
       single_page: "Viser %{count} %{item_name}"
       multiple_pages: "Viser %{item_name} %{from}-%{to} av totalt %{count}"
     combo_nav_js: "Side %{page_input} av %{pages}"
-    items_selector_js: "Vis %{items_input} %{item_name} per side"
+    limit_selector_js: "Vis %{limit_input} %{item_name} per side"

data/locales/nl.yml

@@ -18,4 +18,4 @@ nl:
       single_page: "Toont %{count} %{item_name}"
       multiple_pages: "Toont %{from}-%{to} %{item_name} van %{count} in totaal"
     combo_nav_js: "Pagina %{page_input} van %{pages}"
-    items_selector_js: "Toont %{items_input} %{item_name} per pagina"
+    limit_selector_js: "Toont %{limit_input} %{item_name} per pagina"

data/locales/nn.yml

@@ -18,4 +18,4 @@ nn:
       single_page: "Viser %{count} %{item_name}"
       multiple_pages: "Viser %{item_name} %{from}-%{to} av totalt %{count}"
     combo_nav_js: "Side %{page_input} av %{pages}"
-    items_selector_js: "Vis %{items_input} %{item_name} per side"
+    limit_selector_js: "Vis %{limit_input} %{item_name} per side"

data/locales/pl.yml

@@ -22,4 +22,4 @@ pl:
       single_page: "Wyświetlono %{count} %{item_name}"
       multiple_pages: "Wyświetlono %{item_name} %{from}-%{to} z wszystkich %{count}"
     combo_nav_js: "Strona %{page_input} z %{pages}"
-    items_selector_js: "Pokaż %{items_input} %{item_name} na stronie"
+    limit_selector_js: "Pokaż %{limit_input} %{item_name} na stronie"

data/locales/pt-BR.yml

@@ -18,4 +18,4 @@ pt-BR:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/locales/pt.yml

@@ -18,4 +18,4 @@ pt:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/locales/ru.yml

@@ -22,4 +22,4 @@ ru:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Всего %{count} %{item_name}, показаны с %{from} по %{to}"
     combo_nav_js: "Страница %{page_input} из %{pages}"
-    items_selector_js: "Показать %{items_input} %{item_name} на странице"
+    limit_selector_js: "Показать %{limit_input} %{item_name} на странице"

data/locales/sr.yml

@@ -22,4 +22,4 @@ sr:
       single_page: "Приказује се %{count} %{item_name}"
       multiple_pages: "Приказ %{item_name} %{from}-%{to} од %{count} укупно"
     combo_nav_js: "Страниca %{page_input} од %{pages}"
-    items_selector_js: "Прикажи %{items_input} %{item_name} по страниcи"
+    limit_selector_js: "Прикажи %{limit_input} %{item_name} по страниcи"

data/locales/sv-SE.yml

@@ -18,4 +18,4 @@ sv-SE:
       single_page: "Visar %{count} %{item_name}"
       multiple_pages: "Visar %{item_name} %{from}-%{to} av %{count} totalt"
     combo_nav_js: "Sida %{page_input} av %{pages}"
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    limit_selector_js: "Visa %{limit_input} %{item_name} per sida"

data/locales/sv.yml

@@ -18,4 +18,4 @@ sv:
       single_page: "Visar %{count} %{item_name}"
       multiple_pages: "Visar %{item_name} %{from}-%{to} av %{count} totalt"
     combo_nav_js: "Sida %{page_input} av %{pages}"
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    limit_selector_js: "Visa %{limit_input} %{item_name} per sida"

data/locales/sw.yml

@@ -20,4 +20,4 @@ sw:
       single_page: "Inaonyesha %{item_name} %{count}"
       multiple_pages: "Inaonyesha %{item_name} %{from}-%{to} ya %{count} kwa jumla"
     combo_nav_js: "Kurasa %{page_input} ya %{pages}"
-    items_selector_js: "Onyesha %{items_input} %{item_name} kwa kila ukurasa"
+    limit_selector_js: "Onyesha %{limit_input} %{item_name} kwa kila ukurasa"

data/locales/ta.yml

@@ -20,4 +20,4 @@ ta:
       single_page: "%{count} %{item_name} காட்டப்படுகின்றது"
       multiple_pages: "மொத்தம் %{count} %{item_name}, காட்டப்படுபவை %{from}-%{to}"
     combo_nav_js: "%{pages}-இல் %{page_input}-வது பக்கம்"
-    items_selector_js: "ஒரு பக்கத்திற்கு %{items_input} %{item_name} காட்டு"
+    limit_selector_js: "ஒரு பக்கத்திற்கு %{limit_input} %{item_name} காட்டு"

data/locales/tr.yml

@@ -16,4 +16,4 @@ tr:
       single_page: "Toplam %{count} %{item_name} gösteriliyor"
       multiple_pages: "%{count} %{item_name} içerisinden %{from}-%{to} kadarı gösteriliyor"
     combo_nav_js: "Sayfa %{page_input} / %{pages}"
-    items_selector_js: "Sayfada %{items_input} %{item_name} göster"
+    limit_selector_js: "Sayfada %{limit_input} %{item_name} göster"

data/locales/uk.yml

@@ -22,4 +22,4 @@ uk:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Загалом %{count} %{item_name}, показані з %{from} по %{to}"
     combo_nav_js: "Сторінка %{page_input} з %{pages}"
-    items_selector_js: "Показати %{items_input} %{item_name} на сторінці"
+    limit_selector_js: "Показати %{limit_input} %{item_name} на сторінці"

data/locales/vi.yml

@@ -14,4 +14,4 @@ vi:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Đang hiển thị %{from}-%{to} trong tổng số %{count} %{item_name}"
     combo_nav_js: "Trang %{page_input} trên %{pages}"
-    items_selector_js: "Hiển thị %{items_input} %{item_name} mỗi trang"
+    limit_selector_js: "Hiển thị %{limit_input} %{item_name} mỗi trang"

data/locales/zh-CN.yml

@@ -16,4 +16,4 @@ zh-CN:
       single_page: "显示%{count} 项%{item_name}"
       multiple_pages: "共 %{count} 项%{item_name}，显示 %{from}-%{to}"
     combo_nav_js: "第 %{page_input} / %{pages} 页"
-    items_selector_js: "每页显示 %{items_input} 条%"
+    limit_selector_js: "每页显示 %{limit_input} 条%"

data/locales/zh-HK.yml

@@ -16,4 +16,4 @@ zh-HK:
       single_page: "顯示 %{count} %{item_name}"
       multiple_pages: "共 %{count}  %{item_name}，顯示 %{from}-%{to}"
     combo_nav_js: "第 %{page_input} / %{pages} 頁"
-    items_selector_js: "每頁顯示 %{items_input} 記錄"
+    limit_selector_js: "每頁顯示 %{limit_input} 記錄"

data/locales/zh-TW.yml

@@ -16,4 +16,4 @@ zh-TW:
       single_page: "顯示 %{count} 項%{item_name}"
       multiple_pages: "共 %{count} 項%{item_name}，顯示 %{from}-%{to}"
     combo_nav_js: "第 %{page_input} / %{pages} 頁"
-    items_selector_js: "每頁顯示 %{items_input} 項%{item_name}"
+    limit_selector_js: "每頁顯示 %{limit_input} 項%{item_name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 9.0.2
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-07-20 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -21,13 +21,18 @@ files:
 - LICENSE.txt
 - apps/calendar.ru
 - apps/demo.ru
+- apps/keyset_ar.ru
+- apps/keyset_s.ru
 - apps/rails.ru
 - apps/repro.ru
 - apps/tmp/calendar.sqlite3
 - apps/tmp/calendar.sqlite3-shm
 - apps/tmp/calendar.sqlite3-wal
 - apps/tmp/local_secret.txt
-- apps/tmp/pagy-rails.sqlite3
+- apps/tmp/pagy-keyset-ar.sqlite3
+- apps/tmp/pagy-keyset-ar.sqlite3-shm
+- apps/tmp/pagy-keyset-ar.sqlite3-wal
+- apps/tmp/pagy-keyset-s.sqlite3
 - bin/pagy
 - config/pagy.rb
 - javascripts/pagy-module.js
@@ -38,6 +43,7 @@ files:
 - javascripts/pagy.mjs
 - lib/optimist.rb
 - lib/pagy.rb
+- lib/pagy/b64.rb
 - lib/pagy/backend.rb
 - lib/pagy/calendar.rb
 - lib/pagy/calendar/day.rb
@@ -56,26 +62,27 @@ files:
 - lib/pagy/extras/calendar.rb
 - lib/pagy/extras/countless.rb
 - lib/pagy/extras/elasticsearch_rails.rb
-- lib/pagy/extras/foundation.rb
 - lib/pagy/extras/gearbox.rb
 - lib/pagy/extras/headers.rb
 - lib/pagy/extras/i18n.rb
-- lib/pagy/extras/items.rb
 - lib/pagy/extras/js_tools.rb
 - lib/pagy/extras/jsonapi.rb
-- lib/pagy/extras/materialize.rb
+- lib/pagy/extras/keyset.rb
+- lib/pagy/extras/limit.rb
 - lib/pagy/extras/meilisearch.rb
 - lib/pagy/extras/metadata.rb
 - lib/pagy/extras/overflow.rb
 - lib/pagy/extras/pagy.rb
 - lib/pagy/extras/searchkick.rb
-- lib/pagy/extras/semantic.rb
 - lib/pagy/extras/size.rb
 - lib/pagy/extras/standalone.rb
 - lib/pagy/extras/trim.rb
-- lib/pagy/extras/uikit.rb
 - lib/pagy/frontend.rb
 - lib/pagy/i18n.rb
+- lib/pagy/keyset.rb
+- lib/pagy/keyset/active_record.rb
+- lib/pagy/keyset/sequel.rb
+- lib/pagy/shared_methods.rb
 - lib/pagy/url_helpers.rb
 - locales/ar.yml
 - locales/be.yml
@@ -126,14 +133,7 @@ metadata:
   bug_tracker_uri: https://github.com/ddnexus/pagy/issues
   changelog_uri: https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md
   support: https://github.com/ddnexus/pagy/discussions/categories/q-a
-post_install_message: |
-  *********************** PAGY WARNING! ***********************
-   The foundation, materialize, semantic and uikit CSS extras
-        have been discontinued and will be removed in v9
-         https://github.com/ddnexus/pagy/discussions/672
-        The javascript files have been deprecated/renamed
-      https://ddnexus.github.io/pagy/changelog/#deprecations
-  *************************************************************
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib

data/lib/pagy/extras/foundation.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-warn '[PAGY WARNING] The foundation extra has been discontinued and it will be removed in v9 ' \
-     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
-
-require_relative 'js_tools'
-
-class Pagy # :nodoc:
-  # Frontend modules are specially optimized for performance.
-  # The resulting code may not look very elegant, but produces the best benchmarks
-  module FoundationExtra
-    # Pagination for Foundation: it returns the html with the series of links to the pages
-    def pagy_foundation_nav(pagy, id: nil, aria_label: nil, **vars)
-      id = %( id="#{id}") if id
-      a  = pagy_anchor(pagy)
-
-      html = +%(<nav#{id} class="pagy-foundation-nav" #{
-                  nav_aria_label(pagy, aria_label:)}><ul class="pagination"> #{
-                  foundation_prev_html(pagy, a)})
-      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << case item
-                when Integer
-                  %(<li>#{a.(item)}</li>)
-                when String
-                  %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</li>)
-                when :gap
-                  %(<li class="ellipsis gap"></li>)
-                else
-                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
-                end
-      end
-      html << %(#{foundation_next_html(pagy, a)}</ul></nav>)
-    end
-
-    # Javascript pagination for foundation: it returns a nav with a data-pagy attribute used by the pagy.js file
-    def pagy_foundation_nav_js(pagy, id: nil, aria_label: nil, **vars)
-      sequels = pagy.sequels(**vars)
-      id      = %( id="#{id}") if id
-      a       = pagy_anchor(pagy)
-      tokens  = { 'before'  => %(<ul class="pagination">#{foundation_prev_html pagy, a}),
-                  'a'       => %(<li>#{a.(PAGE_TOKEN, LABEL_TOKEN)}</li>),
-                  'current' => %(<li class="current" role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</li>),
-                  'gap'     => %(<li class="ellipsis gap"></li>),
-                  'after'   => %(#{foundation_next_html pagy, a}</ul>) }
-
-      %(<nav#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-foundation-nav-js" #{
-          nav_aria_label(pagy, aria_label:)} #{
-          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
-        }></nav>)
-    end
-
-    # Javascript combo pagination for Foundation: it returns a nav with a data-pagy attribute used by the pagy.js file
-    def pagy_foundation_combo_nav_js(pagy, id: nil, aria_label: nil)
-      id    = %( id="#{id}") if id
-      a     = pagy_anchor(pagy)
-      pages = pagy.pages
-
-      page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
-                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem; ) <<
-                   %(height: 1.5rem; padding: .5rem; margin: 0 .4rem; font-size: .875rem;" class="current">#{JSTools::A_TAG})
-
-      %(<nav#{id} class="pagy-foundation-combo-nav-js" #{
-          nav_aria_label(pagy, aria_label:)} #{
-          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
-        }><ul class="pagination">#{
-          foundation_prev_html(pagy, a)
-        }<li style="padding: 0 .3rem"><label style="display: flex; align-items: center; white-space: nowrap">#{
-          pagy_t('pagy.combo_nav_js', page_input:, pages:)
-        }</label></li>#{
-          foundation_next_html(pagy, a)
-        }</ul></nav>)
-    end
-
-    private
-
-    def foundation_prev_html(pagy, a)
-      if (p_prev = pagy.prev)
-        %(<li class="prev">#{a.(p_prev, pagy_t('pagy.prev'), aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
-      else
-        %(<li class="prev disabled" role="link" aria-disabled="true" aria-label="#{
-            pagy_t('pagy.aria_label.prev')}">#{pagy_t('pagy.prev')}</li>)
-      end
-    end
-
-    def foundation_next_html(pagy, a)
-      if (p_next = pagy.next)
-        %(<li class="next">#{a.(p_next, pagy_t('pagy.next'), aria_label: pagy_t('pagy.aria_label.next'))}</li>)
-      else
-        %(<li class="next disabled" role="link" aria-disabled="true" aria-label="#{
-             pagy_t('pagy.aria_label.next')}">#{pagy_t('pagy.next')}</li>)
-      end
-    end
-  end
-  Frontend.prepend FoundationExtra
-end