pagy 43.2.1 → 43.2.3

data/lib/pagy/cli.rb

@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+require 'optparse'
+require 'fileutils'
+require 'rbconfig'
+require 'pagy'
+require_relative '../../apps/index'
+
+class Pagy
+  class CLI
+    HOST  = 'localhost'
+    PORT  = '8000'
+
+    def start(args = ARGV)
+      options = parse_options(args)
+      run_command(args, options)
+    end
+
+    private
+
+    def parse_options(args)
+      options = { env: 'development', host: HOST, port: PORT, quiet: false }
+
+      parser = OptionParser.new do |opts|
+        opts.banner = <<~BANNER
+          Pagy #{VERSION} (https://ddnexus.github.io/pagy/playground)
+          Playground to showcase, clone and develop Pagy APPs
+
+          Usage:
+            pagy APP [opts]   Showcase APP from the installed gem
+            pagy clone APP    Clone APP to the current dir
+            pagy FILE [opts]  Develop app FILE from local path
+        BANNER
+
+        opts.summary_indent = '  '
+        opts.summary_width  = 18
+
+        opts.separator "\nAPPs"
+        PagyApps::INDEX.each do |name, path|
+          desc = File.readlines(path)[3].sub('#    ', '').strip
+          opts.separator "  #{name.ljust(18)}#{desc}"
+        end
+
+        opts.separator "\nRackup options"
+        opts.on('-e', '--env ENV', 'Environment') { |v| options[:env] = v }
+        opts.on('-o', '--host HOST', 'Host')      { |v| options[:host] = v }
+        opts.on('-p', '--port PORT', 'Port')      { |v| options[:port] = v }
+
+        opts.separator "\nOther options"
+        opts.on('-q', '--quiet', 'Quiet mode for development') { options[:quiet] = true }
+        opts.on('-v', '--version', 'Show version') do
+          puts VERSION
+          exit
+        end
+        opts.on('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+
+        opts.separator "\nExamples"
+        opts.separator "  pagy demo          Showcase demo at http://#{HOST}:#{PORT}"
+        opts.separator '  pagy clone repro   Clone repro to ./repro.ru (rename it)'
+        opts.separator "  pagy ~/myapp.ru    Develop ~/myapp.ru at #{HOST}:#{PORT}"
+      end
+
+      begin
+        parser.parse!(args)
+      rescue OptionParser::InvalidOption => e
+        abort e.message
+      end
+
+      if args.empty?
+        puts parser
+        exit
+      end
+
+      options
+    end
+
+    def run_command(args, options)
+      run_from_repo = Pagy::ROOT.join('pagy.gemspec').exist?
+      setup_gems(run_from_repo)
+
+      arg = args.shift
+
+      if arg.eql?('clone')
+        clone_app(args.shift)
+      else
+        serve_app(arg, options)
+      end
+    end
+
+    def clone_app(name)
+      abort "Expected APP to be in [#{PagyApps::INDEX.keys.join(', ')}]; got #{name.inspect}" unless PagyApps::INDEX.key?(name)
+
+      if File.exist?(name)
+        print "Do you want to overwrite the #{name.inspect} file? (y/n)> "
+        answer = gets.chomp
+        abort "#{name.inspect} file already present" unless answer.start_with?(/y/i)
+      end
+      FileUtils.cp(PagyApps::INDEX[name], '.', verbose: true)
+    end
+
+    def serve_app(arg, options)
+      if PagyApps::INDEX.key?(arg)
+        options[:env]   = 'showcase'
+        options[:quiet] = true
+        # Avoid the creation of './tmp/local_secret.txt' for showcase env
+        ENV['SECRET_KEY_BASE'] = 'absolute secret!' if arg.eql?('rails')
+        file = PagyApps::INDEX[arg]
+      else
+        file = arg
+      end
+      abort "#{file.inspect} app not found" unless File.exist?(file)
+
+      gem_dir = File.expand_path('../..', __dir__)
+      rackup  = "rackup -I #{gem_dir}/lib -r pagy -o #{options[:host]} -p #{options[:port]} -E #{options[:env]} #{file}"
+      rackup << ' -q' if options[:quiet]
+
+      exec(rackup)
+    end
+
+    # Kept as a separate method because mocking 'gemfile' (dsl) is complex otherwise
+    def setup_gems(run_from_repo)
+      require 'bundler/inline'
+      gemfile(!run_from_repo) do
+        source 'https://rubygems.org'
+        gem 'logger'
+        gem 'rackup'
+      end
+    end
+  end
+end

data/lib/pagy.rb

@@ -8,7 +8,7 @@ require_relative 'pagy/toolbox/helpers/loader'
 
 # Top superclass: it defines only what's common to all the subclasses
 class Pagy
-  VERSION     = '43.2.1'
+  VERSION     = '43.2.3'
   ROOT        = Pathname.new(__dir__).parent.freeze
   DEFAULT     = { limit: 20, limit_key: 'limit', page_key: 'page' }.freeze
   PAGE_TOKEN  = EscapedValue.new('P ')

data/stylesheets/pagy-tailwind.css

@@ -25,7 +25,7 @@
     --background-input:   hsl(var(--H) var(--S) calc(var(--L) + (45 * var(--B))));
     --opacity: 1;
 
-    @apply flex space-x-[var(--spacing)] font-[var(--font-weight)]
+    @apply flex gap-x-[var(--spacing)] font-[var(--font-weight)]
     text-[length:var(--font-size)] text-[var(--text)]
     leading-[var(--line-height)];
 

data/stylesheets/pagy.css

@@ -28,12 +28,7 @@
 }
 
 .pagy > :not([hidden]) ~ :not([hidden]) {
-  margin-left: calc(var(--spacing) * (1 - var(--space-reverse, 0)));
-  margin-right: calc(var(--spacing) * var(--space-reverse, 0));
-}
-
-.rtl .pagy > :not([hidden]) ~ :not([hidden]) {
-  --space-reverse: 1;
+  margin-inline-start: var(--spacing);
 }
 
 .pagy a:not([role="separator"]) { /* all but gaps */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 43.2.1
+  version: 43.2.3
 platform: ruby
 authors:
 - Domizio Demichelis
@@ -48,13 +48,13 @@ files:
 - LICENSE.txt
 - apps/calendar.ru
 - apps/demo.ru
+- apps/enable_rails_page_segment.rb
 - apps/index.rb
 - apps/keynav+root_key.ru
 - apps/keynav.ru
 - apps/keyset.ru
 - apps/keyset_sequel.ru
 - apps/rails.ru
-- apps/rails_page_segment.rb
 - apps/repro.ru
 - bin/pagy
 - config/pagy.rb
@@ -65,7 +65,6 @@ files:
 - javascripts/pagy.min.js
 - javascripts/pagy.mjs
 - javascripts/wand.js
-- lib/optimist.rb
 - lib/pagy.rb
 - lib/pagy/classes/calendar/calendar.rb
 - lib/pagy/classes/calendar/day.rb
@@ -84,6 +83,7 @@ files:
 - lib/pagy/classes/offset/offset.rb
 - lib/pagy/classes/offset/search.rb
 - lib/pagy/classes/request.rb
+- lib/pagy/cli.rb
 - lib/pagy/console.rb
 - lib/pagy/modules/abilities/configurable.rb
 - lib/pagy/modules/abilities/countable.rb
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: "Pagy \U0001F438 The Leaping Gem!"
 test_files: []

data/apps/rails_page_segment.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-# ################# IMPORTANT WARNING #################
-# Use this override ONLY if you strictly need to support the page param as a dynamic segment.
-# (e.g. get '/comments(/:page)', to: 'comments#index').
-#
-# This setup forces Pagy to use the Rails `url_for` method, which is significantly
-# slower (~20x) than Pagy's native URL generation.
-# #####################################################
-
-# 1. CONSTANT REDEFINITION
-# We must replace Pagy's internal tokens.
-# Why: Pagy marks its default tokens as "Escaped" to allow spaces into the URL template for safe interpolation.
-# Since we are handing control back to Rails' standard QueryUtils, we need simple, URL-safe placeholders
-# that Rails won't need to escape, to avoid mismatches between non-escaped and escaped tokens.
-Pagy.send(:remove_const, :PAGE_TOKEN)
-Pagy.send(:remove_const, :LIMIT_TOKEN)
-
-Pagy::PAGE_TOKEN  = '___PAGY_PAGE___'
-Pagy::LIMIT_TOKEN = '___PAGY_LIMIT___'
-
-require 'pagy/toolbox/paginators/method'
-require 'pagy/modules/abilities/linkable'
-
-class Pagy
-  # 2. REQUEST PARAMETERS
-  # Why: Pagy defaults to Rack::Request to be framework agnostic.
-  # To support dynamic segments (which are routing concepts, not query params),
-  # we must switch to the Rails `request.params` method which includes path parameters.
-  module RequestOverride
-    def get_params(request)
-      request.params
-    end
-  end
-  Request.prepend RequestOverride
-
-  # 3. CONTEXT INJECTION
-  # Why: The Pagy object needs access to the Controller instance to call `url_for`.
-  # We intercept the `pagy` method in the controller to inject `self` (the controller)
-  # into the Pagy instance as `@context`.
-  module MethodOverride
-    def pagy(...)
-      super.tap do |result|
-        # result is [pagy_object, records]
-        # We inject the controller (self) directly into the pagy object
-        result[0].instance_variable_set(:@context, self)
-      end
-    end
-  end
-  Method.prepend MethodOverride
-
-  # 4. URL GENERATION
-  # Why: We override Pagy's optimized string interpolation with Rails' `url_for`.
-  # We combine the current Rails parameters with Pagy's options and generate the URL.
-  module LinkableOverride
-    def compose_url(absolute, _path, params, fragment)
-      params[:anchor]    = fragment if fragment
-      params[:only_path] = !absolute
-
-      # Call the Rails url_for method from the controller context
-      @context.url_for(params)
-    end
-  end
-  Linkable.prepend LinkableOverride
-end
-
-# USAGE with rails.ru
-
-# Search and uncomment the following lines in the rails.ru app:
-# require_relative 'rails_page_segment'  # Uncomment to test the rails_page_segment.rb override
-# get '/comments(/:page)', to: 'comments#index'  # Uncomment to test the rails_page_segment.rb override