](https://github.com/ddnexus)[
](https://github.com/benkoshy)[
](https://github.com/dependabot[bot])[
](https://github.com/grosser)[
](https://github.com/workgena)[
](https://github.com/bquorning)[
](https://github.com/molfar)[
](https://github.com/sunny)[
](https://github.com/enzinia)[
](https://github.com/espen)[
](https://github.com/Earlopain)[
](https://github.com/berniechiu)[
](https://github.com/renshuki)[
](https://github.com/wimdavies)[
](https://github.com/tiagotex)[
](https://github.com/gamafranco)[
](https://github.com/thomasklemm)[
](https://github.com/tersor)[
](https://github.com/simonneutert)[
](https://github.com/rainerborene)[
](https://github.com/petergoldstein)[
](https://github.com/sabljak)[
](https://github.com/cseelus)[
](https://github.com/ashmaroli)[
](https://github.com/747)[
](https://github.com/WilliamHorel)[
](https://github.com/okuramasafumi)[
](https://github.com/olleolleolle)[
](https://github.com/pedrocarmona)[
](https://github.com/rafaeelaudibert)[
](https://github.com/rafaelmontas)[
](https://github.com/yenshirak)[
](https://github.com/Tolchi)[
](https://github.com/serghost)[
](https://github.com/sliminas)[
](https://github.com/artplan1)[
](https://github.com/woller)[
](https://github.com/sk8higher)[
](https://github.com/muhammadnawzad)[
](https://github.com/ronald)[
](https://github.com/achmiral)[
](https://github.com/mauro-ni)[
](https://github.com/borama)[
](https://github.com/creativetags)[
](https://github.com/mcary)[
](https://github.com/marckohlbrugge)[
](https://github.com/tr4b4nt)[
](https://github.com/tiejianluo)[
](https://github.com/szTheory)[
](https://github.com/smoothdvd)[
](https://github.com/rhodes-david)[
](https://github.com/radinreth)[
](https://github.com/okliv)[
](https://github.com/nedimdz)[
](https://github.com/msdundar)[
](https://github.com/m-abdurrehman)[
](https://github.com/dwieringa)[
](https://github.com/jyuvaraj03)[
](https://github.com/YutoYasunaga)[
](https://github.com/iamyujinwon)[
](https://github.com/yhk1038)[
](https://github.com/ya-s-u)[
](https://github.com/yshmarov)[
](https://github.com/thattimc)[
](https://github.com/thomaschauffour)[
](https://github.com/snkashis)[
](https://github.com/fluser)[
](https://github.com/tulak)[
](https://github.com/Federico-G)[
](https://github.com/egimenos)[
](https://github.com/elliotlarson)[
](https://github.com/hungdiep97)[
](https://github.com/djpremier)[
](https://github.com/davidwessman)[
](https://github.com/david-a-wheeler)[
](https://github.com/MrMoins)[
](https://github.com/excid3)[
](https://github.com/cellvinchung)[
](https://github.com/brunoocasali)[
](https://github.com/BrandonKlotz)[
](https://github.com/Atul9)[
](https://github.com/amenon)[
](https://github.com/artinboghosian)[
](https://github.com/antonzaharia)[
](https://github.com/andrew)[
](https://github.com/AliOsm)[
](https://github.com/AbelToy)[
](https://github.com/maful)[
](https://github.com/loed-idzinga)[
](https://github.com/epeirce)[
](https://github.com/kobusjoubert)[
](https://github.com/KevinColemanInc)[
](https://github.com/neontuna)[
](https://github.com/xuanxu)[
](https://github.com/jpgarritano)[
](https://github.com/archonic)[
](https://github.com/jonasMirendo)[
](https://github.com/lostapathy)[
](https://github.com/jivko-chobanov)[
](https://github.com/whithajess)
+[](https://github.com/ddnexus)[](https://github.com/benkoshy)[](https://github.com/dependabot[bot])[](https://github.com/grosser)[](https://github.com/Earlopain)[](https://github.com/workgena)[](https://github.com/bquorning)[](https://github.com/molfar)[](https://github.com/sunny)[](https://github.com/enzinia)[](https://github.com/espen)[](https://github.com/berniechiu)[](https://github.com/renshuki)[](https://github.com/wimdavies)[](https://github.com/tiagotex)[](https://github.com/gamafranco)[](https://github.com/thomasklemm)[](https://github.com/tersor)[](https://github.com/simonneutert)[](https://github.com/rainerborene)[](https://github.com/petergoldstein)[](https://github.com/sabljak)[](https://github.com/cseelus)[](https://github.com/ashmaroli)[](https://github.com/747)[](https://github.com/WilliamHorel)[](https://github.com/okuramasafumi)[](https://github.com/olleolleolle)[](https://github.com/pedrocarmona)[](https://github.com/rafaeelaudibert)[](https://github.com/rafaelmontas)[](https://github.com/yenshirak)[](https://github.com/Tolchi)[](https://github.com/serghost)[](https://github.com/sliminas)[](https://github.com/artplan1)[](https://github.com/woller)[](https://github.com/sk8higher)[](https://github.com/muhammadnawzad)[](https://github.com/ronald)[](https://github.com/achmiral)[](https://github.com/mauro-ni)[](https://github.com/borama)[](https://github.com/creativetags)[](https://github.com/mcary)[](https://github.com/marckohlbrugge)[](https://github.com/tr4b4nt)[](https://github.com/tiejianluo)[](https://github.com/szTheory)[](https://github.com/smoothdvd)[](https://github.com/rhodes-david)[](https://github.com/radinreth)[](https://github.com/okliv)[](https://github.com/nedimdz)[](https://github.com/msdundar)[](https://github.com/m-abdurrehman)[](https://github.com/dwieringa)[](https://github.com/jyuvaraj03)[](https://github.com/YutoYasunaga)[](https://github.com/iamyujinwon)[](https://github.com/yhk1038)[](https://github.com/ya-s-u)[](https://github.com/yshmarov)[](https://github.com/thattimc)[](https://github.com/thomaschauffour)[](https://github.com/snkashis)[](https://github.com/fluser)[](https://github.com/tulak)[](https://github.com/Federico-G)[](https://github.com/egimenos)[](https://github.com/elliotlarson)[](https://github.com/hungdiep97)[](https://github.com/djpremier)[](https://github.com/davidwessman)[](https://github.com/david-a-wheeler)[](https://github.com/MrMoins)[](https://github.com/excid3)[](https://github.com/cellvinchung)[](https://github.com/brunoocasali)[](https://github.com/BrandonKlotz)[](https://github.com/Atul9)[](https://github.com/amenon)[](https://github.com/artinboghosian)[](https://github.com/antonzaharia)[](https://github.com/andrew)[](https://github.com/AliOsm)[](https://github.com/AbelToy)[](https://github.com/maful)[](https://github.com/loed-idzinga)[](https://github.com/epeirce)[](https://github.com/kobusjoubert)[](https://github.com/KevinColemanInc)[](https://github.com/neontuna)[](https://github.com/xuanxu)[](https://github.com/jpgarritano)[](https://github.com/archonic)[](https://github.com/jonasMirendo)[](https://github.com/lostapathy)[](https://github.com/jivko-chobanov)[](https://github.com/whithajess)
diff --git a/Rakefile b/Rakefile index e31d448fd..4524943f8 100644 --- a/Rakefile +++ b/Rakefile @@ -2,5 +2,5 @@ Rake.add_rakelib 'tasks' -task default: %i[test rubocop check_coverage manifest:check] +task default: %i[rubocop test check_coverage] task test_cov: %i[test check_coverage] diff --git a/docs/api/javascript/setup.md b/docs/api/javascript/setup.md index dd7d14c71..87e479ae0 100644 --- a/docs/api/javascript/setup.md +++ b/docs/api/javascript/setup.md @@ -167,7 +167,7 @@ unless Rails.env.production? Prepend the `NODE_PATH` environment variable to the `scripts.build` command: ```json package.json { - "build": "NODE_PATH=\"$(bundle show 'pagy')/gem/javascripts\"
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "\n 941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960\n
", - "12": "" + "12": "" }, "Test /bulma #combo-nav-js": { "1": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "\n 941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960\n
", - "12": "" + "12": "" }, "Test /foundation #combo-nav-js": { "1": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "\n 941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960\n
", - "12": "" + "12": "" }, "Test /materialize #combo-nav-js": { "1": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "\n 941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960\n
", - "12": "" + "12": "" }, "Test /pagy #combo-nav-js": { "1": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "\n 941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960\n
", - "12": "" + "12": "" }, "Test /semantic #combo-nav-js": { "1": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "\n 941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960\n
", - "12": "" + "12": "" }, "Test /uikit #combo-nav-js": { "1": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
", - "4": "", + "4": "", "5": "41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60
", - "6": "", + "6": "", "7": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "8": "", + "8": "", "9": "\n 961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980\n
", - "10": "", + "10": "", "11": "\n 941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960\n
", - "12": "" + "12": "" } }, "Test generic helpers": { @@ -535,37 +535,37 @@ module.exports = { }, "Test pagy_items_selector_js": { "1": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
", - "2": "", + "2": "", "3": "1,2,3,4,5,6,7,8,9,10
", - "4": "", + "4": "", "5": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17
", - "6": "", + "6": "", "7": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18
", - "8": "", + "8": "", "9": "81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100
", - "10": "", + "10": "", "11": "81,82,83,84,85,86,87,88,89,90
", - "12": "", + "12": "", "13": "69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85
", - "14": "", + "14": "", "15": "55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72
", - "16": "", + "16": "", "17": "\n 701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,718,719,720\n
", - "18": "", + "18": "", "19": "701,702,703,704,705,706,707,708,709,710
", - "20": "", + "20": "", "21": "\n 698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,713,714
", - "22": "", + "22": "", "23": "\n 685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702
", - "24": "", + "24": "", "25": "\n 981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000\n
", - "26": "", + "26": "", "27": "981,982,983,984,985,986,987,988,989,990
", - "28": "", + "28": "", "29": "\n 970,971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986
", - "30": "", + "30": "", "31": "\n 955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972
", - "32": "" + "32": "" } }, "Test all navs for all styles": { @@ -994,107 +994,107 @@ module.exports = { "Test trimmed links for /bootstrap?trim=true&page=1": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /bootstrap?trim=true&page=2": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /bootstrap?trim=true&page=3": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /bulma?trim=true&page=1": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /bulma?trim=true&page=2": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /bulma?trim=true&page=3": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /foundation?trim=true&page=1": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /foundation?trim=true&page=2": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /foundation?trim=true&page=3": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /materialize?trim=true&page=1": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /materialize?trim=true&page=2": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /materialize?trim=true&page=3": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /pagy?trim=true&page=1": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /pagy?trim=true&page=2": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /pagy?trim=true&page=3": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /semantic?trim=true&page=1": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /semantic?trim=true&page=2": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /semantic?trim=true&page=3": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /uikit?trim=true&page=1": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /uikit?trim=true&page=2": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /uikit?trim=true&page=3": { "1": "", "2": "", - "3": "" + "3": "" }, "Test trimmed links for /bootstrap-calendar?trim=true&month_page=1": { "1": "", diff --git a/gem/apps/calendar.ru b/gem/apps/calendar.ru index f82a585d9..909f7bbd7 100644 --- a/gem/apps/calendar.ru +++ b/gem/apps/calendar.ru @@ -18,7 +18,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#4-calendar-app -VERSION = '8.0.1' +VERSION = '8.0.2' require 'bundler/inline' gemfile(true) do diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru index 394775264..b8f636230 100644 --- a/gem/apps/demo.ru +++ b/gem/apps/demo.ru @@ -18,7 +18,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#3-demo-app -VERSION = '8.0.1' +VERSION = '8.0.2' require 'bundler/inline' gemfile(true) do diff --git a/gem/apps/rails.ru b/gem/apps/rails.ru index e5b209dfb..50debd6b6 100644 --- a/gem/apps/rails.ru +++ b/gem/apps/rails.ru @@ -15,7 +15,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#2-rails-app -VERSION = '8.0.1' +VERSION = '8.0.2' # Gemfile require 'bundler/inline' @@ -27,15 +27,6 @@ gemfile(true) do gem 'sqlite3' end -# Pagy initializer -require 'pagy/extras/pagy' -require 'pagy/extras/items' -require 'pagy/extras/overflow' -Pagy::DEFAULT[:size] = [1, 4, 4, 1] -Pagy::DEFAULT[:items] = 10 -Pagy::DEFAULT[:overflow] = :empty_page -Pagy::DEFAULT.freeze - # require 'rails/all' # too much stuff require 'action_controller/railtie' require 'active_record' @@ -64,6 +55,15 @@ unless File.writable?(dir) exit 1 end +# Pagy initializer +require 'pagy/extras/pagy' +require 'pagy/extras/items' +require 'pagy/extras/overflow' +Pagy::DEFAULT[:size] = [1, 4, 4, 1] +Pagy::DEFAULT[:items] = 10 +Pagy::DEFAULT[:overflow] = :empty_page +Pagy::DEFAULT.freeze + ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: "#{dir}/tmp/pagy-rails.sqlite3") ActiveRecord::Schema.define do create_table :posts, force: true do |t| diff --git a/gem/apps/repro.ru b/gem/apps/repro.ru index d1919c0d1..d5ee91529 100644 --- a/gem/apps/repro.ru +++ b/gem/apps/repro.ru @@ -15,7 +15,7 @@ # DOC # https://ddnexus.github.io/pagy/playground/#1-repro-app -VERSION = '8.0.1' +VERSION = '8.0.2' require 'bundler/inline' gemfile(true) do diff --git a/gem/bin/pagy b/gem/bin/pagy index 2a1c93a4c..ce2216cce 100755 --- a/gem/bin/pagy +++ b/gem/bin/pagy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -VERSION = '8.0.1' +VERSION = '8.0.2' APPS = %w[repro rails demo calendar].freeze require_relative '../lib/optimist' diff --git a/gem/config/pagy.rb b/gem/config/pagy.rb index b5f009db5..0ad70d0dc 100644 --- a/gem/config/pagy.rb +++ b/gem/config/pagy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# Pagy initializer file (8.0.1) +# Pagy initializer file (8.0.2) # Customize only what you really need and notice that the core Pagy works also without any of the following lines. # Should you just cherry pick part of this file, please maintain the require-order of the extras diff --git a/gem/javascripts/pagy-dev.js b/gem/javascripts/pagy-dev.js index 54e7a5bd1..dadfd4398 100644 --- a/gem/javascripts/pagy-dev.js +++ b/gem/javascripts/pagy-dev.js @@ -53,6 +53,7 @@ window.Pagy = (() => { // Init the input element const initInput = (el, getVars, trimParam) => { const input = el.querySelector("input"); + const link = el.querySelector("a"); const initial = input.value; const action = function () { if (input.value === initial) { @@ -68,7 +69,8 @@ window.Pagy = (() => { if (typeof trimParam === "string" && page === "1") { url = trim(url, trimParam); } - window.location.href = url; + link.href = url; + link.click(); }; ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select input.addEventListener("focusout", action); // trigger action @@ -80,7 +82,7 @@ window.Pagy = (() => { const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), ""); // Public interface return { - version: "8.0.1", + version: "8.0.2", // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args init(arg) { const target = arg instanceof Element ? arg : document; @@ -109,4 +111,4 @@ window.Pagy = (() => { } }; })(); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n    readonly before:string\n    readonly a:string\n    readonly current:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n                                               entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(\n                                                   el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth = -1;\n        const fillIn = (a:string, page:string, label:string):string =>\n            a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function () {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html = tokens.before;  // already trimmed in html\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item = series[i];\n                const label = labels[i];\n                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tokens.a, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tokens.gap;\n                } else { // active page\n                    filled = fillIn(tokens.current, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n            }\n            html += tokens.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n    // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, url];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n        const input = el.querySelector(\"input\") as HTMLInputElement;\n        const initial = input.value;\n        const action = function () {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n            window.location.href = url;\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (a:string, param:string) =>\n        a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"8.0.1\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element | never) {\n            const target = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n    readonly before:string\n    readonly a:string\n    readonly current:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n                                               entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(\n                                                   el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth = -1;\n        const fillIn = (a:string, page:string, label:string):string =>\n            a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function () {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html = tokens.before;  // already trimmed in html\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item = series[i];\n                const label = labels[i];\n                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tokens.a, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tokens.gap;\n                } else { // active page\n                    filled = fillIn(tokens.current, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n            }\n            html += tokens.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n    // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, url];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n        const input = el.querySelector(\"input\") as HTMLInputElement;\n        const link = el.querySelector(\"a\") as HTMLAnchorElement;\n        const initial = input.value;\n        const action = function () {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n            link.href = url;\n            link.click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (a:string, param:string) =>\n        a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"8.0.2\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element | never) {\n            const target = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]} \ No newline at end of file diff --git a/gem/javascripts/pagy-module.js b/gem/javascripts/pagy-module.js index ba3e09166..8e6e3b939 100644 --- a/gem/javascripts/pagy-module.js +++ b/gem/javascripts/pagy-module.js @@ -52,6 +52,7 @@ const Pagy = (() => { // Init the input element const initInput = (el, getVars, trimParam) => { const input = el.querySelector("input"); + const link = el.querySelector("a"); const initial = input.value; const action = function () { if (input.value === initial) { @@ -67,7 +68,8 @@ const Pagy = (() => { if (typeof trimParam === "string" && page === "1") { url = trim(url, trimParam); } - window.location.href = url; + link.href = url; + link.click(); }; ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select input.addEventListener("focusout", action); // trigger action @@ -79,7 +81,7 @@ const Pagy = (() => { const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), ""); // Public interface return { - version: "8.0.1", + version: "8.0.2", // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args init(arg) { const target = arg instanceof Element ? arg : document; diff --git a/gem/javascripts/pagy.js b/gem/javascripts/pagy.js index b2bf316b9..082a02238 100644 --- a/gem/javascripts/pagy.js +++ b/gem/javascripts/pagy.js @@ -1 +1 @@ -!function(){let e=(()=>{let e=new ResizeObserver(e=>e.forEach(e=>e.target.querySelectorAll(".pagy-rjs").forEach(e=>e.pagyRender()))),t=(t,[r,n,a,i])=>{let l=t.parentElement??t,p=Object.keys(n).map(e=>parseInt(e)).sort((e,t)=>t-e),c=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=p.find(e=>e\n\n## Version $new_vers\n") "$TMPLOG") diff --git a/src/package.json b/src/package.json index e768a8079..35fd5315d 100644 --- a/src/package.json +++ b/src/package.json @@ -4,8 +4,8 @@ "private": true, "devDependencies": { "@types/node": "20.8.0", - "@typescript-eslint/eslint-plugin": "7.4.0", - "@typescript-eslint/parser": "7.4.0", + "@typescript-eslint/eslint-plugin": "7.5.0", + "@typescript-eslint/parser": "7.5.0", "eslint": "8.57.0", "eslint-plugin-align-assignments": "^1.1.2", "eslint-plugin-import": "2.29.1", @@ -13,7 +13,7 @@ "eslint-plugin-promise": "6.1.1", "parcel": "2.12.0", "parcel-plugin-nuke-dist": "^1.0.1", - "typescript": "5.4.3" + "typescript": "5.4.4" }, "browserslist": [ "defaults" diff --git a/src/pagy.ts b/src/pagy.ts index 84b75900e..5db65732d 100644 --- a/src/pagy.ts +++ b/src/pagy.ts @@ -72,6 +72,7 @@ const Pagy = (() => { // Init the input element const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => { const input = el.querySelector("input") as HTMLInputElement; + const link = el.querySelector("a") as HTMLAnchorElement; const initial = input.value; const action = function () { if (input.value === initial) { return } // not changed @@ -83,7 +84,8 @@ const Pagy = (() => { } let [page, url] = getVars(input.value); // eslint-disable-line prefer-const if (typeof trimParam === "string" && page === "1") { url = trim(url, trimParam) } - window.location.href = url; + link.href = url; + link.click(); }; ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select input.addEventListener("focusout", action); // trigger action @@ -96,7 +98,7 @@ const Pagy = (() => { // Public interface return { - version: "8.0.1", + version: "8.0.2", // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args init(arg?:Element | never) { diff --git a/tasks/check_coverage.rake b/tasks/check_coverage.rake index c57a45ca1..f3af38901 100644 --- a/tasks/check_coverage.rake +++ b/tasks/check_coverage.rake @@ -4,7 +4,7 @@ require 'json' desc 'Display coverage summary. Fail if not 100%' task :check_coverage do - last_run = JSON.parse(File.read(File.expand_path('../coverage/.last_run.json', __dir__))) + last_run = JSON.parse(File.read('coverage/.last_run.json')) line = last_run['result']['line'] branch = last_run['result']['branch'] message = "\n>>> Coverage -> line: #{line}% -> branch: #{branch}%\n" diff --git a/tasks/rubygem_release.rake b/tasks/rubygem_release.rake index b662b4d18..a08c6b361 100644 --- a/tasks/rubygem_release.rake +++ b/tasks/rubygem_release.rake @@ -1,14 +1,8 @@ # frozen_string_literal: true # Gem release cycle - -require 'bundler/gem_tasks' -require 'rake/manifest' - -Rake::Manifest::Task.new do |t| - t.patterns = FileList.new.include('gem/**/*', 'LICENSE.txt').exclude('**/*.md') - t.manifest_file = 'pagy.manifest' -end +require 'bundler/gem_helper' +Bundler::GemHelper.install_tasks(dir: 'gem', name: 'pagy') module Bundler # :nodoc: all class GemHelper @@ -26,8 +20,10 @@ task :rubygem_release do branch = `git rev-parse --abbrev-ref HEAD` abort 'Wrong branch to release!' unless /^master/.match?(branch) - Rake::Task['manifest:check'].invoke + FileUtils.cp('LICENSE.txt', 'gem/LICENSE.txt') Rake::Task['build'].invoke + FileUtils.rm_f('gem/LICENSE.txt') + Rake::Task['release'].invoke - FileUtils.rm_rf('pkg', secure: true) + FileUtils.rm_rf('gem/pkg', secure: true) end diff --git a/test/pagy/extras/bootstrap_test.rb.rematch b/test/pagy/extras/bootstrap_test.rb.rematch index cf96277db..4e62ef292 100644 --- a/test/pagy/extras/bootstrap_test.rb.rematch +++ b/test/pagy/extras/bootstrap_test.rb.rematch @@ -1,50 +1,4 @@ --- -pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0001_renders first, intermediate and last pages: - :plain_1: '' - :extras_1: '' - :plain_3: '' - :extras_3: '' - :plain_6: '' - :extras_6: '' pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0001_renders single and multiple pages when used with Pagy::Countless: :plain_1_0: :extras_1_0: +pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0001_renders first, intermediate and last pages: + :plain_1: '' + :extras_1: '' + :plain_3: '' + :extras_3: '' + :plain_6: '' + :extras_6: '' diff --git a/test/pagy/extras/bulma_test.rb.rematch b/test/pagy/extras/bulma_test.rb.rematch index 6f5d9cbd4..aecdc3a88 100644 --- a/test/pagy/extras/bulma_test.rb.rematch +++ b/test/pagy/extras/bulma_test.rb.rematch @@ -29,7 +29,8 @@ pagy/extras/bulma::#pagy_bulma_combo_nav_js#test_0001_renders first, intermediat class="pagination-link">' + color: white; background-color: #485fc7;"> + of 6' :extras_1: '' + 4px; padding: 0; font-size: 1.1rem; color: white; background-color: #485fc7;"> of 6' :plain_3: '' + color: white; background-color: #485fc7;"> + of 6' :extras_3: '' + 4px; padding: 0; font-size: 1.1rem; color: white; background-color: #485fc7;"> of 6' :plain_6: '' + color: white; background-color: #485fc7;"> + of 6' :extras_6: '' + 4px; padding: 0; font-size: 1.1rem; color: white; background-color: #485fc7;"> of 6' pagy/extras/bulma::#pagy_bulma_nav#test_0001_renders first, intermediate and last pages: :plain_1: ' + :extras_1: '' + :plain_3: '' + :extras_3: '' + :plain_6: '' + :extras_6: '' pagy/extras/foundation::#pagy_foundation_nav#test_0001_renders first, intermediate and last pages: :plain_1: -pagy/extras/foundation::#pagy_foundation_nav_js#test_0001_renders single and multiple pages when used with Pagy::Countless: - :plain_1_0: - :extras_1_0: - :plain_2_23: - :extras_2_23: pagy/extras/foundation::#pagy_foundation_nav_js#test_0002_renders first, intermediate and last pages with required steps: :plain_1: :extras_1: :extras_50: -pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0001_renders first, intermediate and last pages: - :plain_1: '' - :extras_1: '' - :plain_3: '' - :extras_3: '' - :plain_6: '' - :extras_6: '' +pagy/extras/foundation::#pagy_foundation_nav_js#test_0001_renders single and multiple pages when used with Pagy::Countless: + :plain_1_0: + :extras_1_0: + :plain_2_23: + :extras_2_23: diff --git a/test/pagy/extras/items_test.rb.rematch b/test/pagy/extras/items_test.rb.rematch index 40478eee7..92caa2ab2 100644 --- a/test/pagy/extras/items_test.rb.rematch +++ b/test/pagy/extras/items_test.rb.rematch @@ -2,10 +2,9 @@ pagy/extras/items::view_methods#test_0001_renders items selector: :selector_1: '' + 0; text-align: center; width: 3rem;"> + items per page' :selector_2: '' - :selector_3: '' + 0; text-align: center; width: 3rem;"> + products per page' diff --git a/test/pagy/extras/items_trim_test.rb.rematch b/test/pagy/extras/items_trim_test.rb.rematch index 46c38f5f2..c6b4c0048 100644 --- a/test/pagy/extras/items_trim_test.rb.rematch +++ b/test/pagy/extras/items_trim_test.rb.rematch @@ -2,10 +2,9 @@ pagy/extras/items_trim#test_0001_renders items selector with trim: :selector_1: '' + 0; text-align: center; width: 3rem;"> + items per page' :selector_2: '' - :selector_3: '' + 0; text-align: center; width: 3rem;"> + products per page' diff --git a/test/pagy/extras/materialize_test.rb.rematch b/test/pagy/extras/materialize_test.rb.rematch index 6df503524..e16b64f15 100644 --- a/test/pagy/extras/materialize_test.rb.rematch +++ b/test/pagy/extras/materialize_test.rb.rematch @@ -1,59 +1,4 @@ --- -pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0001_renders first, intermediate and last pages: - :plain_1: '' - :extras_1: '' - :plain_3: '' - :extras_3: '' - :plain_6: '' - :extras_6: '' pagy/extras/materialize::#pagy_materialize_nav#test_0001_renders first, intermediate and last pages: :plain_1: -pagy/extras/materialize::#pagy_materialize_nav_js#test_0001_renders single and multiple pages when used with Pagy::Countless: - :plain_1_0: - :extras_1_0: - :plain_2_23: - :extras_2_23: pagy/extras/materialize::#pagy_materialize_nav_js#test_0002_renders first, intermediate and last pages with required steps: :plain_1: @@ -143,3 +79,71 @@ pagy/extras/materialize::#pagy_materialize_nav_js#test_0002_renders first, inter data-pagy="WyJuYXYiLHsiYmVmb3JlIjoiPHVsIGNsYXNzPVwicGFnaW5hdGlvblwiPjxsaSBjbGFzcz1cIndhdmVzLWVmZmVjdCBwcmV2XCI+PGEgaHJlZj1cIi9mb28/cGFnZT00OVwiIGFyaWEtbGFiZWw9XCJQcmV2aW91c1wiPjxpIGNsYXNzPVwibWF0ZXJpYWwtaWNvbnNcIj5jaGV2cm9uX2xlZnQ8L2k+PC9hPjwvbGk+IiwiYSI6IjxsaSBjbGFzcz1cIndhdmVzLWVmZmVjdFwiPjxhIGhyZWY9XCIvZm9vP3BhZ2U9X19wYWd5X3BhZ2VfX1wiPl9fcGFneV9sYWJlbF9fPC9hPjwvbGk+IiwiY3VycmVudCI6IjxsaSBjbGFzcz1cImFjdGl2ZVwiPjxhIHJvbGU9XCJsaW5rXCIgYXJpYS1jdXJyZW50PVwicGFnZVwiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+X19wYWd5X2xhYmVsX188L2E+PC9saT4iLCJnYXAiOiI8bGkgY2xhc3M9XCJnYXAgZGlzYWJsZWRcIj48YSByb2xlPVwibGlua1wiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+JmhlbGxpcDs8L2E+PC9saT4iLCJhZnRlciI6IjxsaSBjbGFzcz1cIm5leHQgZGlzYWJsZWRcIiM+PGEgcm9sZT1cImxpbmtcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiIGFyaWEtbGFiZWw9XCJOZXh0PjxpIGNsYXNzPVwibWF0ZXJpYWwtaWNvbnNcIj5jaGV2cm9uX3JpZ2h0PC9pPjwvYT48L2xpPjwvdWw+In0seyIwIjpbMSwiZ2FwIiw0Niw0Nyw0OCw0OSwiNTAiXX0sbnVsbF0="> :extras_50: +pagy/extras/materialize::#pagy_materialize_nav_js#test_0001_renders single and multiple pages when used with Pagy::Countless: + :plain_1_0: + :extras_1_0: + :plain_2_23: + :extras_2_23: +pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0001_renders first, intermediate and last pages: + :plain_1: '' + :extras_1: '' + :plain_3: '' + :extras_3: '' + :plain_6: '' + :extras_6: '' diff --git a/test/pagy/extras/pagy_test.rb.rematch b/test/pagy/extras/pagy_test.rb.rematch index 34dd365c5..9b4791d98 100644 --- a/test/pagy/extras/pagy_test.rb.rematch +++ b/test/pagy/extras/pagy_test.rb.rematch @@ -1,34 +1,82 @@ --- -pagy/extras/pagy::#pagy_next_link#test_0004_renders the pagy_next_link for page 50: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_next_link#test_0003_renders the pagy_next_link for page 6: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_next_link#test_0001_renders the pagy_next_link for page 1: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_next_link#test_0002_renders the pagy_next_link for page 3: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_next_a#test_0004_renders the pagy_next_a for page 50: - :r1: > - :r2: > - :r3: NEXT - :r4: NEXT +pagy/extras/pagy::#pagy_nav_js#test_0001_renders single and multiple pages when used with Pagy::Countless: + :plain_1_0: + :extras_1_0: + :plain_2_23: + :extras_2_23: +pagy/extras/pagy::#pagy_nav_js#test_0002_renders first, intermediate and last pages with required steps: + :plain_1: + :extras_1: + :plain_20: + :extras_20: + :plain_50: + :extras_50: +pagy/extras/pagy::#pagy_combo_nav_js#test_0001_renders first, intermediate and last pages: + :plain_1: '' + :extras_1: '' + :plain_3: '' + :extras_3: '' + :plain_6: '' + :extras_6: '' +pagy/extras/pagy::#pagy_prev_a#test_0003_renders the pagy_prev_a for page 6: + :r1: < + :r2: < + :r3: PREV + :r4: PREV +pagy/extras/pagy::#pagy_prev_a#test_0004_renders the pagy_prev_a for page 50: + :r1: < + :r2: < + :r3: PREV + :r4: PREV +pagy/extras/pagy::#pagy_prev_a#test_0001_renders the pagy_prev_a for page 1: + :r1: < + :r2: < + :r3: PREV + :r4: PREV +pagy/extras/pagy::#pagy_prev_a#test_0002_renders the pagy_prev_a for page 3: + :r1: < + :r2: < + :r3: PREV + :r4: PREV pagy/extras/pagy::#pagy_next_a#test_0003_renders the pagy_next_a for page 6: :r1: > :r2: > :r3: NEXT :r4: NEXT +pagy/extras/pagy::#pagy_next_a#test_0004_renders the pagy_next_a for page 50: + :r1: > + :r2: > + :r3: NEXT + :r4: NEXT pagy/extras/pagy::#pagy_next_a#test_0001_renders the pagy_next_a for page 1: :r1: > :r2: > @@ -78,82 +126,16 @@ pagy/extras/pagy::#pagy_nav#test_0001_renders first, intermediate and last pages anchor_string href="/foo?page=47">47484950> -pagy/extras/pagy::#pagy_combo_nav_js#test_0001_renders first, intermediate and last pages: - :plain_1: '' - :extras_1: '' - :plain_3: '' - :extras_3: '' - :plain_6: '' - :extras_6: '' -pagy/extras/pagy::#pagy_nav_js#test_0001_renders single and multiple pages when used with Pagy::Countless: - :plain_1_0: - :extras_1_0: - :plain_2_23: - :extras_2_23: -pagy/extras/pagy::#pagy_nav_js#test_0002_renders first, intermediate and last pages with required steps: - :plain_1: - :extras_1: - :plain_20: - :extras_20: - :plain_50: - :extras_50: -pagy/extras/pagy::#pagy_prev_a#test_0004_renders the pagy_prev_a for page 50: - :r1: < - :r2: < - :r3: PREV - :r4: PREV -pagy/extras/pagy::#pagy_prev_a#test_0003_renders the pagy_prev_a for page 6: - :r1: < - :r2: < - :r3: PREV - :r4: PREV -pagy/extras/pagy::#pagy_prev_a#test_0001_renders the pagy_prev_a for page 1: - :r1: < - :r2: < - :r3: PREV - :r4: PREV -pagy/extras/pagy::#pagy_prev_a#test_0002_renders the pagy_prev_a for page 3: - :r1: < - :r2: < - :r3: PREV - :r4: PREV -pagy/extras/pagy::#pagy_next_url#test_0004_renders the pagy_next_url for page 50: - :r1: - :r2: - :r3: - :r4: pagy/extras/pagy::#pagy_next_url#test_0003_renders the pagy_next_url for page 6: :r1: "/foo?page=7" :r2: "/foo?page=7" :r3: http://example.com:3000/foo?page=7 :r4: http://example.com:3000/foo?page=7 +pagy/extras/pagy::#pagy_next_url#test_0004_renders the pagy_next_url for page 50: + :r1: + :r2: + :r3: + :r4: pagy/extras/pagy::#pagy_next_url#test_0001_renders the pagy_next_url for page 1: :r1: "/foo?page=2" :r2: "/foo?page=2" @@ -164,36 +146,16 @@ pagy/extras/pagy::#pagy_next_url#test_0002_renders the pagy_next_url for page 3: :r2: "/foo?page=4" :r3: http://example.com:3000/foo?page=4 :r4: http://example.com:3000/foo?page=4 -pagy/extras/pagy::#pagy_prev_link#test_0004_renders the pagy_prev_link for page 50: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_prev_link#test_0003_renders the pagy_prev_link for page 6: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_prev_link#test_0001_renders the pagy_prev_link for page 1: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_prev_link#test_0002_renders the pagy_prev_link for page 3: - :r1: - :r2: - :r3: - :r4: -pagy/extras/pagy::#pagy_prev_url#test_0004_renders the pagy_prev_url for page 50: - :r1: "/foo?page=49" - :r2: "/foo?page=49" - :r3: http://example.com:3000/foo?page=49 - :r4: http://example.com:3000/foo?page=49 pagy/extras/pagy::#pagy_prev_url#test_0003_renders the pagy_prev_url for page 6: :r1: "/foo?page=5" :r2: "/foo?page=5" :r3: http://example.com:3000/foo?page=5 :r4: http://example.com:3000/foo?page=5 +pagy/extras/pagy::#pagy_prev_url#test_0004_renders the pagy_prev_url for page 50: + :r1: "/foo?page=49" + :r2: "/foo?page=49" + :r3: http://example.com:3000/foo?page=49 + :r4: http://example.com:3000/foo?page=49 pagy/extras/pagy::#pagy_prev_url#test_0001_renders the pagy_prev_url for page 1: :r1: :r2: @@ -204,3 +166,43 @@ pagy/extras/pagy::#pagy_prev_url#test_0002_renders the pagy_prev_url for page 3: :r2: "/foo?page=2" :r3: http://example.com:3000/foo?page=2 :r4: http://example.com:3000/foo?page=2 +pagy/extras/pagy::#pagy_next_link#test_0003_renders the pagy_next_link for page 6: + :r1: + :r2: + :r3: + :r4: +pagy/extras/pagy::#pagy_next_link#test_0004_renders the pagy_next_link for page 50: + :r1: + :r2: + :r3: + :r4: +pagy/extras/pagy::#pagy_next_link#test_0001_renders the pagy_next_link for page 1: + :r1: + :r2: + :r3: + :r4: +pagy/extras/pagy::#pagy_next_link#test_0002_renders the pagy_next_link for page 3: + :r1: + :r2: + :r3: + :r4: +pagy/extras/pagy::#pagy_prev_link#test_0003_renders the pagy_prev_link for page 6: + :r1: + :r2: + :r3: + :r4: +pagy/extras/pagy::#pagy_prev_link#test_0004_renders the pagy_prev_link for page 50: + :r1: + :r2: + :r3: + :r4: +pagy/extras/pagy::#pagy_prev_link#test_0001_renders the pagy_prev_link for page 1: + :r1: + :r2: + :r3: + :r4: +pagy/extras/pagy::#pagy_prev_link#test_0002_renders the pagy_prev_link for page 3: + :r1: + :r2: + :r3: + :r4: diff --git a/test/pagy/extras/semantic_test.rb.rematch b/test/pagy/extras/semantic_test.rb.rematch index 5e2a754e0..7b29b3b1a 100644 --- a/test/pagy/extras/semantic_test.rb.rematch +++ b/test/pagy/extras/semantic_test.rb.rematch @@ -21,6 +21,48 @@ pagy/extras/semantic::#pagy_semantic_nav_js#test_0001_renders single and multipl aria-label="Pages" data-pagy="WyJuYXYiLHsiYmVmb3JlIjoiPGEgaHJlZj1cIi9mb28/cGFnZT0xXCIgY2xhc3M9XCJpdGVtXCIgYXJpYS1sYWJlbD1cIlByZXZpb3VzXCI+Jmx0OzwvYT4iLCJhIjoiPGEgaHJlZj1cIi9mb28/cGFnZT1fX3BhZ3lfcGFnZV9fXCIgY2xhc3M9XCJpdGVtXCI+X19wYWd5X2xhYmVsX188L2E+IiwiY3VycmVudCI6IjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJpdGVtIGFjdGl2ZVwiIGFyaWEtY3VycmVudD1cInBhZ2VcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPl9fcGFneV9sYWJlbF9fPC9hPiIsImdhcCI6IjxkaXYgY2xhc3M9XCJkaXNhYmxlZCBpdGVtXCI+JmhlbGxpcDs8L2Rpdj4iLCJhZnRlciI6IjxhIGhyZWY9XCIvZm9vP3BhZ2U9M1wiIGNsYXNzPVwiaXRlbVwiIGFyaWEtbGFiZWw9XCJOZXh0XCI+Jmd0OzwvYT4ifSx7IjAiOlsxLCIyIiwzXX0sbnVsbF0="> :extras_2_23: +pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0001_renders first, intermediate and last pages: + :plain_1: '' + :extras_1: '' + :plain_3: '' + :extras_3: '' + :plain_6: '' + :extras_6: '' pagy/extras/semantic::#pagy_semantic_nav#test_0001_renders first, intermediate and last pages: :plain_1: -pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0001_renders first, intermediate and last pages: - :plain_1: '' - :extras_1: '' - :plain_3: '' - :extras_3: '' - :plain_6: '' - :extras_6: '' diff --git a/test/pagy/extras/uikit_test.rb.rematch b/test/pagy/extras/uikit_test.rb.rematch index 46a0c057f..b8aee6261 100644 --- a/test/pagy/extras/uikit_test.rb.rematch +++ b/test/pagy/extras/uikit_test.rb.rematch @@ -5,39 +5,64 @@ pagy/extras/uikit::#pagy_uikit_combo_nav_js#test_0001_renders first, intermediat class="uk-disabled">