pagy 4.0.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8abadf0305f4adce1cb070d5de45822a38cfeb02b8e0e4389e33dee2f926ff0c
-  data.tar.gz: 1fe429839b5f704a62e70ace80cd2a2c851d8f8e2eee2dc89fe84dd18a1a5c2e
+  metadata.gz: ea6862ff93b09769c9810860307a4a63a88de1ecf8d6a4f8176f6cb90e22565f
+  data.tar.gz: 5564e6b0f2e006b098dc9fe07ea8409ce4748bd6a32acb0f19bdb56e6f8b791d
 SHA512:
-  metadata.gz: 7ba816fa365290f6c7ca3850aca55cec280923f2a9f5340988373629526c6096206b31e66e053be8e7d968398b3d205468a9d4fad1978c6e984ef4b63f288197
-  data.tar.gz: 5caed0bfd335b497405a7665e8f74be8d99a9c8b2c1bf51090e49f99a60e68c770218d050815aaa82318d2b0b6891ed1f6ddc83ade1a88dd0d951da18280ceeb
+  metadata.gz: b299c1727379ba77ace97691cce28df77e81a25bfaac7d0fff7668f1f5b8178b60963ec8f5fd27fb824ef5f0f067ee3070b846f7d975269cec83ddec5db6763b
+  data.tar.gz: daeb51d6b08394c64833938a5b594d46a189ae27357885361b6d0fb6dc1fa91c78def2b47cb09ec649fdebe39326577f989ac2569f32190ae8a756a7ccb591bf

data/lib/config/pagy.rb

@@ -1,11 +1,34 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (4.0.0)
+# Pagy initializer file (4.5.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
 
 
+# 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.0.0';
+Pagy.version = '4.5.0'
 
-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/bs.yml

@@ -0,0 +1,24 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+bs:
+  pagy:
+
+    item_name:
+      one: "stavka"
+      few: "stavke"
+      many: "stavki"
+      other: "stavki"
+
+    nav:
+      prev: "‹ Prethodna"
+      next: "Sljedeća  ›"
+      gap: "…"
+
+    info:
+      no_items: "Nije pronađena %{item_name}"
+      single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
+      multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
+
+    combo_nav_js: "Stranica %{page_input} od %{pages}"
+
+    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"

data/lib/locales/hr.yml

@@ -0,0 +1,24 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+hr:
+  pagy:
+
+    item_name:
+      one: "stavka"
+      few: "stavke"
+      many: "stavki"
+      other: "stavki"
+
+    nav:
+      prev: "‹ Prethodna"
+      next: "Sljedeća  ›"
+      gap: "…"
+
+    info:
+      no_items: "Nije pronađena %{item_name}"
+      single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
+      multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
+
+    combo_nav_js: "Stranica %{page_input} od %{pages}"
+
+    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"

data/lib/locales/sr.yml

@@ -0,0 +1,23 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+sr:
+  pagy:
+    item_name:
+      one: "ставка"
+      few: "ставкe"
+      many: "ставки"
+      other: "ставки"
+
+    nav:
+      prev: "‹ Претходна"
+      next: "Следећa  ›"
+      gap: "…"
+
+    info:
+      no_items: "Нema пронађених %{item_name}"
+      single_page: "Приказује се <b>%{count}</b> %{item_name}"
+      multiple_pages: "Приказ %{item_name} <b>%{from}-%{to}</b> од <b>%{count}</b> укупно"
+
+    combo_nav_js: "Страниca %{page_input} од %{pages}"
+
+    items_selector_js: "Прикажи %{items_input} %{item_name} по страниcи"

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
 }
@@ -67,14 +71,17 @@ p11n = {
 # The default pluralization for locales not explicitly listed here
 # is the :one_other pluralization proc (used for English)
 plurals = Hash.new(p11n[:one_other]).tap do |hash|
+  hash['bs']    = p11n[:east_slavic]
   hash['cs']    = p11n[:west_slavic]
   hash['id']    = p11n[:other]
   hash['fr']    = p11n[:one_upto_two_other]
+  hash['hr']    = p11n[:east_slavic]
   hash['ja']    = p11n[:other]
   hash['km']    = p11n[:other]
   hash['ko']    = p11n[:other]
   hash['pl']    = p11n[:polish]
   hash['ru']    = p11n[:east_slavic]
+  hash['sr']    = p11n[:east_slavic]
   hash['sv']    = p11n[:one_two_other]
   hash['sv-SE'] = p11n[:one_two_other]
   hash['tr']    = p11n[:other]