pagy 4.8.1 → 4.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c87ea4c3c1bf0dbfb6ae76db111177cda391165a844ff3302f8ee2722249ef2f
-  data.tar.gz: 26618714b6555f46cb9c140166b3407efb350bf8263cfcb8bdd4bde293265ca9
+  metadata.gz: af9dd0bcf50c1a54209d29f8a13318fc72f0cb76f07a1ff4e5df04c42e2a0712
+  data.tar.gz: 16ec5ce47444e7ef5adc3a3db977dbdf9a518cbec5da0e3d0454c1e33433faae
 SHA512:
-  metadata.gz: 5e0026cc9cb9051f43c3b89a3d68bde3fbb738ea21055117da0427e0dba9eae6c1d501dcd76d5dadd68890609fde321d33372fe8c949cf8c03c3388e4aa61317
-  data.tar.gz: 643f315b5de922a30f47f70465e7e13d7a5837835b6da90cf52cdf491eaec75f66450678094a3cbef0f38d65afd280ddafec0e0dc16dc52a479e324b896655dd
+  metadata.gz: eb9bcf0b26ef773511e98ab5985a9ce0b4639e79deb60ca2a45ed79cbf6beca5145e032d30907cd4453085a6f2b8072580c4ec4fabd8a788c61037d243e51dc0
+  data.tar.gz: 2219496ad2c296a6fe3a93b7380696b29b7c77e16a6b4731d5322aa9df4be0bbf3433355f8780122be72c3149242d52afb617328d14c53522ec1b2f697b39323

data/lib/config/pagy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (4.8.1)
+# Pagy initializer file (4.10.2)
 # 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
 
@@ -56,6 +56,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.8.1'
+Pagy.version = '4.10.2'
 
 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.8.1'
+  VERSION = '4.10.2'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root

data/lib/pagy/extras/meilisearch.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Pagy
+
+  VARS[:meilisearch_search_method] ||= :pagy_search
+
+  module Meilisearch
+    # returns an array used to delay the call of #search
+    # after the pagination variables are merged to the options
+    def pagy_meilisearch(term = nil, **vars)
+      [self, term, vars]
+    end
+    alias_method VARS[:meilisearch_search_method], :pagy_meilisearch
+  end
+
+  # 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']
+    new(vars)
+  end
+
+  # Add specialized backend methods to paginate Meilisearch results
+  module Backend
+    private
+
+    # Return Pagy object and results
+    def pagy_meilisearch(pagy_search_args, vars = {})
+      model, term, options = pagy_search_args
+      vars             = pagy_meilisearch_get_vars(nil, vars)
+      options[:limit]  = vars[:items]
+      options[:offset] = (vars[:page] - 1) * vars[:items]
+      results          = model.search(term, **options)
+      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
+      return pagy_meilisearch(pagy_search_args, vars.merge(page: pagy.page)) \
+        if defined?(Pagy::UseOverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
+
+      [ pagy, results ]
+    end
+
+    # Sub-method called only by #pagy_meilisearch: here for easy customization of variables by overriding
+    # the _collection argument is not available when the method is called
+    def pagy_meilisearch_get_vars(_collection, vars)
+      pagy_set_items_from_params(vars) if defined?(UseItemsExtra)
+      vars[:items] ||= VARS[:items]
+      vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
+      vars
+    end
+
+  end
+end

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.8.1
+  version: 4.10.2
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-18 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
@@ -72,6 +73,7 @@ files:
 - lib/pagy/extras/i18n.rb
 - lib/pagy/extras/items.rb
 - lib/pagy/extras/materialize.rb
+- lib/pagy/extras/meilisearch.rb
 - lib/pagy/extras/metadata.rb
 - lib/pagy/extras/navs.rb
 - lib/pagy/extras/overflow.rb
@@ -117,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