pagy 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc238e37f6ae65c1581b464c1ac3b2d3d96a1168aea4d05e6f4c093a6d2a574
-  data.tar.gz: a3cbe116d1279fce48a91ba0c78b1a59d22445fe37f17aff5660305c9b5dc0d2
+  metadata.gz: 388922f4fd6c86c42945097ef08078bfe351e8b61a380ef68c58c583509ee4ae
+  data.tar.gz: 775b71455d808039150ac6285a15c8fd9574609df2a43399f465d71fed853cff
 SHA512:
-  metadata.gz: a6c0979f616fd8cac7c20ef6f6242ddd8a1a1099fa6b2cf0b3678b180705bc2e74e8e25e29d761a0f497c99aa3120783661f73044dc35bea701ea97c637526c1
-  data.tar.gz: db8389ae56438687fb038915e4a7406d263797f05718fe22bad9b67ec3002f7befd7f21777a09d62023ed1fc1fa74ee50dc82619b685f79419fb9abcafd3e137
+  metadata.gz: a98e301538f52ebd068f137ff5bf7850ab713a28e8636b399753b8a70022d076885e3ac93216c7da255fb3d4269f8bd3c48990243e27db31ccc08f841af750b2
+  data.tar.gz: d22e17a6910d0e1dbc31f184a69a9dae63a25932c7d29d2f9dc1d291d9ed5fe58c641bba96ae9feea2e312cd06e478643705688916d8b26c3395937a7fe0442c

data/lib/config/pagy.rb

@@ -8,69 +8,74 @@
 
 # Backend Extras
 
-# Array: Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
+# Array extra: Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
 # See https://ddnexus.github.io/pagy/extras/array
 # require 'pagy/extras/array'
 
-# Countless: Paginate without any count, saving one query per rendering
+# Countless extra: Paginate without any count, saving one query per rendering
 # See https://ddnexus.github.io/pagy/extras/countless
 # require 'pagy/extras/countless'
+# Pagy::VARS[:cycle] = false    # default
 
-# Elasticsearch Rails: Paginate `ElasticsearchRails::Results` objects efficiently, avoiding expensive object-wrapping and without overriding.
+# Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects efficiently, avoiding expensive object-wrapping and without overriding.
 # See https://ddnexus.github.io/pagy/extras/elasticsearch_rails
 # require 'pagy/extras/elasticsearch_rails'
 
-# Searchkick: Paginate `Searchkick::Results` objects efficiently, avoiding expensive object-wrapping and without overriding.
+# Searchkick extra: Paginate `Searchkick::Results` objects efficiently, avoiding expensive object-wrapping and without overriding.
 # See https://ddnexus.github.io/pagy/extras/searchkick
 # require 'pagy/extras/searchkick'
 
 
 # Frontend Extras
 
-# Navs: Add responsive and compact generic/unstyled nav helpers
-# Notice: the other frontend extras add their own framework-styled versions,
-# so require this extra only if you need the plain unstyled version
-# See https://ddnexus.github.io/pagy/extras/navs
-# require 'pagy/extras/navs'
-
-# Bootstrap: Nav, responsive and compact helpers and templates for Bootstrap pagination
+# Bootstrap extra: Add nav, responsive and compact helpers and templates for Bootstrap pagination
 # See https://ddnexus.github.io/pagy/extras/bootstrap
 # require 'pagy/extras/bootstrap'
 
-# Bulma: Nav, responsive and compact helpers and templates for Bulma pagination
+# Bulma extra: Add nav, responsive and compact helpers and templates for Bulma pagination
 # See https://ddnexus.github.io/pagy/extras/bulma
 # require 'pagy/extras/bulma'
 
-# Foundation: Nav, responsive and compact helpers and templates for Foundation pagination
+# Foundation extra: Add nav, responsive and compact helpers and templates for Foundation pagination
 # See https://ddnexus.github.io/pagy/extras/foundation
 # require 'pagy/extras/foundation'
 
-# Materialize: Nav, responsive and compact helpers for Materialize pagination
+# Materialize extra: Nav, responsive and compact helpers for Materialize pagination
 # See https://ddnexus.github.io/pagy/extras/materialize
 # require 'pagy/extras/materialize'
 
-# Semantic: Nav, responsive and compact helpers for Semantic UI pagination
+# Plain extra: Add responsive and compact nav plain helpers
+# Notice: the other frontend extras add their own framework-styled versions,
+# so require this extra only if you need the plain unstyled version
+# See https://ddnexus.github.io/pagy/extras/plain
+# require 'pagy/extras/plain'
+
+# Semantic extra: Nav, responsive and compact helpers for Semantic UI pagination
 # See https://ddnexus.github.io/pagy/extras/semantic
 # require 'pagy/extras/semantic'
 
 # Breakpoints var used by the responsive nav helpers
-# See https://ddnexus.github.io/pagy/extras/navs#breakpoints
+# See https://ddnexus.github.io/pagy/extras/plain#breakpoints
 # Pagy::VARS[:breakpoints] = { 0 => [1,2,2,1], 350 => [2,3,3,2], 550 => [3,4,4,3] }    # example of width/size pairs
 
 
 # Feature Extras
 
-# Items: Allow the client to request a custom number of items per page with an optional selector UI
+# Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination
+# See https://ddnexus.github.io/pagy/extras/support
+# require 'pagy/extras/support'
+
+# Items extra: Allow the client to request a custom number of items per page with an optional selector UI
 # See https://ddnexus.github.io/pagy/extras/items
 # require 'pagy/extras/items'
 # Pagy::VARS[:items_param] = :items    # default
 # Pagy::VARS[:max_items]   = 100       # default
 
-# Overflow: Allow for easy handling of overflowing pages
+# Overflow extra: Allow for easy handling of overflowing pages
 # See https://ddnexus.github.io/pagy/extras/overflow
 # Pagy::VARS[:overflow] = :last_page    # default  (other options: :empty_page and :exception)
 
-# Trim: Remove the page=1 param from links
+# Trim extra: Remove the page=1 param from links
 # See https://ddnexus.github.io/pagy/extras/trim
 # require 'pagy/extras/trim'
 
@@ -106,7 +111,7 @@
 
 # I18n
 
-# I18n: faster internal pagy implementation (does not use the I18n gem)
+# I18n faster internal pagy implementation (does not use the I18n gem)
 # Use only for single language apps that don't need dynamic translation between multiple languages
 # See https://ddnexus.github.io/pagy/api/frontend#i18n
 # Notice: Do not use any of the following lines if you use the i18n extra below
@@ -114,7 +119,7 @@
 # Pagy::Frontend::I18N.load(file:'path/to/dictionary.yml', language:'en')            # load a custom 'en' file
 # Pagy::Frontend::I18N[:plural] = -> (count) {(['zero', 'one'][count] || 'other')}   # default
 
-# I18n: Use the `I18n` gem instead of the pagy implementation
+# I18n extra: Use the `I18n` gem instead of the pagy implementation
 # (slower but allows dynamic translation between multiple languages)
 # See https://ddnexus.github.io/pagy/extras/i18n
 # require 'pagy/extras/i18n'

data/lib/javascripts/pagy.js

@@ -14,28 +14,28 @@ Pagy.addInputEventListeners = function(input, handler){
                               };
 
 Pagy.compact = function(id, marker, page, trim){
-                 var pagyNav = document.getElementById('pagy-nav-'+id),
-                     input   = pagyNav.getElementsByTagName('input')[0],
-                     link    = pagyNav.getElementsByTagName('a')[0],
-                     linkP1  = pagyNav.getElementsByTagName('a')[1],
-                     go      = function(){
-                                 if (page !== input.value) {
-                                   if (trim === true && input.value === '1') { linkP1.click() }
-                                   else {
-                                     var href = link.getAttribute('href').replace(marker, input.value);
-                                     link.setAttribute('href', href);
-                                     link.click();
-                                   }
-                                 }
-                               };
+                 var pagyEl = document.getElementById(id),
+                     input  = pagyEl.getElementsByTagName('input')[0],
+                     link   = pagyEl.getElementsByTagName('a')[0],
+                     linkP1 = pagyEl.getElementsByTagName('a')[1],
+                     go     = function(){
+                                if (page !== input.value) {
+                                  if (trim === true && input.value === '1') { linkP1.click() }
+                                  else {
+                                    var href = link.getAttribute('href').replace(marker, input.value);
+                                    link.setAttribute('href', href);
+                                    link.click();
+                                  }
+                                }
+                              };
                  Pagy.addInputEventListeners(input, go);
                };
 
 Pagy.items = function(id, marker, from){
-               var pagyNav = document.getElementById('pagy-items-'+id),
-                   input   = pagyNav.getElementsByTagName('input')[0],
+               var pagyEl  = document.getElementById(id),
+                   input   = pagyEl.getElementsByTagName('input')[0],
                    current = input.value,
-                   link    = pagyNav.getElementsByTagName('a')[0],
+                   link    = pagyEl.getElementsByTagName('a')[0],
                    go      = function(){
                                var items = input.value;
                                if (current !== items) {
@@ -49,18 +49,18 @@ Pagy.items = function(id, marker, from){
              };
 
 Pagy.responsive = function(id, tags, widths, series){
-                    var pagyNav    = document.getElementById('pagy-nav-'+id),
-                        pagyParent = pagyNav.parentElement,
+                    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 (pagyNav.firstChild) { pagyNav.removeChild(pagyNav.firstChild) }
+                                         while (pagyEl.firstChild) { pagyEl.removeChild(pagyEl.firstChild) }
                                          var html = tags['before'];
                                          series[width].forEach(function(item){html += tags[item]});
                                          html += tags['after'];
-                                         pagyNav.insertAdjacentHTML('beforeend', html);
+                                         pagyEl.insertAdjacentHTML('beforeend', html);
                                          lastWidth = width;
                                        }
                                      }.bind(this);
@@ -73,6 +73,12 @@ 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[args.shift()].apply(null, args);
+              }
+              // Support for legacy overridden helpers. It will be removed in 2.0
               ['compact', 'items', 'responsive'].forEach(function(name){
                 var json = document.getElementsByClassName("pagy-"+name+"-json");
                 for (var i = 0, len = json.length; i < len; i++) {
@@ -80,3 +86,7 @@ Pagy.init = function(){
                 }
               })
             };
+
+function PagyInit(){}
+
+Pagy.applyInit = function(name, payload){ PagyInit[name].apply(null, [payload]) };

data/lib/pagy.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '1.1.0'
+class Pagy ; VERSION = '1.2.0'
 
   class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 
@@ -11,7 +11,7 @@ class Pagy ; VERSION = '1.1.0'
   def self.root; Pathname.new(__FILE__).dirname end
 
   # default vars
-  VARS = { page:1, items:20, outset:0, size:[1,4,4,1], page_param: :page, params:{}, anchor:'', link_extra:'', item_path:'pagy.info.item_name' }
+  VARS = { page:1, items:20, outset:0, size:[1,4,4,1], page_param: :page, params:{}, anchor:'', link_extra:'', item_path:'pagy.info.item_name', cycle: false }
 
   attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :from, :to, :prev, :next
 
@@ -29,7 +29,7 @@ class Pagy ; VERSION = '1.1.0'
     @from   = @count == 0 ? 0 : @offset+1 - @outset                            # page begins from item
     @to     = @count == 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, 1 if :cycle
   end
 
   # Return the array of page numbers and :gap items e.g. [1, :gap, 7, 8, "9", 10, 11, :gap, 36]

data/lib/pagy/countless.rb

@@ -23,6 +23,7 @@ class Pagy
       @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
       self
     end
 

data/lib/pagy/extras/bootstrap.rb

@@ -7,7 +7,7 @@ class Pagy
   module Frontend
 
     # Pagination for bootstrap: it returns the html with the series of links to the pages
-    def pagy_nav_bootstrap(pagy)
+    def pagy_bootstrap_nav(pagy)
       html, link, p_prev, p_next = +'', pagy_link_proc(pagy, 'class="page-link"'), pagy.prev, pagy.next
 
       html << (p_prev ? %(<li class="page-item prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
@@ -20,15 +20,16 @@ class Pagy
       end
       html << (p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
                       : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
-      %(<nav class="pagy-nav-bootstrap pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></nav>)
+      %(<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
 
     # 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_nav_compact_bootstrap(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 pagination" role="navigation" aria-label="pager">)
+      html << %(<nav id="#{id}" class="pagy-nav-compact-bootstrap pagy-bootstrap-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)
         html << %(<div class="btn-group" role="group">)
@@ -38,12 +39,13 @@ class Pagy
         html << %(<div class="pagy-compact-input btn btn-primary disabled">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
         html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"')
                         : %(<a class="next btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
-      html << %(</div></nav><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)
+      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
 
     # Responsive pagination for bootstrap: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_nav_responsive_bootstrap(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">'
@@ -58,9 +60,10 @@ class Pagy
       tags['after'] = +(p_next ? %(<li class="page-item next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
                                : %(<li class="page-item next disabled"><a href="#" class="page-link">#{pagy_t('pagy.nav.next')}</a></li>))
       tags['after'] << '</ul>'
-      script = %(<script type="application/json" class="pagy-responsive-json">["#{id}", #{tags.to_json},  #{responsive[:widths].to_json}, #{responsive[:series].to_json}]</script>)
-      %(<nav id="pagy-nav-#{id}" class="pagy-nav-responsive-bootstrap pagination" role="navigation" aria-label="pager"></nav>#{script})
+      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
 
   end
 end

data/lib/pagy/extras/bulma.rb

@@ -7,7 +7,7 @@ class Pagy
   module Frontend
 
     # Pagination for Bulma: it returns the html with the series of links to the pages
-    def pagy_nav_bulma(pagy)
+    def pagy_bulma_nav(pagy)
       html, link, p_prev, p_next = +'', pagy_link_proc(pagy), pagy.prev, pagy.next
 
       html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="pagination-previous" aria-label="previous page"')
@@ -22,15 +22,16 @@ class Pagy
                 end
       end
       html << '</ul>'
-      %(<nav class="pagy-nav-bulma pagination is-centered" role="navigation" aria-label="pagination">#{html}</nav>)
+      %(<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
 
     # 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_nav_compact_bulma(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" role="navigation" aria-label="pagination">)
+      html << %(<nav id="#{id}" class="pagy-nav-compact-bulma pagy-bulma-compact-nav" role="navigation" aria-label="pagination">)
         html << link.call(MARKER, '', 'style="display: none;"')
         (html << link.call(1, '', %(style="display: none;"))) if defined?(TRIM)
         html << %(<div class="field is-grouped is-grouped-centered" role="group">)
@@ -40,12 +41,13 @@ class Pagy
         html << %(<div class="pagy-compact-input control level is-mobile">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
         html << (p_next ? %(<p class="control">#{link.call(p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"')}</p>)
                         : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.next')}</a></p>))
-      html << %(</div></nav><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)
+      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
 
     # Responsive pagination for Bulma: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_nav_responsive_bulma(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"')
@@ -60,9 +62,10 @@ class Pagy
                           end
       end
       tags['after'] = '</ul>'
-      script = %(<script type="application/json" class="pagy-responsive-json">["#{id}", #{tags.to_json},  #{responsive[:widths].to_json}, #{responsive[:series].to_json}]</script>)
-      %(<nav id="pagy-nav-#{id}" class="pagy-nav-bulma pagination is-centered" role="navigation" aria-label="pagination"></nav>#{script})
+      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
 
   end
 end

data/lib/pagy/extras/foundation.rb

@@ -7,7 +7,7 @@ class Pagy
   module Frontend
 
     # Pagination for Foundation: it returns the html with the series of links to the pages
-    def pagy_nav_foundation(pagy)
+    def pagy_foundation_nav(pagy)
       html, link, p_prev, p_next = +'', pagy_link_proc(pagy), pagy.prev, pagy.next
 
       html << (p_prev ? %(<li class="prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
@@ -20,15 +20,16 @@ class Pagy
       end
       html << (p_next ? %(<li class="next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
                       : %(<li class="next disabled">#{pagy_t('pagy.nav.next')}</li>))
-      %(<nav class="pagy-nav-foundation" role="navigation" aria-label="Pagination"><ul class="pagination">#{html}</ul></nav>)
+      %(<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
 
     # 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_nav_compact_foundation(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" role="navigation" aria-label="Pagination">)
+      html << %(<nav id="#{id}" class="pagy-nav-compact-foundation pagy-foundation-compact-nav" role="navigation" aria-label="Pagination">)
         html << link.call(MARKER, '', %(style="display: none;" ))
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
         html << %(<div class="input-group">)
@@ -38,12 +39,13 @@ class Pagy
         html << %(<span class="input-group-label">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</span>)
         html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0px;" aria-label="next" class="next button primary"')
                         : %(<a style="margin-bottom: 0px;" class="next button primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
-      html << %(</div></nav><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)
+      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
 
     # Responsive pagination for Foundation: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_nav_responsive_foundation(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">'
@@ -58,9 +60,10 @@ class Pagy
       tags['after'] = +(p_next ? %(<li class="next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
                                : %(<li class="next disabled">#{pagy_t('pagy.nav.next')}</li>))
       tags['after'] << '</ul>'
-      script = %(<script type="application/json" class="pagy-responsive-json">["#{id}", #{tags.to_json},  #{responsive[:widths].to_json}, #{responsive[:series].to_json}]</script>)
-      %(<nav id="pagy-nav-#{id}" class="pagy-nav-responsive-foundation" aria-label="Pagination"></nav>#{script})
+      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
 
   end
 end

data/lib/pagy/extras/items.rb

@@ -1,6 +1,8 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/items
 # frozen_string_literal: true
 
+require 'pagy/extras/shared'
+
 class Pagy
 
   # Default variables for this extra
@@ -44,14 +46,14 @@ 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)
+    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}">)
+      html = +%(<span id="#{id}">)
         html << %(<a href="#{pagy_url_for("#{MARKER}-page-", pagy)}"></a>)
         input = %(<input type="number" min="1" max="#{p_vars[:max_items]}" value="#{p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length+1}rem;">)
         html << %(#{pagy_t('pagy.items', items_input: input, count: p_items)})
-      html << %(</span><script type="application/json" class="pagy-items-json">["#{id}", "#{MARKER}", #{pagy.from}]</script>)
+      html << %(</span>#{pagy_json_tag(:items, id, MARKER, pagy.from)})
     end
 
   end

data/lib/pagy/extras/materialize.rb

@@ -7,7 +7,7 @@ class Pagy
   module Frontend
 
     # Pagination for materialize: it returns the html with the series of links to the pages
-    def pagy_nav_materialize(pagy)
+    def pagy_materialize_nav(pagy)
       html, link, p_prev, p_next = +'', pagy_link_proc(pagy), pagy.prev, pagy.next
       html << (p_prev ? %(<li class="waves-effect prev">#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
                       : %(<li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li>))
@@ -19,15 +19,16 @@ class Pagy
       end
       html << (p_next ? %(<li class="waves-effect next">#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
                       : %(<li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li>))
-      %(<div class="pagy-nav-materialize pagination" role="navigation" aria-label="pager"><ul class="pagination">#{html}</ul></div>)
+      %(<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
 
     # 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_nav_compact_materialize(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 pagination" role="navigation" aria-label="pager">)
+      html << %(<div id="#{id}" class="pagy-nav-compact-materialize pagy-materialize-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)
       html << %(<div class="pagy-compact-chip role="group" style="height: 35px; border-radius: 18px; background: #e4e4e4; display: inline-block;">)
@@ -39,12 +40,13 @@ class Pagy
       html << %(<div class="pagy-compact-input btn-flat" style="cursor: default; padding: 0px">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
       html << (p_next ? %(<li class="waves-effect next" #{li_style}>#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
                : %(<li class="next disabled" #{li_style}><a href="#"><i class="material-icons">chevron_right</i></a></li>))
-      html << %(</ul></div><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)
+      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
 
     # Responsive pagination for Materialize: it returns the html with the series of links to the pages
     # rendered by the Pagy.responsive javascript
-    def pagy_nav_responsive_materialize(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">'
@@ -59,9 +61,10 @@ class Pagy
       tags['after'] = +(p_next ? %(<li class="waves-effect next">#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
                                : %(<li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li>))
       tags['after'] << '</ul>'
-      script = %(<script type="application/json" class="pagy-responsive-json">["#{id}", #{tags.to_json},  #{responsive[:widths].to_json}, #{responsive[:series].to_json}]</script>)
-      %(<div id="pagy-nav-#{id}" class="pagy-nav-responsive-materialize pagination" role="navigation" aria-label="pager"></div>#{script})
+      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
 
   end
 end

data/lib/pagy/extras/navs.rb

@@ -1,46 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/navs
-# frozen_string_literal: true
+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/shared'
+require 'pagy/extras/plain'
 
-class Pagy
-  module Frontend
-
-    # Generic 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_nav_compact(pagy, id=caller(1,1)[0].hash)
-      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 pagination" role="navigation" aria-label="pager">)
-        html << link.call(MARKER, '', %(style="display: none;" ))
-        (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
-        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> ))
-        input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-        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><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)
-    end
-
-    # Generic responsive pagination: it returns the html with the series of links to the pages
-    # rendered by the Pagy.responsive javascript
-    def pagy_nav_responsive(pagy, id=caller(1,1)[0].hash)
-      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]
-        tags[item.to_s] = 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
-                          elsif item == :gap       ; %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> ) # page gap
-                          end
-      end
-      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 = %(<script type="application/json" class="pagy-responsive-json">["#{id}", #{tags.to_json},  #{responsive[:widths].to_json}, #{responsive[:series].to_json}]</script>)
-      %(<nav id="pagy-nav-#{id}" class="pagy-nav-responsive pagination" role="navigation" aria-label="pager"></nav>#{script})
-    end
-
-  end
-end

data/lib/pagy/extras/plain.rb

@@ -0,0 +1,51 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/plain
+# frozen_string_literal: true
+
+require 'pagy/extras/shared'
+
+class Pagy
+  module Frontend
+
+    # 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)
+      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)
+        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> ))
+        input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
+        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
+
+    # 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)
+      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]
+        tags[item.to_s] = 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
+                          elsif item == :gap       ; %(<span class="page gap">#{pagy_t('pagy.nav.gap')}</span> ) # page gap
+                          end
+      end
+      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
+
+  end
+end

data/lib/pagy/extras/semantic.rb

@@ -7,7 +7,7 @@ class Pagy
   module Frontend
 
     # Pagination for semantic-ui: it returns the html with the series of links to the pages
-    def pagy_nav_semantic(pagy)
+    def pagy_semantic_nav(pagy)
       html, link, p_prev, p_next = +'', pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
 
       html << (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
@@ -20,15 +20,16 @@ class Pagy
       end
       html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
                       : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      %(<div class="ui pagination menu" aria-label="pager">#{html}</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
 
     # 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_nav_compact_semantic(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 ui compact menu" role="navigation" aria-label="pager">)
+      html << %(<div id="#{id}" class="pagy-nav-compact-semantic pagy-semantic-compact-nav ui compact menu" role="navigation" aria-label="pager">)
         html << link.call(MARKER, '', %(style="display: none;" ))
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
         html << (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
@@ -37,12 +38,13 @@ class Pagy
         html << %(<div class="pagy-compact-input item">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div> )
         html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
                         : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      html << %(</div><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)
+      html << %(</div>#{pagy_json_tag(:compact, id, MARKER, p_page, !!defined?(TRIM))})
     end
+    Pagy.deprecate self, :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_nav_responsive_semantic(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"'})
@@ -55,9 +57,10 @@ class Pagy
       end
       tags['after'] = (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
                               : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      script = %(<script type="application/json" class="pagy-responsive-json">["#{id}", #{tags.to_json},  #{responsive[:widths].to_json}, #{responsive[:series].to_json}]</script>)
-      %(<div id="pagy-nav-#{id}" class="pagy-nav-responsive-semantic ui pagination menu" role="navigation" aria-label="pager"></div>#{script})
+      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
 
   end
 end

data/lib/pagy/extras/shared.rb

@@ -27,4 +27,19 @@ 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
+
+  end
+
 end

data/lib/pagy/extras/support.rb

@@ -0,0 +1,54 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/support
+# frozen_string_literal: true
+
+require 'pagy/extras/shared'
+
+class Pagy
+
+  def to_h
+    { count:  @count,
+      page:   @page,
+      items:  @items,
+      pages:  @pages,
+      last:   @last,
+      offset: @offset,
+      from:   @from,
+      to:     @to,
+      prev:   @prev,
+      next:   @next,
+      vars:   @vars,
+      series: series }
+  end
+
+  module Frontend
+
+    def pagy_prev_url(pagy)
+      pagy_url_for(pagy.prev, pagy) if pagy.prev
+    end
+
+    def pagy_next_url(pagy)
+      pagy_url_for(pagy.next, pagy) if pagy.next
+    end
+
+    def pagy_prev_link(pagy, text = pagy_t('pagy.nav.prev'), link_extra = '')
+      pagy.prev ? %(<span class="page prev"><a href="#{pagy_prev_url(pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+                : %(<span class="page prev disabled">#{text}</span>)
+    end
+
+    def pagy_next_link(pagy, text = pagy_t('pagy.nav.next'), link_extra = '')
+      pagy.next ? %(<span class="page next"><a href="#{pagy_next_url(pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
+                : %(<span class="page next disabled">#{text}</span>)
+    end
+
+    def pagy_serialized(pagy)
+      pagy.to_h.merge(prev_url: pagy_prev_url(pagy), next_url: pagy_next_url(pagy))
+    end
+
+    # Multi purpose JSON tag for custom javascript initialization
+    def pagy_apply_init_tag(pagy, function, payload=pagy_serialized(pagy))
+      pagy_json_tag(:applyInit, function, payload)
+    end
+
+  end
+
+end

data/lib/templates/{nav_bootstrap.html.erb → 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 pagination" role="navigation">
+<%#                            -%><nav aria-label="pager"  class="pagy-nav-bootstrap 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/{nav_bootstrap.html.haml → bootstrap_nav.html.haml}

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy, 'class="page-link"')
 
-%nav.pagy-nav-bootstrap.pagination{"aria-label" => "pager", :role => "navigation"}
+%nav.pagy-nav-bootstrap.pagy-bootstrap-nav.pagination{"aria-label" => "pager", :role => "navigation"}
 
   %ul.pagination
 

data/lib/templates/{nav_bootstrap.html.slim → bootstrap_nav.html.slim}

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy, 'class="page-link"')
 
-nav.pagy-nav-bootstrap.pagination role="navigation" aria-label="pager"
+nav.pagy-nav-bootstrap.pagy-bootstrap-nav.pagination role="navigation" aria-label="pager"
 
   ul.pagination
 

data/lib/templates/{nav_bulma.html.erb → 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 pagination is-centered" role="navigation" aria-label="pagination">
+<%#                            -%><nav class="pagy-nav-bulma 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/{nav_bulma.html.haml → bulma_nav.html.haml}

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-%nav.pagy-nav-bulma.pagination.is-centered{:role => "navigation", "aria-label" => "pagination"}
+%nav.pagy-nav-bulma.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/{nav_bulma.html.slim → bulma_nav.html.slim}

@@ -6,7 +6,7 @@
 
 - link = pagy_link_proc(pagy)
 
-nav.pagy-nav-bulma.pagination.is-centered role="navigation" aria-label="pagination"
+nav.pagy-nav-bulma.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/{nav_foundation.html.erb → 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" role="navigation" aria-label="Pagination">
+<%#                            -%><nav class="pagy-nav-foundation 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/{nav_foundation.html.haml → foundation_nav.html.haml}

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

data/lib/templates/{nav_foundation.html.slim → foundation_nav.html.slim}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-12-03 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,
@@ -48,23 +48,25 @@ files:
 - lib/pagy/extras/materialize.rb
 - lib/pagy/extras/navs.rb
 - lib/pagy/extras/overflow.rb
+- lib/pagy/extras/plain.rb
 - lib/pagy/extras/searchkick.rb
 - lib/pagy/extras/semantic.rb
 - lib/pagy/extras/shared.rb
+- lib/pagy/extras/support.rb
 - lib/pagy/extras/trim.rb
 - lib/pagy/frontend.rb
+- lib/templates/bootstrap_nav.html.erb
+- lib/templates/bootstrap_nav.html.haml
+- lib/templates/bootstrap_nav.html.slim
+- lib/templates/bulma_nav.html.erb
+- lib/templates/bulma_nav.html.haml
+- lib/templates/bulma_nav.html.slim
+- lib/templates/foundation_nav.html.erb
+- lib/templates/foundation_nav.html.haml
+- lib/templates/foundation_nav.html.slim
 - lib/templates/nav.html.erb
 - lib/templates/nav.html.haml
 - lib/templates/nav.html.slim
-- lib/templates/nav_bootstrap.html.erb
-- lib/templates/nav_bootstrap.html.haml
-- lib/templates/nav_bootstrap.html.slim
-- lib/templates/nav_bulma.html.erb
-- lib/templates/nav_bulma.html.haml
-- lib/templates/nav_bulma.html.slim
-- lib/templates/nav_foundation.html.erb
-- lib/templates/nav_foundation.html.haml
-- lib/templates/nav_foundation.html.slim
 - pagy.gemspec
 homepage: https://github.com/ddnexus/pagy
 licenses: