pagy 1.3.3 → 2.0.0

data/lib/pagy/extras/foundation.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/foundation
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,10 +9,10 @@ class Pagy
 
     # Pagination for Foundation: it returns the html with the series of links to the pages
     def pagy_foundation_nav(pagy)
-      html, link, p_prev, p_next = +'', pagy_link_proc(pagy), pagy.prev, pagy.next
+      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
 
-      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 = EMPTY + (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>))
       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
@@ -20,16 +21,15 @@ class Pagy
       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-nav-foundation pagy-foundation-nav" role="navigation" aria-label="Pagination"><ul class="pagination">#{html}</ul></nav>)
+      %(<nav class="pagy-foundation-nav" role="navigation" aria-label="Pagination"><ul class="pagination">#{html}</ul></nav>)
     end
-    deprecate :pagy_nav_foundation, :pagy_foundation_nav
 
     # Compact pagination for Foundation: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
     def pagy_foundation_compact_nav(pagy, id=pagy_id)
-      html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
+      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-nav-compact-foundation pagy-foundation-compact-nav" role="navigation" aria-label="Pagination">)
+      html = EMPTY + %(<nav id="#{id}" class="pagy-foundation-compact-nav" role="navigation" aria-label="Pagination">)
         html << link.call(MARKER, '', %(style="display: none;" ))
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
         html << %(<div class="input-group">)
@@ -41,14 +41,13 @@ class Pagy
                         : %(<a style="margin-bottom: 0px;" class="next button primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
       html << %(</div></nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    deprecate :pagy_nav_compact_foundation, :pagy_foundation_compact_nav
 
     # Responsive pagination for Foundation: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
     def pagy_foundation_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
-      tags['before'] = +'<ul class="pagination">'
+      tags['before'] = EMPTY + '<ul class="pagination">'
       tags['before'] << (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>))
       responsive[:items].each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
@@ -57,13 +56,12 @@ class Pagy
                           elsif item == :gap       ; %(<li class="ellipsis gap" aria-hidden="true"></li>) # page gap
                           end
       end
-      tags['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>))
+      tags['after'] = EMPTY + (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>))
       tags['after'] << '</ul>'
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
-      %(<nav id="#{id}" class="pagy-nav-responsive-foundation pagy-foundation-responsive-nav" aria-label="Pagination"></nav>#{script})
+      %(<nav id="#{id}" class="pagy-foundation-responsive-nav" aria-label="Pagination"></nav>#{script})
     end
-    deprecate :pagy_nav_responsive_foundation, :pagy_foundation_responsive_nav
 
   end
 end

data/lib/pagy/extras/i18n.rb

@@ -1,4 +1,6 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/i18n
+# encoding: utf-8
+# frozen_string_literal: true
 
 class Pagy
   # Use ::I18n gem
@@ -6,10 +8,11 @@ class Pagy
 
     ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]
 
-    # Override the built-in pagy_t
-    def pagy_t(*args)
-      ::I18n.t(*args)
-    end
+    Pagy::I18n.clear.instance_eval { undef :load; undef :t } # unload the pagy default constant for efficiency
+
+    # no :pagy_without_i18n alias with the i18n gem
+    def pagy_t_with_i18n(*args) ::I18n.t(*args) end
+    alias :pagy_t :pagy_t_with_i18n
 
   end
 end

data/lib/pagy/extras/items.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/items
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -14,24 +15,22 @@ class Pagy
 
     def pagy_with_items(vars)
       vars[:items] ||= (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
+                       [items.to_i, vars.key?(:max_items) ? vars[:max_items] : VARS[:max_items]].compact.min   # :items capped to :max_items
     end
 
-    alias_method :pagy_get_vars_without_items, :pagy_get_vars
-    def pagy_get_vars_with_items(collection, vars)
-      pagy_with_items(vars)
-      pagy_get_vars_without_items(collection, vars)
-    end
-    alias_method :pagy_get_vars, :pagy_get_vars_with_items
-
-    # support for countless extra
-    if defined?(Pagy::COUNTLESS)   # defined in the countless extra
-      alias_method :pagy_countless_get_vars_without_items, :pagy_countless_get_vars
-      def pagy_countless_get_vars_with_items(collection, vars)
-        pagy_with_items(vars)
-        pagy_countless_get_vars_without_items(collection, vars)
-      end
-      alias_method :pagy_countless_get_vars, :pagy_countless_get_vars_with_items
+    # add the pagy*_get_vars alias-chained methods for frontend, and defined/required extras
+    [nil, 'countless', 'elasticsearch_rails', 'searchkick'].each do |name|
+      prefix, if_start, if_end = "_#{name}", "if defined?(Pagy::#{name.upcase})", "end" if name
+      module_eval <<-RUBY
+        #{if_start}
+          alias_method :pagy#{prefix}_get_vars_without_items, :pagy#{prefix}_get_vars
+          def pagy#{prefix}_get_vars_with_items(collection, vars)
+            pagy_with_items(vars)
+            pagy#{prefix}_get_vars_without_items(collection, vars)
+          end
+          alias_method :pagy#{prefix}_get_vars, :pagy#{prefix}_get_vars_with_items  
+        #{if_end}
+      RUBY
     end
 
   end
@@ -49,7 +48,7 @@ class Pagy
     def pagy_items_selector(pagy, id=pagy_id)
       p_vars = pagy.vars; p_items = p_vars[:items]; p_vars[:items] = "#{MARKER}-items-"
 
-      html = +%(<span id="#{id}">)
+      html = EMPTY + %(<span id="#{id}">)
         html << %(<a href="#{pagy_url_for("#{MARKER}-page-", pagy)}"></a>)
         p_vars[:items] = p_items # restore the items
         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;">)

data/lib/pagy/extras/materialize.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/materialize
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,9 +9,9 @@ class Pagy
 
     # Pagination for materialize: it returns the html with the series of links to the pages
     def pagy_materialize_nav(pagy)
-      html, 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, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
+      html = EMPTY + (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>))
       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
@@ -19,16 +20,15 @@ class Pagy
       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-nav-materialize pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></div>)
+      %(<div class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></div>)
     end
-    deprecate :pagy_nav_materialize, :pagy_materialize_nav
 
     # Compact pagination for materialize: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
     def pagy_materialize_compact_nav(pagy, id=pagy_id)
-      html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
+      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-nav-compact-materialize pagy-materialize-compact-nav pagination" role="navigation" aria-label="pager">)
+      html = EMPTY + %(<div id="#{id}" class="pagy-materialize-compact-nav pagination" role="navigation" aria-label="pager">)
       html << link.call(MARKER, '', %(style="display: none;" ))
       (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
       html << %(<div class="pagy-compact-chip role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;">)
@@ -42,14 +42,13 @@ class Pagy
                : %(<li class="next disabled" #{li_style}><a href="#"><i class="material-icons">chevron_right</i></a></li>))
       html << %(</ul></div>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    deprecate :pagy_nav_compact_materialize, :pagy_materialize_compact_nav
 
     # Responsive pagination for Materialize: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
     def pagy_materialize_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
-      tags['before'] = +'<ul class="pagination">'
+      tags['before'] = EMPTY + '<ul class="pagination">'
       tags['before'] << (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>))
       responsive[:items].each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
@@ -58,13 +57,12 @@ class Pagy
                           elsif item == :gap       ; %(<li class="gap disabled"><a href="#">#{pagy_t('pagy.nav.gap')}</a></li>)   # page gap
                           end
       end
-      tags['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>))
+      tags['after'] = EMPTY + (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>))
       tags['after'] << '</ul>'
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
-      %(<div id="#{id}" class="pagy-nav-responsive-materialize pagy-materialize-responsive-nav pagination" role="navigation" aria-label="pager"></div>#{script})
+      %(<div id="#{id}" class="pagy-materialize-responsive-nav pagination" role="navigation" aria-label="pager"></div>#{script})
     end
-    deprecate :pagy_nav_responsive_materialize, :pagy_materialize_responsive_nav
 
   end
 end

data/lib/pagy/extras/overflow.rb

@@ -1,53 +1,55 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/overflow
+# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
 
   VARS[:overflow] = :empty_page
 
-  def overflow?; !!@overflow end
+  def overflow?; @overflow end
 
-  module Overflow
-
-    def initialize(vars)
-      super
-    rescue OverflowError
-      @overflow = true                            # add the overflow flag
-      case @vars[:overflow]
-      when :exception
-        raise                                     # same as without the extra
-      when :last_page
-        initial_page = @vars[:page]               # save the very initial page (even after re-run)
-        super(vars.merge!(page: @last))           # re-run with the last page
-        @vars[:page] = initial_page               # restore the inital page
-      when :empty_page
-        @offset = @items = @from = @to = 0        # vars relative to the actual page
-        @prev = @last                             # prev relative to the actual page
-        extend(Series)                            # special series for :empty_page
-      else
-        raise ArgumentError, "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
-      end
+  alias :initialize_without_overflow :initialize
+  def initialize_with_overflow(vars)
+    @overflow ||= false                         # don't override if :last_page re-run the method after an overflow
+    initialize_without_overflow(vars)
+  rescue OverflowError
+    @overflow = true                            # add the overflow flag
+    case @vars[:overflow]
+    when :exception
+      raise                                     # same as without the extra
+    when :last_page
+      initial_page = @vars[:page]               # save the very initial page (even after re-run)
+      initialize(vars.merge!(page: @last))      # re-run with the last page
+      @vars[:page] = initial_page               # restore the inital page
+    when :empty_page
+      @offset = @items = @from = @to = 0        # vars relative to the actual page
+      @prev = @last                             # prev relative to the actual page
+      extend(Series)                            # special series for :empty_page
+    else
+      raise ArgumentError, "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
     end
+  end
+  alias :initialize :initialize_with_overflow
 
-    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
-        end
+  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
       end
     end
-
   end
-  prepend Overflow
+
 
   # support for Pagy::Countless
   if defined?(Pagy::Countless)
-    module CountlessOverflow
+    class Countless
 
-      def finalize(items)
-        super
+      alias :finalize_without_overflow :finalize
+      def finalize_with_overflow(items)
+        @overflow = false
+        finalize_without_overflow(items)
       rescue OverflowError
         @overflow = true                            # add the overflow flag
         case @vars[:overflow]
@@ -61,9 +63,9 @@ class Pagy
           raise ArgumentError, "expected :overflow variable in [:empty_page, :exception]; got #{@vars[:overflow].inspect}"
         end
       end
+      alias :finalize :finalize_with_overflow
 
     end
-    Countless.prepend CountlessOverflow
   end
 
 end

data/lib/pagy/extras/pagy_search.rb

@@ -0,0 +1,16 @@
+# Support module to capture search calls
+# encoding: utf-8
+# frozen_string_literal: true
+
+class Pagy
+  module Search
+    # 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 and arguments
+    def pagy_search(arg, options={}, &block)
+      [self, arg, options, block].tap do |args|
+        args.define_singleton_method(:method_missing){|*a| args += a}
+      end
+    end
+  end
+end

data/lib/pagy/extras/plain.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/plain
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -12,9 +13,9 @@ class Pagy
     # Plain compact pagination: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
     def pagy_plain_compact_nav(pagy, id=pagy_id)
-      html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
+      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-nav-compact pagy-plain-compact-nav pagination" role="navigation" aria-label="pager">)
+      html = EMPTY + %(<nav id="#{id}" class="pagy-plain-compact-nav pagination" role="navigation" aria-label="pager">)
         html << link.call(MARKER, '', %(style="display: none;" ))
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
         html << (p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
@@ -25,7 +26,6 @@ class Pagy
                         : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>))
       html << %(</nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    deprecate :pagy_nav_compact, :pagy_plain_compact_nav
 
     # Plain responsive pagination: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
@@ -43,9 +43,8 @@ class Pagy
       tags['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>))
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
-      %(<nav id="#{id}" class="pagy-nav-responsive pagy-plain-responsive-nav pagination" role="navigation" aria-label="pager"></nav>#{script})
+      %(<nav id="#{id}" class="pagy-plain-responsive-nav pagination" role="navigation" aria-label="pager"></nav>#{script})
     end
-    deprecate :pagy_nav_responsive, :pagy_plain_responsive_nav
 
   end
 end

data/lib/pagy/extras/searchkick.rb

@@ -1,20 +1,43 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/searchkick
+# encoding: utf-8
+# frozen_string_literal: true
+
+require 'pagy/extras/pagy_search'
 
 class Pagy
+
+  # used by the items extra
+  SEARCHKICK = true
+
+  # create a Pagy object from a Searchkick::Results object
+  def self.new_from_searchkick(results, vars={})
+    vars[:items] = results.options[:per_page]
+    vars[:page]  = results.options[:page]
+    vars[:count] = results.total_count
+    new(vars)
+  end
+
   # Add specialized backend methods to paginate Searchkick::Results
   module Backend ; private
-    # Return Pagy object and items
-    def pagy_searchkick(results, vars={})
-      pagy = Pagy.new(pagy_searchkick_get_vars(results, vars))
-      return pagy, results
+
+    # Return Pagy object and results
+    def pagy_searchkick(search_args, vars={})
+      model, term, options, block, *called = search_args
+      vars               = pagy_searchkick_get_vars(nil, vars)
+      options[:per_page] = vars[:items]
+      options[:page]     = vars[:page]
+      results            = model.search(term, options, &block)
+      vars[:count]       = results.total_count
+      return Pagy.new(vars), called.empty? ? results : results.send(*called)
     end
 
     # Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
-    def pagy_searchkick_get_vars(results, vars)
-      vars[:count] ||= results.total_count
-      vars[:page]  ||= results.options[:page]
-      vars[:items] ||= results.options[:per_page]
+    # the _collection argument is not available when the method is called
+    def pagy_searchkick_get_vars(_collection, vars)
+      vars[:items] ||= VARS[:items]
+      vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
       vars
     end
+
   end
 end

data/lib/pagy/extras/semantic.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/semantic
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -8,10 +9,10 @@ class Pagy
 
     # Pagination for semantic-ui: it returns the html with the series of links to the pages
     def pagy_semantic_nav(pagy)
-      html, link, p_prev, p_next = +'', pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
+      link, p_prev, p_next = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
 
-      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 = EMPTY + (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>))
       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
@@ -20,16 +21,15 @@ class Pagy
       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-nav-semantic pagy-semantic-nav ui pagination menu" aria-label="pager">#{html}</div>)
+      %(<div class="pagy-semantic-nav ui pagination menu" aria-label="pager">#{html}</div>)
     end
-    deprecate :pagy_nav_semantic, :pagy_semantic_nav
 
     # Compact pagination for semantic: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
     def pagy_semantic_compact_nav(pagy, id=pagy_id)
-      html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next, pagy.page, pagy.pages
+      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-nav-compact-semantic pagy-semantic-compact-nav ui compact menu" role="navigation" aria-label="pager">)
+      html = EMPTY + %(<div id="#{id}" class="pagy-semantic-compact-nav ui compact menu" role="navigation" aria-label="pager">)
         html << link.call(MARKER, '', %(style="display: none;" ))
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
         html << (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
@@ -40,7 +40,6 @@ class Pagy
                         : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
       html << %(</div>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    deprecate :pagy_nav_compact_semantic, :pagy_semantic_compact_nav
 
     # Responsive pagination for semantic: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
@@ -58,9 +57,8 @@ class Pagy
       tags['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>))
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
-      %(<div id="#{id}" class="pagy-nav-responsive-semantic pagy-semantic-responsive-nav ui pagination menu" role="navigation" aria-label="pager"></div>#{script})
+      %(<div id="#{id}" class="pagy-semantic-responsive-nav ui pagination menu" role="navigation" aria-label="pager"></div>#{script})
     end
-    deprecate :pagy_nav_responsive_semantic, :pagy_semantic_responsive_nav
 
   end
 end