pagy 4.1.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eec238a32b24a046a7ddaf632f6bfeeb73ef8a2fb0389222b322d50d1b3fd64
-  data.tar.gz: 9dc1b595e6a6c6b37cb5c1d32080517c383bbbd5d5d1ce023eac384114aeebb7
+  metadata.gz: 19e29bbf55102d30e9da7d4e6e3e72b838bd4973451ce861e4724fc1824a6cc8
+  data.tar.gz: 483657a52db974186448c72c3dc071dc754855e9d8bf6963886c6c0600cf8516
 SHA512:
-  metadata.gz: 9be42486ebe3686f8461d5868427446664b00b7c733dafc4506eca883e280fc71a5c1cbd94fcbe9c8f15e12aa6b6af550e8890f71b835629d45f926d0e850a8b
-  data.tar.gz: 9563de1d768f284a65ec0ae3f60530e29ea36b62c0455048cefb81fa49c95bae21188beafbc9adc9e16fd7abc902ed1498070942a38847524eb9ffa23b89a75b
+  metadata.gz: 41e8776832f9fa255056815fcbae25d066716fd6910cba99eb0a1351807d5e601a1229c1815065a555971f2aa76fca4c9cdee33188ca30e627fb2c7b3afcba64
+  data.tar.gz: 23a50e3d270c22a4b12fd12ec0a7543db527a939ddf27da19cf2acab8edfe1f9da1f307ba4adab50775c8d8846728d9a2fad39565257df786ea819980fa67885

data/lib/config/pagy.rb

@@ -1,11 +1,34 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (4.1.0)
+# Pagy initializer file (4.5.1)
 # 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
 
 
+# Pagy Variables
+# See https://ddnexus.github.io/pagy/api/pagy#variables
+# All the Pagy::VARS are set for all the Pagy instances but can be overridden
+# per instance by just passing them to Pagy.new or the #pagy controller method
+
+
+# Instance variables
+# See https://ddnexus.github.io/pagy/api/pagy#instance-variables
+# Pagy::VARS[:page]   = 1                                  # default
+# Pagy::VARS[:items]  = 20                                 # default
+# Pagy::VARS[:outset] = 0                                  # default
+
+
+# Other Variables
+# See https://ddnexus.github.io/pagy/api/pagy#other-variables
+# Pagy::VARS[:size]       = [1,4,4,1]                       # default
+# Pagy::VARS[:page_param] = :page                           # default
+# Pagy::VARS[:params]     = {}                              # default
+# Pagy::VARS[:fragment]   = '#fragment'                     # example
+# Pagy::VARS[:link_extra] = 'data-remote="true"'            # example
+# Pagy::VARS[:i18n_key]   = 'pagy.item_name'                # default
+# Pagy::VARS[:cycle]      = true                            # example
+
+
 # Extras
 # See https://ddnexus.github.io/pagy/extras
 
@@ -19,7 +42,6 @@
 # Countless extra: Paginate without any count, saving one query per rendering
 # See https://ddnexus.github.io/pagy/extras/countless
 # require 'pagy/extras/countless'
-# Pagy::VARS[:cycle] = false    # default
 
 # Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects
 # See https://ddnexus.github.io/pagy/extras/elasticsearch_rails
@@ -88,6 +110,8 @@
 # require 'pagy/extras/items'
 # Pagy::VARS[:items_param] = :items    # default
 # Pagy::VARS[:max_items]   = 100       # default
+# set to false if you want to make :enable_items_extra an opt-in variable
+# Pagy::VARS[:enable_items_extra] = false    # default true
 
 # Overflow extra: Allow for easy handling of overflowing pages
 # See https://ddnexus.github.io/pagy/extras/overflow
@@ -105,27 +129,9 @@
 # Trim extra: Remove the page=1 param from links
 # See https://ddnexus.github.io/pagy/extras/trim
 # require 'pagy/extras/trim'
-
-
-
-# Pagy Variables
-# See https://ddnexus.github.io/pagy/api/pagy#variables
-# All the Pagy::VARS are set for all the Pagy instances but can be overridden
-# per instance by just passing them to Pagy.new or the #pagy controller method
-
-
-# Instance variables
-# See https://ddnexus.github.io/pagy/api/pagy#instance-variables
-# Pagy::VARS[:items] = 20                                   # default
-
-
-# Other Variables
-# See https://ddnexus.github.io/pagy/api/pagy#other-variables
-# Pagy::VARS[:size]       = [1,4,4,1]                       # default
-# Pagy::VARS[:page_param] = :page                           # default
-# Pagy::VARS[:params]     = {}                              # default
-# Pagy::VARS[:anchor]     = '#anchor'                       # example
-# Pagy::VARS[:link_extra] = 'data-remote="true"'            # example
+# after requiring it will trim by default
+# set to false if you want to make :enable_trim_extra an opt-in variable
+# Pagy::VARS[:enable_trim_extra] = false # default true
 
 
 # Rails

data/lib/javascripts/pagy.js

@@ -2,105 +2,116 @@
 
 function Pagy(){}
 
-Pagy.version = '4.1.0';
+Pagy.version = '4.5.1'
 
-Pagy.init = function(arg){
-              var target   = arg instanceof Event || arg === undefined ? document : arg,
-                  jsonTags = target.getElementsByClassName('pagy-json');
-              if (target === document) { // reset resize-listeners on page load (#163)
-                for (var id in Pagy.navResizeListeners) { window.removeEventListener('resize', Pagy.navResizeListeners[id], true) }
-                Pagy.navResizeListeners = {};
-              }
-              for (var i = 0, len = jsonTags.length; i < len; i++) {
-                var args = JSON.parse(jsonTags[i].innerHTML);
-                Pagy[args.shift()].apply(null, args);
-              }
-            };
+Pagy.delay = 100
 
-Pagy.nav = function(id, tags, sequels, param){
-             var pagyEl    = document.getElementById(id),
-                 lastWidth = undefined,
-                 timeoutId = 0,
-                 pageREg   = new RegExp(/__pagy_page__/g),
-                 widths    = [],
-                 rendering = function(){ clearTimeout(timeoutId); timeoutId = setTimeout(pagyEl.render, 150) };  // suppress rapid firing rendering
+Pagy.init =
+  function(arg) {
+    var target   = arg instanceof Event || arg === undefined ? document : arg,
+        jsonTags = target.getElementsByClassName('pagy-json')
+    for (var i = 0, len = jsonTags.length; i < len; i++) {
+      var args  = JSON.parse(jsonTags[i].innerHTML),
+          fname = args.shift()
+      args.unshift(jsonTags[i].previousSibling)
+      Pagy[fname].apply(null, args)
+    }
+  }
 
-             for (var width in sequels) { widths.push(parseInt(width)) } // fine with sequels structure
-             widths.sort(function(a, b){return b-a});
+Pagy.nav =
+  function(pagyEl, tags, sequels, trimParam) {
+    var lastWidth,
+        pageREg = new RegExp(/__pagy_page__/g),
+        widths  = []
+    for (var width in sequels) {
+      if (sequels.hasOwnProperty(width)) { widths.push(parseInt(width, 10)) }
+    }
+    widths.sort(function(a, b) { return b - a })
 
-             pagyEl.render = function(){
-                               if (this.parentElement.clientWidth === 0) { rendering() }
-                               var width, i, len;
-                               for (i = 0, len = widths.length; i < len; i++) {
-                                 if (this.parentElement.clientWidth > widths[i]) { width = widths[i]; break }
-                               }
-                               if (width !== lastWidth) {
-                                 var html   = tags.before,
-                                     series = sequels[width];
-                                 for (i = 0, len = series.length; i < len; i++) {
-                                   var item = series[i];
-                                   if (typeof(param) === 'string' && item === 1) { html += Pagy.trim(tags.link.replace(pageREg, item), param) }
-                                   else if (typeof(item) === 'number') { html += tags.link.replace(pageREg, item) }
-                                   else if (item === 'gap') { html += tags.gap }
-                                   else if (typeof(item) === 'string') { html += tags.active.replace(pageREg, item) }
-                                 }
-                                 html += tags.after;
-                                 this.innerHTML = '';
-                                 this.insertAdjacentHTML('afterbegin', html);
-                                 lastWidth = width;
-                               }
-                             }.bind(pagyEl);
+    pagyEl.render =
+      function() {
+        var width, i, len
+        for (i = 0, len = widths.length; i < len; i++) {
+          if (this.parentElement.clientWidth > widths[i]) { width = widths[i]; break }
+        }
+        if (width !== lastWidth) {
+          var html   = tags.before,
+              series = sequels[width]
+          for (i = 0, len = series.length; i < len; i++) {
+            var item = series[i]
+            if (typeof(trimParam) === 'string' && item === 1) { html += Pagy.trim(tags.link.replace(pageREg, item), trimParam) }
+            else if (typeof(item) === 'number') { html += tags.link.replace(pageREg, item) }
+            else if (item === 'gap') { html += tags.gap }
+            else if (typeof(item) === 'string') { html += tags.active.replace(pageREg, item) }
+          }
+          html += tags.after
+          this.innerHTML = ''
+          this.insertAdjacentHTML('afterbegin', html)
+          lastWidth = width
+        }
+      }.bind(pagyEl)
+    pagyEl.render()
+ }
 
-             if (widths.length > 1) {
-               // refresh the window resize listener (avoiding rendering multiple times)
-               window.removeEventListener('resize', Pagy.navResizeListeners[id], true);   // needed for AJAX init
-               window.addEventListener('resize', rendering, true);
-               Pagy.navResizeListeners[id] = rendering;
-             }
-             pagyEl.render();
-           };
+Pagy.combo_nav =
+  function(pagyEl, page, link, trimParam) {
+    var input  = pagyEl.getElementsByTagName('input')[0],
+        toPage =
+          function() {
+            if (page !== input.value) {
+              var html = link.replace(/__pagy_page__/, input.value)
+              if (typeof (trimParam) === 'string' && input.value === '1') { html = Pagy.trim(html, trimParam) }
+              pagyEl.insertAdjacentHTML('afterbegin', html)
+              pagyEl.getElementsByTagName('a')[0].click()
+            }
+          }
+    Pagy.addInputEventListeners(input, toPage)
+  }
 
-Pagy.combo_nav = function(id, page, link, param){
-                   var pagyEl = document.getElementById(id),
-                       input  = pagyEl.getElementsByTagName('input')[0],
-                       go     = function(){
-                                  if (page !== input.value) {
-                                    var html = link.replace(/__pagy_page__/, input.value);
-                                    if (typeof(param) === 'string' && input.value === '1') { html = Pagy.trim(html, param) }
-                                    pagyEl.insertAdjacentHTML('afterbegin', html);
-                                    pagyEl.getElementsByTagName('a')[0].click();
-                                  }
-                                };
-                   Pagy.addInputEventListeners(input, go);
-                 };
+Pagy.items_selector =
+  function(pagyEl, from, link, param) {
+    var input   = pagyEl.getElementsByTagName('input')[0],
+        current = input.value,
+        toPage  =
+          function() {
+            var items = input.value
+            if (current !== items) {
+              var page = Math.max(Math.ceil(from / items), 1),
+                  html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, items)
+              if (typeof (param) === 'string' && page === 1) { html = Pagy.trim(html, param) }
+              pagyEl.insertAdjacentHTML('afterbegin', html)
+              pagyEl.getElementsByTagName('a')[0].click()
+            }
+          }
+    Pagy.addInputEventListeners(input, toPage)
+  }
 
-Pagy.items_selector = function(id, from, link, param){
-                        var pagyEl  = document.getElementById(id),
-                            input   = pagyEl.getElementsByTagName('input')[0],
-                            current = input.value,
-                            go      = function(){
-                                        var items = input.value;
-                                        if (current !== items) {
-                                          var page = Math.max(Math.ceil(from / items),1),
-                                              html = link.replace(/__pagy_page__/, page).replace(/__pagy_items__/, items);
-                                          if (typeof(param) === 'string' && page === 1){ html = Pagy.trim(html, param) }
-                                          pagyEl.insertAdjacentHTML('afterbegin', html);
-                                          pagyEl.getElementsByTagName('a')[0].click();
-                                        }
-                                      };
-                        Pagy.addInputEventListeners(input, go);
-                      };
+Pagy.addInputEventListeners =
+  function(input, toPage) {
+    // select the content on click: easier for typing a number
+    input.addEventListener('click', function() { this.select() })
+    // toPage when the input looses focus
+    input.addEventListener('focusout', toPage)
+    // … and when pressing enter inside the input
+    input.addEventListener('keyup', function(e) { if (e.which === 13) {toPage()} }.bind(this))
+  }
 
-Pagy.addInputEventListeners = function(input, handler){
-                                // select the content on click: easier for typing a number
-                                input.addEventListener('click', function(){ this.select() });
-                                // go when the input looses focus
-                                input.addEventListener('focusout', handler);
-                                // … and when pressing enter inside the input
-                                input.addEventListener('keyup', function(e){ if (e.which === 13) handler() }.bind(this));
-                              };
+Pagy.trim =
+  function(html, param) {
+    var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&')
+    return html.replace(re, '')
+  }
 
-Pagy.trim = function(html, param){
-              var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&');
-              return html.replace(re, '');
-            };
+Pagy.renderNavs =
+  function() {
+    var navs = document.getElementsByClassName('pagy-njs')  // 'pagy-njs' is common to all *nav_js helpers
+    for (var i = 0, len = navs.length; i < len; i++) { navs[i].render() }
+  }
+
+Pagy.waitForMe =
+  function() {
+    if (typeof(Pagy.tid) === 'number') { clearTimeout(Pagy.tid) }
+    Pagy.tid = setTimeout(Pagy.renderNavs, Pagy.delay)
+  }
+
+window.addEventListener('resize', Pagy.waitForMe, true)

data/lib/locales/utils/i18n.rb

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

data/lib/locales/utils/loader.rb

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

data/lib/locales/utils/p11n.rb

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

data/lib/pagy.rb

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