pagy 3.12.0 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579eed5284017d67002b2def3cc82fab990b416c9b89226bdea2ec210677a014
-  data.tar.gz: b4fd177fbae68205121d79437dda967646aa593e45569934142a35546224c87e
+  metadata.gz: e16e1b508c2096d675f846a898da3e1338e8535b460074535e1742cd08a3c6cb
+  data.tar.gz: 450a453312266d3af1f8b18a9cd0734ebc002a6533b9f6c269d7802706f66116
 SHA512:
-  metadata.gz: c5eba45292ec4f0c25047830e9c761aa081b6365e95be4ba09e5917c52ca59e9d956fccf376e6c7fb821fc318363a5078ce72abbfa83b6d11603a13953d3a476
-  data.tar.gz: b25ac2fcc23d996ff77f14b6f539d34e972a3c41178a790dc0697c92082243ec33fafe834639c4fce8acf3bfa11c77f78ca725d2f2b01f91665af9f2def43b6b
+  metadata.gz: da6eccb117de48a28d0572d011b29040c7c5f17dcb8282a1a7eadc0c5d11f38aea062e6a4f8e6db40ceba2b2022a54af1deb74e7a2eeb720f0b76b4fdba11098
+  data.tar.gz: 873549bfee07251e7c5948eb24837f01309db20b69e512cffa53a8552e5ca6c634c60a49239d0e87480635118e83e213acc29981d9cbd0d30874a912443e4a6d

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.12.0)
+# 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.12.0';
+Pagy.version = '3.13.0';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,

data/lib/pagy.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '3.12.0'
+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.12.0'
   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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-12 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
@@ -96,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
@@ -119,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+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', '< 3.0']
-end