plain.rb in pagy-1.3

- old
+ new

@@ -9,11 +9,11 @@
     # added alias for symmetry
     alias :pagy_plain_nav :pagy_nav
 
     # 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">)
         html << link.call(MARKER, '', %(style="display: none;" ))
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
@@ -23,15 +23,15 @@
         html << %(<span class="pagy-compact-input" style="margin: 0 0.6rem;">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</span> )
         html << (p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
                         : %(<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> )
                                : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ))
       responsive[:items].each do |item|  # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
@@ -43,9 +43,9 @@
       tags['after'] = (p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
                               : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>))
       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