automatic ids based on hash must be strings

ddnexus · Dec 1, 2018 · 98ce8e7 · 98ce8e7
1 parent e2ea5b6
commit 98ce8e7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/lib/pagy/extras/bootstrap.rb b/lib/pagy/extras/bootstrap.rb
@@ -26,7 +26,7 @@ def pagy_bootstrap_nav(pagy)
 
     # 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)
+    def pagy_bootstrap_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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="pagy-nav-#{id}" class="pagy-nav-compact-bootstrap pagy-bootstrap-compact-nav pagination" role="navigation" aria-label="pager">)
@@ -45,7 +45,7 @@ def pagy_bootstrap_compact_nav(pagy, id=caller(1,1)[0].hash)
 
     # 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)
+    def pagy_bootstrap_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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">'

diff --git a/lib/pagy/extras/bulma.rb b/lib/pagy/extras/bulma.rb
@@ -28,7 +28,7 @@ def pagy_bulma_nav(pagy)
 
     # 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)
+    def pagy_bulma_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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="pagy-nav-#{id}" class="pagy-nav-compact-bulma pagy-bulma-compact-nav" role="navigation" aria-label="pagination">)
@@ -47,7 +47,7 @@ def pagy_bulma_compact_nav(pagy, id=caller(1,1)[0].hash)
 
     # 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)
+    def pagy_bulma_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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"')

diff --git a/lib/pagy/extras/foundation.rb b/lib/pagy/extras/foundation.rb
@@ -26,7 +26,7 @@ def pagy_foundation_nav(pagy)
 
     # 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)
+    def pagy_foundation_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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="pagy-nav-#{id}" class="pagy-nav-compact-foundation pagy-foundation-compact-nav" role="navigation" aria-label="Pagination">)
@@ -45,7 +45,7 @@ def pagy_foundation_compact_nav(pagy, id=caller(1,1)[0].hash)
 
     # 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)
+    def pagy_foundation_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = +'<ul class="pagination">'

diff --git a/lib/pagy/extras/items.rb b/lib/pagy/extras/items.rb
@@ -44,7 +44,7 @@ def pagy_url_for_with_items(page, 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)
+    def pagy_items_selector(pagy, id=caller(1,1)[0].hash.to_s)
       pagy = pagy.clone; p_vars = pagy.vars; p_items = p_vars[:items]; p_vars[:items] = "#{MARKER}-items-"
 
       html = +%(<span id="pagy-items-#{id}">)

diff --git a/lib/pagy/extras/materialize.rb b/lib/pagy/extras/materialize.rb
@@ -25,7 +25,7 @@ def pagy_materialize_nav(pagy)
 
     # 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)
+    def pagy_materialize_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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="pagy-nav-#{id}" class="pagy-nav-compact-materialize pagy-materialize-compact-nav pagination" role="navigation" aria-label="pager">)
@@ -46,7 +46,7 @@ def pagy_materialize_compact_nav(pagy, id=caller(1,1)[0].hash)
 
     # 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)
+    def pagy_materialize_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
       tags, link, p_prev, p_next, responsive = {}, pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.responsive
 
       tags['before'] = +'<ul class="pagination">'

diff --git a/lib/pagy/extras/plain.rb b/lib/pagy/extras/plain.rb
@@ -11,7 +11,7 @@ module Frontend
 
     # 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)
+    def pagy_plain_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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="pagy-nav-#{id}" class="pagy-nav-compact pagy-plain-compact-nav pagination" role="navigation" aria-label="pager">)
@@ -29,7 +29,7 @@ def pagy_plain_compact_nav(pagy, id=caller(1,1)[0].hash)
 
     # 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)
+    def pagy_plain_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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> )

diff --git a/lib/pagy/extras/semantic.rb b/lib/pagy/extras/semantic.rb
@@ -26,7 +26,7 @@ def pagy_semantic_nav(pagy)
 
     # 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)
+    def pagy_semantic_compact_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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="pagy-nav-#{id}" class="pagy-nav-compact-semantic pagy-semantic-compact-nav ui compact menu" role="navigation" aria-label="pager">)
@@ -44,7 +44,7 @@ def pagy_semantic_compact_nav(pagy, id=caller(1,1)[0].hash)
 
     # 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)
+    def pagy_semantic_responsive_nav(pagy, id=caller(1,1)[0].hash.to_s)
       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"'})

diff --git a/lib/pagy/extras/shared.rb b/lib/pagy/extras/shared.rb
@@ -28,7 +28,7 @@ def responsive
   end
 
   def self.deprecate(mod, old_meth, new_meth)
-    mod.send(:define_method, old_meth) do |pagy, id=caller(1,1)[0].hash|
+    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