pagy 1.2.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404671150cf9cb3580df7ec51a52715dbec0ea879140f16b0f41d67714a9760e
-  data.tar.gz: 9074cfed85d9465b2484222b6063e3b282e4c910fc01388bd5155ce4348181e3
+  metadata.gz: b17506ef8c1eb28b4d309d528129738e50df21e8133a5a5b93b513770bd166df
+  data.tar.gz: 2083ac8f294973bb99fa458bb97ca70894b07299bf430ccb0e30739a08b72b98
 SHA512:
-  metadata.gz: bbba1646133377c9dc118fdb184d694dd5b137d780cdd55009f61b7190f276e737e46cf0dd0ebd63957b4f8fb7a67cbc1ed409c0ac3a0055ab6a58db0eadece6
-  data.tar.gz: e7ef0461dc55852c9f6d1baa594cb495256d7cefdd6a230c36b139fcf9adfc16684d4e9b3e65a075c93891a2f315912c1e3f33e3c6bef5d909aa5f21f77e7303
+  metadata.gz: 23b98cd8d721407c821f32305c8acff47ced168eead12030fa54b5547323a444afb524e834e4ab2417aaebac593e832e6fd93df64045164b6f31d90aa2a0fd8e
+  data.tar.gz: 1d66cffcb0396a788db7f2fbf2818e7d440e3f6530bb8e50262d07b888e5ad1be5cc717e3f97da0750172c27248bfd33b465452e20331e241b4fb57617cf135b

data/lib/javascripts/pagy.js

@@ -1,8 +1,9 @@
 // See the Pagy documentation: https://ddnexus.github.io/pagy/extras#javascript
 
+// Pagy namespace
 function Pagy(){}
 
-Pagy.windowListeners = [];
+Pagy.windowListeners = {};
 
 Pagy.addInputEventListeners = function(input, handler){
                                 // select the content on click: easier for typing a number
@@ -49,33 +50,37 @@ Pagy.items = function(id, marker, from){
              };
 
 Pagy.responsive = function(id, tags, widths, series){
-                    var pagyEl     = document.getElementById(id),
-                        pagyParent = pagyEl.parentElement,
-                        lastWidth  = undefined,
-                        render     = function(){
-                                       var parentWidth = parseInt(pagyParent.clientWidth),
-                                           width       = widths.find(function(w){return parentWidth > w});
-                                       if (width !== lastWidth) {
-                                         while (pagyEl.firstChild) { pagyEl.removeChild(pagyEl.firstChild) }
-                                         var html = tags['before'];
-                                         series[width].forEach(function(item){html += tags[item]});
-                                         html += tags['after'];
-                                         pagyEl.insertAdjacentHTML('beforeend', html);
-                                         lastWidth = width;
-                                       }
-                                     }.bind(this);
-                    window.addEventListener('resize', render, true);
-                    Pagy.windowListeners.push(render);
+                    var pagyEl    = document.getElementById(id),
+                        container = pagyEl.parentElement,
+                        lastWidth = undefined,
+                        resizeId  = 0,
+                        render    = function(){
+                                      var width = widths.find(function(w) {return container.clientWidth > w});
+                                      if (width !== lastWidth) {
+                                        while (pagyEl.firstChild) { pagyEl.removeChild(pagyEl.firstChild) }
+                                        var html = tags['before'];
+                                        series[width].forEach(function(item) {html += tags[item]});
+                                        html += tags['after'];
+                                        pagyEl.insertAdjacentHTML('beforeend', html);
+                                        lastWidth = width;
+                                      }
+                                    },
+                        resize    = function(){  // call render once, after window.resize is done
+                                      clearTimeout(resizeId);
+                                      resizeId = setTimeout(render, 300);
+                                    };
+                    // remove the previous window resize listener which may result in firing the render multiple times
+                    window.removeEventListener('resize', Pagy.windowListeners[id], true);
+                    window.addEventListener('resize', resize, true);
+                    Pagy.windowListeners[id] = resize;
                     render();
                   };
 
-Pagy.init = function(){
-              // we need to explicitly remove the window listeners  because turbolinks persists the window object
-              Pagy.windowListeners.forEach(function(l){window.removeEventListener('resize', l, true)});
-              Pagy.windowListeners = [];
-              var json = document.getElementsByClassName('pagy-json');
-              for (var i = 0, len = json.length; i < len; i++) {
-                var args = JSON.parse(json[i].innerHTML);
+Pagy.init = function(arg){
+              var target   = arg instanceof Event || arg === undefined ? document : arg,
+                  jsonTags = target.getElementsByClassName('pagy-json');
+              for (var i = 0, len = jsonTags.length; i < len; i++) {
+                var args = JSON.parse(jsonTags[i].innerHTML);
                 Pagy[args.shift()].apply(null, args);
               }
               // Support for legacy overridden helpers. It will be removed in 2.0
@@ -87,6 +92,7 @@ Pagy.init = function(){
               })
             };
 
+// namespace for custom init functions
 function PagyInit(){}
 
 Pagy.applyInit = function(name, payload){ PagyInit[name].apply(null, [payload]) };

data/lib/locales/README.md

@@ -0,0 +1,15 @@
+# Pagy locales
+
+### Please, submit your translation!
+
+If you are using pagy with some language missing from the dictionary files, please, submit your translation!
+
+The `pagy.info.single_page`, `pagy.info.item_name` and `pagy.items` keys of the yaml file are pluralized according to the plural rules of the language.
+
+If you are going to submit a dictionary, please check wether the pluralization type of your language exists in the [plurals.rb](https://github.com/ddnexus/pagy/blob/master/lib/locales/plurals.rb) file. If it is missing, please, report it. Thanks.
+
+### Useful Links
+
+* [Pagy I18n Documentation](https://ddnexus.github.io/pagy/api/frontend#i18n)
+* [i18n extra](https://ddnexus.github.io/pagy/extra/i18n)
+

data/lib/locales/nl.yml

@@ -0,0 +1,20 @@
+nl:
+  pagy:
+    nav:
+      prev: "‹ Vorige"
+      next: "Volgende ›"
+      gap: "…"
+    info:
+      single_page:
+        zero: "Geen %{item_name} gevonden"
+        one: "Toont <b>1</b> %{item_name}"
+        other: "Toont <b>alle %{count}</b> %{item_name}"
+      multiple_pages: "Toont <b>%{from}-%{to}</b> %{item_name} van <b>%{count}</b> in totaal"
+      item_name:
+        zero: "stuks"
+        one: "stuk"
+        other: "stuks"
+    compact: "Pagina %{page_input} van %{pages}"
+    items:
+      one: "Toont %{items_input} item per pagina"
+      other: "Toont %{items_input} items per pagina"

data/lib/locales/plurals.rb

@@ -3,24 +3,36 @@
 # frozen_string_literal: true
 
 # utility variables
-zero_one   = ['zero', 'one']
-from2to4   = (2..4)
-from5to9   = (5..9)
-from11to14 = (11..14)
-from12to14 = (12..14)
+zero_one   = ['zero', 'one'].freeze
+from2to4   = (2..4).freeze
+from5to9   = (5..9).freeze
+from11to14 = (11..14).freeze
+from12to14 = (12..14).freeze
 
 # Plurals
 # A plural proc returns a plural type string based on the passed count
 # Each plural proc may apply to one or more languages below
 plurals = {
-  zero_one_other:     -> (count) {zero_one[count] || 'other'},
-  one_few_many_other: -> (count) do
+  zero_one_other: -> (count) {zero_one[count] || 'other'},
+
+  zero_one_few_many_other: -> (count) do
     mod10, mod100 = count % 10, count % 100
-    if    mod10 == 1 && mod100 != 11                                        ; 'one'
+    if count == 0                                                           ; 'zero'
+    elsif mod10 == 1 && mod100 != 11                                        ; 'one'
     elsif from2to4.cover?(mod10) && !from12to14.cover?(mod100)              ; 'few'
     elsif mod10 == 0 || from5to9.cover?(mod10) || from11to14.cover?(mod100) ; 'many'
     else                                                                      'other'
     end
+  end,
+
+  pl: -> (count) do
+    mod10, mod100 = count % 10, count % 100
+    if count == 0                                                                       ; 'zero'
+    elsif count == 1                                                                    ; 'one'
+    elsif from2to4.cover?(mod10) && !from12to14.cover?(mod100)                          ; 'few'
+    elsif [0, 1].include?(mod10) || from5to9.cover?(mod10) || from12to14.cover?(mod100) ; 'many'
+    else                                                                                  'other'
+    end
   end
 }
 
@@ -30,7 +42,8 @@ plurals = {
 # is the :zero_one_other plural (used for English)
 Hash.new(plurals[:zero_one_other]).tap do |languages|
   languages['en'] = plurals[:zero_one_other]
-  languages['ru'] = plurals[:one_few_many_other]
+  languages['ru'] = plurals[:zero_one_few_many_other]
+  languages['pl'] = plurals[:pl]
 end
 
 # PR for other languages and plurals are very welcome. Thanks!

data/lib/pagy.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '1.2.1'
+class Pagy ; VERSION = '1.3'
 
   class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

data/lib/pagy/countless.rb

@@ -14,16 +14,15 @@ class Pagy
       @offset = @items * (@page - 1) + @outset                          # pagination offset + outset (initial offset)
     end
 
-    # Finalize the instance variables based on the retrieved items
-    def finalize(items)
-      items == 0 && @page > 1 and raise(OverflowError.new(self), "page #{@page} got no items")
-      @pages = @last = (items > @items ? @page + 1 : @page)             # set the @pages and @last
-      @items = items if items < @items && items > 0                     # adjust items for last non-empty page
-      @from  = items == 0 ? 0 : @offset+1 - @outset                     # page begins from item
-      @to    = items == 0 ? 0 : @offset + @items - @outset              # page ends to item
-      @prev  = (@page-1 unless @page == 1)                              # nil if no prev page
-      @next  = (@page+1 unless @page == @last)                          # nil if no next page
-      @next   = (@page == @last ? (1 if @vars[:cycle]) : @page+1)                # nil if no next page
+    # Finalize the instance variables based on the fetched items
+    def finalize(fetched)
+      fetched == 0 && @page > 1 and raise(OverflowError.new(self), "page #{@page} got no items")
+      @pages = @last = (fetched > @items ? @page + 1 : @page)         # set the @pages and @last
+      @items = fetched if fetched < @items && fetched > 0             # adjust items for last non-empty page
+      @from  = fetched == 0 ? 0 : @offset+1 - @outset                 # page begins from item
+      @to    = fetched == 0 ? 0 : @offset + @items - @outset          # page ends to item
+      @prev  = (@page-1 unless @page == 1)                            # nil if no prev page
+      @next  = @page == @last ? (1 if @vars[:cycle]) : @page+1        # nil if no next page, 1 if :cycle
       self
     end
 

data/lib/pagy/extras/bootstrap.rb

@@ -22,11 +22,11 @@ class Pagy
                       : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
       %(<nav class="pagy-nav-bootstrap pagy-bootstrap-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
     end
-    Pagy.deprecate self, :pagy_nav_bootstrap, :pagy_bootstrap_nav
+    deprecate :pagy_nav_bootstrap, :pagy_bootstrap_nav
 
     # Compact pagination for bootstrap: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
-    def pagy_bootstrap_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_bootstrap_compact_nav(pagy, id=pagy_id)
       html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
       html << %(<nav id="#{id}" class="pagy-nav-compact-bootstrap pagy-bootstrap-compact-nav pagination" role="navigation" aria-label="pager">)
@@ -41,11 +41,11 @@ class Pagy
                         : %(<a class="next btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
       html << %(</div></nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    Pagy.deprecate self, :pagy_nav_compact_bootstrap, :pagy_bootstrap_compact_nav
+    deprecate :pagy_nav_compact_bootstrap, :pagy_bootstrap_compact_nav
 
     # Responsive pagination for bootstrap: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_bootstrap_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_bootstrap_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = +'<ul class="pagination">'
@@ -63,7 +63,7 @@ class Pagy
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
       %(<nav id="#{id}" class="pagy-nav-responsive-bootstrap pagy-bootstrap-responsive-nav pagination" role="navigation" aria-label="pager"></nav>#{script})
     end
-    Pagy.deprecate self, :pagy_nav_responsive_bootstrap, :pagy_bootstrap_responsive_nav
+    deprecate :pagy_nav_responsive_bootstrap, :pagy_bootstrap_responsive_nav
 
   end
 end

data/lib/pagy/extras/bulma.rb

@@ -24,11 +24,11 @@ class Pagy
       html << '</ul>'
       %(<nav class="pagy-nav-bulma pagy-bulma-nav pagination is-centered" role="navigation" aria-label="pagination">#{html}</nav>)
     end
-    Pagy.deprecate self, :pagy_nav_bulma, :pagy_bulma_nav
+    deprecate :pagy_nav_bulma, :pagy_bulma_nav
 
     # Compact pagination for Bulma: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
-    def pagy_bulma_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_bulma_compact_nav(pagy, id=pagy_id)
       html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
       html << %(<nav id="#{id}" class="pagy-nav-compact-bulma pagy-bulma-compact-nav" role="navigation" aria-label="pagination">)
@@ -43,11 +43,11 @@ class Pagy
                         : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.next')}</a></p>))
       html << %(</div></nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    Pagy.deprecate self, :pagy_nav_compact_bulma, :pagy_bulma_compact_nav
+    deprecate :pagy_nav_compact_bulma, :pagy_bulma_compact_nav
 
     # Responsive pagination for Bulma: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_bulma_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_bulma_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = +(p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
@@ -65,7 +65,7 @@ class Pagy
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
       %(<nav id="#{id}" class="pagy-nav-responsive-bulma pagy-bulma-responsive-nav pagination is-centered" role="navigation" aria-label="pagination"></nav>#{script})
     end
-    Pagy.deprecate self, :pagy_nav_responsive_bulma, :pagy_bulma_responsive_nav
+    deprecate :pagy_nav_responsive_bulma, :pagy_bulma_responsive_nav
 
   end
 end

data/lib/pagy/extras/foundation.rb

@@ -22,11 +22,11 @@ class Pagy
                       : %(<li class="next disabled">#{pagy_t('pagy.nav.next')}</li>))
       %(<nav class="pagy-nav-foundation pagy-foundation-nav" role="navigation" aria-label="Pagination"><ul class="pagination">#{html}</ul></nav>)
     end
-    Pagy.deprecate self, :pagy_nav_foundation, :pagy_foundation_nav
+    deprecate :pagy_nav_foundation, :pagy_foundation_nav
 
     # Compact pagination for Foundation: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
-    def pagy_foundation_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_foundation_compact_nav(pagy, id=pagy_id)
       html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
       html << %(<nav id="#{id}" class="pagy-nav-compact-foundation pagy-foundation-compact-nav" role="navigation" aria-label="Pagination">)
@@ -41,11 +41,11 @@ class Pagy
                         : %(<a style="margin-bottom: 0px;" class="next button primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
       html << %(</div></nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    Pagy.deprecate self, :pagy_nav_compact_foundation, :pagy_foundation_compact_nav
+    deprecate :pagy_nav_compact_foundation, :pagy_foundation_compact_nav
 
     # Responsive pagination for Foundation: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_foundation_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_foundation_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = +'<ul class="pagination">'
@@ -63,7 +63,7 @@ class Pagy
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
       %(<nav id="#{id}" class="pagy-nav-responsive-foundation pagy-foundation-responsive-nav" aria-label="Pagination"></nav>#{script})
     end
-    Pagy.deprecate self, :pagy_nav_responsive_foundation, :pagy_foundation_responsive_nav
+    deprecate :pagy_nav_responsive_foundation, :pagy_foundation_responsive_nav
 
   end
 end

data/lib/pagy/extras/items.rb

@@ -46,7 +46,7 @@ class Pagy
     alias_method :pagy_url_for, :pagy_url_for_with_items
 
     # Return the items selector HTML. For example "Show [20] items per page"
-    def pagy_items_selector(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_items_selector(pagy, id=pagy_id)
       pagy = pagy.clone; p_vars = pagy.vars; p_items = p_vars[:items]; p_vars[:items] = "#{MARKER}-items-"
 
       html = +%(<span id="#{id}">)

data/lib/pagy/extras/materialize.rb

@@ -21,11 +21,11 @@ class Pagy
                       : %(<li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li>))
       %(<div class="pagy-nav-materialize pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></div>)
     end
-    Pagy.deprecate self, :pagy_nav_materialize, :pagy_materialize_nav
+    deprecate :pagy_nav_materialize, :pagy_materialize_nav
 
     # Compact pagination for materialize: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
-    def pagy_materialize_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_materialize_compact_nav(pagy, id=pagy_id)
       html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
       html << %(<div id="#{id}" class="pagy-nav-compact-materialize pagy-materialize-compact-nav pagination" role="navigation" aria-label="pager">)
@@ -42,11 +42,11 @@ class Pagy
                : %(<li class="next disabled" #{li_style}><a href="#"><i class="material-icons">chevron_right</i></a></li>))
       html << %(</ul></div>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    Pagy.deprecate self, :pagy_nav_compact_materialize, :pagy_materialize_compact_nav
+    deprecate :pagy_nav_compact_materialize, :pagy_materialize_compact_nav
 
     # Responsive pagination for Materialize: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_materialize_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_materialize_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = +'<ul class="pagination">'
@@ -64,7 +64,7 @@ class Pagy
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
       %(<div id="#{id}" class="pagy-nav-responsive-materialize pagy-materialize-responsive-nav pagination" role="navigation" aria-label="pager"></div>#{script})
     end
-    Pagy.deprecate self, :pagy_nav_responsive_materialize, :pagy_materialize_responsive_nav
+    deprecate :pagy_nav_responsive_materialize, :pagy_materialize_responsive_nav
 
   end
 end

data/lib/pagy/extras/plain.rb

@@ -11,7 +11,7 @@ class Pagy
 
     # Plain compact pagination: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
-    def pagy_plain_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_plain_compact_nav(pagy, id=pagy_id)
       html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
 
       html << %(<nav id="#{id}" class="pagy-nav-compact pagy-plain-compact-nav pagination" role="navigation" aria-label="pager">)
@@ -25,11 +25,11 @@ class Pagy
                         : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>))
       html << %(</nav>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    Pagy.deprecate self, :pagy_nav_compact, :pagy_plain_compact_nav
+    deprecate :pagy_nav_compact, :pagy_plain_compact_nav
 
     # Plain responsive pagination: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_plain_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_plain_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = (p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
@@ -45,7 +45,7 @@ class Pagy
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
       %(<nav id="#{id}" class="pagy-nav-responsive pagy-plain-responsive-nav pagination" role="navigation" aria-label="pager"></nav>#{script})
     end
-    Pagy.deprecate self, :pagy_nav_responsive, :pagy_plain_responsive_nav
+    deprecate :pagy_nav_responsive, :pagy_plain_responsive_nav
 
   end
 end

data/lib/pagy/extras/semantic.rb

@@ -22,11 +22,11 @@ class Pagy
                       : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
       %(<div class="pagy-nav-semantic pagy-semantic-nav ui pagination menu" aria-label="pager">#{html}</div>)
     end
-    Pagy.deprecate self, :pagy_nav_semantic, :pagy_semantic_nav
+    deprecate :pagy_nav_semantic, :pagy_semantic_nav
 
     # Compact pagination for semantic: it returns the html with the series of links to the pages
     # we use a numeric input tag to set the page and the Pagy.compact javascript to navigate
-    def pagy_semantic_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_semantic_compact_nav(pagy, id=pagy_id)
       html, link, p_prev, p_next, p_page, p_pages = +'', pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next, pagy.page, pagy.pages
 
       html << %(<div id="#{id}" class="pagy-nav-compact-semantic pagy-semantic-compact-nav ui compact menu" role="navigation" aria-label="pager">)
@@ -40,11 +40,11 @@ class Pagy
                         : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
       html << %(</div>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
-    Pagy.deprecate self, :pagy_nav_compact_semantic, :pagy_semantic_compact_nav
+    deprecate :pagy_nav_compact_semantic, :pagy_semantic_compact_nav
 
     # Responsive pagination for semantic: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_semantic_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
+    def pagy_semantic_responsive_nav(pagy, id=pagy_id)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
@@ -60,7 +60,7 @@ class Pagy
       script = pagy_json_tag(:responsive, id, tags,  responsive[:widths], responsive[:series])
       %(<div id="#{id}" class="pagy-nav-responsive-semantic pagy-semantic-responsive-nav ui pagination menu" role="navigation" aria-label="pager"></div>#{script})
     end
-    Pagy.deprecate self, :pagy_nav_responsive_semantic, :pagy_semantic_responsive_nav
+    deprecate :pagy_nav_responsive_semantic, :pagy_semantic_responsive_nav
 
   end
 end

data/lib/pagy/extras/shared.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'digest'
 
 class Pagy
 
@@ -27,19 +28,24 @@ class Pagy
     end
   end
 
-  def self.deprecate(mod, old_meth, new_meth)
-    mod.send(:define_method, old_meth) do |pagy, id=caller(1,1)[0].hash.to_s|
-      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"
-      mod.instance_method(new_meth).arity == 1 ? send(new_meth, pagy) : send(new_meth, pagy, id)
-    end
-  end
-
   module Frontend
 
     def pagy_json_tag(*args)
       %(<script type="application/json" class="pagy-json">#{args.to_json}</script>)
     end
 
+    def pagy_id
+      # SHA1 is the fastest on modern ruby
+      "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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: '1.3'
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-01-15 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,
@@ -23,12 +23,14 @@ files:
 - LICENSE.txt
 - lib/config/pagy.rb
 - lib/javascripts/pagy.js
+- lib/locales/README.md
 - lib/locales/de.yml
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/locales/id.yml
 - 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