pagy 3.8.3 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5914b35c8067b8d14845b7d9436f7ca4790175d177eef5762f69e436add1f3c
-  data.tar.gz: e3215ee3eea2b59db1af94ff525e7b1643ba64c55564c7e19971b54f5a2c05b1
+  metadata.gz: e16e1b508c2096d675f846a898da3e1338e8535b460074535e1742cd08a3c6cb
+  data.tar.gz: 450a453312266d3af1f8b18a9cd0734ebc002a6533b9f6c269d7802706f66116
 SHA512:
-  metadata.gz: 71ce505f853364f27a64088497d70b0c4a4c4621cb060d719200e76a5f623bcfc4c182b9b716a2ba6005670caf512e717dcf51be13cb181b7b112b2cfc4e95b6
-  data.tar.gz: 2401ef28c166a69a83567d5fa4f92587be93d2ded49f8261d582acb4df62dff41f5a7773da48a37d26faedf50f7f6da39585beac0fd22fc9ee5419e32c8d1a99
+  metadata.gz: da6eccb117de48a28d0572d011b29040c7c5f17dcb8282a1a7eadc0c5d11f38aea062e6a4f8e6db40ceba2b2022a54af1deb74e7a2eeb720f0b76b4fdba11098
+  data.tar.gz: 873549bfee07251e7c5948eb24837f01309db20b69e512cffa53a8552e5ca6c634c60a49239d0e87480635118e83e213acc29981d9cbd0d30874a912443e4a6d

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 Domizio Demichelis
+Copyright (c) 2017-2020 Domizio Demichelis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.8.3)
+# Pagy initializer file (3.13.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
 

data/lib/javascripts/pagy.js

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

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/cs.yml

@@ -0,0 +1,22 @@
+# :czech pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+cs:
+  pagy:
+    item_name:
+      one: "položka"
+      few: "položek"
+      other: "položky"
+
+    nav:
+      prev: "‹ Předchozí"
+      next: "Další ›"
+      gap: "…"
+
+    info:
+      no_items: "Nic nebylo nalezeno"
+      single_page: "Zobrazeno <b>%{count}</b> %{item_name}"
+      multiple_pages: "Zobrazeno %{item_name} <b>%{from}-%{to}</b> z <b>%{count}</b> celkem"
+
+    combo_nav_js: "Strana %{page_input} z %{pages}"
+
+    items_selector_js: "Zobrazit %{items_input} %{item_name} na stránce"

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/sw.yml

@@ -0,0 +1,22 @@
+# :one_other pluralization
+
+sw:
+  pagy:
+
+    item_name:
+      one: "kifaa"
+      other: "vifaa"
+
+    nav:
+      prev: "‹ Awali"
+      next: "Ifuatayo ›"
+      gap: "…"
+
+    info:
+      no_items: "Hamna %{item_name} vilivyopatikana"
+      single_page: "Inaonyesha %{item_name} <b>%{count}</b>"
+      multiple_pages: "Inaonyesha %{item_name} <b>%{from}-%{to}</b> ya <b>%{count}</b> kwa jumla"
+
+    combo_nav_js: "Kurasa %{page_input} ya %{pages}"
+
+    items_selector_js: "Onyesha %{items_input} %{item_name} kwa kila ukurasa"

data/lib/locales/utils/p11n.rb

@@ -32,6 +32,13 @@ p11n = {
     end
   end,
 
+  west_slavic: lambda do |n|
+     if n == 1                    ; 'one'
+     elsif [2, 3, 4].include?(n)  ; 'few'
+     else                         ; 'other'
+     end
+  end,
+
   one_two_other: lambda do |n|
     if n == 1    ; 'one'
     elsif n == 2 ; 'two'
@@ -60,19 +67,23 @@ 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]
   hash['zh-CN'] = p11n[:other]
   hash['zh-HK'] = p11n[:other]
   hash['zh-TW'] = p11n[:other]
-  hash['km']    = p11n[:other]
 end
 
 [ plurals, p11n ]

data/lib/pagy.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '3.8.3'
+class Pagy ; VERSION = '3.13.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root; @root ||= Pathname.new(__FILE__).dirname.freeze end
@@ -32,18 +32,31 @@ class Pagy ; VERSION = '3.8.3'
   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                                        # 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
+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 }
+  # This algorithm (backported from pagy 4.3) is up to ~5x faster and ~2.3x lighter than the previous one
+  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) > 0
+    series.push(*start..(left_gap_start - 1), :gap)
+    start = left_gap_end + 1
   end
+  if (right_gap_end - right_gap_start) > 0
+    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
 

data/lib/pagy/countless.rb

@@ -8,7 +8,7 @@ class Pagy
   class Countless < Pagy
 
     # Merge and validate the options, do some simple arithmetic and set a few instance variables
-    def initialize(vars={})
+    def initialize(vars={})   # rubocop:disable Lint/MissingSuper
       @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })      # default vars + cleaned vars (can be overridden)
       { items:1, outset:0, page:1 }.each do |k,min|                     # validate instance variables
         (@vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min) \

data/lib/pagy/exceptions.rb

@@ -4,6 +4,7 @@ class Pagy
     attr_reader :pagy
 
     def initialize(pagy)
+      super
       @pagy = pagy
     end
 

data/lib/pagy/extras/support.rb

@@ -15,15 +15,23 @@ class Pagy
     end
 
     def pagy_prev_link(pagy, text = pagy_t('pagy.nav.prev'), link_extra = '')
-      pagy.prev ? %(<span class="page prev"><a href="#{pagy_prev_url(pagy)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+      pagy.prev ? %(<span class="page prev"><a href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
                 : %(<span class="page prev disabled">#{text}</span>)
     end
 
     def pagy_next_link(pagy, text = pagy_t('pagy.nav.next'), link_extra = '')
-      pagy.next ? %(<span class="page next"><a href="#{pagy_next_url(pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+      pagy.next ? %(<span class="page next"><a href="#{pagy_url_for(pagy.next, pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
                 : %(<span class="page next disabled">#{text}</span>)
     end
 
+    def pagy_prev_link_tag(pagy)
+      %(<link href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev"/>) if pagy.prev
+    end
+
+    def pagy_next_link_tag(pagy)
+      %(<link href="#{pagy_url_for(pagy.next, pagy)}" rel="next"/>) if pagy.next
+    end
+
   end
 
 end

data/lib/pagy/frontend.rb

@@ -68,6 +68,7 @@ class Pagy
     end
 
     # Similar to I18n.t: just ~18x faster using ~10x less memory
+    # (@pagy_locale explicitly initilized in order to avoid warning)
     def pagy_t(path, vars={}) Pagy::I18n.t(@pagy_locale||=nil, path, vars) end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.13.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 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,14 +22,16 @@ 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
+- lib/locales/cs.yml
 - lib/locales/da.yml
 - lib/locales/de.yml
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/locales/fr.yml
+- lib/locales/hr.yml
 - lib/locales/id.yml
 - lib/locales/it.yml
 - lib/locales/ja.yml
@@ -41,8 +43,10 @@ files:
 - lib/locales/pt-BR.yml
 - lib/locales/pt.yml
 - lib/locales/ru.yml
+- lib/locales/sr.yml
 - lib/locales/sv-SE.yml
 - lib/locales/sv.yml
+- lib/locales/sw.yml
 - lib/locales/tr.yml
 - lib/locales/utils/i18n.rb
 - lib/locales/utils/loader.rb
@@ -91,7 +95,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
@@ -105,13 +108,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: The Ultimate Pagination Ruby Gem

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 = '>= 1.9'  # rubocop:disable Gemspec/RequiredRubyVersion
-end