lib/pagy/extras/materialize.rb in pagy-4.11.0 vs lib/pagy/extras/materialize.rb in pagy-5.0.0

@@ -2,12 +2,11 @@
 # frozen_string_literal: true
 
 require 'pagy/extras/shared'
 
 class Pagy
-  module Frontend
-
+  module MaterializeExtra
     # Pagination for materialize: it returns the html with the series of links to the pages
     def pagy_materialize_nav(pagy, pagy_id: nil, link_extra: '')
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
 
@@ -23,60 +22,59 @@
       html << pagy_materialize_next_html(pagy, link)
       html << %(</ul></div>)
     end
 
     # Javascript pagination for materialize: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_materialize_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '', steps: nil)
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_materialize_nav_js(pagy, pagy_id: nil, link_extra: '', steps: nil)
       p_id = %( id="#{pagy_id}") if pagy_id
       link = pagy_link_proc(pagy, link_extra: link_extra)
 
       tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html pagy, link}),
                'link'   => %(<li class="waves-effect">#{mark = link.call(PAGE_PLACEHOLDER)}</li>),
                'active' => %(<li class="active">#{mark}</li>),
                'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
                'after'  => %(#{pagy_materialize_next_html pagy, link}</ul>) }
 
-      %(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" #{pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></div>)
+      %(<div#{p_id} class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" #{
+          pagy_json_attr(pagy, :nav, tags, pagy.sequels(steps))}></div>)
     end
 
     # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_materialize_combo_nav_js(pagy, deprecated_id=nil, pagy_id: nil, link_extra: '')
-      pagy_id = Pagy.deprecated_arg(:id, deprecated_id, :pagy_id, pagy_id) if deprecated_id
+    def pagy_materialize_combo_nav_js(pagy, pagy_id: nil, link_extra: '')
       p_id    = %( id="#{pagy_id}") if pagy_id
       link    = pagy_link_proc(pagy, link_extra: link_extra)
       p_page  = pagy.page
       p_pages = pagy.pages
       style   = ' style="vertical-align: middle"'
-      input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+      input   = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{
+                    p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
 
-      %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation" aria-label="pager" style="padding-right: 0" #{
-          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)
-      }>#{
-          pagy_materialize_prev_html pagy, link, style
-      }<li class="pagy-combo-input">#{
-          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-      }</li>#{
-          pagy_materialize_next_html pagy, link, style
-      }</ul>)
+      html = %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation")
+      %(#{html} aria-label="pager" style="padding-right: 0" #{
+          pagy_json_attr pagy, :combo_nav, p_page, pagy_marked_link(link)}>#{
+          pagy_materialize_prev_html pagy, link, style}<li class="pagy-combo-input">#{
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</li>#{
+          pagy_materialize_next_html pagy, link, style}</ul>)
     end
 
     private
 
-      def pagy_materialize_prev_html(pagy, link, style='')
-        if (p_prev = pagy.prev)
-          %(<li class="waves-effect prev"#{style}>#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
-        else
-          %(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
-        end
+    def pagy_materialize_prev_html(pagy, link, style = '')
+      if (p_prev = pagy.prev)
+        %(<li class="waves-effect prev"#{style}>#{
+            link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
+      else
+        %(<li class="prev disabled"#{style}><a href="#"><i class="material-icons">chevron_left</i></a></li>)
       end
+    end
 
-      def pagy_materialize_next_html(pagy, link, style='')
-        if (p_next = pagy.next)
-          %(<li class="waves-effect next"#{style}>#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
-        else
-          %(<li class="next disabled"#{style}><a href="#"><i class="material-icons">chevron_right</i></a></li>)
-        end
+    def pagy_materialize_next_html(pagy, link, style = '')
+      if (p_next = pagy.next)
+        %(<li class="waves-effect next"#{style}>#{
+            link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
+      else
+        %(<li class="next disabled"#{style}><a href="#"><i class="material-icons">chevron_right</i></a></li>)
       end
-
+    end
   end
+  Frontend.prepend MaterializeExtra
 end