pagy 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eec238a32b24a046a7ddaf632f6bfeeb73ef8a2fb0389222b322d50d1b3fd64
-  data.tar.gz: 9dc1b595e6a6c6b37cb5c1d32080517c383bbbd5d5d1ce023eac384114aeebb7
+  metadata.gz: 1893ce66c2ad5ccb5e1b55340873135bf1174f6876a7fe9987bf3d7b11c8b93d
+  data.tar.gz: 15ec7c5615cc40f2fc854f18577632d99f0ec83134f432a2526ca51c1c579a2a
 SHA512:
-  metadata.gz: 9be42486ebe3686f8461d5868427446664b00b7c733dafc4506eca883e280fc71a5c1cbd94fcbe9c8f15e12aa6b6af550e8890f71b835629d45f926d0e850a8b
-  data.tar.gz: 9563de1d768f284a65ec0ae3f60530e29ea36b62c0455048cefb81fa49c95bae21188beafbc9adc9e16fd7abc902ed1498070942a38847524eb9ffa23b89a75b
+  metadata.gz: 3b0a30aa314e2abc44dbad8a89352cd640b3ff81979b31436b8911920df344eef2a43cd622ba2921e9ef088a3059611e7e3ccab05f1e07ab7e3bdaefd72ecd58
+  data.tar.gz: 318953ee34f26d5f89f59417b2b02edda38608ada3946241633513167c1b5c5e209a8b474dfb8c1f028381283ba20cf367b5e2b7e9ad7ad95ca22af86d94730d

data/lib/config/pagy.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (4.1.0)
+# Pagy initializer file (4.2.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,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '4.1.0';
+Pagy.version = '4.2.0';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,

data/lib/locales/utils/i18n.rb

@@ -1,5 +1,4 @@
 # See https://ddnexus.github.io/pagy/api/frontend#i18n
-# encoding: utf-8
 # frozen_string_literal: true
 
 # this file returns the I18n hash used as default alternative to the i18n gem

data/lib/locales/utils/loader.rb

@@ -1,18 +1,20 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 # the whole file will be eval'ed/executed and gc-collected after returning/executing the loader proc
 
 # eval: no need for the whole file in memory
-plurals, _ = eval(Pagy.root.join('locales', 'utils', 'p11n.rb').read)   #rubocop:disable Security/Eval
+plurals, = eval Pagy.root.join('locales', 'utils', 'p11n.rb').read   # rubocop:disable Security/Eval
 
 # flatten the dictionary file nested keys
 # convert each value to a simple ruby interpolation proc
 flatten = lambda do |hash, key=''|
             hash.each.reduce({}) do |h, (k, v)|
-              v.is_a?(Hash) \
-                ? h.merge!(flatten.call(v, "#{key}#{k}."))
-                : h.merge!(eval %({"#{key}#{k}" => lambda{|vars|"#{v.gsub(/%{[^}]+?}/){|m| "\#{vars[:#{m[2..-2]}]||'#{m}'}" }}"}})) #rubocop:disable Security/Eval
+              if v.is_a?(Hash)
+                h.merge! flatten.call(v, "#{key}#{k}.")
+              else
+                code = %({"#{key}#{k}" => lambda{|vars|"#{v.gsub(/%{[^}]+?}/){|m| "\#{vars[:#{m[2..-2]}]||'#{m}'}" }}"}})
+                h.merge! eval(code) # rubocop:disable Security/Eval
+              end
             end
           end
 

data/lib/locales/utils/p11n.rb

@@ -1,5 +1,4 @@
 # See https://ddnexus.github.io/pagy/api/frontend#i18n
-# encoding: utf-8
 # frozen_string_literal: true
 
 # This file adds support for multiple built-in plualization types.
@@ -18,46 +17,51 @@ from12to14 = [12,13,14].freeze
 # Each proc may apply to one or more locales below.
 # Pluralization logic adapted from https://github.com/svenfuchs/rails-i18n
 p11n = {
-  one_other: lambda {|n| n == 1 ? 'one' : 'other'},    # default
+  one_other: -> (n){ n == 1 ? 'one' : 'other' },    # default
 
   east_slavic: lambda do |n|
     n ||= 0
     mod10 = n % 10
     mod100 = n % 100
 
-    if    mod10 == 1 && mod100 != 11                                            ; 'one'
-    elsif from2to4.include?(mod10) && !from12to14.include?(mod100)              ; 'few'
-    elsif mod10 == 0 || from5to9.include?(mod10) || from11to14.include?(mod100) ; 'many'
-    else                                                                          'other'
+    case
+    when mod10 == 1 && mod100 != 11                                            then 'one'
+    when from2to4.include?(mod10) && !from12to14.include?(mod100)              then 'few'
+    when mod10 == 0 || from5to9.include?(mod10) || from11to14.include?(mod100) then 'many' # rubocop:disable Style/NumericPredicate
+    else                                                                            'other'
     end
   end,
 
   west_slavic: lambda do |n|
-     if n == 1                    ; 'one'
-     elsif [2, 3, 4].include?(n)  ; 'few'
-     else                         ; 'other'
-     end
+    case n
+    when 1       then 'one'
+    when 2, 3, 4 then 'few'
+    else              'other'
+    end
   end,
 
   one_two_other: lambda do |n|
-    if n == 1    ; 'one'
-    elsif n == 2 ; 'two'
-    else           'other'
+    case n
+    when 1 then 'one'
+    when 2 then 'two'
+    else        'other'
     end
   end,
 
-  one_upto_two_other: lambda {|n| n && n >= 0 && n < 2 ? 'one' : 'other'},
+  one_upto_two_other: -> (n){ n && n >= 0 && n < 2 ? 'one' : 'other' },
 
-  other: Proc.new { 'other' },
+  other: -> (*){ 'other' },
 
   polish: lambda do |n|
     n ||= 0
-    mod10 = n % 10
+    mod10  = n % 10
     mod100 = n % 100
-    if n == 1                                                                  ; 'one'
-    elsif from2to4.include?(mod10) && !from12to14.include?(mod100)             ; 'few'
-    elsif (from0to1 + from5to9).include?(mod10) || from12to14.include?(mod100) ; 'many'
-    else                                                                         'other'
+
+    case
+    when n == 1                                                               then 'one'
+    when from2to4.include?(mod10) && !from12to14.include?(mod100)             then 'few'
+    when (from0to1 + from5to9).include?(mod10) || from12to14.include?(mod100) then 'many'
+    else                                                                           'other'
     end
   end
 }

data/lib/pagy.rb

@@ -1,48 +1,66 @@
 # See Pagy API documentation: https://ddnexus.github.io/pagy/api/pagy
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pathname'
 
-class Pagy ; VERSION = '4.1.0'
+# main class
+class Pagy
+  VERSION = '4.2.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
-  def self.root = @root ||= Pathname.new(__FILE__).dirname.freeze
+  def self.root
+    @root ||= Pathname.new(__dir__).freeze
+  end
 
   # default vars
-  VARS = { page:1, items:20, outset:0, size:[1,4,4,1], page_param: :page, params:{}, anchor:'', link_extra:'', i18n_key:'pagy.item_name', cycle:false }
+  VARS = { page: 1, items: 20, outset: 0, size: [1, 4, 4, 1], page_param: :page,              # rubocop:disable Style/MutableConstant
+           params: {}, anchor: '', link_extra: '', i18n_key: 'pagy.item_name', cycle: false }
 
   attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next
 
+  INSTANCE_VARS_MIN = { count: 0, items: 1, page: 1, outset: 0 }.freeze
+
   # Merge and validate the options, do some simple arithmetic and set the instance variables
   def initialize(vars)
-    @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })               # default vars + cleaned vars
-    { count:0, items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
-      (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \
-         or raise(VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
+    @vars = VARS.merge( vars.delete_if{|_,v| v.nil? || v == '' } )
+
+    INSTANCE_VARS_MIN.each do |name,min|
+      raise VariableError.new(self), "expected :#{name} >= #{min}; got #{@vars[name].inspect}" \
+            unless @vars[name] && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
     end
-    @pages = @last = [(@count.to_f / @items).ceil, 1].max                      # cardinal and ordinal meanings
-    @page <= @last or raise(OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}")
-    @offset = @items * (@page - 1) + @outset                                   # pagination offset + outset (initial offset)
-    @items  = @count - ((@pages-1) * @items) if @page == @last && @count > 0   # adjust items for last non-empty page
-    @from   = @count == 0 ? 0 : @offset+1 - @outset                            # page begins from item
-    @to     = @count == 0 ? 0 : @offset + @items - @outset                     # page ends to item
-    @prev   = (@page-1 unless @page == 1)                                      # nil if no prev page
-    @next   = @page == @last ? (1 if @vars[:cycle]) : @page+1                  # nil if no next page, 1 if :cycle
+    @pages = @last = [(@count.to_f / @items).ceil, 1].max
+    raise OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}" if @page > @last
+
+    @offset = @items * (@page - 1) + @outset
+    @items  = @count - ((@pages-1) * @items) if @page == @last && @count.positive?
+    @from   = @count.zero? ? 0 : @offset + 1 - @outset
+    @to     = @count.zero? ? 0 : @offset + @items - @outset
+    @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]
   def series(size=@vars[:size])
-    (series = []) and size.empty? and return series
-    4.times{|i| (size[i]>=0 rescue nil) or raise(VariableError.new(self), "expected 4 items >= 0 in :size; got #{size.inspect}")}
-    [*0..size[0], *@page-size[1]..@page+size[2], *@last-size[3]+1..@last+1].sort!.each_cons(2) do |a, b|
-      if    a<0 || a==b || a>@last; next                                  # skip out of range and duplicates
-      elsif a+1 == b; series.push(a)                                      # no gap     -> no additions
-      elsif a+2 == b; series.push(a, a+1)                                 # 1 page gap -> fill with missing page
-      else            series.push(a, :gap)                                # n page gap -> add gap
-      end                                                                 # skip the end boundary (last+1)
-    end                                                                   # shift the start boundary (0) and
-    series.shift; series[series.index(@page)] = @page.to_s; series        # convert the current page to String
+    return [] if size.empty?
+    raise VariableError.new(self), "expected 4 items >= 0 in :size; got #{size.inspect}" \
+          unless size.size == 4 && size.all?{ |num| num >= 0 rescue false }  # rubocop:disable Style/RescueModifier
+
+    series = []
+    [ *0..size[0],                                   # initial pages from 0
+      *@page-size[1]..@page+size[2],                 # around current page
+      *@last-size[3]+1..@last+1                      # final pages till @last+1
+    ].sort!.each_cons(2) do |left, right|            # sort and loop by 2
+      next if left.negative? || left == right        # skip out of range and duplicates
+      break if left > @last                          # break if out of @last boundary
+      case right
+      when left+1 then series.push(left)             # no gap     -> no additions
+      when left+2 then series.push(left, left+1)     # 1 page gap -> fill with missing page
+      else             series.push(left, :gap)       # n page gap -> add gap
+      end
+    end
+    series.shift                                     # shift the start boundary (0)
+    series[series.index(@page)] = @page.to_s         # convert the current page to String
+    series
   end
 
 end

data/lib/pagy/backend.rb

@@ -1,5 +1,4 @@
 # See Pagy::Backend API documentation: https://ddnexus.github.io/pagy/api/backend
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -8,12 +7,14 @@ class Pagy
 
   # See also the extras if you need specialized methods to paginate Arrays or other collections
 
-  module Backend ; private         # the whole module is private so no problem with including it in a controller
+
+  module Backend
+    private         # the whole module is private so no problem with including it in a controller
 
     # Return Pagy object and items
     def pagy(collection, vars={})
       pagy = Pagy.new(pagy_get_vars(collection, vars))
-      return pagy, pagy_get_items(collection, pagy)
+      [ pagy, pagy_get_items(collection, pagy) ]
     end
 
     # Sub-method called only by #pagy: here for easy customization of variables by overriding

data/lib/pagy/countless.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy'
@@ -7,25 +6,29 @@ class Pagy
 
   class Countless < Pagy
 
+    INSTANCE_VARS_MIN = { items: 1, page: 1, outset: 0 }.freeze
+
     # Merge and validate the options, do some simple arithmetic and set a few instance variables
     def initialize(vars={})  # rubocop:disable Lint/MissingSuper
       @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })      # default vars + cleaned vars (can be overridden)
-      { items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
-        (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \
-         or raise(VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}")
+      INSTANCE_VARS_MIN.each do |k,min|                                 # validate instance variables
+        raise VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}" \
+              unless @vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min
       end
       @offset = @items * (@page - 1) + @outset                          # pagination offset + outset (initial offset)
     end
 
     # Finalize the instance variables based on the fetched items
     def finalize(fetched)
-      fetched == 0 && @page > 1 and raise(OverflowError.new(self), "page #{@page} got no items")
+      raise OverflowError.new(self), "page #{@page} got no items" \
+            if fetched.zero? && @page > 1
+
       @pages = @last = (fetched > @items ? @page + 1 : @page)         # set the @pages and @last
-      @items = fetched if fetched < @items && fetched > 0             # adjust items for last non-empty page
-      @from  = fetched == 0 ? 0 : @offset+1 - @outset                 # page begins from item
-      @to    = fetched == 0 ? 0 : @offset + @items - @outset          # page ends to item
+      @items = fetched if fetched < @items && fetched.positive?       # adjust items for last non-empty page
+      @from  = fetched.zero? ? 0 : @offset + 1 - @outset              # page begins from item
+      @to    = fetched.zero? ? 0 : @offset + @items - @outset         # page ends to item
       @prev  = (@page-1 unless @page == 1)                            # nil if no prev page
-      @next  = @page == @last ? (1 if @vars[:cycle]) : @page+1        # nil if no next page, 1 if :cycle
+      @next  = @page == @last ? (1 if @vars[:cycle]) : @page + 1      # nil if no next page, 1 if :cycle
       self
     end
 

data/lib/pagy/exceptions.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class Pagy
 
+  # generic variable error
   class VariableError < ArgumentError
     attr_reader :pagy
 
@@ -9,15 +12,14 @@ class Pagy
     end
 
     def variable
-      message =~ /expected :([\w]+)/
-      $1.to_sym if $1
+      message =~ /expected :(\w+)/
+      Regexp.last_match(1)&.to_sym
     end
 
-    def value
-      pagy.vars[variable]
-    end
+    def value = pagy.vars[variable]
   end
 
+  # specific overflow error
   class OverflowError < VariableError; end
 
 end

data/lib/pagy/extras/arel.rb

@@ -1,13 +1,13 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/arel
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
-  module Backend ; private
+  module Backend
+    private
 
     def pagy_arel(collection, vars={})
       pagy = Pagy.new(pagy_arel_get_vars(collection, vars))
-      return pagy, pagy_get_items(collection, pagy)
+      [ pagy, pagy_get_items(collection, pagy) ]
     end
 
     def pagy_arel_get_vars(collection, vars)

data/lib/pagy/extras/array.rb

@@ -1,15 +1,15 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/array
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
   # Add specialized backend methods to paginate array collections
-  module Backend ; private
+  module Backend
+    private
 
     # Return Pagy object and items
     def pagy_array(array, vars={})
       pagy = Pagy.new(pagy_array_get_vars(array, vars))
-      return pagy, array[pagy.offset, pagy.items]
+      [ pagy, array[pagy.offset, pagy.items] ]
     end
 
     # Sub-method called only by #pagy_array: here for easy customization of variables by overriding

data/lib/pagy/extras/bootstrap.rb

@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bootstrap
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,47 +8,75 @@ class Pagy
 
     # Pagination for bootstrap: it returns the html with the series of links to the pages
     def pagy_bootstrap_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next
+      link = pagy_link_proc(pagy, 'class="page-link"')
 
-      html = (p_prev ? %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
-                     : %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.prev')}</a></li>))
+      html = +%(<nav class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">)
+      html << pagy_bootstrap_prev_html(pagy, link)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << if    item.is_a?(Integer); %(<li class="page-item">#{link.call item}</li>)                                                               # page link
-                elsif item.is_a?(String) ; %(<li class="page-item active">#{link.call item}</li>)                                                        # active page
-                elsif item == :gap       ; %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.gap')}</a></li>) # page gap
+        html << case item
+                when Integer then %(<li class="page-item">#{link.call item}</li>)
+                when String  then %(<li class="page-item active">#{link.call item}</li>)
+                when :gap    then %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.gap'}</a></li>)
                 end
       end
-      html << (p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
-                      : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
-      %(<nav class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
+      html << pagy_bootstrap_next_html(pagy, link)
+      html << %(</ul></nav>)
     end
 
     # Javascript pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_bootstrap_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next
-      tags = { 'before' => p_prev ? %(<ul class="pagination"><li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
-                                  : %(<ul class="pagination"><li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.prev')}</a></li>),
+      link = pagy_link_proc(pagy, 'class="page-link"')
+      tags = { 'before' => %(<ul class="pagination">#{pagy_bootstrap_prev_html pagy, link}),
                'link'   => %(<li class="page-item">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="page-item active">#{mark}</li>),
-               'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.gap')}</a></li>),
-               'after'  => p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li></ul>)
-                                  : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li></ul>) }
-      %(<nav id="#{id}" class="pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               '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 id="#{id}" class="pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_bootstrap_combo_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = %(<nav id="#{id}" class="pagy-bootstrap-combo-nav-js pagination" role="navigation" aria-label="pager">) + %(<div class="btn-group" role="group">)
-      html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"')
-                      : %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>))
-      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;">)
-      html << %(<div class="pagy-combo-input btn btn-primary disabled" style="white-space: nowrap;">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div>)
-      html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"')
-                      : %(<a class="next btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
-      html << %(</div></nav>#{pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))})
+      link    = pagy_link_proc(pagy)
+      p_page  = pagy.page
+      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 id="#{id}" class="pagy-bootstrap-combo-nav-js pagination" role="navigation" aria-label="pager"><div class="btn-group" role="group">#{
+          if (p_prev = pagy.prev)
+            link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"'
+          else
+            %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>)
+          end
+      }<div class="pagy-combo-input btn btn-primary disabled" style="white-space: nowrap;">#{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'), 'aria-label="next" class="next btn btn-primary"'
+          else
+            %(<a class="next btn btn-primary disabled" href="#">#{pagy_t 'pagy.nav.next' }</a>)
+          end
+      }</div></nav>#{
+          pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))
+      })
     end
 
+    private
+
+      def pagy_bootstrap_prev_html(pagy, link)
+        if (p_prev = pagy.prev)
+          %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
+        else
+          %(<li class="page-item prev disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.prev'}</a></li>)
+        end
+      end
+
+      def pagy_bootstrap_next_html(pagy, link)
+        if (p_next = pagy.next)
+          %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
+        else
+          %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t 'pagy.nav.next'}</a></li>)
+        end
+      end
+
   end
 end