pagy 3.7.2 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76652fd4a632f5c9214e1edd7ab0c1068a3d7d68cfab8ebf2bc32e72149fe90c
-  data.tar.gz: c644235b4a3157e17e60b26f41505bc84d2c6c952d01f4fbb922f20c3a8d63bc
+  metadata.gz: 7ea52feecd4bb597b050def40adc283602005ff5e92b4df578228e05d747f9ef
+  data.tar.gz: 808775763c37c92e3457214284fffcfc1075a7c8fbde1da39286b35c06923424
 SHA512:
-  metadata.gz: 9dcf374789272f45d6b19c1179c02285de9ea3adfe9cd8fa3cc0449113060a91eb56e6609c71384756f49e078f3127e5e2b1f7bc964de54eecafe2308c470844
-  data.tar.gz: b5591387bfcc00721540e81f3cecd4f4e4e8a699f29329e29a3a8099d398d4439b8e8e6331dc6a4202d8734d1a7eb5dd74630413547cbd04b4d7faac4ea3068b
+  metadata.gz: 80015e89122214f8e8054e2c8e8490b407f4fb9513a4336458eeedd2b5bc986e27abf339830157392afd9cd8f901d61fcd0403480fe7acb093da27d68f9d800b
+  data.tar.gz: ec2ab4d61e3763c580d011565811a55595b15f1f7498b9879dd20f6986f5b470f155f1f4ff5c74286892836c5a2f133e0f2d17e32f82d2b0e1e737a876b89155

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.7.2)
+# Pagy initializer file (3.8.1)
 # 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.2';
+Pagy.version = '3.8.1';
 
 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-br.yml → pt-BR.yml}

@@ -1,6 +1,6 @@
 # :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
 
-pt-br:
+pt-BR:
   pagy:
 
     item_name:

data/lib/locales/sv-SE.yml

@@ -0,0 +1,23 @@
+# :one_two_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+sv-SE:
+  pagy:
+
+    item_name:
+      one: "resultat"
+      two: "resultat"
+      other: "resultat"
+
+    nav:
+      prev: "‹ Föregående"
+      next: "Nästa ›"
+      gap: "…"
+
+    info:
+      no_items: "Inga %{item_name} hittade"
+      single_page: "Visar <b>%{count}</b> %{item_name}"
+      multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
+
+    combo_nav_js: "Sida %{page_input} av %{pages}"
+
+    items_selector_js: "Visa %{items_input} %{item_name} per sida"

data/lib/locales/{se.yml → sv.yml}

@@ -1,6 +1,6 @@
 # :one_two_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
 
-se:
+sv:
   pagy:
 
     item_name:

data/lib/locales/utils/i18n.rb

@@ -4,15 +4,22 @@
 
 # this file returns the I18n hash used as default alternative to the i18n gem
 
-Hash.new{|h,_| h.first[1]}.tap do |i18n|   # first loaded locale used as default
-  i18n.define_singleton_method(:load) do |*args|
+Pagy::DEPRECATED_LOCALES = {'pt-br' =>'pt-BR', 'se' => 'sv-SE'}
+
+Hash.new{|h,_| h.first[1]}.tap do |i18n_hash|   # first loaded locale used as default
+  i18n_hash.define_singleton_method(:load) do |*load_args|
     # eval: we don't need to keep the loader proc in memory
-    eval(Pagy.root.join('locales', 'utils', 'loader.rb').read).call(i18n, *args)   #rubocop:disable Security/Eval
+    eval(Pagy.root.join('locales', 'utils', 'loader.rb').read).call(i18n_hash, *load_args)   #rubocop:disable Security/Eval
   end
-  i18n.define_singleton_method(:t) do |locale, path, vars={}|
+  i18n_hash.define_singleton_method(:t) do |locale, path, vars={}|
+    if Pagy::DEPRECATED_LOCALES.key?(locale)
+      new_locale = Pagy::DEPRECATED_LOCALES[locale]
+      $stderr.puts("WARNING: the Pagy locale '#{locale}' is deprecated; use '#{new_locale}' instead")
+      locale = new_locale
+    end
     data, pluralize = self[locale]
     translate = data[path] || vars[:count] && data[path+=".#{pluralize.call(vars[:count])}"] or return %([translation missing: "#{path}"])
     translate.call(vars)
   end
-  i18n.load(locale: 'en')
+  i18n_hash.load(locale: 'en')
 end

data/lib/locales/utils/loader.rb

@@ -20,6 +20,11 @@ flatten = lambda do |hash, key=''|
 lambda do |i18n, *args|
   i18n.clear
   args.each do |arg|
+    if Pagy::DEPRECATED_LOCALES.key?(arg[:locale])
+      new_locale = Pagy::DEPRECATED_LOCALES[arg[:locale]]
+      $stderr.puts("WARNING: the Pagy locale '#{arg[:locale]}' is deprecated; use '#{new_locale}' instead")
+      arg[:locale] = new_locale
+    end
     arg[:filepath]  ||= Pagy.root.join('locales', "#{arg[:locale]}.yml")
     arg[:pluralize] ||= plurals[arg[:locale]]
     hash = YAML.load(File.read(arg[:filepath], encoding: 'UTF-8')) #rubocop:disable Security/YAMLLoad

data/lib/locales/utils/p11n.rb

@@ -60,17 +60,19 @@ 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['id'] = p11n[:other]
-  hash['fr'] = p11n[:one_upto_two_other]
-  hash['ja'] = p11n[:other]
-  hash['ko'] = p11n[:other]
-  hash['pl'] = p11n[:polish]
-  hash['ru'] = p11n[:east_slavic]
-  hash['se'] = p11n[:one_two_other]
-  hash['tr'] = p11n[:other]
+  hash['id']    = p11n[:other]
+  hash['fr']    = p11n[:one_upto_two_other]
+  hash['ja']    = p11n[:other]
+  hash['ko']    = p11n[:other]
+  hash['pl']    = p11n[:polish]
+  hash['ru']    = p11n[:east_slavic]
+  hash['sv']    = p11n[:one_two_other]
+  hash['sv-SE'] = p11n[:one_two_other]
+  hash['tr']    = p11n[:other]
   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.2'
+class Pagy ; VERSION = '3.8.1'
 
   # 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/bootstrap.rb

@@ -21,7 +21,7 @@ class Pagy
       end
       html << (p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
                       : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
-      %(<nav class="pagy-bootstrap-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
+      %(<nav class="pagy-bootstrap-nav" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
     end
 
     # Javascript pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.nav javascript
@@ -34,7 +34,7 @@ class Pagy
                'gap'    => %(<li class="page-item gap disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.gap')}</a></li>),
                'after'  => p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li></ul>)
                                   : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li></ul>) }
-      %(<nav id="#{id}" class="pagy-bootstrap-nav-js pagination" role="navigation" aria-label="pager"></nav>#{pagy_json_tag(:nav, id, tags, pagy.sequels, defined?(TRIM) && pagy.vars[:page_param])})
+      %(<nav id="#{id}" class="pagy-bootstrap-nav-js" role="navigation" aria-label="pager"></nav>#{pagy_json_tag(:nav, id, tags, pagy.sequels, defined?(TRIM) && pagy.vars[:page_param])})
     end
 
     # Javascript combo pagination for bootstrap: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript

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/templates/bootstrap_nav.html.erb

@@ -6,7 +6,7 @@
   Usage: link.call( page_number [, text [, extra_attributes_string ]])
 -%>
 <% link = pagy_link_proc(pagy, 'class="page-link"') -%>
-<%#                            -%><nav aria-label="pager"  class="pagy-bootstrap-nav pagination" role="navigation">
+<%#                            -%><nav aria-label="pager"  class="pagy-bootstrap-nav" role="navigation">
 <%#                            -%>  <ul class="pagination">
 <% if pagy.prev                -%>    <li class="page-item prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></li>
 <% else                        -%>    <li class="page-item prev disabled"><a href="#" class="page-link"><%== pagy_t('pagy.nav.prev') %></a></li>

data/lib/templates/bootstrap_nav.html.haml

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy, 'class="page-link"')
 
-%nav.pagy-bootstrap-nav.pagination{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy-bootstrap-nav{"aria-label" => "pager", :role => "navigation"}
 
   %ul.pagination
 

data/lib/templates/bootstrap_nav.html.slim

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy, 'class="page-link"')
 
-nav.pagy-bootstrap-nav.pagination role="navigation" aria-label="pager"
+nav.pagy-bootstrap-nav role="navigation" aria-label="pager"
 
   ul.pagination
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.8.1
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-05-08 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,13 +33,15 @@ 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-BR.yml
 - lib/locales/ru.yml
-- lib/locales/se.yml
+- lib/locales/sv-SE.yml
+- lib/locales/sv.yml
 - lib/locales/tr.yml
 - lib/locales/utils/i18n.rb
 - lib/locales/utils/loader.rb
@@ -107,7 +110,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