pagy 1.3.3 → 2.0.0

data/lib/pagy/extras/shared.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'json'
@@ -39,13 +40,6 @@ class Pagy
       "pagy-#{Digest::SHA1.hexdigest(caller(2..2)[0].split(':in')[0])}"
     end
 
-    def self.deprecate(old_meth, new_meth)
-      send(:define_method, old_meth) do |pagy, id=pagy_id|
-        Warning.warn "WARNING: The ##{old_meth} pagy helper method is deprecated and will be removed in 2.0; please use ##{new_meth} instead. More info at https://github.com/ddnexus/pagy/blob/master/DEPRECATIONS.md\n"
-        method(new_meth).arity == 1 ? send(new_meth, pagy) : send(new_meth, pagy, id)
-      end
-    end
-
   end
 
 end

data/lib/pagy/extras/support.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/support
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
@@ -6,7 +7,7 @@ require 'pagy/extras/shared'
 class Pagy
 
   def to_h
-    { count:  @count,
+    { count:  defined?(@count) && @count,
       page:   @page,
       items:  @items,
       pages:  @pages,

data/lib/pagy/extras/trim.rb

@@ -1,4 +1,5 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/trim
+# encoding: utf-8
 # frozen_string_literal: true
 
 class Pagy
@@ -15,7 +16,7 @@ class Pagy
       page1_url  = pagy_trim_url(marker_url, "#{p_vars[:page_param]}=#{MARKER}")
       page1_link = %(<a href="#{page1_url}" #{p_vars[:link_extra]} #{link_extra})
       a, b = %(<a href="#{marker_url}" #{p_vars[:link_extra]} #{link_extra}).split(MARKER, 2)
-      -> (n, text=n, extra='') { start = n.to_i == 1 ? page1_link : "#{a}#{n}#{b}"
+      lambda{|n, text=n, extra=''| start = n.to_i == 1 ? page1_link : "#{a}#{n}#{b}"
                                  "#{start}#{ if    n == p_prev ; ' rel="prev"'
                                              elsif n == p_next ; ' rel="next"'
                                              else                           '' end } #{extra}>#{text}</a>" }

data/lib/pagy/frontend.rb

@@ -1,20 +1,28 @@
 # See Pagy::Frontend API documentation: https://ddnexus.github.io/pagy/api/frontend
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'yaml'
 
 class Pagy
 
+  # I18n static hash loaded at startup, used as default alternative to the i18n gem.
+  # see https://ddnexus.github.io/pagy/api/frontend#i18n
+  I18n = eval(Pagy.root.join('locales', 'utils', 'i18n.rb').read) #rubocop:disable Security/Eval
+
   # All the code here has been optimized for performance: it may not look very pretty
   # (as most code dealing with many long strings), but its performance makes it very sexy! ;)
   module Frontend
 
+    # We use EMPTY + 'whatever' that is almost as fast as +'whatever' but is also 1.9 compatible
+    EMPTY = ''
+
     # Generic pagination: it returns the html with the series of links to the pages
     def pagy_nav(pagy)
-      html, link, p_prev, p_next = +'', pagy_link_proc(pagy), pagy.prev, pagy.next
+      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
 
-      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> ))
+      html = EMPTY + (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> ))
       pagy.series.each do |item|  # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << if    item.is_a?(Integer); %(<span class="page">#{link.call item}</span> )               # page link
                 elsif item.is_a?(String) ; %(<span class="page active">#{item}</span> )                  # current page
@@ -45,34 +53,17 @@ class Pagy
     MARKER = "-pagy-#{'pagy'.hash}-"
 
     # Returns a performance optimized proc to generate the HTML links
-    # Benchmarked on a 20 link nav: it is ~27x faster and uses ~13x less memory than rails' link_to
+    # Benchmarked on a 20 link nav: it is ~22x faster and uses ~18x less memory than rails' link_to
     def pagy_link_proc(pagy, link_extra='')
       p_prev, p_next = pagy.prev, pagy.next
       a, b = %(<a href="#{pagy_url_for(MARKER, pagy)}" #{pagy.vars[:link_extra]} #{link_extra}).split(MARKER, 2)
-      -> (n, text=n, extra='') { "#{a}#{n}#{b}#{ if    n == p_prev ; ' rel="prev"'
-                                                 elsif n == p_next ; ' rel="next"'
-                                                 else                           '' end } #{extra}>#{text}</a>" }
+      lambda {|n, text=n, extra=''| "#{a}#{n}#{b}#{ if    n == p_prev ; ' rel="prev"'
+                                                    elsif n == p_next ; ' rel="next"'
+                                                    else                           '' end } #{extra}>#{text}</a>" }
     end
 
-    # Pagy::Frontend::I18N
-    def (I18N = {data:{}}).load(file:Pagy.root.join('locales', 'en.yml'), language: 'en')
-      self[:data]   = YAML.load_file(file)[language]
-      self[:plural] = eval(Pagy.root.join('locales', 'plurals.rb').read)[language] #rubocop:disable Security/Eval
-    end; I18N.load
-
-    # Similar to I18n.t for streamlined interpolation and pluralization but without dynamic translation.
-    # It is specialized for Pagy and 5x faster than I18n.t (see https://ddnexus.github.io/pagy/api/frontend#i18n)
-    # See also https://ddnexus.github.io/pagy/extras/i18n if you need to use the standard I18n gem instead
-    def pagy_t(path, vars={})
-      value = I18N[:data].dig(*path.split('.')) or return %(translation missing: "#{path}")
-      if value.is_a?(Hash)
-        vars.key?(:count) or return value
-        plural = I18N[:plural].call(vars[:count])
-        value.key?(plural) or return %(invalid pluralization data: "#{path}" cannot be used with count: #{vars[:count]}; key "#{plural}" is missing.)
-        value = value[plural] or return %(translation missing: "#{path}")
-      end
-      sprintf value, Hash.new{|_,k| "%{#{k}}"}.merge!(vars)    # interpolation
-    end
+    # Similar to I18n.t: just ~18x faster using ~10x less memory
+    def pagy_t(path, vars={}) Pagy::I18n.t(@pagy_locale, path, vars) end
 
   end
 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-nav-bootstrap pagy-bootstrap-nav pagination" role="navigation">
+<%#                            -%><nav aria-label="pager"  class="pagy-bootstrap-nav pagination" 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-nav-bootstrap.pagy-bootstrap-nav.pagination{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy-bootstrap-nav.pagination{"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-nav-bootstrap.pagy-bootstrap-nav.pagination role="navigation" aria-label="pager"
+nav.pagy-bootstrap-nav.pagination role="navigation" aria-label="pager"
 
   ul.pagination
 

data/lib/templates/bulma_nav.html.erb

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

data/lib/templates/bulma_nav.html.haml

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-%nav.pagy-nav-bulma.pagy-bulma_nav.pagination.is-centered{:role => "navigation", "aria-label" => "pagination"}
+%nav.pagy-bulma_nav.pagination.is-centered{:role => "navigation", "aria-label" => "pagination"}
 
   - if pagy.prev
     != link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')

data/lib/templates/bulma_nav.html.slim

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-nav.pagy-nav-bulma.pagy-bulma-nav.pagination.is-centered role="navigation" aria-label="pagination"
+nav.pagy-bulma-nav.pagination.is-centered role="navigation" aria-label="pagination"
 
   - if pagy.prev
     == link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')

data/lib/templates/foundation_nav.html.erb

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

data/lib/templates/foundation_nav.html.haml

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-%nav.pagy-nav-foundation.pagy-foundation-nav{"role" => "navigation", "aria-label" => "Pagination"}
+%nav.pagy-foundation-nav{"role" => "navigation", "aria-label" => "Pagination"}
 
   %ul.pagination
 

data/lib/templates/foundation_nav.html.slim

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-nav.pagy-nav-foundation.pagy-foundation-nav role="navigation" aria-label="Pagination"
+nav.pagy-foundation-nav role="navigation" aria-label="Pagination"
 
   ul.pagination
 

data/pagy.gemspec

@@ -8,12 +8,9 @@ Gem::Specification.new do |s|
   s.authors       = ['Domizio Demichelis']
   s.email         = ['dd.nexus@gmail.com']
   s.summary       = 'The Ultimate Pagination Ruby Gem'
-  s.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, JSON data... and just whatever you can count. Easy to use and customize, very fast and very light.'
+  s.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, JSON data... Easy, powerful, fast and light.'
   s.homepage      = 'https://github.com/ddnexus/pagy'
   s.license       = 'MIT'
   s.files         = `git ls-files -z`.split("\x0").select{|f| f.start_with?('lib', 'pagy.gemspec', 'LICENSE') }
-  s.required_ruby_version = '>= 2.3.0'
-
-  # remove after 1.0
-  s.post_install_message = "Pagy CHANGELOG: https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md"
+  s.required_ruby_version = '>= 1.9'  # rubocop:disable Gemspec/RequiredRubyVersion
 end

metadata

@@ -1,19 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-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,
-  JSON data... and just whatever you can count. Easy to use and customize, very fast
-  and very light.'
+  JSON data... Easy, powerful, fast and light.'
 email:
 - dd.nexus@gmail.com
 executables: []
@@ -31,10 +30,12 @@ files:
 - lib/locales/ja.yml
 - lib/locales/nb.yml
 - lib/locales/nl.yml
-- lib/locales/plurals.rb
 - lib/locales/pt-br.yml
 - lib/locales/ru.yml
 - lib/locales/tr.yml
+- lib/locales/utils/i18n.rb
+- lib/locales/utils/loader.rb
+- lib/locales/utils/p11n.rb
 - lib/locales/zh-cn.yml
 - lib/pagy.rb
 - lib/pagy/backend.rb
@@ -48,8 +49,8 @@ files:
 - lib/pagy/extras/i18n.rb
 - lib/pagy/extras/items.rb
 - lib/pagy/extras/materialize.rb
-- lib/pagy/extras/navs.rb
 - lib/pagy/extras/overflow.rb
+- lib/pagy/extras/pagy_search.rb
 - lib/pagy/extras/plain.rb
 - lib/pagy/extras/searchkick.rb
 - lib/pagy/extras/semantic.rb
@@ -74,7 +75,7 @@ homepage: https://github.com/ddnexus/pagy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 'Pagy CHANGELOG: https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -82,15 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Ultimate Pagination Ruby Gem

data/lib/pagy/extras/navs.rb

@@ -1,4 +0,0 @@
-Warning.warn %(WARNING: The "navs" extra is deprecated and will be removed in 2.0; please require "pagy/extras/plain" instead.\n)
-
-require 'pagy/extras/plain'
-