From cb673530eca0916771d9f4eebe56899f9eac9ad8 Mon Sep 17 00:00:00 2001
From: Domizio Demichelis <dd.nexus@gmail.com>
Date: Thu, 8 Apr 2021 20:13:10 +0700
Subject: [PATCH] code-restyling: extras

---
 lib/pagy.rb                            | 28 ++++-----
 lib/pagy/countless.rb                  |  1 +
 lib/pagy/extras/arel.rb                |  6 +-
 lib/pagy/extras/array.rb               |  6 +-
 lib/pagy/extras/bootstrap.rb           | 81 ++++++++++++++++--------
 lib/pagy/extras/bulma.rb               | 86 +++++++++++++++----------
 lib/pagy/extras/countless.rb           |  9 +--
 lib/pagy/extras/elasticsearch_rails.rb | 13 ++--
 lib/pagy/extras/foundation.rb          | 81 +++++++++++++++---------
 lib/pagy/extras/headers.rb             | 22 ++++---
 lib/pagy/extras/i18n.rb                |  7 ++-
 lib/pagy/extras/items.rb               | 29 +++++----
 lib/pagy/extras/materialize.rb         | 80 ++++++++++++++---------
 lib/pagy/extras/metadata.rb            | 45 +++++++------
 lib/pagy/extras/navs.rb                | 55 +++++++++++-----
 lib/pagy/extras/overflow.rb            | 13 ++--
 lib/pagy/extras/searchkick.rb          | 15 ++---
 lib/pagy/extras/semantic.rb            | 75 ++++++++++++++--------
 lib/pagy/extras/shared.rb              | 18 +++---
 lib/pagy/extras/support.rb             | 15 +++--
 lib/pagy/extras/trim.rb                | 14 +++--
 lib/pagy/extras/uikit.rb               | 87 +++++++++++++++++---------
 lib/pagy/frontend.rb                   | 23 ++++---
 test/pagy/extras/semantic_test.rb      |  1 +
 24 files changed, 499 insertions(+), 311 deletions(-)

diff --git a/lib/pagy.rb b/lib/pagy.rb
index 6084658a9..5c7d79b0d 100644
--- a/lib/pagy.rb
+++ b/lib/pagy.rb
@@ -45,22 +45,22 @@ def series(size=@vars[:size])
     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
 
-    [].tap do |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
+    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
-      series.shift                                     # shift the start boundary (0)
-      series[series.index(@page)] = @page.to_s         # convert the current page to String
     end
+    series.shift                                     # shift the start boundary (0)
+    series[series.index(@page)] = @page.to_s         # convert the current page to String
+    series
   end
 
 end
diff --git a/lib/pagy/countless.rb b/lib/pagy/countless.rb
index fa7277bfc..3ea12c46d 100644
--- a/lib/pagy/countless.rb
+++ b/lib/pagy/countless.rb
@@ -22,6 +22,7 @@ def initialize(vars={})  # rubocop:disable Lint/MissingSuper
     def finalize(fetched)
       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.positive?       # adjust items for last non-empty page
       @from  = fetched.zero? ? 0 : @offset + 1 - @outset              # page begins from item
diff --git a/lib/pagy/extras/arel.rb b/lib/pagy/extras/arel.rb
index 3e6dfaef9..b92fd2233 100644
--- a/lib/pagy/extras/arel.rb
+++ b/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)
diff --git a/lib/pagy/extras/array.rb b/lib/pagy/extras/array.rb
index 35870cb93..3dc08621d 100644
--- a/lib/pagy/extras/array.rb
+++ b/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
diff --git a/lib/pagy/extras/bootstrap.rb b/lib/pagy/extras/bootstrap.rb
index d5c3b8da8..89a008414 100644
--- a/lib/pagy/extras/bootstrap.rb
+++ b/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 @@ module Frontend
 
     # 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
diff --git a/lib/pagy/extras/bulma.rb b/lib/pagy/extras/bulma.rb
index ccbd793a4..51f03da3b 100644
--- a/lib/pagy/extras/bulma.rb
+++ b/lib/pagy/extras/bulma.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/bulma
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,52 +8,71 @@ module Frontend
 
     # Pagination for Bulma: it returns the html with the series of links to the pages
     def pagy_bulma_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
+      link = pagy_link_proc(pagy)
 
-      html = (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
-                     : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>)) \
-           + (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"')
-                     : %(<a class="pagination-next" disabled>#{pagy_t('pagy.nav.next')}</a>))
-      html << '<ul class="pagination-list">'
+      html = +%(<nav class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">)
+      html << pagy_bulma_prev_next_html(pagy, link)
+      html << %(<ul class="pagination-list">)
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << if    item.is_a?(Integer); %(<li>#{link.call item, item, %(class="pagination-link" aria-label="goto page #{item}") }</li>)                           # page link
-                elsif item.is_a?(String) ; %(<li>#{link.call item, item, %(class="pagination-link is-current" aria-label="page #{item}" aria-current="page")}</li>)  # active page
-                elsif item == :gap       ; %(<li><span class="pagination-ellipsis">#{pagy_t('pagy.nav.gap')}</span></li>)                                            # page gap
+        html << case item
+                when Integer then %(<li>#{link.call item, item, %(class="pagination-link" aria-label="goto page #{item}") }</li>)                           # page link
+                when String  then %(<li>#{link.call item, item, %(class="pagination-link is-current" aria-label="page #{item}" aria-current="page")}</li>)  # active page
+                when :gap    then %(<li><span class="pagination-ellipsis">#{pagy_t('pagy.nav.gap')}</span></li>)                                            # page gap
                 end
       end
-      html << '</ul>'
-      %(<nav class="pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">#{html}</nav>)
+      html << %(</ul></nav>)
     end
 
-    # Javascript pagination for bulma: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_bulma_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => ( (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
-                                     : %(<a class="pagination-previous" disabled>#{pagy_t('pagy.nav.prev')}</a>)) \
-                           + (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"')
-                                     : %(<a class="pagination-next" disabled>#{pagy_t('pagy.nav.next')}</a>)) \
-                           + '<ul class="pagination-list">' ),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}"))}</li>),
-               'active' => %(<li>#{link.call(PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link is-current" aria-current="page" aria-label="page #{PAGE_PLACEHOLDER}"))}</li>),
-               'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t('pagy.nav.gap')}</span></li>),
+      link = pagy_link_proc(pagy)
+      tags = { 'before' => %(#{pagy_bulma_prev_next_html(pagy, link)}<ul class="pagination-list">),
+               'link'   => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link" aria-label="goto page #{PAGE_PLACEHOLDER}")}</li>),
+               'active' => %(<li>#{link.call PAGE_PLACEHOLDER, PAGE_PLACEHOLDER, %(class="pagination-link is-current" aria-current="page" aria-label="page #{PAGE_PLACEHOLDER}")}</li>),
+               'gap'    => %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap' }</span></li>),
                'after'  => '</ul>' }
-      %(<nav id="#{id}" class="pagy-bulma-nav-js pagination is-centered" role="navigation" aria-label="pagination"></nav>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+
+      html = %(<nav id="#{id}" class="pagy-bulma-nav-js pagination is-centered" role="navigation" aria-label="pagination"></nav>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination for Bulma: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_bulma_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-bulma-combo-nav-js" role="navigation" aria-label="pagination">) \
-           + %(<div class="field is-grouped is-grouped-centered" role="group">)
-      html << (p_prev ? %(<p class="control">#{link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"')}</p>)
-                      : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.prev')}</a></p>))
-      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;">)
-      html << %(<div class="pagy-combo-input control level is-mobile">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div>)
-      html << (p_next ? %(<p class="control">#{link.call(p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"')}</p>)
-                      : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.next')}</a></p>))
-      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 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 id="#{id}" class="pagy-bulma-combo-nav-js" role="navigation" aria-label="pagination"><div class="field is-grouped is-grouped-centered" role="group">#{
+          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
+            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.prev'}</a></p>)
+          end
+      }<div class="pagy-combo-input control level is-mobile">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div>#{
+          if (p_next  = pagy.next)
+            %(<p class="control">#{link.call p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"'}</p>)
+          else
+            %(<p class="control"><a class="button" disabled>#{pagy_t 'pagy.nav.next'}</a></p>)
+          end
+      }</div></nav>#{
+         pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))
+      })
     end
 
+    private
+
+      def pagy_bulma_prev_next_html(pagy, link)
+        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>)
+                end
+        html << if (p_next = pagy.next)
+                  link.call p_next, pagy_t('pagy.nav.next'), 'class="pagination-next" aria-label="next page"'
+                else
+                  %(<a class="pagination-next" disabled>#{pagy_t 'pagy.nav.next' }</a>)
+                end
+      end
+
   end
 end
diff --git a/lib/pagy/extras/countless.rb b/lib/pagy/extras/countless.rb
index 2b50ec9d4..d7bbdd33b 100644
--- a/lib/pagy/extras/countless.rb
+++ b/lib/pagy/extras/countless.rb
@@ -1,17 +1,17 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/countless
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/countless'
 
 class Pagy
 
-  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_countless(collection, vars={})
       pagy = Pagy::Countless.new(pagy_countless_get_vars(collection, vars))
-      return pagy, pagy_countless_get_items(collection, pagy)
+      [ pagy, pagy_countless_get_items(collection, pagy) ]
     end
 
     # Sub-method called only by #pagy_countless: here for easy customization of variables by overriding
@@ -26,7 +26,8 @@ def pagy_countless_get_items(collection, pagy)
       items      = collection.offset(pagy.offset).limit(pagy.items + 1).to_a
       items_size = items.size
       items.pop if items_size == pagy.items + 1
-      pagy.finalize(items_size)                  # finalize may adjust pagy.items, so must be used after checking the size
+      # finalize may adjust pagy.items, so must be used after checking the size
+      pagy.finalize(items_size)
       items
     end
 
diff --git a/lib/pagy/extras/elasticsearch_rails.rb b/lib/pagy/extras/elasticsearch_rails.rb
index a16b03ffc..f3121df59 100644
--- a/lib/pagy/extras/elasticsearch_rails.rb
+++ b/lib/pagy/extras/elasticsearch_rails.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/elasticsearch_rails
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -28,7 +27,8 @@ def self.new_from_elasticsearch_rails(response, vars={})
   end
 
   # Add specialized backend methods to paginate ElasticsearchRails searches
-  module Backend ; private
+  module Backend
+    private
 
     # Return Pagy object and items
     def pagy_elasticsearch_rails(pagy_search_args, vars={})
@@ -39,12 +39,13 @@ def pagy_elasticsearch_rails(pagy_search_args, vars={})
       response       = model.search(query_or_payload, **options)
       total          = response.respond_to?(:raw_response) ? response.raw_response['hits']['total'] : response.response['hits']['total']
       vars[:count]   = total.is_a?(Hash) ? total['value'] : total
+
       pagy = Pagy.new(vars)
       # with :last_page overflow we need to re-run the method in order to get the hits
-      if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
-        return pagy_elasticsearch_rails(pagy_search_args, vars.merge(page: pagy.page))
-      end
-      return pagy, called.empty? ? response : response.send(*called)
+      return pagy_elasticsearch_rails(pagy_search_args, vars.merge(page: pagy.page)) \
+             if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
+
+      [ pagy, called.empty? ? response : response.send(*called) ]
     end
 
     # Sub-method called only by #pagy_elasticsearch_rails: here for easy customization of variables by overriding
diff --git a/lib/pagy/extras/foundation.rb b/lib/pagy/extras/foundation.rb
index dcefc3d09..e2b22c2dc 100644
--- a/lib/pagy/extras/foundation.rb
+++ b/lib/pagy/extras/foundation.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/foundation
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,49 +8,73 @@ module Frontend
 
     # Pagination for Foundation: it returns the html with the series of links to the pages
     def pagy_foundation_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
+      link = pagy_link_proc(pagy)
 
-      html = +(p_prev ? %(<li class="prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
-                      : %(<li class="prev disabled">#{pagy_t('pagy.nav.prev')}</li>))
+      html = +%(<nav class="pagy-foundation-nav" role="navigation" aria-label="Pagination"><ul class="pagination">)
+      html << pagy_foundation_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>#{link.call item}</li>)                        # page link
-                elsif item.is_a?(String) ; %(<li class="current">#{item}</li>)                  # active page
-                elsif item == :gap       ; %(<li class="ellipsis gap" aria-hidden="true"></li>) # page gap
+        html << case item
+                when Integer then %(<li>#{link.call item}</li>)                        # page link
+                when String  then %(<li class="current">#{item}</li>)                  # active page
+                when :gap    then %(<li class="ellipsis gap" aria-hidden="true"></li>) # page gap
                 end
       end
-      html << (p_next ? %(<li class="next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
-                      : %(<li class="next disabled">#{pagy_t('pagy.nav.next')}</li>))
-      %(<nav class="pagy-foundation-nav" role="navigation" aria-label="Pagination"><ul class="pagination">#{html}</ul></nav>)
+      html << pagy_foundation_next_html(pagy, link)
+      html << %(</ul></nav>)
     end
 
     # Javascript pagination for foundation: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_foundation_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => ( '<ul class="pagination">' \
-                           + (p_prev ? %(<li class="prev">#{link.call(p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"')}</li>)
-                                     : %(<li class="prev disabled">#{pagy_t('pagy.nav.prev')}</li>)) ),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER)}</li>),
+      link = pagy_link_proc(pagy)
+      tags = { 'before' => %(<ul class="pagination">#{pagy_foundation_prev_html(pagy, link)}),
+               'link'   => %(<li>#{link.call PAGE_PLACEHOLDER}</li>),
                'active' => %(<li class="current">#{pagy.page}</li>),
                'gap'    => %(<li class="ellipsis gap" aria-hidden="true"></li>),
-               'after'  => ( (p_next ? %(<li class="next">#{link.call(p_next, pagy_t('pagy.nav.next'), 'aria-label="next"')}</li>)
-                                     : %(<li class="next disabled">#{pagy_t('pagy.nav.next')}</li>)) \
-                           + '</ul>' ) }
-      %(<nav id="#{id}" class="pagy-foundation-nav-js" role="navigation" aria-label="Pagination"></nav>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               'after'  => %(#{pagy_foundation_next_html(pagy, link)}</ul>) }
+
+      html = %(<nav id="#{id}" class="pagy-foundation-nav-js" role="navigation" aria-label="Pagination"></nav>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination for Foundation: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_foundation_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-foundation-combo-nav-js" role="navigation" aria-label="Pagination">) + %(<div class="input-group">)
-      html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0px;" aria-label="previous" class="prev button primary"')
-                      : %(<a style="margin-bottom: 0px;" class="prev button primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>))
-      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;">)
-      html << %(<span class="input-group-label">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</span>)
-      html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0px;" aria-label="next" class="next button primary"')
-                      : %(<a style="margin-bottom: 0px;" class="next button 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 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 id="#{id}" class="pagy-foundation-combo-nav-js" role="navigation" aria-label="Pagination"><div class="input-group">#{
+          if (p_prev  = pagy.prev)
+            link.call p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0px;" aria-label="previous" class="prev button primary"'
+          else
+            %(<a style="margin-bottom: 0px;" class="prev button primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>)
+          end
+      }<span class="input-group-label">#{pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</span>#{
+          if (p_next  = pagy.next)
+            link.call p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0px;" aria-label="next" class="next button primary"'
+          else
+            %(<a style="margin-bottom: 0px;" class="next button 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_foundation_prev_html(pagy, link)
+        if (p_prev = pagy.prev)
+          %(<li class="prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
+        else
+          %(<li class="prev disabled">#{pagy_t 'pagy.nav.prev' }</li>)
+        end
+      end
+
+      def pagy_foundation_next_html(pagy, link)
+        if (p_next = pagy.next)
+          %(<li class="next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
+        else
+          %(<li class="next disabled">#{pagy_t 'pagy.nav.next'}</li>)
+        end
+      end
+
   end
 end
diff --git a/lib/pagy/extras/headers.rb b/lib/pagy/extras/headers.rb
index 591325cbb..892a2aee1 100644
--- a/lib/pagy/extras/headers.rb
+++ b/lib/pagy/extras/headers.rb
@@ -1,10 +1,10 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/headers
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
   # Add specialized backend methods to add pagination response headers
-  module Backend ; private
+  module Backend
+    private
 
     VARS[:headers] = { page: 'Current-Page', items: 'Page-Items', count: 'Total-Count', pages: 'Total-Pages' }
 
@@ -15,17 +15,21 @@ def pagy_headers_merge(pagy)
     end
 
     def pagy_headers(pagy)
-      hash = pagy_headers_hash(pagy)
-      hash['Link'] = hash['Link'].map{|rel, link| %(<#{link}>; rel="#{rel}")}.join(', ')
-      hash
+      pagy_headers_hash(pagy).tap do |hash|
+        hash['Link'] = hash['Link'].map{|rel, link| %(<#{link}>; rel="#{rel}")}.join(', ')
+      end
     end
 
     def pagy_headers_hash(pagy)
       countless = defined?(Pagy::Countless) && pagy.is_a?(Pagy::Countless)
-      rels      = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }; rels['last'] = pagy.last unless countless
-      url_str   = pagy_url_for(PAGE_PLACEHOLDER, pagy, :url)
-      hash      = { 'Link' => Hash[rels.map{|rel, n|[rel, url_str.sub(PAGE_PLACEHOLDER, n.to_s)] if n}.compact] }
-      headers   = pagy.vars[:headers]
+      rels = { 'first' => 1, 'prev' => pagy.prev, 'next' => pagy.next }
+      rels['last'] = pagy.last unless countless
+      url_str = pagy_url_for(PAGE_PLACEHOLDER, pagy, :url)
+      hash    = { 'Link' => rels.map do |rel, num|
+                              next unless num
+                              [ rel, url_str.sub(PAGE_PLACEHOLDER, num.to_s) ]
+                            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]
       unless countless
diff --git a/lib/pagy/extras/i18n.rb b/lib/pagy/extras/i18n.rb
index d125855a7..2766b2711 100644
--- a/lib/pagy/extras/i18n.rb
+++ b/lib/pagy/extras/i18n.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/i18n
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -8,7 +7,11 @@ module Frontend
 
     ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]
 
-    Pagy::I18n.clear.instance_eval { undef :load; undef :t } # unload the pagy default constant for efficiency
+    # unload the pagy default constant for efficiency
+    Pagy::I18n.clear.instance_eval do
+      undef :load
+      undef :t
+    end
 
     module UseI18nGem
       def pagy_t(key, **opts) = ::I18n.t(key, **opts)
diff --git a/lib/pagy/extras/items.rb b/lib/pagy/extras/items.rb
index 75181696e..99188d063 100644
--- a/lib/pagy/extras/items.rb
+++ b/lib/pagy/extras/items.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/items
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -12,15 +11,21 @@ class Pagy
 
   ITEMS_PLACEHOLDER = '__pagy_items__'
 
-  module UseItemsExtra ; private
+  module UseItemsExtra
+    private
 
-    [:pagy_get_vars, :pagy_countless_get_vars, :pagy_elasticsearch_rails_get_vars, :pagy_searchkick_get_vars].each do |meth|
-      if Backend.private_method_defined?(meth, true)
-        define_method(meth) do |collection, vars|
-          vars[:items] ||= (items = params[vars[:items_param] || VARS[:items_param]]) &&                           # :items from :items_param
+    %i[ pagy_get_vars
+        pagy_countless_get_vars
+        pagy_elasticsearch_rails_get_vars
+        pagy_searchkick_get_vars
+    ].each do |meth|
+      next unless Backend.private_method_defined?(meth, true)
+
+      define_method(meth) do |collection, vars|
+        vars[:items] ||= if (items = params[vars[:items_param] || VARS[:items_param]])                             # :items from :items_param
                            [items.to_i, vars.key?(:max_items) ? vars[:max_items] : VARS[:max_items]].compact.min   # :items capped to :max_items
-          super(collection, vars)
-        end
+                         end
+        super collection, vars
       end
     end
 
@@ -31,7 +36,7 @@ module UseItemsExtra ; private
   module Frontend
 
     module UseItemsExtra
-      def pagy_url_for(page, pagy, url=false)
+      def pagy_url_for(page, pagy, url=nil)
         p_vars = pagy.vars
         params = request.GET.merge(p_vars[:params])
         params[p_vars[:page_param].to_s]  = page
@@ -49,9 +54,11 @@ def pagy_items_selector_js(pagy, id=pagy_id)
       link           = pagy_marked_link(pagy_link_proc(pagy))
       p_vars[:items] = p_items # restore the items
 
-      html = %(<span id="#{id}">)
+      html  = %(<span id="#{id}">)
       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: pagy_t(p_vars[:i18n_key], count: p_items), items_input: input, count: p_items)})
+      html << pagy_t('pagy.items_selector_js', item_name:   pagy_t(p_vars[:i18n_key], count: p_items),
+                                               items_input: input,
+                                               count:       p_items)
       html << %(</span>#{pagy_json_tag(pagy, :items_selector, id, pagy.from, link)})
     end
 
diff --git a/lib/pagy/extras/materialize.rb b/lib/pagy/extras/materialize.rb
index a9ccfb532..440d6772d 100644
--- a/lib/pagy/extras/materialize.rb
+++ b/lib/pagy/extras/materialize.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/materialize
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,51 +8,70 @@ module Frontend
 
     # Pagination for materialize: it returns the html with the series of links to the pages
     def pagy_materialize_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      html = (p_prev ? %(<li class="waves-effect prev">#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
-                     : +%(<li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li>))
+      link = pagy_link_proc(pagy)
+
+      html = +%(<div class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">)
+      html << pagy_materialize_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="waves-effect">#{link.call item}</li>)                                             # page link
-                elsif item.is_a?(String) ; %(<li class="active">#{link.call item}</li>)                                                   # active page
-                elsif item == :gap       ; %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>)   # page gap
+        html << case item
+                when Integer then %(<li class="waves-effect">#{link.call item}</li>)                           # page link
+                when String  then %(<li class="active">#{link.call item}</li>)                                 # active page
+                when :gap    then %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>)   # page gap
                 end
       end
-      html << (p_next ? %(<li class="waves-effect next">#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
-                      : %(<li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li>))
-      %(<div class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></div>)
+      html << pagy_materialize_next_html(pagy, link)
+      html << %(</ul></div>)
     end
 
     # Javascript pagination for materialize: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_materialize_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => ( '<ul class="pagination">' \
-                           + (p_prev  ? %(<li class="waves-effect prev">#{link.call(p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"')}</li>)
-                                      : %(<li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li>)) ),
+      link = pagy_link_proc(pagy)
+      tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html(pagy, link)}),
                'link'   => %(<li class="waves-effect">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="active">#{mark}</li>),
                'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>),
-               'after'  => ( (p_next ? %(<li class="waves-effect next">#{link.call(p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"')}</li>)
-                                     : %(<li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li>)) \
-                           + '</ul>' ) }
-      %(<div id="#{id}" class="pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               'after'  => %(#{pagy_materialize_next_html(pagy, link)}</ul>) }
+
+      html = %(<div id="#{id}" class="pagy-materialize-nav-js" role="navigation" aria-label="pager"></div>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_materialize_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 = %(<div id="#{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;">)
-      html << '<ul class="pagination" style="margin: 0px;">'
-      li_style = 'style="vertical-align: middle;"'
-      html << (p_prev ? %(<li class="waves-effect prev" #{li_style}>#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
-                      : %(<li class="prev disabled" #{li_style}><a href="#"><i class="material-icons">chevron_left</i></a></li>))
-      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;">)
-      html << %(<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div>)
-      html << (p_next ? %(<li class="waves-effect next" #{li_style}>#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
-                      : %(<li class="next disabled" #{li_style}><a href="#"><i class="material-icons">chevron_right</i></a></li>))
-      html << %(</ul></div>#{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
+      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;">)
+
+      %(<div id="#{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: 0px;">#{
+          pagy_materialize_prev_html(pagy, link, style)
+      }<div class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px">#{
+          pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)
+      }</div>#{
+          pagy_materialize_next_html(pagy, link, style)
+      }</ul></div>#{
+          pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))
+      })
     end
 
+    private
+
+      def pagy_materialize_prev_html(pagy, link, style='')
+        if (p_prev = pagy.prev)
+          %(<li class="waves-effect prev"#{style}>#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
+        else
+          +%(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
+        end
+      end
+
+      def pagy_materialize_next_html(pagy, link, style='')
+        if (p_next = pagy.next)
+          %(<li class="waves-effect next"#{style}>#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
+        else
+          %(<li class="next disabled"#{style}><a href="#"><i class="material-icons">chevron_right</i></a></li>)
+        end
+      end
+
   end
 end
diff --git a/lib/pagy/extras/metadata.rb b/lib/pagy/extras/metadata.rb
index e6fce687d..fa189d86a 100644
--- a/lib/pagy/extras/metadata.rb
+++ b/lib/pagy/extras/metadata.rb
@@ -1,36 +1,41 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/metadata
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
   # Add a specialized backend method for pagination metadata
-  module Backend ; private
+  module Backend
+  private
 
-    METADATA = [ :scaffold_url, :first_url, :prev_url, :page_url, :next_url, :last_url,
-                 :count, :page, :items, :vars, :pages, :last, :from, :to, :prev, :next, :series ]
-    METADATA << :sequels if VARS.key?(:steps)  # :steps gets defined along with the #sequels method
+    METADATA = %i[ scaffold_url first_url prev_url page_url next_url last_url
+                   count page items vars pages last from to prev next series
+               ].tap do |metadata|
+                 metadata << :sequels if VARS.key?(:steps)  # :steps gets defined along with the #sequels method
+               end.freeze
 
     VARS[:metadata] = METADATA.dup
 
     include Helpers
 
-    def pagy_metadata(pagy, url=false)
-      names = pagy.vars[:metadata]
-      (unknown = names - METADATA).empty? or raise(VariableError.new(pagy), "unknown metadata #{unknown.inspect}")
+    def pagy_metadata(pagy, url=nil)
+      names   = pagy.vars[:metadata]
+      unknown = names - METADATA
+      raise VariableError.new(pagy), "unknown metadata #{unknown.inspect}" \
+            unless unknown.empty?
+
       scaffold_url = pagy_url_for(PAGE_PLACEHOLDER, pagy, url)
-      metadata = {}
-      names.each do |key|
-        metadata[key] = case key
-                        when :scaffold_url ; scaffold_url
-                        when :first_url    ; scaffold_url.sub(PAGE_PLACEHOLDER, 1.to_s)
-                        when :prev_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.prev.to_s)
-                        when :page_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.page.to_s)
-                        when :next_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.next.to_s)
-                        when :last_url     ; scaffold_url.sub(PAGE_PLACEHOLDER, pagy.last.to_s)
-                        else pagy.send(key)
-                        end
+      {}.tap do |metadata|
+        names.each do |key|
+          metadata[key] = case key
+                          when :scaffold_url then scaffold_url
+                          when :first_url    then scaffold_url.sub(PAGE_PLACEHOLDER, 1.to_s)
+                          when :prev_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.prev.to_s)
+                          when :page_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.page.to_s)
+                          when :next_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.next.to_s)
+                          when :last_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.last.to_s)
+                          else pagy.send(key)
+                          end
+        end
       end
-      metadata
     end
 
   end
diff --git a/lib/pagy/extras/navs.rb b/lib/pagy/extras/navs.rb
index 35c8612c7..35114ec66 100644
--- a/lib/pagy/extras/navs.rb
+++ b/lib/pagy/extras/navs.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/navs
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,30 +8,52 @@ module Frontend
 
     # Javascript pagination: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      tags = { 'before' => p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-                                  : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ),
+      link = pagy_link_proc(pagy)
+      tags = { 'before' => pagy_nav_prev_html(pagy, link),
                'link'   => %(<span class="page">#{link.call(PAGE_PLACEHOLDER)}</span> ),
                'active' => %(<span class="page active">#{pagy.page}</span> ),
                'gap'    => %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> ),
-               'after'  => p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-                                  : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>) }
-      %(<nav id="#{id}" class="pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               'after'  => pagy_nav_next_html(pagy, link) }
+
+      html = %(<nav id="#{id}" class="pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_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-combo-nav-js pagination" role="navigation" aria-label="pager">)
-      html << (p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-                      : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ))
-      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;">)
-      html << %(<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> )
-      html << (p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
-                      : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>))
-      html << %(</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}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+
+      %(<nav id="#{id}" class="pagy-combo-nav-js pagination" role="navigation" aria-label="pager">#{
+          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, id, p_page, pagy_marked_link(link))
+      })
     end
 
+    private
+
+      def pagy_nav_prev_html(pagy, link)
+        if (p_prev = pagy.prev)
+          %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
+        else
+          %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> )
+        end
+      end
+
+      def pagy_nav_next_html(pagy, link)
+        if (p_next = pagy.next)
+          %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
+        else
+          %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>)
+        end
+      end
+
   end
 end
diff --git a/lib/pagy/extras/overflow.rb b/lib/pagy/extras/overflow.rb
index 5fd7e147c..1ef571601 100644
--- a/lib/pagy/extras/overflow.rb
+++ b/lib/pagy/extras/overflow.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/overflow
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -34,8 +33,8 @@ module Series
       def series(size=@vars[:size])
         @page = @last                             # series for last page
         super(size).tap do |s|                    # call original series
-        s[s.index(@page.to_s)] = @page            # string to integer (i.e. no current page)
-        @page = @vars[:page]                      # restore the actual page
+          s[s.index(@page.to_s)] = @page          # string to integer (i.e. no current page)
+          @page = @vars[:page]                    # restore the actual page
         end
       end
     end
@@ -54,13 +53,13 @@ def finalize(items)
           @overflow = false
           super
         rescue OverflowError
-          @overflow = true                            # add the overflow flag
+          @overflow = true                        # add the overflow flag
           case @vars[:overflow]
           when :exception
-            raise                                     # same as without the extra
+            raise                                 # same as without the extra
           when :empty_page
-            @offset = @items = @from = @to = 0        # vars relative to the actual page
-            @vars[:size] = []                         # no page in the series
+            @offset = @items = @from = @to = 0    # vars relative to the actual page
+            @vars[:size] = []                     # no page in the series
             self
           else
             raise VariableError.new(self), "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
diff --git a/lib/pagy/extras/searchkick.rb b/lib/pagy/extras/searchkick.rb
index 77db7f6f2..a7558fadc 100644
--- a/lib/pagy/extras/searchkick.rb
+++ b/lib/pagy/extras/searchkick.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/searchkick
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -10,7 +9,7 @@ module Searchkick
     # returns an array used to delay the call of #search
     # after the pagination variables are merged to the options
     # it also pushes to the same array an eventually called method
-    def pagy_searchkick(term = "*", **options, &block)
+    def pagy_searchkick(term = '*', **options, &block)
       [self, term, options, block].tap do |args|
         args.define_singleton_method(:method_missing){|*a| args += a}
       end
@@ -27,7 +26,8 @@ def self.new_from_searchkick(results, vars={})
   end
 
   # Add specialized backend methods to paginate Searchkick::Results
-  module Backend ; private
+  module Backend
+    private
 
     # Return Pagy object and results
     def pagy_searchkick(pagy_search_args, vars={})
@@ -37,12 +37,13 @@ def pagy_searchkick(pagy_search_args, vars={})
       options[:page]     = vars[:page]
       results            = model.search(term, **options, &block)
       vars[:count]       = results.total_count
+
       pagy = Pagy.new(vars)
       # with :last_page overflow we need to re-run the method in order to get the hits
-      if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
-        return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page))
-      end
-      return pagy, called.empty? ? results : results.send(*called)
+      return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page)) \
+             if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
+
+      [ pagy, called.empty? ? results : results.send(*called) ]
     end
 
     # Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
diff --git a/lib/pagy/extras/semantic.rb b/lib/pagy/extras/semantic.rb
index 55685be51..9b20be3f2 100644
--- a/lib/pagy/extras/semantic.rb
+++ b/lib/pagy/extras/semantic.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/semantic
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,47 +8,69 @@ module Frontend
 
     # Pagination for semantic: it returns the html with the series of links to the pages
     def pagy_semantic_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
+      link = pagy_link_proc(pagy, 'class="item"')
 
-      html = (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
-                     : +%(<div class="item disabled"><i class="left small chevron icon"></i></div>))
+      html = +%(<div class="pagy-semantic-nav ui pagination menu" aria-label="pager">)
+      html << pagy_semantic_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); %(#{link.call item})                      # page link
-                elsif item.is_a?(String) ; %(<a class="item active">#{item}</a>)     # current page
-                elsif item == :gap       ; %(<div class="disabled item">...</div>)   # page gap
+        html << case item
+                when Integer then link.call item                            # page link
+                when String  then %(<a class="item active">#{item}</a>)     # current page
+                when :gap    then %(<div class="disabled item">...</div>)   # page gap
                 end
       end
-      html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
-                      : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      %(<div class="pagy-semantic-nav ui pagination menu" aria-label="pager">#{html}</div>)
+      html << pagy_semantic_next_html(pagy, link)
+      html << %(</div>)
     end
 
     # Javascript pagination for semantic: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_semantic_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
-      tags = { 'before' => (p_prev ? %(#{link.call(p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"')})
-                                   : %(<div class="item disabled"><i class="left small chevron icon"></i></div>)),
-               'link'   => %(#{link.call(PAGE_PLACEHOLDER)}),
+      link = pagy_link_proc(pagy, 'class="item"')
+      tags = { 'before' => pagy_semantic_prev_html(pagy, link),
+               'link'   => link.call(PAGE_PLACEHOLDER),
                'active' => %(<a class="item active">#{pagy.page}</a>),
                'gap'    => %(<div class="disabled item">#{pagy_t('pagy.nav.gap')}</div>),
-               'after'  => (p_next ? %(#{link.call(p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"')})
-                                   : %(<div class="item disabled"><i class="right small chevron icon"></i></div>)) }
-      %(<div id="#{id}" class="pagy-semantic-nav-js ui pagination menu" role="navigation" aria-label="pager"></div>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               'after'  => pagy_semantic_next_html(pagy, link) }
+
+      html = %(<div id="#{id}" class="pagy-semantic-nav-js ui pagination menu" role="navigation" aria-label="pager"></div>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Combo pagination for semantic: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_semantic_combo_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = %(<div id="#{id}" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" aria-label="pager">)
-      html << (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
-                      : %(<div class="item disabled"><i class="left small chevron icon"></i></div>))
-      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">)
-      html << %(<div class="pagy-combo-input item">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div> )
-      html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
-                      : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      html << %(</div>#{pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))})
+      link    = pagy_link_proc(pagy, 'class="item"')
+      p_page  = pagy.page
+      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 id="#{id}" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" aria-label="pager">#{
+         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, id, p_page, pagy_marked_link(link))
+      })
     end
 
+    private
+
+      def pagy_semantic_prev_html(pagy, link)
+        if (p_prev = pagy.prev)
+          link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'
+        else
+          %(<div class="item disabled"><i class="left small chevron icon"></i></div>)
+        end
+      end
+
+      def pagy_semantic_next_html(pagy, link)
+        if (p_next = pagy.next)
+          link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'
+        else
+          %(<div class="item disabled"><i class="right small chevron icon"></i></div>)
+        end
+      end
+
   end
 end
diff --git a/lib/pagy/extras/shared.rb b/lib/pagy/extras/shared.rb
index a2edb1e91..019ae3e4e 100644
--- a/lib/pagy/extras/shared.rb
+++ b/lib/pagy/extras/shared.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'digest'
@@ -19,10 +18,11 @@ class Pagy
   # Notice: if :steps is false it will use the single {0 => @vars[:size]} size
   def sequels
     steps = @vars[:steps] || {0 => @vars[:size]}
-    steps.key?(0) or raise(VariableError.new(self), "expected :steps to define the 0 width; got #{steps.inspect}")
-    sequels = {}
-    steps.each {|width, size| sequels[width.to_s] = series(size)}
-    sequels
+    raise VariableError.new(self), "expected :steps to define the 0 width; got #{steps.inspect}" \
+          unless steps.key?(0)
+    {}.tap do |sequels|
+      steps.each {|width, size| sequels[width.to_s] = series(size)}
+    end
   end
 
   module Frontend
@@ -43,10 +43,14 @@ def pagy_json_tag(pagy, *args)
     end
 
     # it returns the SHA1 (fastest on modern ruby) string used as default `id` attribute by all the `*_js` tags
-    def pagy_id = "pagy-#{Digest::SHA1.hexdigest(caller(2..2)[0].split(':in')[0])}"
+    def pagy_id
+      "pagy-#{Digest::SHA1.hexdigest(caller(2..2)[0].split(':in')[0])}"
+    end
 
     # it returns the marked link to used by pagy.js
-    def pagy_marked_link(link) = link.call(PAGE_PLACEHOLDER, '', 'style="display: none;"')
+    def pagy_marked_link(link)
+      link.call PAGE_PLACEHOLDER, '', 'style="display: none;"'
+    end
 
   end
 
diff --git a/lib/pagy/extras/support.rb b/lib/pagy/extras/support.rb
index 27510f568..5ad32a6a4 100644
--- a/lib/pagy/extras/support.rb
+++ b/lib/pagy/extras/support.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/support
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -15,13 +14,19 @@ def pagy_next_url(pagy)
     end
 
     def pagy_prev_link(pagy, text = pagy_t('pagy.nav.prev'), link_extra = '')
-      pagy.prev ? %(<span class="page prev"><a href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
-                : %(<span class="page prev disabled">#{text}</span>)
+      if pagy.prev
+        %(<span class="page prev"><a href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+      else
+        %(<span class="page prev disabled">#{text}</span>)
+      end
     end
 
     def pagy_next_link(pagy, text = pagy_t('pagy.nav.next'), link_extra = '')
-      pagy.next ? %(<span class="page next"><a href="#{pagy_url_for(pagy.next, pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
-                : %(<span class="page next disabled">#{text}</span>)
+      if pagy.next
+        %(<span class="page next"><a href="#{pagy_url_for(pagy.next, pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+      else
+        %(<span class="page next disabled">#{text}</span>)
+      end
     end
 
     def pagy_prev_link_tag(pagy)
diff --git a/lib/pagy/extras/trim.rb b/lib/pagy/extras/trim.rb
index b5e92473d..710af9230 100644
--- a/lib/pagy/extras/trim.rb
+++ b/lib/pagy/extras/trim.rb
@@ -1,18 +1,22 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/trim
-# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
 
   module UseTrimExtra
+
     def pagy_link_proc(pagy, link_extra='')
       link_proc = super(pagy, link_extra)
-      re = /[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/
-      lambda do |n, text=n, extra=''|
-        link = link_proc.call(n, text, extra)
-        n == 1 ? link.sub(re, '') : link
+      lambda do |num, text=num, extra=''|
+        link = link_proc.call(num, text, extra)
+        if num == 1
+         link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
+        else
+          link
+        end
       end
     end
+
   end
   Frontend.prepend UseTrimExtra
 
diff --git a/lib/pagy/extras/uikit.rb b/lib/pagy/extras/uikit.rb
index 12b762567..c6403a9e6 100644
--- a/lib/pagy/extras/uikit.rb
+++ b/lib/pagy/extras/uikit.rb
@@ -1,5 +1,4 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/uikit
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -9,54 +8,80 @@ module Frontend
 
     # Pagination for uikit: it returns the html with the series of links to the pages
     def pagy_uikit_nav(pagy)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
+      link = pagy_link_proc(pagy)
 
-      previous_span = "<span uk-pagination-previous>#{pagy_t('pagy.nav.prev')}</span>"
-      html = (p_prev ? %(<li>#{link.call p_prev, previous_span}</li>)
-                     : %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>))
+      html = %(<ul class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html(pagy, link)})
       pagy.series.each do |item|
-        html << if    item.is_a?(Integer); %(<li>#{link.call item}</li>)
-                elsif item.is_a?(String) ; %(<li class="uk-active"><span>#{item}</span></li>)
-                elsif item == :gap       ; %(<li class="uk-disabled"><span>#{pagy_t('pagy.nav.gap')}</span></li>)
+        html << case    item
+                when Integer then %(<li>#{link.call item}</li>)
+                when String  then %(<li class="uk-active"><span>#{item}</span></li>)
+                when :gap    then %(<li class="uk-disabled"><span>#{pagy_t('pagy.nav.gap')}</span></li>)
                 end
       end
-      next_span = "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>"
-      html << (p_next ? %(<li>#{link.call p_next, next_span}</li>)
-                      : %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>))
-      %(<ul class="pagy-uikit-nav uk-pagination uk-flex-center">#{html}</ul>)
+      html << pagy_uikit_next_html(pagy, link)
+      html << %(</ul>)
     end
 
     # Javascript pagination for uikit: it returns a nav and a JSON tag used by the Pagy.nav javascript
     def pagy_uikit_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      previous_span = "<span uk-pagination-previous>#{pagy_t('pagy.nav.prev')}</span>"
-      next_span     = "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>"
-      tags = { 'before' => p_prev ? %(<li>#{link.call p_prev, previous_span}</li>)
-                                  : %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>),
+      link = pagy_link_proc(pagy)
+      tags = { 'before' => pagy_uikit_prev_html(pagy, link),
                'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="uk-active"><span>#{PAGE_PLACEHOLDER}</span></li>),
                'gap'    => %(<li class="uk-disabled"><span>#{pagy_t('pagy.nav.gap')}</span></li>),
-               'after'  => p_next ? %(<li>#{link.call p_next, next_span}</li>)
-                                  : %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>) }
-      %(<ul id="#{id}" class="pagy-uikit-nav-js uk-pagination uk-flex-center"></ul>#{pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)})
+               'after'  => pagy_uikit_next_html(pagy, link) }
+
+      html = %(<ul id="#{id}" class="pagy-uikit-nav-js uk-pagination uk-flex-center"></ul>)
+      html << pagy_json_tag(pagy, :nav, id, tags, pagy.sequels)
     end
 
     # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
     def pagy_uikit_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
+      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="uk-input" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+
+      %(<div id="#{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">#{
+          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, id, p_page, pagy_marked_link(link))
+      })
+    end
 
-      html = %(<div id="#{id}" class="pagy-uikit-combo-nav-js uk-button-group">)
-      html = html + (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="uk-button uk-button-default"')
-                            : %(<button class="uk-button uk-button-default" disabled>#{pagy_t('pagy.nav.prev')}</button>))
 
-      html << %(<div class="uk-text-middle uk-margin-left uk-margin-right">)
-      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;">)
-      html << 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'), 'class="uk-button uk-button-default"')
-                      : %(<button class="uk-button uk-button-default" disabled>#{pagy_t('pagy.nav.next')}</button>))
+    private
+
+      def pagy_uikit_prev_html(pagy, link)
+        previous_span = %(<span uk-pagination-previous>#{pagy_t('pagy.nav.prev')}</span>)
+        if (p_prev = pagy.prev)
+          %(<li>#{link.call p_prev, previous_span}</li>)
+        else
+          %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>)
+        end
+      end
+
+      def pagy_uikit_next_html(pagy, link)
+        next_span = %(<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>)
+        if (p_next = pagy.next)
+          %(<li>#{link.call p_next, next_span}</li>)
+        else
+          %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>)
+        end
+      end
 
-      html << %(</div>#{pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))})
-    end
   end
 end
diff --git a/lib/pagy/frontend.rb b/lib/pagy/frontend.rb
index 3e1c418ce..18bb27417 100644
--- a/lib/pagy/frontend.rb
+++ b/lib/pagy/frontend.rb
@@ -35,11 +35,13 @@ def pagy_nav(pagy)
       link   = pagy_link_proc(pagy)
       p_prev = pagy.prev
       p_next = pagy.next
-      html   = if p_prev
-                 %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
-               else
-                 %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> )
-               end
+
+      html  = +%(<nav class="pagy-nav pagination" role="navigation" aria-label="pager">)
+      html << if p_prev
+                %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
+              else
+                %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> )
+              end
       pagy.series.each do |item|  # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
                 when Integer then %(<span class="page">#{link.call item}</span> )               # page link
@@ -52,18 +54,15 @@ def pagy_nav(pagy)
               else
                 %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>)
               end
-      %(<nav class="pagy-nav pagination" role="navigation" aria-label="pager">#{html}</nav>)
+      html << %(</nav>)
     end
 
     # Return examples: "Displaying items 41-60 of 324 in total" of "Displaying Products 41-60 of 324 in total"
     def pagy_info(pagy, item_name=nil)
       count = pagy.count
-      key   = if count.zero?
-                'pagy.info.no_items'
-              elsif pagy.pages == 1
-                'pagy.info.single_page'
-              else
-                'pagy.info.multiple_pages'
+      key   = if    count.zero?     then 'pagy.info.no_items'
+              elsif pagy.pages == 1 then 'pagy.info.single_page'
+              else                       'pagy.info.multiple_pages'
               end
       pagy_t key, item_name: item_name || pagy_t(pagy.vars[:i18n_key], count: count),
                   count:     count,
diff --git a/test/pagy/extras/semantic_test.rb b/test/pagy/extras/semantic_test.rb
index 2f448117b..142c4d0b2 100644
--- a/test/pagy/extras/semantic_test.rb
+++ b/test/pagy/extras/semantic_test.rb
@@ -49,6 +49,7 @@
       pagy = Pagy.new(count: 1000, page: 50)
       _(view.pagy_semantic_nav_js(pagy, pagy_test_id)).must_equal \
         "<div id=\"test-id\" class=\"pagy-semantic-nav-js ui pagination menu\" role=\"navigation\" aria-label=\"pager\"></div><script type=\"application/json\" class=\"pagy-json\">[\"nav\",\"test-id\",{\"before\":\"<a href=\\\"/foo?page=49\\\"  class=\\\"item\\\" rel=\\\"prev\\\" aria-label=\\\"previous\\\"><i class=\\\"left small chevron icon\\\"></i></a>\",\"link\":\"<a href=\\\"/foo?page=__pagy_page__\\\"  class=\\\"item\\\" >__pagy_page__</a>\",\"active\":\"<a class=\\\"item active\\\">50</a>\",\"gap\":\"<div class=\\\"disabled item\\\">&hellip;</div>\",\"after\":\"<div class=\\\"item disabled\\\"><i class=\\\"right small chevron icon\\\"></i></div>\"},{\"0\":[1,\"gap\",46,47,48,49,\"50\"]},null]</script>"
+        "<div id=\"test-id\" class=\"pagy-semantic-nav-js ui pagination menu\" role=\"navigation\" aria-label=\"pager\"></div><script type=\"application/json\" class=\"pagy-json\">[\"nav\",\"test-id\",{\"before\":\"<a href=\\\"/foo?page=49\\\"  class=\\\"item\\\" rel=\\\"prev\\\" ><i class=\\\"left small chevron icon\\\"></i>', 'aria-label=\\\"previous\\\"</a>\",\"link\":\"<a href=\\\"/foo?page=__pagy_page__\\\"  class=\\\"item\\\" >__pagy_page__</a>\",\"active\":\"<a class=\\\"item active\\\">50</a>\",\"gap\":\"<div class=\\\"disabled item\\\">&hellip;</div>\",\"after\":\"<div class=\\\"item disabled\\\"><i class=\\\"right small chevron icon\\\"></i></div>\"},{\"0\":[1,\"gap\",46,47,48,49,\"50\"]},null]</script>"
     end
 
     it 'renders with :steps' do