pagy 4.9.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e74b8c735813ad07410c45184e0f8ff345ba104ff3f0bdd75a763a137a63aa53
-  data.tar.gz: b9fc3f608fadcc6be76c1374bded0963a0b45b322321001d8b371148e537e4cd
+  metadata.gz: ed7987ef93f9d2d45f8b37c7d8c62546bb08b658699d4fdacf7e06b2e5abdefe
+  data.tar.gz: d2330d05cbf068d938425ed64ec3a0b0a16cf86d36cd2a2b2d8fc2568942a2d3
 SHA512:
-  metadata.gz: d68129e5f7134cfde1dff25ab00350bf6458f3270e64f154fd621a7cdad946628d3ff1a6dc4af267aab9605162ba1e725ed902fa62a74adc6e2ced3348ed8497
-  data.tar.gz: 33f1f3fba27c3c4e78cfd52649f82aa430e5d5236eb8cf3e9e300a3dc45b8ada546a1a535ceaf4ae65e9f8693ae61d15dad94582a10bdc9643b8d9e3fc76da85
+  metadata.gz: c938d41fae6e33cfd0d569655b134f2d239fe44f6fc5cdcfc76234e20d5c6a9e2650e6bd6f3230044783353ba65dde5afb24867af8df4c59189eee67dda25fea
+  data.tar.gz: 585446ab8b45078fcb666dc9a406516eeac7f715cca90118d5927f5d89acf0cc51056aa75aebed9885c3e5b25f61f9e4baad75869f2d244ab01a359919493b98

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.9.0)
+# Pagy initializer file (4.11.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
 
@@ -42,6 +42,7 @@
 # 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[:countless_minimal] = false   # default (eager loading)
 
 # Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects
 # See https://ddnexus.github.io/pagy/extras/elasticsearch_rails
@@ -56,6 +57,9 @@
 # also the elasticsearch_rails extra that defines the same
 # VARS[:searchkick_search_method] = :pagy_search
 # require 'pagy/extras/searchkick'
+# uncomment if you are going to use Searchkick.pagy_search
+# Searchkick.extend Pagy::Searchkick
+
 
 # Frontend Extras
 

data/lib/javascripts/pagy.js

@@ -2,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '4.9.0'
+Pagy.version = '4.11.0'
 
 Pagy.delay = 100
 
@@ -114,4 +114,8 @@ Pagy.waitForMe =
     Pagy.tid = setTimeout(Pagy.renderNavs, Pagy.delay)
   }
 
-window.addEventListener('resize', Pagy.waitForMe, true)
+
+if (typeof window !== "undefined") {
+  window.addEventListener('resize', Pagy.waitForMe, true)
+}
+

data/lib/locales/ar.yml

@@ -0,0 +1,26 @@
+# :arabic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+ar:
+  pagy:
+
+    item_name:
+      zero: "صفر"
+      one: "عنصر"
+      two: "عنصرين"
+      few: "قليل"
+      many: "كثير"
+      other: "عناصر"
+
+    nav:
+      prev: "‹ السابق"
+      next: "التالي ›"
+      gap: "…"
+
+    info:
+      no_items: "لا يوجد %{item_name}"
+      single_page: "عرض <b>%{count}</b> %{item_name}"
+      multiple_pages: "عرض %{item_name} <b>%{from}-%{to}</b> من اجمالي <b>%{count}</b>"
+
+    combo_nav_js: "الصفحة %{page_input} من %{pages}"
+
+    items_selector_js: "عرض %{items_input} %{item_name} لكل صفحة"

data/lib/locales/utils/p11n.rb

@@ -19,6 +19,20 @@ from12to14 = [12,13,14].freeze
 p11n = {
   one_other: -> (n){ n == 1 ? 'one' : 'other' },    # default
 
+  arabic: lambda do |n|
+    n ||= 0
+    mod100 = n % 100
+
+    case
+    when n == 0                         then 'zero'      # rubocop:disable Style/NumericPredicate
+    when n == 1                         then 'one'
+    when n == 2                         then 'two'
+    when (3..10).to_a.include?(mod100)  then 'few'
+    when (11..99).to_a.include?(mod100) then 'many'
+    else                                     'other'
+    end
+  end,
+
   east_slavic: lambda do |n|
     n ||= 0
     mod10 = n % 10
@@ -32,14 +46,6 @@ p11n = {
     end
   end,
 
-  west_slavic: lambda do |n|
-    case n
-    when 1       then 'one'
-    when 2, 3, 4 then 'few'
-    else              'other'
-    end
-  end,
-
   one_two_other: lambda do |n|
     case n
     when 1 then 'one'
@@ -63,7 +69,16 @@ p11n = {
     when (from0to1 + from5to9).include?(mod10) || from12to14.include?(mod100) then 'many'
     else                                                                           'other'
     end
+  end,
+
+  west_slavic: lambda do |n|
+    case n
+    when 1       then 'one'
+    when 2, 3, 4 then 'few'
+    else              'other'
+    end
   end
+
 }
 
 # Hash of locale/pluralization pairs
@@ -71,6 +86,7 @@ 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['ar']    = p11n[:arabic]
   hash['bs']    = p11n[:east_slavic]
   hash['cs']    = p11n[:west_slavic]
   hash['id']    = p11n[:other]

data/lib/pagy.rb

@@ -5,7 +5,7 @@ require 'pathname'
 
 # main class
 class Pagy
-  VERSION = '4.9.0'
+  VERSION = '4.11.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

data/lib/pagy/countless.rb

@@ -11,6 +11,8 @@ class Pagy
     # Merge and validate the options, do some simple arithmetic and set a few instance variables
     def initialize(vars={})  # rubocop:disable Lint/MissingSuper
       @vars = VARS.merge(vars.delete_if{|_,v| v.nil? || v == '' })      # default vars + cleaned vars (can be overridden)
+      @vars[:fragment] = Pagy.deprecated_var(:anchor, @vars[:anchor], :fragment, @vars[:fragment]) if @vars[:anchor]
+
       INSTANCE_VARS_MIN.each do |k,min|                                 # validate instance variables
         raise VariableError.new(self), "expected :#{k} >= #{min}; got #{@vars[k].inspect}" \
               unless @vars[k] && instance_variable_set(:"@#{k}", @vars[k].to_i) >= min

data/lib/pagy/extras/countless.rb

@@ -5,6 +5,8 @@ require 'pagy/countless'
 
 class Pagy
 
+  VARS[:countless_minimal] = false
+
   module Backend
     private         # the whole module is private so no problem with including it in a controller
 
@@ -17,13 +19,15 @@ class Pagy
     # Sub-method called only by #pagy_countless: here for easy customization of variables by overriding
     def pagy_countless_get_vars(_collection, vars)
       pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
-      vars[:page]  ||= params[ vars[:page_param] || VARS[:page_param] ]
+      vars[:page] ||= params[ vars[:page_param] || VARS[:page_param] ]
       vars
     end
 
     # Sub-method called only by #pagy_countless: here for easy customization of record-extraction by overriding
     def pagy_countless_get_items(collection, pagy)
       # This should work with ActiveRecord, Sequel, Mongoid...
+      return collection.offset(pagy.offset).limit(pagy.items) if pagy.vars[:countless_minimal]
+
       items      = collection.offset(pagy.offset).limit(pagy.items + 1).to_a
       items_size = items.size
       items.pop if items_size == pagy.items + 1

data/lib/pagy/extras/meilisearch.rb

@@ -15,9 +15,9 @@ class Pagy
 
   # create a Pagy object from a Meilisearch results
   def self.new_from_meilisearch(results, vars={})
-    vars[:items] = results.raw_answer[:limit]
-    vars[:page]  = [results.raw_answer[:offset] / vars[:items], 1].max
-    vars[:count] = results.raw_answer[:nbHits]
+    vars[:items] = results.raw_answer['limit']
+    vars[:page]  = [results.raw_answer['offset'] / vars[:items], 1].max
+    vars[:count] = results.raw_answer['nbHits']
     new(vars)
   end
 
@@ -32,7 +32,7 @@ class Pagy
       options[:limit]  = vars[:items]
       options[:offset] = (vars[:page] - 1) * vars[:items]
       results          = model.search(term, **options)
-      vars[:count]     = results.raw_answer[:nbHits]
+      vars[:count]     = results.raw_answer['nbHits']
 
       pagy = Pagy.new(vars)
       # with :last_page overflow we need to re-run the method in order to get the hits

data/lib/pagy/extras/trim.rb

@@ -14,10 +14,14 @@ class Pagy
       lambda do |num, text=num, extra=''|
         link = +link_proc.call(num, text, extra)
         return link unless num == 1
-        link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
+        pagy_trim(pagy, link)
       end
     end
 
+    def pagy_trim(pagy, link)
+      link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
+    end
+
   end
   Frontend.prepend UseTrimExtra
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-19 00:00:00.000000000 Z
+date: 2021-08-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,6 +22,7 @@ files:
 - LICENSE.txt
 - lib/config/pagy.rb
 - lib/javascripts/pagy.js
+- lib/locales/ar.yml
 - lib/locales/bg.yml
 - lib/locales/bs.yml
 - lib/locales/ca.yml
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: The Ultimate Pagination Ruby Gem