pagy 9.2.0 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2085cf1f7f8e3b016a9d2b40ec9cf3720014b8bb2ab2b1070466129b0c18f3bb
-  data.tar.gz: a3e93e7018900837ed4258eef202e7e66f930fa8d105139c342d62a4ee2b51c6
+  metadata.gz: 50fce56f851465e19e07eb834ac69359abec701000cb23900d043bba62d3f0a3
+  data.tar.gz: e3207beec177cdecafc4c23b74181ad09ea76d8ce16d74eb96b1104cc0f07ff2
 SHA512:
-  metadata.gz: 729555f087c358546243b556dd09e48b33287add79edff83931439b010baa8dea896912714b6156dc56d059238369f96907acd403ba73be0bf36a020dbb1a67f
-  data.tar.gz: e3253f968ac68d8bcccf8e8ce060f42ee4071737615ac99c29c59c2b2f60c779bb3396facf938e45b0de2ed687365b94e142961ef4f2d7a3f43a66c675f8d2a9
+  metadata.gz: a2c87364b765b31846788a0b3ed5234bc3096d58cccf407b36a107dc906c964aa41328984b82c2c399e91165f0ac13bab12a3954398c47f8eedc2cf67f5f9774
+  data.tar.gz: 1e5a7a0b030d0e8e9a88fa438cfd9b4987d93d7a2cc1dffd81e6736cb0a80d5d1f5d4c7cfbb3390cfbfd9e44aa6fc7036a7e470543d8cd1d830bf42812fb64c8

data/apps/calendar.ru

@@ -1,61 +1,35 @@
 # frozen_string_literal: true
 
-# Interactive showcase for the pagy calendar extra (https://ddnexus.github.io/pagy/docs/extras/calendar)
-
+# DESCRIPTION
+#    Showcase the calendar; reproduce related issues
+#
+# DOC
+#    https://ddnexus.github.io/pagy/playground/#5-calendar-app
+#
+# BIN HELP
+#    bundle exec pagy -h
+#
 # DEV USAGE
-#    pagy clone calendar
-#    pagy ./calendar.ru
-
+#    bundle exec pagy clone calendar
+#    bundle exec pagy ./calendar.ru
+#
 # URL
 #    http://0.0.0.0:8000
 
-# HELP
-#    pagy -h
-
-# DOC
-#    https://ddnexus.github.io/pagy/playground/#5-calendar-app
-
-VERSION = '9.2.0'
+VERSION = '9.3.1'
 
-# Gemfile
+# Bundle
 require 'bundler/inline'
 require 'bundler'
 Bundler.configure
 gemfile(ENV['PAGY_INSTALL_BUNDLE'] == 'true') do
   source 'https://rubygems.org'
+  gem 'activerecord'
+  gem 'activesupport'
   gem 'groupdate'
   gem 'puma'
-  gem 'rails'
-  # activerecord/sqlite3_adapter.rb probably useless) constraint !!!
-  # https://github.com/rails/rails/blame/v7.1.3.4/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L14
-  gem 'sqlite3', '~> 1.4.0'
-end
-
-# require 'rails/all'     # too much stuff
-require 'action_controller/railtie'
-require 'active_record'
-
-OUTPUT = Rails.env.showcase? ? IO::NULL : $stdout
-
-# Rails config
-class Calendar < Rails::Application # :nodoc:
-  config.root = __dir__
-  config.session_store :cookie_store, key: 'cookie_store_key'
-  Rails.application.credentials.secret_key_base = 'absolute_secret'
-
-  config.logger = Logger.new(OUTPUT)
-  Rails.logger  = config.logger
-
-  routes.draw do
-    root to: 'events#index'
-  end
-end
-
-# AR config
-dir = Rails.env.development? ? '.' : Dir.pwd  # app dir in dev or pwd otherwise
-unless File.writable?(dir)
-  warn "ERROR: directory #{dir.inspect} is not writable (the calendar-app needs to create DB files)"
-  exit 1
+  gem 'sinatra'
+  gem 'sqlite3'
 end
 
 # Pagy initializer
@@ -63,32 +37,10 @@ require 'pagy/extras/calendar'
 require 'pagy/extras/bootstrap'
 Pagy::DEFAULT.freeze
 
-# Groupdate initializer  (https://github.com/ankane/groupdate)
-# Groupdate week_start default is :sunday, while rails and pagy default to :monday
-Groupdate.week_start = :monday
-
-# Activerecord initializer
-ActiveRecord::Base.logger = Logger.new(OUTPUT)
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: "#{dir}/tmp/calendar.sqlite3")
-ActiveRecord::Schema.define do
-  create_table :events, force: true do |t|
-    t.string :title
-    t.timestamp :time
-  end
-end
-
-# Models
-class Event < ActiveRecord::Base
-end
-
-# Helpers
-module EventsHelper
-  include Pagy::Frontend
-end
-
-# Controllers
-class EventsController < ActionController::Base
-  include Rails.application.routes.url_helpers
+# Sinatra setup
+require 'sinatra/base'
+# Sinatra application
+class PagyCalendar < Sinatra::Base
   include Pagy::Backend
 
   # This method must be implemented by the application.
@@ -117,7 +69,8 @@ class EventsController < ActionController::Base
         unless params[:skip_counts] == 'true'
   end
 
-  def index
+  # Root route/action
+  get '/' do
     # Groupdate does not support time zones with SQLite.
     # 'UTC' does not work on certain machines config (pulling the actual local time zone utc_offset)
     # so for this demo we use a different zone with utc_offset 0
@@ -133,55 +86,66 @@ class EventsController < ActionController::Base
                                               month:  {},
                                               day:    {},
                                               active: !params[:skip])
-    render inline: TEMPLATE
+    erb :main
   end
-end
 
-TEMPLATE = <<~ERB
-  <!DOCTYPE html>
-  <html lang="en">
-    <html>
-    <head>
-    <title>Pagy Calendar App</title>
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <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">
-
-      <style type="text/css">
-        @media screen { html, body {
-          font-size: .8rem;
-          line-height: 1.1s;
-          padding: 0;
-          margin: 0;
-        } }
-        body {
-          background-color: #f7f7f7;
-          color: #51585F;"
-          font-family: sans-serif;
-        }
-        .content {
-          padding: 1rem 1.5rem 2rem;
-        }
-        /* added with the pagy counts feature */
-        a.empty-page {
-          color: #888888;
-        }
-      </style>
-    </head>
-
-    <body>
+  helpers do
+    include Pagy::Frontend
+  end
 
+  # Views
+  template :layout do
+    <<~ERB
+      <!DOCTYPE html>
+      <html lang="en">
+        <html>
+        <head>
+        <title>Pagy Calendar App</title>
+          <meta name="viewport" content="width=device-width, initial-scale=1.0">
+          <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">
+
+          <style type="text/css">
+            @media screen { html, body {
+              font-size: .8rem;
+              line-height: 1.1s;
+              padding: 0;
+              margin: 0;
+            } }
+            body {
+              background-color: #f7f7f7;
+              color: #51585F;"
+              font-family: sans-serif;
+            }
+            .content {
+              padding: 1rem 1.5rem 2rem;
+            }
+            /* added with the pagy counts feature */
+            a.empty-page {
+              color: #888888;
+            }
+          </style>
+        </head>
+
+        <body>
+          <%= yield %>
+        </body>
+      </html>
+    ERB
+  end
+  template :main do
+    <<~ERB
       <div class="container">
         <h1>Pagy Calendar App</h1>
-        <p>Self-contained, standalone Rails app implementing nested calendar pagination for year, month, day units.</p>
+        <p>Self-contained, standalone 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>
         <p>Please, report the following versions in any new issue.</p>
         <h2>Versions</h2>
         <ul>
-          <li>Ruby:  <%== RUBY_VERSION %></li>
-          <li>Rack:  <%== Rack::RELEASE %></li>
-          <li>Rails: <%== Rails.version %></li>
-          <li>Pagy:  <%== Pagy::VERSION %></li>
+          <li>Ruby:    <%= RUBY_VERSION %></li>
+          <li>Rack:    <%= Rack::RELEASE %></li>
+          <li>Sinatra: <%= Sinatra::VERSION %></li>
+          <li>Pagy:    <%= Pagy::VERSION %></li>
         </ul>
         <hr>
 
@@ -200,14 +164,14 @@ TEMPLATE = <<~ERB
         <!-- calendar filtering navs -->
         <% if @calendar %>
           <p>Showtime: <%= @calendar.showtime %></p>
-          <%== 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 -->
+          <%= 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, id: 'pagy-info') %>
+          <%= pagy_info(@pagy, id: 'pagy-info') %>
           <% if @calendar %>
             for <b><%= @calendar.showtime.strftime('%Y-%m-%d') %></b>
           <% end %>
@@ -221,13 +185,41 @@ TEMPLATE = <<~ERB
         </div>
 
         <!-- standard pagination of the selected month -->
-        <p><%== pagy_bootstrap_nav(@pagy, id: 'pages-nav', aria_label: 'Pages') if @pagy.pages > 1 %><p/>
+        <p><%= pagy_bootstrap_nav(@pagy, id: 'pages-nav', aria_label: 'Pages') if @pagy.pages > 1 %><p/>
       </div>
-    </body>
-  </html>
-ERB
+    ERB
+  end
+end
+
+# ActiveRecord setup
+require 'active_record'
+# Log
+output = ENV['APP_ENV'].equal?('showcase') ? IO::NULL : $stdout
+ActiveRecord::Base.logger = Logger.new(output)
+# SQLite DB files
+dir = ENV['APP_ENV'].equal?('development') ? '.' : Dir.pwd  # app dir in dev or pwd otherwise
+abort "ERROR: Cannot create DB files: the directory #{dir.inspect} is not writable." \
+      unless File.writable?(dir)
+# Connection
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: "#{dir}/tmp/pagy-calendar.sqlite3")
+
+# Groupdate initializer  (https://github.com/ankane/groupdate)
+# Groupdate week_start default is :sunday, while rails and pagy default to :monday
+Groupdate.week_start = :monday
+ActiveSupport.to_time_preserves_timezone = :zone  # Fix ActiveSupport deprecation
+
+ActiveRecord::Schema.define do
+  create_table :events, force: true do |t|
+    t.string :title
+    t.timestamp :time
+  end
+end
+
+# Models
+class Event < ActiveRecord::Base; end
 
-TIMES = <<~TIMES
+# Event times
+data = <<~DATA
   2021-10-21 13:18:23 +0000
   2021-10-21 23:14:50 +0000
   2021-10-23 01:06:02 +0000
@@ -733,13 +725,13 @@ TIMES = <<~TIMES
   2023-11-12 04:22:50 +0000
   2023-11-12 08:38:58 +0000
   2023-11-13 15:43:40 +0000
-TIMES
+DATA
 
 # DB seed
 events = []
-TIMES.each_line(chomp: true).with_index do |time, i|
+data.each_line(chomp: true).with_index do |time, i|
   events << { title: "Event ##{i + 1}", time: }
 end
 Event.insert_all(events)
 
-run Calendar
+run PagyCalendar