From 8da6d54965ff9931679a9283d6b19b309f3db403 Mon Sep 17 00:00:00 2001 From: Domizio Demichelis Date: Thu, 6 Feb 2025 10:57:15 +0700 Subject: [PATCH] WIP: *_a -> *_anchor --- CHANGELOG-10.md | 2 + docs/extras/pagy.md | 18 ++++---- gem/apps/demo.ru | 4 +- gem/apps/keyset.ru | 2 +- gem/apps/keyset_sequel.ru | 2 +- gem/lib/pagy/frontend/loader.rb | 4 +- gem/lib/pagy/frontend/pagy/combo_nav_js.rb | 4 +- gem/lib/pagy/frontend/pagy/nav.rb | 4 +- gem/lib/pagy/frontend/pagy/nav_js.rb | 4 +- gem/lib/pagy/frontend/pagy/previous_next.rb | 8 ++-- test/pagy/frontend/pagy_test.rb | 8 ++-- test/pagy/frontend/pagy_test.rb.yaml | 46 +++++++++++++++++---- 12 files changed, 69 insertions(+), 37 deletions(-) diff --git a/CHANGELOG-10.md b/CHANGELOG-10.md index 20fd6332b..e61f9feb3 100644 --- a/CHANGELOG-10.md +++ b/CHANGELOG-10.md @@ -127,6 +127,8 @@ Your app likely uses just a little fraction of the renamed things in the list be | Method/args | `label_for(page` | `label(page: page` | Simpler name: `page` is now a keywork argument | | Method/args | `label(page` | `label(page: page` | Same name: `page` is now a keywork argument | | Naming | `*prev*` | `*previous*` | Unabbreviated word everywhere (option, accessor, methods, CSS class) | +| Method | `pagy_prev_a` | `pagy_previous_anchor` | Unabbreviated words | +| Method | `pagy_next_a` | `pagy_next_anchor` | Unabbreviated words | #### Replace your `pagy.rb` config file diff --git a/docs/extras/pagy.md b/docs/extras/pagy.md index 1ccee5901..6626138f5 100644 --- a/docs/extras/pagy.md +++ b/docs/extras/pagy.md @@ -20,12 +20,12 @@ require 'pagy/extras/pagy' ``` ```erb View (helper) -<%== pagy_nav_js(@pagy, **vars) %> -<%== pagy_combo_nav_js(@pagy, **vars) %> -<%== pagy_prev_a(@pagy, **vars) %> -<%== pagy_next_a(@pagy, **vars) %> -<%== pagy_prev_link(@pagy, **vars) %> -<%== pagy_next_link(@pagy, **vars) %> +<%== pagy_nav_js(@pagy, **opts) %> +<%== pagy_combo_nav_js(@pagy, **opts) %> +<%== pagy_prev_a(@pagy, **opts) %> +<%== pagy_next_anchor(@pagy, **opts) %> +<%== pagy_prev_link(@pagy, **opts) %> +<%== pagy_next_link(@pagy, **opts) %> ``` ```ruby URL helpers @@ -85,7 +85,7 @@ The keyord argument used from `vars` are: - `aria_label: pagy_t('pagy.aria_label.prev)` - `anchor_string: nil` -==- `pagy_next_a(pagy, **vars)` +==- `pagy_next_anchor(pagy, **opts)` Return the enabled/disabled next page anchor tag. It is the same next link string which is part of the `pagy_nav` helper. @@ -164,7 +164,7 @@ end ```erb _next_link.html.erb (partial) -<%== pagy_next_a(@pagy, text: 'More...', anchor_string: 'data-remote="true"') %> +<%== pagy_next_anchor(@pagy, text: 'More...', anchor_string: 'data-remote="true"') %> ``` ```erb incremental.js.erb (javascript template) @@ -190,7 +190,7 @@ of changes: **1**. Hide the link in `_next_link.html.erb` by adding a style attribute: ```erb _next_link.html.erb (partial) -<%== pagy_next_a(@pagy, text: 'More...') %> +<%== pagy_next_anchor(@pagy, text: 'More...') %> ``` **2**. Add a javascript that will click the link when the listing-bottom appears in the viewport on load/resize/scroll. It will diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru index c5ec7c797..310b0e071 100644 --- a/gem/apps/demo.ru +++ b/gem/apps/demo.ru @@ -299,8 +299,8 @@ class PagyDemo < Sinatra::Base <%= html = pagy_limit_selector_js(@pagy, id: 'limit-selector-js') %> <%= highlight(html) %> -

pagy_previous_a / pagy_next_a

- <%= html = '' %> +

pagy_previous_anchor / pagy_next_anchor

+ <%= html = '' %> <%= highlight(html) %>

pagy_previous_link / pagy_next_link Link not rendered

diff --git a/gem/apps/keyset.ru b/gem/apps/keyset.ru index 67fb420e7..af99c18af 100644 --- a/gem/apps/keyset.ru +++ b/gem/apps/keyset.ru @@ -124,7 +124,7 @@ class PagyKeyset < Sinatra::Base

ERB diff --git a/gem/apps/keyset_sequel.ru b/gem/apps/keyset_sequel.ru index 0658cace7..f52638ec1 100644 --- a/gem/apps/keyset_sequel.ru +++ b/gem/apps/keyset_sequel.ru @@ -123,7 +123,7 @@ class PagyKeysetSequel < Sinatra::Base

ERB diff --git a/gem/lib/pagy/frontend/loader.rb b/gem/lib/pagy/frontend/loader.rb index 532ceddae..98657115b 100644 --- a/gem/lib/pagy/frontend/loader.rb +++ b/gem/lib/pagy/frontend/loader.rb @@ -18,8 +18,8 @@ module Loader pagy_next_link: 'pagy/helpers', pagy_info: 'pagy/info', pagy_limit_selector_js: 'pagy/limit_selector', - pagy_previous_a: 'pagy/previous_next', - pagy_next_a: 'pagy/previous_next' }.freeze + pagy_previous_anchor: 'pagy/previous_next', + pagy_next_anchor: 'pagy/previous_next' }.freeze define_method :pagy_load_frontend do |*args, **kwargs| method_sym = __callee__ diff --git a/gem/lib/pagy/frontend/pagy/combo_nav_js.rb b/gem/lib/pagy/frontend/pagy/combo_nav_js.rb index d76bebcde..5157dd818 100644 --- a/gem/lib/pagy/frontend/pagy/combo_nav_js.rb +++ b/gem/lib/pagy/frontend/pagy/combo_nav_js.rb @@ -10,9 +10,9 @@ def pagy_combo_nav_js(pagy, **) pages = pagy.pages input = %(#{A_TAG}) - html = %(#{pagy_previous_a(pagy, create_anchor)}