pagy 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1893ce66c2ad5ccb5e1b55340873135bf1174f6876a7fe9987bf3d7b11c8b93d
-  data.tar.gz: 15ec7c5615cc40f2fc854f18577632d99f0ec83134f432a2526ca51c1c579a2a
+  metadata.gz: 66ae2dcfec4f4aefaa0a2531b5abe5e0d18b92a835edf6549251c0073ce2f38f
+  data.tar.gz: 295ca05e50dc171da7c184d7d3e8dd9e3b7eaed1cf7387959471a3f758f6d169
 SHA512:
-  metadata.gz: 3b0a30aa314e2abc44dbad8a89352cd640b3ff81979b31436b8911920df344eef2a43cd622ba2921e9ef088a3059611e7e3ccab05f1e07ab7e3bdaefd72ecd58
-  data.tar.gz: 318953ee34f26d5f89f59417b2b02edda38608ada3946241633513167c1b5c5e209a8b474dfb8c1f028381283ba20cf367b5e2b7e9ad7ad95ca22af86d94730d
+  metadata.gz: d96430c17d8936a27942e3da7c0fbcff4d80372afd1f99b7a0c12b4ed5eb694aa1921404d31b77889078dc0fc59b4bbc5bfb0e4a6c418f3ae50837436bc17262
+  data.tar.gz: d7349c4e47d8b33cdadea01168d8a122ef36c6283164cf895dbcf197aca0f07c44437abce7e7d72b29d358f4d95b80586157d5bd5eeb4515e32b7001031329b8

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.2.0)
+# Pagy initializer file (4.3.0)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 
@@ -104,7 +104,9 @@
 # Trim extra: Remove the page=1 param from links
 # See https://ddnexus.github.io/pagy/extras/trim
 # require 'pagy/extras/trim'
-
+# after requiring it will trim by default
+# set to false if you want to make :trim an opt-in variable
+# Pagy::VARS[:trim] = true # default
 
 
 # Pagy Variables

data/lib/javascripts/pagy.js

@@ -2,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '4.2.0';
+Pagy.version = '4.3.0';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # main class
 class Pagy
-  VERSION = '4.2.0'
+  VERSION = '4.3.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root
@@ -29,13 +29,14 @@ class Pagy
             unless @vars[name] && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
     end
     @pages = @last = [(@count.to_f / @items).ceil, 1].max
-    raise OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}" if @page > @last
+    raise OverflowError.new(self), "expected :page in 1..#{@last}; got #{@page.inspect}" \
+          if @page > @last
 
     @offset = @items * (@page - 1) + @outset
-    @items  = @count - ((@pages-1) * @items) if @page == @last && @count.positive?
+    @items  = @count - ((@pages - 1) * @items) if @page == @last && @count.positive?
     @from   = @count.zero? ? 0 : @offset + 1 - @outset
     @to     = @count.zero? ? 0 : @offset + @items - @outset
-    @prev   = (@page-1 unless @page == 1)
+    @prev   = (@page - 1 unless @page == 1)
     @next   = @page == @last ? (1 if @vars[:cycle]) : @page + 1
   end
 
@@ -43,23 +44,26 @@ class Pagy
   def series(size=@vars[:size])
     return [] if size.empty?
     raise VariableError.new(self), "expected 4 items >= 0 in :size; got #{size.inspect}" \
-          unless size.size == 4 && size.all?{ |num| num >= 0 rescue false }  # rubocop:disable Style/RescueModifier
-
+          unless size.size == 4 && size.all?{ |num| !num.negative? rescue false }  # rubocop:disable Style/RescueModifier
+    # This algorithm is up to ~5x faster and ~2.3x lighter than the previous one (pagy < 4.3)
+    left_gap_start  =     1 + size[0]
+    left_gap_end    = @page - size[1] - 1
+    right_gap_start = @page + size[2] + 1
+    right_gap_end   = @last - size[3]
+    left_gap_end    = right_gap_end  if left_gap_end   > right_gap_end
+    right_gap_start = left_gap_start if left_gap_start > right_gap_start
     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
+    start  = 1
+    if (left_gap_end - left_gap_start).positive?
+      series.push(*start..(left_gap_start - 1), :gap)
+      start = left_gap_end + 1
+    end
+    if (right_gap_end - right_gap_start).positive?
+      series.push(*start..(right_gap_start - 1), :gap)
+      start = right_gap_end + 1
     end
-    series.shift                                     # shift the start boundary (0)
-    series[series.index(@page)] = @page.to_s         # convert the current page to String
+    series.push(*start..@last)
+    series[series.index(@page)] = @page.to_s
     series
   end
 

data/lib/pagy/extras/bootstrap.rb

@@ -56,7 +56,7 @@ class Pagy
             %(<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))
+          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
       })
     end
 

data/lib/pagy/extras/bulma.rb

@@ -17,7 +17,7 @@ class Pagy
         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
+                when :gap    then %(<li><span class="pagination-ellipsis">#{pagy_t 'pagy.nav.gap'}</span></li>)                                            # page gap
                 end
       end
       html << %(</ul></nav>)
@@ -48,14 +48,14 @@ class Pagy
           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>#{
+      }<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))
+         pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
       })
     end
 

data/lib/pagy/extras/foundation.rb

@@ -26,11 +26,11 @@ class Pagy
     # 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 = pagy_link_proc(pagy)
-      tags = { 'before' => %(<ul class="pagination">#{pagy_foundation_prev_html(pagy, link)}),
+      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'  => %(#{pagy_foundation_next_html(pagy, link)}</ul>) }
+               '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)
@@ -47,7 +47,7 @@ class Pagy
           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>)
+            %(<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)
@@ -55,7 +55,9 @@ class Pagy
           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))})
+      }</div></nav>#{
+          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
+      })
     end
 
     private

data/lib/pagy/extras/items.rb

@@ -36,6 +36,7 @@ class Pagy
   module Frontend
 
     module UseItemsExtra
+
       def pagy_url_for(page, pagy, url=nil)
         p_vars = pagy.vars
         params = request.GET.merge(p_vars[:params])
@@ -43,6 +44,7 @@ class Pagy
         params[p_vars[:items_param].to_s] = p_vars[:items]
         "#{request.base_url if url}#{request.path}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
       end
+
     end
     prepend UseItemsExtra
 

data/lib/pagy/extras/materialize.rb

@@ -16,7 +16,7 @@ class Pagy
         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
+                when :gap    then %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>)    # page gap
                 end
       end
       html << pagy_materialize_next_html(pagy, link)
@@ -26,11 +26,11 @@ class Pagy
     # 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 = pagy_link_proc(pagy)
-      tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html(pagy, link)}),
+      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'  => %(#{pagy_materialize_next_html(pagy, link)}</ul>) }
+               'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
+               '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)
@@ -45,13 +45,13 @@ class Pagy
       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)
+          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)
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</div>#{
-          pagy_materialize_next_html(pagy, link, style)
+          pagy_materialize_next_html pagy, link, style
       }</ul></div>#{
-          pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))
+          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
       })
     end
 
@@ -61,7 +61,7 @@ class Pagy
         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>)
+          %(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
         end
       end
 

data/lib/pagy/extras/navs.rb

@@ -12,7 +12,7 @@ class 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> ),
+               'gap'    => %(<span class="page gap">#{pagy_t 'pagy.nav.gap'}</span> ),
                'after'  => pagy_nav_next_html(pagy, link) }
 
       html = %(<nav id="#{id}" class="pagy-nav-js pagination" role="navigation" aria-label="pager"></nav>)
@@ -27,13 +27,13 @@ class Pagy
       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)
+          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)
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</span> #{
-          pagy_nav_next_html(pagy, link)
+          pagy_nav_next_html pagy, link
       }</nav>#{
-          pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))
+          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
       })
     end
 
@@ -43,7 +43,7 @@ class Pagy
         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> )
+          %(<span class="page prev disabled">#{pagy_t 'pagy.nav.prev'}</span> )
         end
       end
 
@@ -51,7 +51,7 @@ class Pagy
         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>)
+          %(<span class="page next disabled">#{pagy_t 'pagy.nav.next'}</span>)
         end
       end
 

data/lib/pagy/extras/overflow.rb

@@ -18,12 +18,12 @@ class Pagy
         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
+        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
+        extend Series                             # special series for :empty_page
       else
         raise VariableError.new(self), "expected :overflow variable in [:last_page, :empty_page, :exception]; got #{@vars[:overflow].inspect}"
       end

data/lib/pagy/extras/semantic.rb

@@ -44,13 +44,13 @@ class Pagy
       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)
+         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)
+         pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
       }</div> #{
-         pagy_semantic_next_html(pagy, link)
+         pagy_semantic_next_html pagy, link
       }</div>#{
-         pagy_json_tag(pagy, :combo_nav, id, p_page, pagy_marked_link(link))
+         pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
       })
     end
 
@@ -60,7 +60,7 @@ class Pagy
         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>)
+          +%(<div class="item disabled"><i class="left small chevron icon"></i></div>)
         end
       end
 
@@ -68,7 +68,7 @@ class Pagy
         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>)
+          +%(<div class="item disabled"><i class="right small chevron icon"></i></div>)
         end
       end
 

data/lib/pagy/extras/shared.rb

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

data/lib/pagy/extras/trim.rb

@@ -3,17 +3,17 @@
 
 class Pagy
 
+  VARS[:trim] = true
+
   module UseTrimExtra
 
     def pagy_link_proc(pagy, link_extra='')
       link_proc = super(pagy, link_extra)
+      return link_proc unless pagy.vars[:trim]
       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
+        return link unless num == 1
+        link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
       end
     end
 

data/lib/pagy/extras/uikit.rb

@@ -10,12 +10,12 @@ class Pagy
     def pagy_uikit_nav(pagy)
       link = pagy_link_proc(pagy)
 
-      html = %(<ul class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html(pagy, link)})
+      html = %(<ul class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html pagy, link})
       pagy.series.each do |item|
         html << case    item
                 when Integer then %(<li>#{link.call item}</li>)
                 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>)
+                when :gap    then %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>)
                 end
       end
       html << pagy_uikit_next_html(pagy, link)
@@ -46,18 +46,18 @@ class Pagy
           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>)
+            %(<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)
+          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"')
+            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>)
+            %(<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))
+          pagy_json_tag pagy, :combo_nav, id, p_page, pagy_marked_link(link)
       })
     end
 
@@ -66,7 +66,7 @@ class Pagy
     private
 
       def pagy_uikit_prev_html(pagy, link)
-        previous_span = %(<span uk-pagination-previous>#{pagy_t('pagy.nav.prev')}</span>)
+        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
@@ -75,7 +75,7 @@ class Pagy
       end
 
       def pagy_uikit_next_html(pagy, link)
-        next_span = %(<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>)
+        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

data/lib/pagy/frontend.rb

@@ -65,9 +65,7 @@ class Pagy
               else                       'pagy.info.multiple_pages'
               end
       pagy_t key, item_name: item_name || pagy_t(pagy.vars[:i18n_key], count: count),
-                  count:     count,
-                  from:      pagy.from,
-                  to:        pagy.to
+                  count: count, from: pagy.from, to: pagy.to
     end
 
     # Returns a performance optimized proc to generate the HTML links
@@ -75,18 +73,18 @@ class Pagy
     def pagy_link_proc(pagy, link_extra='')
       p_prev = pagy.prev
       p_next = pagy.next
-      left, right = %(<a href="#{pagy_url_for(PAGE_PLACEHOLDER, pagy)}" #{pagy.vars[:link_extra]} #{link_extra}).split(PAGE_PLACEHOLDER, 2)
+      left, right = %(<a href="#{pagy_url_for PAGE_PLACEHOLDER, pagy}" #{pagy.vars[:link_extra]} #{link_extra}).split(PAGE_PLACEHOLDER, 2)
       lambda do |num, text=num, extra=''|
-        "#{left}#{num}#{right}#{ case num
-                                 when p_prev then ' rel="prev"'
-                                 when p_next then ' rel="next"'
-                                 else             ''
-                                 end } #{extra}>#{text}</a>"
+        %(#{left}#{num}#{right}#{ case num
+                                  when p_prev then ' rel="prev"'
+                                  when p_next then ' rel="next"'
+                                  else             ''
+                                  end } #{extra}>#{text}</a>)
       end
     end
 
     # Similar to I18n.t: just ~18x faster using ~10x less memory
-    # (@pagy_locale explicitly initilized in order to avoid warning)
+    # (@pagy_locale explicitly initialized in order to avoid warning)
     def pagy_t(key, **opts)
       Pagy::I18n.t @pagy_locale||=nil, key, **opts
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,
@@ -22,7 +22,6 @@ files:
 - LICENSE.txt
 - lib/config/pagy.rb
 - lib/javascripts/pagy.js
-- lib/locales/README.md
 - lib/locales/bg.yml
 - lib/locales/bs.yml
 - lib/locales/ca.yml
@@ -95,7 +94,6 @@ files:
 - lib/templates/uikit_nav.html.erb
 - lib/templates/uikit_nav.html.haml
 - lib/templates/uikit_nav.html.slim
-- pagy.gemspec
 homepage: https://github.com/ddnexus/pagy
 licenses:
 - MIT

data/lib/locales/README.md

@@ -1,35 +0,0 @@
-# Pagy locales
-
-### Please, submit your translation!
-
-If you find that some translation could be improved, please, create an issue.
-
-If you are using pagy with some language missing from the dictionary files, please, submit your translation!
-
-You can create a Pull Request for your language, and get all the help you need to correctly complete it. Here is a check list.
-
-### Check list for a new dictionary file:
-
-- [ ] Find the pluralization rule for your language
-
-  - [ ] Find the locale file you need in the [list of pluralizations](https://github.com/svenfuchs/rails-i18n/tree/master/rails/pluralization) and check the pluralization rule in it. For example it is `::RailsI18n::Pluralization::OneOther.with_locale(:en)` for `en.rb`. Note the rule part i.e. `OneOther`. In pagy that translates to the symbol `:one_other`.
-
-    - [ ] If the pluralization rule of your language is not the `:one_other` default, confirm that the [p11n.rb](https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb) file already defines the pluralization rule of your dictionary file:
-
-      - [ ] If the rule is not defined, you can either: a) Add the rule as a new rule/lambda entry in the `p11n` variable hash and relative tests or b) Just create an issue requesting the addition to the rule/lambda entry and tests.
-
-      - [ ] Add your language to the `plurals` hash in the file.
-
-- [ ] add/edit the first line comment in the language rule in your dictionary file (e.g. `# :one_other pluralization ...`
-
-- [ ] The mandatory pluralized entry in the dictionary file is the `item_name`. Please, provide all the plurals needed by your language. E.g. if your language uses the `:east_slavic` you should provide the plurals for `one`, `few`, `many` and `other`, if it uses `:one_other`, you should provide `one` and `other` plurals. If it uses `:other` you should only provide a single value. Look into other dictionary files to get some example. Ask if in doubt.
-
-- [ ] The other entries in the dictionary file don't need any plural variant in most languages since the pluralization of the `item_name` in the sentence is enough. However, in some language, a whole sentence might need to be written in different ways for different counts. In that case you should add the different plurals for the sentence and the `count` will trigger the one that applies.
-
-Feel free to ask for help in your Pull Request.
-
-### Useful Links
-
-* [Pagy I18n Documentation](https://ddnexus.github.io/pagy/api/frontend#i18n)
-* [I18n Extra](https://ddnexus.github.io/pagy/extras/i18n)
-

data/pagy.gemspec

@@ -1,16 +0,0 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pagy'
-
-Gem::Specification.new do |s|
-  s.name          = 'pagy'
-  s.version       = Pagy::VERSION
-  s.authors       = ['Domizio Demichelis']
-  s.email         = ['dd.nexus@gmail.com']
-  s.summary       = 'The Ultimate Pagination Ruby Gem'
-  s.description   = 'Agnostic pagination in plain ruby: it works with any framework, ORM and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays, JSON data... Easy, powerful, fast and light.'
-  s.homepage      = 'https://github.com/ddnexus/pagy'
-  s.license       = 'MIT'
-  s.files         = `git ls-files -z`.split("\x0").select{|f| f.start_with?('lib', 'pagy.gemspec', 'LICENSE') }
-  s.required_ruby_version = '>= 3.0'
-end