pagy 3.7.5 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1294620f428cf3807db1ab558bebf4bc01cc43d1e5d1fce668eec802b8a3088
-  data.tar.gz: '094b895627f5bb472d952fbc8e078a23d9f830cc2f2b629945733853e83ef1ce'
+  metadata.gz: 76e3d9bead25964339d54c1cd73d9e907da2339e3f06b260f9cee31fa595deca
+  data.tar.gz: 6b4babd77239dee7f8d5bdc599fc621aeae42089fd7a2c0689010e1f5f8fafb4
 SHA512:
-  metadata.gz: 1a041ca4fad15e46930d178ff9f86c20d66f60408d0ca270d127e615fca4ea29529a04e376905b45742405240b8d55438fbb4be4b60fe9c400171cce222eac64
-  data.tar.gz: bd9f46987b98a2d83e8a03f3e16cf9f02272cbb9177d74e7a2b3e6eca30dcc20b1ed901d5d59a240a521decb0b359c9d5f5be21e10dbf1e970e67e5fc0499e21
+  metadata.gz: d52670d1b6b9e8145589ce948fbbc4332a946fbd955a3a2bdca3acbb591c33cb6e956e83a2a8b9c50545ccd80b709c4f0709296be6330e22031990cbd8e17116
+  data.tar.gz: 8e0c0a3ba6d655386de0a50a53e315c854a88319fdafa5792e94fd4f432be263eee420840f54bcbb206b505b26cbf850faa07db6eef66157f91391f5c43ff89f

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.7.5)
+# Pagy initializer file (3.9.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.7.5';
+Pagy.version = '3.9.0';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,
@@ -101,6 +101,6 @@ Pagy.addInputEventListeners = function(input, handler){
                               };
 
 Pagy.trim = function(html, param){
-              var re = new RegExp('[?&]' + param + '=1\b(?!&)|\b' + param + '=1&');
+              var re = new RegExp('[?&]' + param + '=1\\b(?!&)|\\b' + param + '=1&');
               return html.replace(re, '');
             };

data/lib/locales/km.yml

@@ -0,0 +1,19 @@
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+km:
+  pagy:
+    item_name: "ធាតុ"
+
+    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/pt.yml

@@ -0,0 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+pt:
+  pagy:
+
+    item_name:
+      one: "item"
+      other: "itens"
+
+    nav:
+      prev: "‹ Anterior"
+      next: "Próximo ›"
+      gap: "…"
+
+    info:
+      no_items: "Sem resultados"
+      single_page: "Mostrando %{count} %{item_name}"
+      multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
+
+    combo_nav_js: "Página %{page_input} de %{pages}"
+
+    items_selector_js: "Mostrar %{items_input} %{item_name} por página"

data/lib/locales/utils/p11n.rb

@@ -72,6 +72,7 @@ plurals = Hash.new(p11n[:one_other]).tap do |hash|
   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.7.5'
+class Pagy ; VERSION = '3.9.0'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root; @root ||= Pathname.new(__FILE__).dirname.freeze end

data/lib/pagy/extras/elasticsearch_rails.rb

@@ -13,7 +13,7 @@ class Pagy
   def self.new_from_elasticsearch_rails(response, vars={})
     vars[:items] = response.search.options[:size] || 10
     vars[:page]  = (response.search.options[:from] || 0) / vars[:items] + 1
-    total        = response.raw_response['hits']['total']
+    total        = response.respond_to?(:raw_response) ? response.raw_response['hits']['total'] : response.response['hits']['total']
     vars[:count] = total.is_a?(Hash) ? total['value'] : total
     new(vars)
   end
@@ -28,7 +28,7 @@ class Pagy
       search_args[-1][:size] = vars[:items]
       search_args[-1][:from] = vars[:items] * (vars[:page] - 1)
       response               = model.search(*search_args)
-      total                  = response.raw_response['hits']['total']
+      total                  = response.respond_to?(:raw_response) ? response.raw_response['hits']['total'] : response.response['hits']['total']
       vars[:count]           = total.is_a?(Hash) ? total['value'] : total
       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/i18n.rb

@@ -11,7 +11,14 @@ class Pagy
     Pagy::I18n.clear.instance_eval { undef :load; undef :t } # unload the pagy default constant for efficiency
 
     alias_method :pagy_without_i18n, :pagy_t
-    def pagy_t_with_i18n(*args) ::I18n.t(*args) end
+    if Gem::Version.new(::I18n::VERSION) < Gem::Version.new('1.6.0')
+      def pagy_t_with_i18n(*args) ::I18n.t(*args) end
+    else
+      # keep 1.9 compatibility by hiding 2.0+ syntax in string
+      module_eval <<-RUBY
+        def pagy_t_with_i18n(key, **opts) ::I18n.t(key, **opts) end
+      RUBY
+    end
     alias_method :pagy_t, :pagy_t_with_i18n
 
   end

data/lib/pagy/extras/navs.rb

@@ -24,7 +24,7 @@ class Pagy
     def pagy_combo_nav_js(pagy, id=pagy_id)
       link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
-      html = EMPTY + %(<nav id="#{id}" class="pagy-combo-nav-js-js pagination" role="navigation" aria-label="pager">)
+      html = EMPTY + %(<nav id="#{id}" class="pagy-combo-nav-js pagination" role="navigation" aria-label="pager">)
       html << (p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
                       : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ))
       input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)

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="next" aria-label="next" #{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

@@ -50,11 +50,11 @@ class Pagy
     end
 
     # Return examples: "Displaying items 41-60 of 324 in total" of "Displaying Products 41-60 of 324 in total"
-    def pagy_info(pagy)
+    def pagy_info(pagy, item_name=nil)
       path = if (count = pagy.count) == 0 ; 'pagy.info.no_items'
              else pagy.pages == 1 ? 'pagy.info.single_page' : 'pagy.info.multiple_pages'
              end
-      pagy_t(path, item_name: pagy_t(pagy.vars[:i18n_key], count: count), count: count, from: pagy.from, to: pagy.to)
+      pagy_t(path, item_name: item_name || pagy_t(pagy.vars[:i18n_key], count: count), count: count, from: pagy.from, to: pagy.to)
     end
 
     # Returns a performance optimized proc to generate the HTML links
@@ -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.7.5
+  version: 3.9.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-10-21 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,
@@ -33,11 +33,13 @@ files:
 - lib/locales/id.yml
 - lib/locales/it.yml
 - lib/locales/ja.yml
+- lib/locales/km.yml
 - lib/locales/ko.yml
 - lib/locales/nb.yml
 - lib/locales/nl.yml
 - lib/locales/pl.yml
 - lib/locales/pt-BR.yml
+- lib/locales/pt.yml
 - lib/locales/ru.yml
 - lib/locales/sv-SE.yml
 - lib/locales/sv.yml
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The Ultimate Pagination Ruby Gem