From b5d4f363bc38a9f3aae1f18a1f2c581b21a19af5 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 8 Aug 2025 18:18:59 +0300 Subject: [PATCH] Rename element_versions_pagination helper to numbered_pagination --- app/helpers/numbered_pagination_helper.rb | 22 ++--- app/views/elements/show.html.erb | 2 +- app/views/old_elements/_actions.html.erb | 2 +- app/views/old_elements/index.html.erb | 2 +- .../numbered_pagination_helper_test.rb | 80 +++++++++---------- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/app/helpers/numbered_pagination_helper.rb b/app/helpers/numbered_pagination_helper.rb index 0a2ee6d23..c582de226 100644 --- a/app/helpers/numbered_pagination_helper.rb +++ b/app/helpers/numbered_pagination_helper.rb @@ -1,11 +1,11 @@ module NumberedPaginationHelper - def element_versions_pagination(top_version, active_version: top_version + 1, window_half_size: 50, step_size: 50, &) + def numbered_pagination(top_version, active_version: top_version + 1, window_half_size: 50, step_size: 50, &) lists = [] if top_version <= 5 lists << tag.ul(:class => "pagination pagination-sm mt-1") do (1..top_version).each do |v| - concat element_versions_pagination_item(v, **yield(v), :active => v == active_version) + concat numbered_pagination_item(v, **yield(v), :active => v == active_version) end end else @@ -33,9 +33,9 @@ module NumberedPaginationHelper lists << tag.ul(:id => "versions-navigation-list-start", :class => "pagination pagination-sm mt-1") do start_list_versions.each do |v| - concat element_versions_pagination_item(v, **yield(v), :active => v == active_version, - :edge => [false, v == start_list_versions.last], - :edge_border => true) + concat numbered_pagination_item(v, **yield(v), :active => v == active_version, + :edge => [false, v == start_list_versions.last], + :edge_border => true) end end lists << tag.ul(:id => "versions-navigation-list-middle", @@ -48,18 +48,18 @@ module NumberedPaginationHelper middle_list_versions.each_with_index do |v, i| edge = [i.zero?, i == middle_list_versions.length - 1] if v == :gap - concat element_versions_pagination_item("...", :edge => edge) + concat numbered_pagination_item("...", :edge => edge) else - concat element_versions_pagination_item(v, **yield(v), :active => v == active_version, :edge => edge) + concat numbered_pagination_item(v, **yield(v), :active => v == active_version, :edge => edge) end end end lists << tag.ul(:id => "versions-navigation-list-end", :class => "pagination pagination-sm mt-1") do end_list_versions.each do |v| - concat element_versions_pagination_item(v, **yield(v), :active => v == active_version, - :edge => [v == end_list_versions.first, false], - :edge_border => true) + concat numbered_pagination_item(v, **yield(v), :active => v == active_version, + :edge => [v == end_list_versions.first, false], + :edge_border => true) end end end @@ -69,7 +69,7 @@ module NumberedPaginationHelper private - def element_versions_pagination_item(body, href: nil, title: nil, active: false, edge: [false, false], edge_border: false) + def numbered_pagination_item(body, href: nil, title: nil, active: false, edge: [false, false], edge_border: false) link_class = ["page-link", { "rounded-start-0" => edge.first, "border-start-0" => edge.first && !edge_border, "rounded-end-0" => edge.last, diff --git a/app/views/elements/show.html.erb b/app/views/elements/show.html.erb index 383df1a3c..476330fad 100644 --- a/app/views/elements/show.html.erb +++ b/app/views/elements/show.html.erb @@ -29,7 +29,7 @@ - <%= element_versions_pagination(@feature.version, :active_version => @feature.version) do |v| + <%= numbered_pagination(@feature.version, :active_version => @feature.version) do |v| { :href => { :controller => "old_#{@type.pluralize}", :action => :show, :version => v }, :title => t("browse.versions_navigation.version", :version => v) } end %> diff --git a/app/views/old_elements/_actions.html.erb b/app/views/old_elements/_actions.html.erb index fea4cbecd..8c3d0eb55 100644 --- a/app/views/old_elements/_actions.html.erb +++ b/app/views/old_elements/_actions.html.erb @@ -25,7 +25,7 @@ - <%= element_versions_pagination(@current_feature.version, :active_version => @feature.version) do |v| + <%= numbered_pagination(@current_feature.version, :active_version => @feature.version) do |v| { :href => { :version => v }, :title => t("browse.versions_navigation.version", :version => v) } end %> diff --git a/app/views/old_elements/index.html.erb b/app/views/old_elements/index.html.erb index 0dac499cd..53436dc2c 100644 --- a/app/views/old_elements/index.html.erb +++ b/app/views/old_elements/index.html.erb @@ -57,7 +57,7 @@ - <%= element_versions_pagination(@current_feature.version) do |v| + <%= numbered_pagination(@current_feature.version) do |v| { :href => { :action => :show, :version => v }, :title => t("browse.versions_navigation.version", :version => v) } end %> diff --git a/test/helpers/numbered_pagination_helper_test.rb b/test/helpers/numbered_pagination_helper_test.rb index d115a8392..f08c5ba63 100644 --- a/test/helpers/numbered_pagination_helper_test.rb +++ b/test/helpers/numbered_pagination_helper_test.rb @@ -1,8 +1,8 @@ require "test_helper" class NumberedPaginationHelperTest < ActionView::TestCase - def test_element_versions_pagination1 - pagination = element_versions_pagination(1) { |v| sample_item_data v } + def test_numbered_pagination1 + pagination = numbered_pagination(1) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 1 do assert_dom "> li", 1 do @@ -11,8 +11,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination1_active1 - pagination = element_versions_pagination(1, :active_version => 1) { |v| sample_item_data v } + def test_numbered_pagination1_active1 + pagination = numbered_pagination(1, :active_version => 1) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 1 do assert_dom "> li", 1 do @@ -21,8 +21,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination5 - pagination = element_versions_pagination(5) { |v| sample_item_data v } + def test_numbered_pagination5 + pagination = numbered_pagination(5) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 1 do assert_dom "> li", 5 do |items| @@ -33,8 +33,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination6 - pagination = element_versions_pagination(6) { |v| sample_item_data v } + def test_numbered_pagination6 + pagination = numbered_pagination(6) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do @@ -51,8 +51,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination6_active1 - pagination = element_versions_pagination(6, :active_version => 1) { |v| sample_item_data v } + def test_numbered_pagination6_active1 + pagination = numbered_pagination(6, :active_version => 1) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 2 do |items| @@ -70,8 +70,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination6_active2 - pagination = element_versions_pagination(6, :active_version => 2) { |v| sample_item_data v } + def test_numbered_pagination6_active2 + pagination = numbered_pagination(6, :active_version => 2) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 3 do |items| @@ -89,8 +89,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination6_active3 - pagination = element_versions_pagination(6, :active_version => 3) { |v| sample_item_data v } + def test_numbered_pagination6_active3 + pagination = numbered_pagination(6, :active_version => 3) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -108,8 +108,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination6_active4 - pagination = element_versions_pagination(6, :active_version => 4) { |v| sample_item_data v } + def test_numbered_pagination6_active4 + pagination = numbered_pagination(6, :active_version => 4) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -127,8 +127,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination6_active5 - pagination = element_versions_pagination(6, :active_version => 5) { |v| sample_item_data v } + def test_numbered_pagination6_active5 + pagination = numbered_pagination(6, :active_version => 5) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -146,8 +146,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination6_active6 - pagination = element_versions_pagination(6, :active_version => 6) { |v| sample_item_data v } + def test_numbered_pagination6_active6 + pagination = numbered_pagination(6, :active_version => 6) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -165,8 +165,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_window_start_include - pagination = element_versions_pagination(50, :window_half_size => 3, :active_version => 3) { |v| sample_item_data v } + def test_numbered_pagination_window_start_include + pagination = numbered_pagination(50, :window_half_size => 3, :active_version => 3) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -186,8 +186,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_window_start_touch - pagination = element_versions_pagination(50, :window_half_size => 3, :active_version => 5) { |v| sample_item_data v } + def test_numbered_pagination_window_start_touch + pagination = numbered_pagination(50, :window_half_size => 3, :active_version => 5) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -209,8 +209,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_window_start_touch_almost - pagination = element_versions_pagination(50, :window_half_size => 3, :active_version => 6) { |v| sample_item_data v } + def test_numbered_pagination_window_start_touch_almost + pagination = numbered_pagination(50, :window_half_size => 3, :active_version => 6) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -233,8 +233,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_window_middle - pagination = element_versions_pagination(50, :window_half_size => 3, :active_version => 43) { |v| sample_item_data v } + def test_numbered_pagination_window_middle + pagination = numbered_pagination(50, :window_half_size => 3, :active_version => 43) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -257,8 +257,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_window_end_touch - pagination = element_versions_pagination(50, :window_half_size => 3, :active_version => 46) { |v| sample_item_data v } + def test_numbered_pagination_window_end_touch + pagination = numbered_pagination(50, :window_half_size => 3, :active_version => 46) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -280,8 +280,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_window_end_beyond - pagination = element_versions_pagination(50, :window_half_size => 3) { |v| sample_item_data v } + def test_numbered_pagination_window_end_beyond + pagination = numbered_pagination(50, :window_half_size => 3) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -298,8 +298,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_step - pagination = element_versions_pagination(35, :step_size => 10, :window_half_size => 0) { |v| sample_item_data v } + def test_numbered_pagination_step + pagination = numbered_pagination(35, :step_size => 10, :window_half_size => 0) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -320,8 +320,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_step_end_touch - pagination = element_versions_pagination(31, :step_size => 10, :window_half_size => 0) { |v| sample_item_data v } + def test_numbered_pagination_step_end_touch + pagination = numbered_pagination(31, :step_size => 10, :window_half_size => 0) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -341,8 +341,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_step_window - pagination = element_versions_pagination(35, :active_version => 15, :step_size => 10, :window_half_size => 1) { |v| sample_item_data v } + def test_numbered_pagination_step_window + pagination = numbered_pagination(35, :active_version => 15, :step_size => 10, :window_half_size => 1) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| @@ -367,8 +367,8 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def test_element_versions_pagination_step_window_touch - pagination = element_versions_pagination(35, :active_version => 12, :step_size => 10, :window_half_size => 1) { |v| sample_item_data v } + def test_numbered_pagination_step_window_touch + pagination = numbered_pagination(35, :active_version => 12, :step_size => 10, :window_half_size => 1) { |v| sample_item_data v } pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| -- 2.39.5