pagy 3.7.4 → 3.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e979c20b3707bfa08719b0fca92c4af61815ef525a9473e73ca2ae7e90fb1edf
-  data.tar.gz: 70fbef96ca45c915f18f47a5e37ecd6c42c2721a808c07c6c7b4c295cc35e501
+  metadata.gz: a5914b35c8067b8d14845b7d9436f7ca4790175d177eef5762f69e436add1f3c
+  data.tar.gz: e3215ee3eea2b59db1af94ff525e7b1643ba64c55564c7e19971b54f5a2c05b1
 SHA512:
-  metadata.gz: f46df19bef1296acd3288e2bcc73dcc6824866ea6abb2ccb31629a4e511baad027dfbba4433cb768291d0c6268221e4e2f3ae32012edb3c0f28c4cbd21798115
-  data.tar.gz: f2b696abd64a438b605304c142c6dd37f2c2a8039cbb002d8959712784a6d072073165df64485250067f0a8b1b6df6ba1efccd3c02459e5e954b0902b9246cb1
+  metadata.gz: 71ce505f853364f27a64088497d70b0c4a4c4621cb060d719200e76a5f623bcfc4c182b9b716a2ba6005670caf512e717dcf51be13cb181b7b112b2cfc4e95b6
+  data.tar.gz: 2401ef28c166a69a83567d5fa4f92587be93d2ded49f8261d582acb4df62dff41f5a7773da48a37d26faedf50f7f6da39585beac0fd22fc9ee5419e32c8d1a99

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.7.4)
+# Pagy initializer file (3.8.3)
 # 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.4';
+Pagy.version = '3.8.3';
 
 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/README.md

@@ -11,13 +11,20 @@ You can create a Pull Request for your language, and get all the help you need t
 ### 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 for `en.rb` it is`::RailsI18n::Pluralization::OneOther.with_locale(:en)`. Note the rule part i.e. `OneOther`. In pagy that translates to the symbol `:one_other`.
+
+  - [ ] 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, the whole sentence needs to be written in a different way for different plurals. In that case you should add the different plurals for the sentence and they will get triggered by the `count`.
+- [ ] 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.
 

data/lib/locales/da.yml

@@ -0,0 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+da:
+  pagy:
+
+    item_name:
+      one: "resultat"
+      other: "resultater"
+
+    nav:
+      prev: "‹ Forrige"
+      next: "Næste ›"
+      gap: "…"
+
+    info:
+      no_items: "Ingen %{item_name} fundet"
+      single_page: "Viser <b>%{count}</b> %{item_name}"
+      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> til <b>%{count}</b> totalt"
+
+    combo_nav_js: "Side %{page_input} of %{pages}"
+
+    items_selector_js: "Antal %{items_input} %{item_name} per side"

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.4'
+class Pagy ; VERSION = '3.8.3'
 
   # 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,7 +15,7 @@ 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_prev_url(pagy)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
                 : %(<span class="page prev disabled">#{text}</span>)
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.8.3
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-07-23 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,
@@ -25,6 +25,7 @@ files:
 - lib/locales/README.md
 - lib/locales/bg.yml
 - lib/locales/ca.yml
+- lib/locales/da.yml
 - lib/locales/de.yml
 - lib/locales/en.yml
 - lib/locales/es.yml
@@ -32,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
@@ -108,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