RubyGems - pagy - Versions diffs - 8.2.2 → 8.4.0 - Mend

pagy 8.2.2 → 8.4.0

Files changed (18) hide show

checksums.yaml +4 -4
data/apps/calendar.ru +18 -14
data/apps/demo.ru +24 -45
data/apps/rails.ru +17 -14
data/apps/repro.ru +19 -13
data/bin/pagy +25 -11
data/config/pagy.rb +1 -17
data/javascripts/pagy-dev.js +2 -2
data/javascripts/pagy-module.js +1 -1
data/javascripts/pagy.js +1 -1
data/lib/pagy/backend.rb +1 -1
data/lib/pagy/extras/foundation.rb +3 -1
data/lib/pagy/extras/materialize.rb +3 -1
data/lib/pagy/extras/overflow.rb +1 -1
data/lib/pagy/extras/semantic.rb +3 -1
data/lib/pagy/extras/uikit.rb +3 -1
data/lib/pagy.rb +1 -1
metadata +5 -5

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b60b1b3fc7e2ae01a725859ef6106f5b01b81d355a212e97a73756dfeece16c6
-  data.tar.gz: c549243c9dc08e2ebcaab9149e9897bd66f34f7ead20e0e6f84eb611013f6685
+  metadata.gz: 1bd45a13dbe1431d3fecb72e84e4892d1a84ed6d6169ea30bafbe5568e5e2ee3
+  data.tar.gz: 28f7ac75c345a8dc8328b8774cb3d336d32bb59a698ce71874f98c1c3ff6eb5b
 SHA512:
-  metadata.gz: a7f11b30a5c8796716971d613558fefa6c0246ce66327a13d094db92e66596e3fa2cbdf13b9df993d62a08972c28d82a45df94465c0cbd49b7a594120a987440
-  data.tar.gz: b04450698d1f7cd5c36bed269efd3c8fd6d9557efa30fe556b96450f54cfdce1ad7a3adf3e7f767537bc1989184b27c363562c8c4d4db3a9780a26b09693fd2d
+  metadata.gz: ed47bfd55f842bedc38a39d8ed23c1a76a08497415d6d63b8cbc4ceab7933edeae7e32657d917f9dc1ace9997a0f023b752aa7c130bb1cf94361b78346556d36
+  data.tar.gz: 6136dbb153691f177af64d95476dca0fe4a8b2adc69c93a2e906d0296a299d9604db958d7e81d06b4a6e6d5c239b9f0cb4c1f8337101e61a3ebd7a2f0fe2ae61

data/apps/calendar.ru CHANGED Viewed

@@ -18,10 +18,12 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#4-calendar-app
-VERSION = '8.2.2'
+VERSION = '8.4.0'
 require 'bundler/inline'
-gemfile(true) do
+require 'bundler'
+Bundler.configure
+gemfile(ENV['PAGY_INSTALL_BUNDLE'] == 'true') do
   source 'https://rubygems.org'
   gem 'activesupport'
   gem 'oj'
@@ -116,8 +118,10 @@ end
 __END__
@@ layout
-<html style="font-size: 0.7rem">
+<!DOCTYPE html>
+<html lang="en" style="font-size: 0.8rem">
 <head>
+  <title>Pagy Calendar App</title>
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
         integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 </head>
@@ -129,19 +133,19 @@ __END__
@@ pagy_demo
 <div class="container">
-  <h3>Pagy Calendar Application</h3>
-  <p>Self-contained, standalone Sinatra app implementing nested calendar pagination for year and month units.</p>
+  <h1>Pagy Calendar App</h1>
+  <p>Self-contained, standalone Sinatra app implementing nested calendar pagination for year, month, day units.</p>
   <p>See the <a href="https://ddnexus.github.io/pagy/docs/extras/calendar">Pagy Calendar Extra</a> for details.</p>
   <hr>
   <!-- calendar UI manual toggle -->
   <p>
   <% if params[:skip] %>
-    <a href="/" >Show Calendar</a>
+    <a id="toggle" href="/" >Show Calendar</a>
   <% else %>
-    <a href="?skip=true" >Hide Calendar</a>
+    <a id="toggle" href="?skip=true" >Hide Calendar</a>
     <br>
-    <a href="<%= pagy_calendar_url_at(@calendar, Time.zone.parse('2022-03-02')) %>">Go to the 2022-03-02 Page</a>
+    <a id="go-to-day" href="<%= pagy_calendar_url_at(@calendar, Time.zone.parse('2022-03-02')) %>">Go to the 2022-03-02 Page</a>
     <!-- You can use Time.zone.now to find the current page if your time period include today -->
     <% end %>
   </p>
@@ -149,25 +153,25 @@ __END__
   <!-- calendar filtering navs -->
   <% if @calendar %>
     <p>Showtime: <%= @calendar.showtime %></p>
-    <%= pagy_bootstrap_nav(@calendar[:year]) %>   <!-- year nav -->
-    <%= pagy_bootstrap_nav(@calendar[:month]) %>  <!-- month nav -->
-    <%= pagy_bootstrap_nav(@calendar[:day]) %> <!-- day nav -->
+    <%= pagy_bootstrap_nav(@calendar[:year], id: "year-nav", aria_label: "Years") %>   <!-- year nav -->
+    <%= pagy_bootstrap_nav(@calendar[:month], id: "month-nav", aria_label: "Months") %>  <!-- month nav -->
+    <%= pagy_bootstrap_nav(@calendar[:day], id: "day-nav", aria_label: "Days") %> <!-- day nav -->
   <% end %>
   <!-- page info extended for the calendar unit -->
   <div class="alert alert-primary" role="alert">
-    <%= pagy_info(@pagy) %><%= " for <b>#{@calendar.showtime.strftime('%Y-%m-%d')}</b>" if @calendar %>
+    <%= pagy_info(@pagy, id: 'pagy-info') %><%= " for <b>#{@calendar.showtime.strftime('%Y-%m-%d')}</b>" if @calendar %>
   </div>
   <!-- page records (time converted in your local time)-->
-  <div class="list-group">
+  <div id="records" class="list-group">
     <% @records.each do |record| %>
     <p class="list-group-item"><%= record.in_time_zone.to_s %></p>
     <% end %>
   </div>
   <!-- standard pagination of the selected month -->
-  <p><%= pagy_bootstrap_nav(@pagy) if @pagy.pages > 1 %><p/>
+  <p><%= pagy_bootstrap_nav(@pagy, id: 'pages-nav', aria_label: 'Pages') if @pagy.pages > 1 %><p/>
 </div>

data/apps/demo.ru CHANGED Viewed

@@ -18,10 +18,12 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#3-demo-app
-VERSION = '8.2.2'
+VERSION = '8.4.0'
 require 'bundler/inline'
-gemfile(true) do
+require 'bundler'
+Bundler.configure
+gemfile(ENV['PAGY_INSTALL_BUNDLE'] == 'true') do
   source 'https://rubygems.org'
   gem 'oj'
   gem 'puma'
@@ -34,11 +36,7 @@ end
 STYLES = { pagy:        { extra: 'pagy', prefix: '', css_anchor: 'pagy-scss' },
            bootstrap:   {},
            bulma:       {},
-           foundation:  {},
-           materialize: {},
-           semantic:    {},
-           tailwind:    { extra: 'pagy', prefix: '', css_anchor: 'pagy-tailwind-css' },
-           uikit:       {} }.freeze
+           tailwind:    { extra: 'pagy', prefix: '', css_anchor: 'pagy-tailwind-css' } }.freeze
 STYLES.each_key do |style|
   require "pagy/extras/#{STYLES[style][:extra] || style}"
@@ -253,7 +251,7 @@ __END__
       margin: 0 !important;
       font-family: sans-serif !important;
     }
-    h1, h4 {
+    h1, h2 {
       font-size: 1.8rem !important;
       font-weight: 600 !important;
       margin-top: 1rem !important;
@@ -261,7 +259,7 @@ __END__
       line-height: 1.5 !important;
       color: rgb(90 90 90)  !important;
     }
-    h4 {
+    h2 {
       font-family: monospace;
       font-size: .9rem !important;
       margin-top: 1.6rem !important;
@@ -351,20 +349,6 @@ __END__
@@ bulma_head
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
-@@ foundation_head
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.8.1/dist/css/foundation.min.css" crossorigin="anonymous">
-@@ materialize_head
-<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
-@@ semantic_head
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.5.0/dist/semantic.min.css"><script
-  src="https://code.jquery.com/jquery-3.1.1.min.js"
-  integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
-  crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.5.0/dist/semantic.min.js"></script>
@@ tailwind_head
 <script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio"></script>
 <!-- copy and paste the pagy.tailwind style in order to edit it -->
@@ -372,11 +356,6 @@ __END__
   <%= Pagy.root.join('stylesheets', 'pagy.tailwind.css').read %>
 </style>
-@@ uikit_head
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.18.3/dist/css/uikit.min.css" />
-<script src="https://cdn.jsdelivr.net/npm/uikit@3.18.3/dist/js/uikit.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/uikit@3.18.3/dist/js/uikit-icons.min.js"></script>
@@ helpers
 <h1><%= style %></h1>
@@ -390,45 +369,45 @@ documentation
 <% end %>
 for details</p>
-<h4>Collection</h4>
-<p>@records: <%= @records.join(',') %></p>
+<h2>Collection</h2>
+<p id="records">@records: <%= @records.join(',') %></p>
-<h4>pagy<%= prefix %>_nav <span class="notes">Simple nav <code>size: 5</code></span></h4>
-<%= html = send(:"pagy#{prefix}_nav", @pagy, id: 'nav', aria_label: 'Pages nav', size: 5) %>
+<h2>pagy<%= prefix %>_nav <span class="notes">Simple nav <code>size: 5</code></span></h2>
+<%= html = send(:"pagy#{prefix}_nav", @pagy, id: 'simple-nav', aria_label: 'Pages simple-nav', size: 5) %>
 <%= highlight(html) %>
-<h4>pagy<%= prefix %>_nav <span class="notes">Classic nav <code>size: [1,4,4,1]</code></span></h4>
+<h2>pagy<%= prefix %>_nav <span class="notes">Classic nav <code>size: [1,4,4,1]</code></span></h2>
 <%= html = send(:"pagy#{prefix}_nav", @pagy, id: 'nav', aria_label: 'Pages nav') %>
 <%= highlight(html) %>
-<h4>pagy<%= prefix %>_nav_js <span class="notes">Classic nav <code>size: [1,4,4,1]</code></span></h4>
+<h2>pagy<%= prefix %>_nav_js <span class="notes">Classic nav <code>size: [1,4,4,1]</code></span></h2>
 <%= html = send(:"pagy#{prefix}_nav_js", @pagy, id: 'nav-js', aria_label: 'Pages nav_js') %>
 <%= highlight(html) %>
-<h4>pagy<%= prefix %>_nav_js <span class="notes">Responsive <code>steps: {...}</code> (Resize the window to see)</span></h4>
+<h2>pagy<%= prefix %>_nav_js <span class="notes">Responsive <code>steps: {...}</code> (Resize the window to see)</span></h2>
 <%= html = send(:"pagy#{prefix}_nav_js", @pagy, id: 'nav-js-responsive',
      aria_label: 'Pages nav_js_responsive',
-     steps: { 0 => 5, 500 => [1,3,3,1], 700 => [1,4,4,1], 900 => [2,4,4,2] }) %>
+     steps: { 0 => [1,1,1,1], 500 => [1,3,3,1], 750 => [1,5,5,1], 1000 => [2,6,6,2] }) %>
 <%= highlight(html) %>
-<h4>pagy<%= prefix %>_combo_nav_js</h4>
+<h2>pagy<%= prefix %>_combo_nav_js</h2>
 <%= html = send(:"pagy#{prefix}_combo_nav_js", @pagy, id: 'combo-nav-js', aria_label: 'Pages combo_nav_js') %>
 <%= highlight(html) %>
-<h4>pagy_info</h4>
+<h2>pagy_info</h2>
 <%= html = pagy_info(@pagy, id: 'pagy-info') %>
 <%= highlight(html) %>
 <% if style.match(/pagy|tailwind/) %>
-<h4>pagy_items_selector_js</h4>
+<h2>pagy_items_selector_js</h2>
 <%= html = pagy_items_selector_js(@pagy, id: 'items-selector-js') %>
 <%= highlight(html) %>
-<h4>pagy_prev_a / pagy_next_a</h4>
-<%= html = '<nav class="pagy">' << pagy_prev_a(@pagy) << pagy_next_a(@pagy) << '</nav>' %>
+<h2>pagy_prev_a / pagy_next_a</h2>
+<%= html = '<nav class="pagy" id="prev-next" aria-label="Pagy prev-next">' << pagy_prev_a(@pagy) << pagy_next_a(@pagy) << '</nav>' %>
 <%= highlight(html) %>
-<h4>pagy_prev_link / pagy_next_link <span class="notes">Link not rendered<span></h4>
+<h2>pagy_prev_link / pagy_next_link <span class="notes">Link not rendered<span></h2>
 <% html = '<head>' << (pagy_prev_link(@pagy)||'') << (pagy_next_link(@pagy)||'') << '</head>' %>
 <%= highlight(html) %>
 <% end %>
@@ -441,10 +420,10 @@ for details</p>
 See the <a href="https://ddnexus.github.io/pagy/docs/how-to/#using-your-pagination-templates">
 Custom Templates</a> documentation.
 </p>
-<h4>Collection</h4>
-<p>@records: <%= @records.join(',') %></p>
+<h2>Collection</h2>
+<p id="records">@records: <%= @records.join(',') %></p>
-<h4>Rendered ERB template</h4>
+<h2>Rendered ERB template</h2>
 <%# We don't inline the template here, so we can highlight it more easily %>
 <%= html = ERB.new(TEMPLATE).result(binding) %>

data/apps/rails.ru CHANGED Viewed

@@ -15,16 +15,18 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#2-rails-app
-VERSION = '8.2.2'
+VERSION = '8.4.0'
 # Gemfile
 require 'bundler/inline'
-gemfile(true) do
+require 'bundler'
+Bundler.configure
+gemfile(ENV['PAGY_INSTALL_BUNDLE'] == 'true') do
   source 'https://rubygems.org'
   gem 'oj'
   gem 'puma'
-  gem 'rails', '~> 7.1'
-  gem 'sqlite3'
+  gem 'rails'
+  gem 'sqlite3', '~> 1.4.0'
 end
 # require 'rails/all'     # too much stuff
@@ -127,8 +129,9 @@ TEMPLATE = <<~ERB
   <html lang="en">
     <html>
     <head>
+    <title>Pagy Rails App</title>
       <script src="/javascript"></script>
-      <script type="application/javascript">
+      <script>
         window.addEventListener("load", Pagy.init);
       </script>
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -165,10 +168,10 @@ TEMPLATE = <<~ERB
     <body>
       <div class="content">
-        <h3>Pagy Rails App</h3>
+        <h1>Pagy Rails App</h1>
         <p> Self-contained, standalone Rails app usable to easily reproduce any rails related pagy issue.</p>
         <p>Please, report the following versions in any new issue.</p>
-        <h4>Versions</h4>
+        <h2>Versions</h2>
         <ul>
           <li>Ruby:  <%== RUBY_VERSION %></li>
           <li>Rack:  <%== Rack::RELEASE %></li>
@@ -176,8 +179,8 @@ TEMPLATE = <<~ERB
           <li>Pagy:  <%== Pagy::VERSION %></li>
         </ul>
-        <h4>Collection</h4>
-        <div class="collection">
+        <h3>Collection</h3>
+        <div id="records" class="collection">
         <% @comments.each do |comment| %>
           <p style="margin: 0;"><%= comment.body %></p>
         <% end %>
@@ -185,19 +188,19 @@ TEMPLATE = <<~ERB
         <hr>
         <h4>pagy_nav</h4>
-        <%== pagy_nav(@pagy) %>
+        <%== pagy_nav(@pagy, id: 'nav', aria_label: 'Pages nav') %>
         <h4>pagy_nav_js</h4>
-        <%== pagy_nav_js(@pagy) %>
+        <%== pagy_nav_js(@pagy, id: 'nav-js', aria_label: 'Pages nav_js') %>
         <h4>pagy_combo_nav_js</h4>
-        <%== pagy_combo_nav_js(@pagy) %>
+        <%== pagy_combo_nav_js(@pagy, id: 'combo-nav-js', aria_label: 'Pages combo_nav_js') %>
         <h4>pagy_items_selector_js</h4>
-        <%== pagy_items_selector_js(@pagy) %>
+        <%== pagy_items_selector_js(@pagy, id: 'items-selector-js') %>
         <h4>pagy_info</h4>
-        <%== pagy_info(@pagy) %>
+        <%== pagy_info(@pagy, id: 'pagy-info') %>
       </div>
     </body>

data/apps/repro.ru CHANGED Viewed

@@ -15,10 +15,12 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#1-repro-app
-VERSION = '8.2.2'
+VERSION = '8.4.0'
 require 'bundler/inline'
-gemfile(true) do
+require 'bundler'
+Bundler.configure
+gemfile(ENV['PAGY_INSTALL_BUNDLE'] == 'true') do
   source 'https://rubygems.org'
   gem 'oj'
   gem 'puma'
@@ -93,8 +95,9 @@ __END__
 <html lang="en">
 <html>
 <head>
+   <title>Pagy Repro App</title>
   <script src="<%= %(/#{PAGY_JS}) %>"></script>
-  <script type="application/javascript">
+  <script>
     window.addEventListener("load", Pagy.init);
   </script>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -127,7 +130,6 @@ __END__
     <%= Pagy.root.join('stylesheets', 'pagy.css').read %>
   </style>
 </head>
 <body>
   <%= yield %>
 </body>
@@ -135,10 +137,10 @@ __END__
@@ main
 <div class="content">
-  <h3>Pagy Repro App</h3>
+  <h1>Pagy Repro App</h1>
   <p> Self-contained, standalone Sinatra app usable to easily reproduce any pagy issue.</p>
   <p>Please, report the following versions in any new issue.</p>
-  <h4>Versions</h4>
+  <h2>Versions</h4>
   <ul>
     <li>Ruby: <%= RUBY_VERSION %></li>
     <li>Rack: <%= Rack::RELEASE %></li>
@@ -146,23 +148,27 @@ __END__
     <li>Pagy: <%= Pagy::VERSION %></li>
   </ul>
-  <h4>Collection</h4>
-  <p>@records: <%= @records.join(',') %></p>
+  <h3>Collection</h3>
+  <p id="records">@records: <%= @records.join(',') %></p>
   <hr>
   <h4>pagy_nav</h4>
-  <%= pagy_nav(@pagy) %>
+  <%= pagy_nav(@pagy, id: 'nav', aria_label: 'Pages nav') %>
+  <h4>pagy_nav_js</h4>
+  <%= pagy_nav_js(@pagy, id: 'nav-js', aria_label: 'Pages nav_js') %>
   <h4>pagy_nav_js</h4>
-  <%= pagy_nav_js(@pagy) %>
+  <%= pagy_nav_js(@pagy, id: 'nav-js-responsive', aria_label: 'Pages nav_js_responsove',
+     steps: { 0 => [1,1,1,1], 500 => [1,3,3,1], 750 => [1,5,5,1], 1000 => [2,6,6,2] }) %>
   <h4>pagy_combo_nav_js</h4>
-  <%= pagy_combo_nav_js(@pagy) %>
+  <%= pagy_combo_nav_js(@pagy, id: 'combo-nav-js', aria_label: 'Pages combo_nav_js') %>
   <h4>pagy_items_selector_js</h4>
-  <%= pagy_items_selector_js(@pagy) %>
+  <%= pagy_items_selector_js(@pagy, id: 'items-selector-js') %>
   <h4>pagy_info</h4>
-  <%= pagy_info(@pagy) %>
+  <%= pagy_info(@pagy, id: 'pagy-info') %>
 </div>

data/bin/pagy CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
-VERSION = '8.2.2'
+VERSION = '8.4.0'
 APPS    = %w[repro rails demo calendar].freeze
 require_relative '../lib/optimist'
@@ -24,20 +24,28 @@ opts = Optimist.options do
       pagy ~/my-repro.ru         Develop ~/my-repro.ru at http://0.0.0.0:8000
   HEAD
   text 'Rackup options'
-  opt :env,   'Environment', default: 'development'
-  opt :host,  'Host', default: '0.0.0.0', short: :o
-  opt :port,  'Port', default: 8000
+  opt :env,     'Environment', default: 'development'
+  opt :host,    'Host', default: '0.0.0.0', short: :o
+  opt :port,    'Port', default: 8000
+  opt :install, 'Install bundle for users', default: true
   text 'Rerun options'
-  opt :rerun, 'Enable rerun for development', default: true
-  opt :clear, 'Clear screen before each rerun'
+  opt :rerun,   'Enable rerun for development', default: true
+  opt :clear,   'Clear screen before each rerun'
   text 'Other options'
-  opt :quiet, 'Quiet mode for development'
+  opt :quiet,   'Quiet mode for development'
   version VERSION
 end
 Optimist.educate if ARGV.empty?
+run_from_repo = File.exist?(File.expand_path('../pagy.gemspec', __dir__))
+# Never install if run from pagy repo (for pagy devs)
+opts[:install] = false if run_from_repo
+# Handles gems
 require 'bundler/inline'
-gemfile true do
+require 'bundler'
+Bundler.configure
+gemfile(opts[:install]) do
   source 'https://rubygems.org'
   gem 'rackup'
   gem 'rerun'
@@ -70,14 +78,20 @@ else
   end
   Optimist.die("#{file.inspect} app not found") unless File.exist?(file)
   # Run command
-  rackup = "rackup -I #{File.expand_path('../lib', __dir__)} -r pagy -o #{opts[:host]} -p #{opts[:port]} -E #{opts[:env]} #{file}"
+  gem_dir = File.expand_path('..', __dir__)
+  rackup  = "rackup -I #{gem_dir}/lib -r pagy -o #{opts[:host]} -p #{opts[:port]} -E #{opts[:env]} #{file}"
   rackup << ' -q' if opts[:quiet]
   if opts[:rerun]
     name  = File.basename(file)
-    rerun = "rerun --name #{name} -d #{File.dirname(file)} -p #{name}"
+    dir   = File.dirname(file)
+    rerun = if run_from_repo   # rerun app also when gem dir files change (for pagy devs)
+              "rerun --name #{name} -d #{dir},#{gem_dir} -p **/*.{rb,js,css,scss,ru,yml}"
+            else
+              "rerun --name #{name} -d #{dir} -p #{name}" # rerun only when app.ru changes
+            end
     rerun << ' -q' if opts[:quiet]
     rerun << ' -c' if opts[:clear]
     rerun << " -- #{rackup}"
   end
-  exec(rerun || rackup)
+  exec("PAGY_INSTALL_BUNDLE='#{opts[:install]}' #{rerun || rackup}")
 end

data/config/pagy.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-# Pagy initializer file (8.2.2)
+# Pagy initializer file (8.4.0)
 # 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
@@ -118,27 +118,11 @@
 # See https://ddnexus.github.io/pagy/docs/extras/bulma
 # require 'pagy/extras/bulma'
-# Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination
-# See https://ddnexus.github.io/pagy/docs/extras/foundation
-# require 'pagy/extras/foundation'
-# Materialize extra: Add nav, nav_js and combo_nav_js helpers for Materialize pagination
-# See https://ddnexus.github.io/pagy/docs/extras/materialize
-# require 'pagy/extras/materialize'
 # Pagy extra: Add the pagy styled versions of the javascript-powered navs
 # and a few other components to the Pagy::Frontend module.
 # See https://ddnexus.github.io/pagy/docs/extras/pagy
 # require 'pagy/extras/pagy'
-# Semantic extra: Add nav, nav_js and combo_nav_js helpers for Semantic UI pagination
-# See https://ddnexus.github.io/pagy/docs/extras/semantic
-# require 'pagy/extras/semantic'
-# UIkit extra: Add nav helper and templates for UIkit pagination
-# See https://ddnexus.github.io/pagy/docs/extras/uikit
-# require 'pagy/extras/uikit'
 # Multi size var used by the *_nav_js helpers
 # See https://ddnexus.github.io/pagy/docs/extras/pagy#steps
 # Pagy::DEFAULT[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] }   # example

data/javascripts/pagy-dev.js CHANGED Viewed

@@ -82,7 +82,7 @@ window.Pagy = (() => {
     const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "8.2.2",
+        version: "8.4.0",
         // 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;
@@ -111,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 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.2.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"]}
+//# 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.4.0\",\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"]}

data/javascripts/pagy-module.js CHANGED Viewed

@@ -81,7 +81,7 @@ const Pagy = (() => {
     const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "8.2.2",
+        version: "8.4.0",
         // 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;

data/javascripts/pagy.js CHANGED Viewed

	@@ -1 +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,a,n,l])=>{let i=t.parentElement??t,c=Object.keys(a).map(e=>parseInt(e)).sort((e,t)=>t-e),p=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=c.find(e=>e<i.clientWidth)\|\|0;if(e===p)return;let g=r.before,y=a[e.toString()],f=n?.[e.toString()]??y.map(e=>e.toString());for(let e in y){let t;let a=y[e],n=f[e];t="number"==typeof a?s(r.a,a.toString(),n):"gap"===a?r.gap:s(r.current,a,n),g+="string"==typeof l&&1==a?o(t,l):t}g+=r.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(i)},r=(e,[t,r])=>n(e,e=>[e,t.replace(/__pagy_page__/,e)],r),a=(e,[t,r,a])=>{n(e,e=>{let a=Math.max(Math.ceil(t/parseInt(e)),1).toString(),n=r.replace(/__pagy_page__/,a).replace(/__pagy_items__/,e);return[a,n]},a)},n=(e,t,r)=>{let a=e.querySelector("input"),n=e.querySelector("a"),l=a.value,i=function(){if(a.value===l)return;let[e,i,c]=[a.min,a.value,a.max].map(e=>parseInt(e)\|\|0);if(i<e\|\|i>c){a.value=l,a.select();return}let[p,s]=t(a.value);"string"==typeof r&&"1"===p&&(s=o(s,r)),n.href=s,n.click()};["change","focus"].forEach(e=>a.addEventListener(e,a.select)),a.addEventListener("focusout",i),a.addEventListener("keypress",e=>{"Enter"===e.key&&i()})},o=(e,t)=>e.replace(RegExp(`[?&]${t}=1\\b(?!&)\|\\b${t}=1&`),"");return{version:"8.2.2",init(e){for(let n of(e instanceof Element?e:document).querySelectorAll("[data-pagy]"))try{let e=Uint8Array.from(atob(n.getAttribute("data-pagy")),e=>e.charCodeAt(0)),[o,...l]=JSON.parse(new TextDecoder().decode(e));"nav"===o?t(n,l):"combo"===o?r(n,l):"selector"===o?a(n,l):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",n,o)}catch(e){console.warn("Skipped Pagy.init() for: %o\n%s",n,e)}}}})();window.Pagy=e}();
1	+ !function(){let e=(()=>{let e=new ResizeObserver(e=>e.forEach(e=>e.target.querySelectorAll(".pagy-rjs").forEach(e=>e.pagyRender()))),t=(t,[r,a,n,l])=>{let i=t.parentElement??t,c=Object.keys(a).map(e=>parseInt(e)).sort((e,t)=>t-e),p=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=c.find(e=>e<i.clientWidth)\|\|0;if(e===p)return;let g=r.before,y=a[e.toString()],f=n?.[e.toString()]??y.map(e=>e.toString());for(let e in y){let t;let a=y[e],n=f[e];t="number"==typeof a?s(r.a,a.toString(),n):"gap"===a?r.gap:s(r.current,a,n),g+="string"==typeof l&&1==a?o(t,l):t}g+=r.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(i)},r=(e,[t,r])=>n(e,e=>[e,t.replace(/__pagy_page__/,e)],r),a=(e,[t,r,a])=>{n(e,e=>{let a=Math.max(Math.ceil(t/parseInt(e)),1).toString(),n=r.replace(/__pagy_page__/,a).replace(/__pagy_items__/,e);return[a,n]},a)},n=(e,t,r)=>{let a=e.querySelector("input"),n=e.querySelector("a"),l=a.value,i=function(){if(a.value===l)return;let[e,i,c]=[a.min,a.value,a.max].map(e=>parseInt(e)\|\|0);if(i<e\|\|i>c){a.value=l,a.select();return}let[p,s]=t(a.value);"string"==typeof r&&"1"===p&&(s=o(s,r)),n.href=s,n.click()};["change","focus"].forEach(e=>a.addEventListener(e,a.select)),a.addEventListener("focusout",i),a.addEventListener("keypress",e=>{"Enter"===e.key&&i()})},o=(e,t)=>e.replace(RegExp(`[?&]${t}=1\\b(?!&)\|\\b${t}=1&`),"");return{version:"8.4.0",init(e){for(let n of(e instanceof Element?e:document).querySelectorAll("[data-pagy]"))try{let e=Uint8Array.from(atob(n.getAttribute("data-pagy")),e=>e.charCodeAt(0)),[o,...l]=JSON.parse(new TextDecoder().decode(e));"nav"===o?t(n,l):"combo"===o?r(n,l):"selector"===o?a(n,l):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",n,o)}catch(e){console.warn("Skipped Pagy.init() for: %o\n%s",n,e)}}}})();window.Pagy=e}();

data/lib/pagy/backend.rb CHANGED Viewed

@@ -38,7 +38,7 @@ class Pagy
     # Sub-method called only by #pagy: here for easy customization of record-extraction by overriding
     # You may need to override this method for collections without offset|limit
     def pagy_get_items(collection, pagy)
-      collection.offset(pagy.offset).limit(pagy.items)
+      collection.offset(pagy.offset).limit(pagy.in)
     end
   end
 end

data/lib/pagy/extras/foundation.rb CHANGED Viewed

@@ -1,6 +1,8 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/foundation
 # frozen_string_literal: true
+warn '[PAGY WARNING] The foundation extra has been discontinued and it will be removed in v9 ' \
+     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
 require_relative 'js_tools'
 class Pagy # :nodoc:

data/lib/pagy/extras/materialize.rb CHANGED Viewed

@@ -1,6 +1,8 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/materialize
 # frozen_string_literal: true
+warn '[PAGY WARNING] The materialize extra has been discontinued and it will be removed in v9 ' \
+     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
 require_relative 'js_tools'
 class Pagy # :nodoc:

data/lib/pagy/extras/overflow.rb CHANGED Viewed

@@ -27,7 +27,7 @@ class Pagy # :nodoc:
           initialize vars.merge!(page: @last)          # re-run with the last page
           @vars[:page] = requested_page                # restore the requested page
         when :empty_page
-          @offset = @items = @from = @to = 0           # vars relative to the actual page
+          @offset = @items = @in = @from = @to = 0     # vars relative to the actual page
           if defined?(Calendar) && is_a?(Calendar)     # only for Calendar instances
             edge = @order == :asc ? @final : @initial  # get the edge of the overflow side (neat, but any time would do)
             @from = @to = edge                         # set both to the edge utc time (a >=&&< query will get no records)

data/lib/pagy/extras/semantic.rb CHANGED Viewed

@@ -1,6 +1,8 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/semantic
 # frozen_string_literal: true
+warn '[PAGY WARNING] The semantic extra has been discontinued and it will be removed in v9 ' \
+     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
 require_relative 'js_tools'
 class Pagy # :nodoc:

data/lib/pagy/extras/uikit.rb CHANGED Viewed

@@ -1,6 +1,8 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/uikit
 # frozen_string_literal: true
+warn '[PAGY WARNING] The uikit extra has been discontinued and it will be removed in v9 ' \
+     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
 require_relative 'js_tools'
 class Pagy # :nodoc:

data/lib/pagy.rb CHANGED Viewed

@@ -5,7 +5,7 @@ require 'pathname'
 # Core class
 class Pagy
-  VERSION = '8.2.2'
+  VERSION = '8.4.0'
   # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 8.2.2
+  version: 8.4.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Agnostic pagination in plain ruby. It does it all. Better.
 email:
@@ -120,9 +120,9 @@ metadata:
   support: https://github.com/ddnexus/pagy/discussions/categories/q-a
 post_install_message: |
   *********************** PAGY WARNING! ***********************
-             We may drop pagy's less used CSS extras.
-        If you wish to keep them alive, please, vote here:
-  https://github.com/ddnexus/pagy/discussions/categories/survey
+   The foundation, materialize, semantic and uikit CSS extras
+        have been discontinued and will be removed in v9
+         https://github.com/ddnexus/pagy/discussions/672
   *************************************************************
 rdoc_options: []
 require_paths: