开源软件构建与测试

_service:tar_scm:rubygem-actionview.spec Changed

@@ -2,17 +2,30 @@
 %bcond_with bootstrap
 
 Name:		rubygem-%{gem_name}
-Version:	6.1.4.1
+Version:	7.0.4
 Release:	1
 Summary:	Rendering framework putting the V in MVC (part of Rails)
 License:	MIT
 URL:		http://rubyonrails.org
 Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# The gem doesn't ship with the test suite.
+# You may check it out like so
+# git clone http://github.com/rails/rails.git
+# cd rails/actionview && git archive -v -o actionview-7.0.4-tests.txz v7.0.4 test/
 Source1:	%{gem_name}-%{version}-tests.txz
+# The tools are needed for the test suite, are however unpackaged in gem file.
+# You may get them like so
+# git clone http://github.com/rails/rails.git --no-checkout
+# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/
 Source2:	rails-%{version}-tools.txz
+# Fixes for Minitest 5.16+
+# https://github.com/rails/rails/pull/45380
+Patch0:         rubygem-actionview-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch
+# https://github.com/rails/rails/pull/45370
+Patch1:         rubygem-actionview-7.0.2.3-Fix-tests-for-minitest-5.16.patch
 
 BuildRequires:	ruby(release)
-BuildRequires:	rubygems-devel
+BuildRequires:	rubygems-devel rubygem(did_you_mean)
 %if %{without bootstrap}
 BuildRequires:	rubygem(activesupport) = %{version}
 BuildRequires:	rubygem(activerecord) = %{version}
@@ -37,6 +50,11 @@
 %prep
 %setup -q -n %{gem_name}-%{version} -b1 -b2
 
+pushd %{_builddir}
+%patch0 -p2
+%patch1 -p2
+popd
+
 %build
 gem build ../%{gem_name}-%{version}.gemspec
 %gem_install
@@ -54,7 +72,9 @@
 ln -s %{_builddir}/tools ..
 mv %{_builddir}/test .
 
-mv test/activerecord/controller_runtime_test.rb{,.disable}
+# Test failure
+# https://github.com/rails/rails/issues/46130
+mv test/template/date_helper_i18n_test.rb{,.disable}
 
 find test -type f -name '*_test.rb' -print0 | \
   sort -z | \
@@ -76,6 +96,9 @@
 %doc %{gem_instdir}/CHANGELOG.md
 
 %changelog
+* Thu Jan 19 2023 yanxiaobing <yanxiaobing@huawei.com> - 7.0.4-1
+- Upgrade to version 7.0.4
+
 * Mon May 02 2022 wangkerong <wangkerong@h-partners.com>- 6.1.4.1-1
 - Upgrade to 6.1.4.1

_service:tar_scm:rubygem-actionview-7.0.2.3-Fix-tests-for-minitest-5.16.patch Added

@@ -0,0 +1,156 @@
+From 9766eb4a833c26c64012230b96dd1157ebb8e8a2 Mon Sep 17 00:00:00 2001
+From: eileencodes <eileencodes@gmail.com>
+Date: Wed, 15 Jun 2022 12:44:11 -0400
+Subject: PATCH Fix tests for minitest 5.16
+
+In minitest/minitest@6e06ac9 minitest changed such that it now accepts
+`kwargs` instead of requiring kwargs to be shoved into the args array.
+This is a good change but required some updates to our test code to get
+the new version of minitest passing.
+
+Changes are as follows:
+
+1) Lock minitest to 5.15 for Ruby 2.7. We don't love this change but
+it's pretty difficult to get 2.7 and 3.0 to play nicely together with
+the new kwargs changes. Dropping 2.7 support isn't an option right
+now for Rails. This is safe because all of the code changes here are
+internal methods to Rails like assert_called_with. Applications
+shouldn't be consuming them as they are no-doc'd.
+2) Update the `assert_called_with` method to take any kwargs but also
+the returns kwarg.
+3) Update callers of `assert_called_with` to move the kwargs outside the
+args array.
+4) Update the message from marshaled exceptions. In 5.16 the exception
+message is "result not reported" instead of "Wrapped undumpable
+exception".
+
+Co-authored-by: Matthew Draper <matthew@trebex.net>
+---
+ .../test/template/date_helper_i18n_test.rb    |  18 +--
+ .../template/form_helper/form_with_test.rb    |   2 +-
+ actionview/test/template/form_helper_test.rb  |   2 +-
+ .../template/form_options_helper_i18n_test.rb |   2 +-
+ .../test/template/translation_helper_test.rb  |   2 +-
+ 16 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/actionview/test/template/date_helper_i18n_test.rb b/actionview/test/template/date_helper_i18n_test.rb
+index 2f098e2f5158f..819d0d0ac206b 100644
+--- a/actionview/test/template/date_helper_i18n_test.rb
++++ b/actionview/test/template/date_helper_i18n_test.rb
+@@ -49,7 +49,7 @@ def test_distance_of_time_in_words_calls_i18n_with_custom_scope
+   end
+ 
+   def test_time_ago_in_words_passes_locale
+-    assert_called_with(I18n, :t, :less_than_x_minutes, scope: :'datetime.distance_in_words', count: 1, locale: "ru") do
++    assert_called_with(I18n, :t, :less_than_x_minutes, scope: :'datetime.distance_in_words', count: 1, locale: "ru") do
+       time_ago_in_words(15.seconds.ago, locale: "ru")
+     end
+   end
+@@ -84,7 +84,7 @@ def assert_distance_of_time_in_words_translates_key(passed, expected, expected_o
+     options = { locale: "en", scope: :'datetime.distance_in_words' }.merge!(expected_options)
+     options:count = count if count
+ 
+-    assert_called_with(I18n, :t, key, options) do
++    assert_called_with(I18n, :t, key, **options) do
+       distance_of_time_in_words(@from, to, passed_options.merge(locale: "en"))
+     end
+   end
+@@ -103,13 +103,13 @@ def test_select_month_given_use_month_names_option_does_not_translate_monthnames
+   end
+ 
+   def test_select_month_translates_monthnames
+-    assert_called_with(I18n, :translate, :'date.month_names', locale: "en", returns: Date::MONTHNAMES) do
++    assert_called_with(I18n, :translate, :'date.month_names', returns: Date::MONTHNAMES, locale: "en") do
+       select_month(8, locale: "en")
+     end
+   end
+ 
+   def test_select_month_given_use_short_month_option_translates_abbr_monthnames
+-    assert_called_with(I18n, :translate, :'date.abbr_month_names', locale: "en", returns: Date::ABBR_MONTHNAMES) do
++    assert_called_with(I18n, :translate, :'date.abbr_month_names', returns: Date::ABBR_MONTHNAMES, locale: "en") do
+       select_month(8, locale: "en", use_short_month: true)
+     end
+   end
+@@ -147,8 +147,8 @@ def test_date_or_time_select_given_an_order_options_does_not_translate_order
+ 
+   def test_date_or_time_select_given_no_order_options_translates_order
+     mock = Minitest::Mock.new
+-    mock.expect(:call, "year", "month", "day", :'date.order', { locale: "en", default:  })
+-    mock.expect(:call, , :'date.month_names', { locale: "en" })
++    expect_called_with(mock, :'date.order', locale: "en", default: , returns: "year", "month", "day")
++    expect_called_with(mock, :'date.month_names', locale: "en", returns: )
+ 
+     I18n.stub(:translate, mock) do
+       datetime_select("post", "updated_at", locale: "en")
+@@ -158,7 +158,7 @@ def test_date_or_time_select_given_no_order_options_translates_order
+   end
+ 
+   def test_date_or_time_select_given_invalid_order
+-    assert_called_with(I18n, :translate, :'date.order', locale: "en", default: , returns: %w(invalid month day)) do
++    assert_called_with(I18n, :translate, :'date.order', returns: %w(invalid month day), locale: "en", default: ) do
+       assert_raise StandardError do
+         datetime_select("post", "updated_at", locale: "en")
+       end
+@@ -167,8 +167,8 @@ def test_date_or_time_select_given_invalid_order
+ 
+   def test_date_or_time_select_given_symbol_keys
+     mock = Minitest::Mock.new
+-    mock.expect(:call, :year, :month, :day, :'date.order', { locale: "en", default:  })
+-    mock.expect(:call, , :'date.month_names', { locale: "en" })
++    expect_called_with(mock, :'date.order', locale: "en", default: , returns: :year, :month, :day)
++    expect_called_with(mock, :'date.month_names', locale: "en", returns: )
+ 
+     I18n.stub(:translate, mock) do
+       datetime_select("post", "updated_at", locale: "en")
+diff --git a/actionview/test/template/form_helper/form_with_test.rb b/actionview/test/template/form_helper/form_with_test.rb
+index 00e6ca42ea473..b3d6d59cd3afa 100644
+--- a/actionview/test/template/form_helper/form_with_test.rb
++++ b/actionview/test/template/form_helper/form_with_test.rb
+@@ -1747,7 +1747,7 @@ def test_nested_fields_label_translation_with_more_than_10_records
+ 
+     mock = Minitest::Mock.new
+     @post.comments.each do
+-      mock.expect(:call, "body", "post.comments.body", default: :"comment.body", "", scope: "helpers.label")
++      expect_called_with(mock, "post.comments.body", default: :"comment.body", "", scope: "helpers.label", returns: "body")
+     end
+ 
+     I18n.stub(:t, mock) do
+diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
+index 8560be2770ca4..d8924d3e65004 100644
+--- a/actionview/test/template/form_helper_test.rb
++++ b/actionview/test/template/form_helper_test.rb
+@@ -3269,7 +3269,7 @@ def test_nested_fields_label_translation_with_more_than_10_records
+ 
+     mock = Minitest::Mock.new
+     @post.comments.each do
+-      mock.expect(:call, "body", "post.comments.body", default: :"comment.body", "", scope: "helpers.label")
++      expect_called_with(mock, "post.comments.body", default: :"comment.body", "", scope: "helpers.label", returns: "body")
+     end
+ 
+     I18n.stub(:t, mock) do
+diff --git a/actionview/test/template/form_options_helper_i18n_test.rb b/actionview/test/template/form_options_helper_i18n_test.rb
+index 21295fa547d8e..3dc625b8ac1df 100644
+--- a/actionview/test/template/form_options_helper_i18n_test.rb
++++ b/actionview/test/template/form_options_helper_i18n_test.rb
+@@ -16,7 +16,7 @@ def teardown
+   end
+ 
+   def test_select_with_prompt_true_translates_prompt_message
+-    assert_called_with(I18n, :translate, "helpers.select.prompt", { default: "Please select" }) do
++    assert_called_with(I18n, :translate, "helpers.select.prompt", default: "Please select") do
+       select("post", "category", , prompt: true)
+     end
+   end
+diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb
+index 9ed034113d0fb..b9da9174a517a 100644
+--- a/actionview/test/template/translation_helper_test.rb
++++ b/actionview/test/template/translation_helper_test.rb
+@@ -65,7 +65,7 @@ def test_delegates_setting_to_i18n
+ 
+   def test_delegates_localize_to_i18n
+     @time = Time.utc(2008, 7, 8, 12, 18, 38)
+-    assert_called_with(I18n, :localize, @time, locale: "en") do
++    assert_called_with(I18n, :localize, @time, locale: "en") do
+       localize @time, locale: "en"
+     end
+     assert_equal "Tue, 08 Jul 2008 12:18:38 +0000", localize(@time, locale: "en")

_service:tar_scm:rubygem-actionview-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch Added

@@ -0,0 +1,114 @@
+From df0de681dc1873534ecd2fc8371e1f2562984b68 Mon Sep 17 00:00:00 2001
+From: John Crepezzi <john.crepezzi@gmail.com>
+Date: Thu, 16 Jun 2022 08:34:05 -0400
+Subject: PATCH Remove the multi-call form of assert_called_with
+
+The `assert_called_with` helper allows passing a multi-dimensional array to
+mock multiple calls to the same method for a given block. This works
+fine now, but when adding support for real kwargs arguments to line up with
+recent upgrades in Minitest, this approach is no longer workable because
+we can't pass multiple sets of differing kwargs.
+
+Rather than complicated this method further, this commit removes the
+multi-call form of `assert_called_with` and modifies the tests that
+currently make use of that functionality to just use the underlying
+`Minitest::Mock` calls.
+
+Co-authored-by: Eileen M. Uchitelle <eileencodes@gmail.com>
+---
+ .../test/template/date_helper_i18n_test.rb    | 16 +++-
+ .../template/form_helper/form_with_test.rb    | 10 ++-
+ actionview/test/template/form_helper_test.rb  | 10 ++-
+ 3 files changed, 30 insertions(+), 6 deletions(-)
+
+diff --git a/actionview/test/template/date_helper_i18n_test.rb b/actionview/test/template/date_helper_i18n_test.rb
+index f100a011a83f7..2f098e2f5158f 100644
+--- a/actionview/test/template/date_helper_i18n_test.rb
++++ b/actionview/test/template/date_helper_i18n_test.rb
+@@ -146,9 +146,15 @@ def test_date_or_time_select_given_an_order_options_does_not_translate_order
+   end
+ 
+   def test_date_or_time_select_given_no_order_options_translates_order
+-    assert_called_with(I18n, :translate,  :'date.order', locale: "en", default: , :"date.month_names", { locale: "en" } , returns: %w(year month day)) do
++    mock = Minitest::Mock.new
++    mock.expect(:call, "year", "month", "day", :'date.order', { locale: "en", default:  })
++    mock.expect(:call, , :'date.month_names', { locale: "en" })
++
++    I18n.stub(:translate, mock) do
+       datetime_select("post", "updated_at", locale: "en")
+     end
++
++    assert_mock(mock)
+   end
+ 
+   def test_date_or_time_select_given_invalid_order
+@@ -160,8 +166,14 @@ def test_date_or_time_select_given_invalid_order
+   end
+ 
+   def test_date_or_time_select_given_symbol_keys
+-    assert_called_with(I18n, :translate,  :'date.order', locale: "en", default: , :"date.month_names", { locale: "en" } , returns: :year, :month, :day) do
++    mock = Minitest::Mock.new
++    mock.expect(:call, :year, :month, :day, :'date.order', { locale: "en", default:  })
++    mock.expect(:call, , :'date.month_names', { locale: "en" })
++
++    I18n.stub(:translate, mock) do
+       datetime_select("post", "updated_at", locale: "en")
+     end
++
++    assert_mock(mock)
+   end
+ end
+diff --git a/actionview/test/template/form_helper/form_with_test.rb b/actionview/test/template/form_helper/form_with_test.rb
+index eadddc15002ee..00e6ca42ea473 100644
+--- a/actionview/test/template/form_helper/form_with_test.rb
++++ b/actionview/test/template/form_helper/form_with_test.rb
+@@ -1745,14 +1745,20 @@ def test_nested_fields_arel_like
+   def test_nested_fields_label_translation_with_more_than_10_records
+     @post.comments = Array.new(11) { |id| Comment.new(id + 1) }
+ 
+-    params = 11.times.map { "post.comments.body", default: :"comment.body", "", scope: "helpers.label" }
+-    assert_called_with(I18n, :t, params, returns: "Write body here") do
++    mock = Minitest::Mock.new
++    @post.comments.each do
++      mock.expect(:call, "body", "post.comments.body", default: :"comment.body", "", scope: "helpers.label")
++    end
++
++    I18n.stub(:t, mock) do
+       form_with(model: @post) do |f|
+         f.fields(:comments) do |cf|
+           concat cf.label(:body)
+         end
+       end
+     end
++
++    assert_mock(mock)
+   end
+ 
+   def test_nested_fields_with_existing_records_on_a_supplied_nested_attributes_collection_different_from_record_one
+diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
+index d08f00cd36c35..8560be2770ca4 100644
+--- a/actionview/test/template/form_helper_test.rb
++++ b/actionview/test/template/form_helper_test.rb
+@@ -3267,14 +3267,20 @@ def test_nested_fields_for_arel_like
+   def test_nested_fields_label_translation_with_more_than_10_records
+     @post.comments = Array.new(11) { |id| Comment.new(id + 1) }
+ 
+-    params = 11.times.map { "post.comments.body", default: :"comment.body", "", scope: "helpers.label" }
+-    assert_called_with(I18n, :t, params, returns: "Write body here") do
++    mock = Minitest::Mock.new
++    @post.comments.each do
++      mock.expect(:call, "body", "post.comments.body", default: :"comment.body", "", scope: "helpers.label")
++    end
++
++    I18n.stub(:t, mock) do
+       form_for(@post) do |f|
+         f.fields_for(:comments) do |cf|
+           concat cf.label(:body)
+         end
+       end
+     end
++
++    assert_mock(mock)
+   end
+ 
+   def test_nested_fields_for_with_existing_records_on_a_supplied_nested_attributes_collection_different_from_record_one

_service Changed

_service:tar_scm:actionview-6.1.4.1-tests.txz Deleted

_service:tar_scm:actionview-7.0.4-tests.txz Added

_service:tar_scm:actionview-6.1.4.1.gem/checksums.yaml.gz -> _service:tar_scm:actionview-7.0.4.gem/checksums.yaml.gz Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/CHANGELOG.md -> _service:tar_scm:actionview-7.0.4.gem/data/CHANGELOG.md Changed

@@ -1,350 +1,405 @@
-## Rails 6.1.4.1 (August 19, 2021) ##
+## Rails 7.0.4 (September 09, 2022) ##
 
-*   No changes.
+*   Guard against `ActionView::Helpers::FormTagHelper#field_name` calls with nil
+    `object_name` arguments. For example:
 
+    ```erb
+    <%= fields do |f| %>
+      <%= f.field_name :body %>
+    <% end %>
+    ```
 
-## Rails 6.1.4 (June 24, 2021) ##
+    *Sean Doyle*
 
-*   The `translate` helper now passes `default` values that aren't
-    translation keys through `I18n.translate` for interpolation.
+*   Strings returned from `strip_tags` are correctly tagged `html_safe?`
 
-    *Jonathan Hefner*
+    Because these strings contain no HTML elements and the basic entities are escaped, they are safe
+    to be included as-is as PCDATA in HTML content. Tagging them as html-safe avoids double-escaping
+    entities when being concatenated to a SafeBuffer during rendering.
 
-*   Don't attach UJS form submission handlers to Turbo forms.
+    Fixes rails/rails-html-sanitizer#124(https://github.com/rails/rails-html-sanitizer/issues/124)
 
-    *David Heinemeier Hansson*
+    *Mike Dalessio*
 
-*   Allow both `current_page?(url_hash)` and `current_page?(**url_hash)` on Ruby 2.7.
+## Rails 7.0.3.1 (July 12, 2022) ##
 
-    *Ryuta Kamizono*
+*   No changes.
 
 
-## Rails 6.1.3.2 (May 05, 2021) ##
+## Rails 7.0.3 (May 09, 2022) ##
 
-*   No changes.
+*   Ensure models passed to `form_for` attempt to call `to_model`.
 
+    *Sean Doyle*
 
-## Rails 6.1.3.1 (March 26, 2021) ##
+## Rails 7.0.2.4 (April 26, 2022) ##
 
-*   No changes.
+*   Fix and add protections for XSS in `ActionView::Helpers` and `ERB::Util`.
 
+    Escape dangerous characters in names of tags and names of attributes in the
+    tag helpers, following the XML specification. Rename the option
+    `:escape_attributes` to `:escape`, to simplify by applying the option to the
+    whole tag.
 
-## Rails 6.1.3 (February 17, 2021) ##
+    *Álvaro Martín Fraguas*
+
+## Rails 7.0.2.3 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.2.1 (February 10, 2021) ##
+## Rails 7.0.2.2 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.2 (February 09, 2021) ##
+## Rails 7.0.2.1 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.1.1 (January 07, 2021) ##
+## Rails 7.0.2 (February 08, 2022) ##
 
-*   Fix lazy translation in partial with block.
+*   Ensure `preload_link_tag` preloads JavaScript modules correctly.
 
-    *Marek Kasztelnik*
+    *Máximo Mussini*
 
-*   Avoid extra `SELECT COUNT` queries when rendering Active Record collections.
+*   Fix `stylesheet_link_tag` and similar helpers are being used to work in objects with
+    a `response` method.
 
-    *aar0nr*
+    *dark-panda*
 
-*   Link preloading keep integrity hashes in the header.
 
-    *Étienne Barrié*
+## Rails 7.0.1 (January 06, 2022) ##
 
-*   Add `config.action_view.preload_links_header` to allow disabling of
-    the `Link` header being added by default when using `stylesheet_link_tag`
-    and `javascript_include_tag`.
+*   Fix `button_to` to work with a hash parameter as URL.
 
-    *Andrew White*
+    *MingyuanQin*
 
-*   The `translate` helper now resolves `default` values when a `nil` key is
-    specified, instead of always returning `nil`.
-
-    *Jonathan Hefner*
+*   Fix `link_to` with a model passed as an argument twice.
 
+    *Alex Ghiculescu*
 
-## Rails 6.1.0 (December 09, 2020) ##
 
-*   SanitizeHelper.sanitized_allowed_attributes and SanitizeHelper.sanitized_allowed_tags
-    call safe_list_sanitizer's class method
+## Rails 7.0.0 (December 15, 2021) ##
 
-    Fixes #39586
+*   Support `include_hidden:` option in calls to
+    `ActionView::Helper::FormBuilder#file_field` with `multiple: true` to
+    support submitting an empty collection of files.
 
-    *Taufiq Muhammadi*
+    ```ruby
+    form.file_field :attachments, multiple: true
+    # => <input type="hidden" autocomplete="off" name="postattachments" value="">
+         <input type="file" multiple="multiple" id="post_attachments" name="postattachments">
 
-*   Change form_with to generate non-remote forms by default.
+    form.file_field :attachments, multiple: true, include_hidden: false
+    # => <input type="file" multiple="multiple" id="post_attachments" name="postattachments">
+    ```
 
-    `form_with` would generate a remote form by default. This would confuse
-    users because they were forced to handle remote requests.
+    *Sean Doyle*
 
-    All new 6.1 applications will generate non-remote forms by default.
-    When upgrading a 6.0 application you can enable remote forms by default by
-    setting `config.action_view.form_with_generates_remote_forms` to `true`.
+*   Fix `number_with_precision(raise: true)` always raising even on valid numbers.
 
-    *Petrik de Heus*
+    *Pedro Moreira*
 
-*   Yield translated strings to calls of `ActionView::FormBuilder#button`
-    when a block is given.
 
-    *Sean Doyle*
+## Rails 7.0.0.rc3 (December 14, 2021) ##
 
-*   Alias `ActionView::Helpers::Tags::Label::LabelBuilder#translation` to
-    `#to_s` so that `form.label` calls can yield that value to their blocks.
+*   No changes.
 
-    *Sean Doyle*
 
-*   Rename the new `TagHelper#class_names` method to `TagHelper#token_list`,
-    and make the original available as an alias.
+## Rails 7.0.0.rc2 (December 14, 2021) ##
 
-        token_list("foo", "foo bar")
-        # => "foo bar"
+*   No changes.
 
-    *Sean Doyle*
+## Rails 7.0.0.rc1 (December 06, 2021) ##
 
-*   ARIA Array and Hash attributes are treated as space separated `DOMTokenList`
-    values. This is useful when declaring lists of label text identifiers in
-    `aria-labelledby` or `aria-describedby`.
-
-        tag.input type: 'checkbox', name: 'published', aria: {
-          invalid: @post.errors:published.any?,
-          labelledby: 'published_context', 'published_label',
-          describedby: { published_errors: @post.errors:published.any? }
-        }
-        #=> <input
-              type="checkbox" name="published" aria-invalid="true"
-              aria-labelledby="published_context published_label"
-              aria-describedby="published_errors"
-            >
+*   Support `fields model: @nested, @model` the same way as `form_with model:
+    @nested, @model`.
 
     *Sean Doyle*
 
-*   Remove deprecated `escape_whitelist` from `ActionView::Template::Handlers::ERB`.
+*   Infer HTTP verb `method` from a model or Array with model as the first
+    argument to `button_to` when combined with a block:
 
-    *Rafael Mendonça França*
+    ```ruby
+    button_to(Workshop.find(1)){ "Update" }
+    #=> <form method="post" action="/workshops/1" class="button_to">
+    #=>   <input type="hidden" name="_method" value="patch" autocomplete="off" />

_service:tar_scm:actionview-6.1.4.1.gem/data/MIT-LICENSE -> _service:tar_scm:actionview-7.0.4.gem/data/MIT-LICENSE Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/base.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/base.rb Changed

@@ -9,7 +9,7 @@
 require "action_view/template"
 require "action_view/lookup_context"
 
-module ActionView #:nodoc:
+module ActionView # :nodoc:
   # = Action View Base
   #
   # Action View templates can be written in several ways.
@@ -142,7 +142,7 @@
     include Helpers, ::ERB::Util, Context
 
     # Specify the proc used to decorate input tags that refer to attributes with errors.
-    cattr_accessor :field_error_proc, default: Proc.new { |html_tag, instance| "<div class=\"field_with_errors\">#{html_tag}</div>".html_safe }
+    cattr_accessor :field_error_proc, default: Proc.new { |html_tag, instance| content_tag :div, html_tag, class: "field_with_errors" }
 
     # How to complete the streaming when an exception occurs.
     # This is our best guess: first try to close the attribute, then the tag.
@@ -156,9 +156,6 @@
     # Specify default_formats that can be rendered.
     cattr_accessor :default_formats
 
-    # Specify whether an error should be raised for missing translations
-    cattr_accessor :raise_on_missing_translations, default: false
-
     # Specify whether submit_tag should automatically disable on click
     cattr_accessor :automatically_disable_submit_tag, default: true
 
@@ -179,7 +176,7 @@
         ActionView::Resolver.caching = value
       end
 
-      def xss_safe? #:nodoc:
+      def xss_safe? # :nodoc:
         true
       end
 
@@ -227,7 +224,7 @@
 
     # :startdoc:
 
-    def initialize(lookup_context, assigns, controller) #:nodoc:
+    def initialize(lookup_context, assigns, controller) # :nodoc:
       @_config = ActiveSupport::InheritableOptions.new
 
       @lookup_context = lookup_context

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/buffers.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/buffers.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/cache_expiry.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/cache_expiry.rb Changed

@@ -4,49 +4,63 @@
   class CacheExpiry
     class Executor
       def initialize(watcher:)
-        @cache_expiry = CacheExpiry.new(watcher: watcher)
+        @execution_lock = Concurrent::ReentrantReadWriteLock.new
+        @cache_expiry = ViewModificationWatcher.new(watcher: watcher) do
+          clear_cache
+        end
       end
 
-      def before(target)
-        @cache_expiry.clear_cache_if_necessary
+      def run
+        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+          @cache_expiry.execute_if_updated
+          @execution_lock.acquire_read_lock
+        end
       end
-    end
-
-    def initialize(watcher:)
-      @watched_dirs = nil
-      @watcher_class = watcher
-      @watcher = nil
-      @mutex = Mutex.new
-    end
 
-    def clear_cache_if_necessary
-      @mutex.synchronize do
-        watched_dirs = dirs_to_watch
-        return if watched_dirs.empty?
+      def complete(_)
+        @execution_lock.release_read_lock
+      end
 
-        if watched_dirs != @watched_dirs
-          @watched_dirs = watched_dirs
-          @watcher = @watcher_class.new(, watched_dirs) do
-            clear_cache
+      private
+        def clear_cache
+          @execution_lock.with_write_lock do
+            ActionView::LookupContext::DetailsKey.clear
           end
-          @watcher.execute
-        else
-          @watcher.execute_if_updated
         end
-      end
-    end
-
-    def clear_cache
-      ActionView::LookupContext::DetailsKey.clear
     end
 
-    private
-      def dirs_to_watch
-        all_view_paths.grep(FileSystemResolver).map!(&:path).tap(&:uniq!).sort!
+    class ViewModificationWatcher
+      def initialize(watcher:, &block)
+        @watched_dirs = nil
+        @watcher_class = watcher
+        @watcher = nil
+        @mutex = Mutex.new
+        @block = block
       end
 
-      def all_view_paths
-        ActionView::ViewPaths.all_view_paths.flat_map(&:paths)
+      def execute_if_updated
+        @mutex.synchronize do
+          watched_dirs = dirs_to_watch
+          return if watched_dirs.empty?
+
+          if watched_dirs != @watched_dirs
+            @watched_dirs = watched_dirs
+            @watcher = @watcher_class.new(, watched_dirs, &@block)
+            @watcher.execute
+          else
+            @watcher.execute_if_updated
+          end
+        end
       end
+
+      private
+        def dirs_to_watch
+          all_view_paths.grep(FileSystemResolver).map!(&:path).tap(&:uniq!).sort!
+        end
+
+        def all_view_paths
+          ActionView::ViewPaths.all_view_paths.flat_map(&:paths)
+        end
+    end
   end
 end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/dependency_tracker.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/dependency_tracker.rb Changed

@@ -2,9 +2,15 @@
 
 require "concurrent/map"
 require "action_view/path_set"
+require "action_view/render_parser"
 
 module ActionView
   class DependencyTracker # :nodoc:
+    extend ActiveSupport::Autoload
+
+    autoload :ERBTracker
+    autoload :RipperTracker
+
     @trackers = Concurrent::Map.new
 
     def self.find_dependencies(name, template, view_paths = nil)
@@ -29,153 +35,6 @@
       @trackers.delete(handler)
     end
 
-    class ERBTracker # :nodoc:
-      EXPLICIT_DEPENDENCY = /# Template Dependency: (\S+)/
-
-      # A valid ruby identifier - suitable for class, method and specially variable names
-      IDENTIFIER = /
-        :alpha:_ # at least one uppercase letter, lowercase letter or underscore
-        :word:*  # followed by optional letters, numbers or underscores
-      /x
-
-      # Any kind of variable name. e.g. @instance, @@class, $global or local.
-      # Possibly following a method call chain
-      VARIABLE_OR_METHOD_CHAIN = /
-        (?:\$|@{1,2})?            # optional global, instance or class variable indicator
-        (?:#{IDENTIFIER}\.)*      # followed by an optional chain of zero-argument method calls
-        (?<dynamic>#{IDENTIFIER}) # and a final valid identifier, captured as DYNAMIC
-      /x
-
-      # A simple string literal. e.g. "School's out!"
-      STRING = /
-        (?<quote>'") # an opening quote
-        (?<static>.*?) # with anything inside, captured as STATIC
-        \k<quote>      # and a matching closing quote
-      /x
-
-      # Part of any hash containing the :partial key
-      PARTIAL_HASH_KEY = /
-        (?:\bpartial:|:partial\s*=>) # partial key in either old or new style hash syntax
-        \s*                          # followed by optional spaces
-      /x
-
-      # Part of any hash containing the :layout key
-      LAYOUT_HASH_KEY = /
-        (?:\blayout:|:layout\s*=>)   # layout key in either old or new style hash syntax
-        \s*                          # followed by optional spaces
-      /x
-
-      # Matches:
-      #   partial: "comments/comment", collection: @all_comments => "comments/comment"
-      #   (object: @single_comment, partial: "comments/comment") => "comments/comment"
-      #
-      #   "comments/comments"
-      #   'comments/comments'
-      #   ('comments/comments')
-      #
-      #   (@topic)         => "topics/topic"
-      #    topics          => "topics/topic"
-      #   (message.topics) => "topics/topic"
-      RENDER_ARGUMENTS = /\A
-        (?:\s*\(?\s*)                                  # optional opening paren surrounded by spaces
-        (?:.*?#{PARTIAL_HASH_KEY}|#{LAYOUT_HASH_KEY})? # optional hash, up to the partial or layout key declaration
-        (?:#{STRING}|#{VARIABLE_OR_METHOD_CHAIN})      # finally, the dependency name of interest
-      /xm
-
-      LAYOUT_DEPENDENCY = /\A
-        (?:\s*\(?\s*)                                  # optional opening paren surrounded by spaces
-        (?:.*?#{LAYOUT_HASH_KEY})                      # check if the line has layout key declaration
-        (?:#{STRING}|#{VARIABLE_OR_METHOD_CHAIN})      # finally, the dependency name of interest
-      /xm
-
-      def self.supports_view_paths? # :nodoc:
-        true
-      end
-
-      def self.call(name, template, view_paths = nil)
-        new(name, template, view_paths).dependencies
-      end
-
-      def initialize(name, template, view_paths = nil)
-        @name, @template, @view_paths = name, template, view_paths
-      end
-
-      def dependencies
-        render_dependencies + explicit_dependencies
-      end
-
-      attr_reader :name, :template
-      private :name, :template
-
-      private
-        def source
-          template.source
-        end
-
-        def directory
-          name.split("/")0..-2.join("/")
-        end
-
-        def render_dependencies
-          render_dependencies = 
-          render_calls = source.split(/\brender\b/).drop(1)
-
-          render_calls.each do |arguments|
-            add_dependencies(render_dependencies, arguments, LAYOUT_DEPENDENCY)
-            add_dependencies(render_dependencies, arguments, RENDER_ARGUMENTS)
-          end
-
-          render_dependencies.uniq
-        end
-
-        def add_dependencies(render_dependencies, arguments, pattern)
-          arguments.scan(pattern) do
-            match = Regexp.last_match
-            add_dynamic_dependency(render_dependencies, match:dynamic)
-            add_static_dependency(render_dependencies, match:static, match:quote)
-          end
-        end
-
-        def add_dynamic_dependency(dependencies, dependency)
-          if dependency
-            dependencies << "#{dependency.pluralize}/#{dependency.singularize}"
-          end
-        end
-
-        def add_static_dependency(dependencies, dependency, quote_type)
-          if quote_type == '"'
-            # Ignore if there is interpolation
-            return if dependency.include?('#{')
-          end
-
-          if dependency
-            if dependency.include?("/")
-              dependencies << dependency
-            else
-              dependencies << "#{directory}/#{dependency}"
-            end
-          end
-        end
-
-        def resolve_directories(wildcard_dependencies)
-          return  unless @view_paths
-
-          wildcard_dependencies.flat_map { |query, templates|
-            @view_paths.find_all_with_query(query).map do |template|
-              "#{File.dirname(query)}/#{File.basename(template).split('.').first}"
-            end
-          }.sort
-        end
-
-        def explicit_dependencies
-          dependencies = source.scan(EXPLICIT_DEPENDENCY).flatten.uniq
-
-          wildcards, explicits = dependencies.partition { |dependency| dependency.end_with?("*") }
-
-          (explicits + resolve_directories(wildcards)).uniq
-        end
-    end
-
     register_tracker :erb, ERBTracker
   end
 end

_service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/dependency_tracker/erb_tracker.rb Added

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+module ActionView
+  class DependencyTracker # :nodoc:
+    class ERBTracker # :nodoc:
+      EXPLICIT_DEPENDENCY = /# Template Dependency: (\S+)/
+
+      # A valid ruby identifier - suitable for class, method and specially variable names
+      IDENTIFIER = /
+        :alpha:_ # at least one uppercase letter, lowercase letter or underscore
+        :word:*  # followed by optional letters, numbers or underscores
+      /x
+
+      # Any kind of variable name. e.g. @instance, @@class, $global or local.
+      # Possibly following a method call chain
+      VARIABLE_OR_METHOD_CHAIN = /
+        (?:\$|@{1,2})?            # optional global, instance or class variable indicator
+        (?:#{IDENTIFIER}\.)*      # followed by an optional chain of zero-argument method calls
+        (?<dynamic>#{IDENTIFIER}) # and a final valid identifier, captured as DYNAMIC
+      /x
+
+      # A simple string literal. e.g. "School's out!"
+      STRING = /
+        (?<quote>'") # an opening quote
+        (?<static>.*?) # with anything inside, captured as STATIC
+        \k<quote>      # and a matching closing quote
+      /x
+
+      # Part of any hash containing the :partial key
+      PARTIAL_HASH_KEY = /
+        (?:\bpartial:|:partial\s*=>) # partial key in either old or new style hash syntax
+        \s*                          # followed by optional spaces
+      /x
+
+      # Part of any hash containing the :layout key
+      LAYOUT_HASH_KEY = /
+        (?:\blayout:|:layout\s*=>)   # layout key in either old or new style hash syntax
+        \s*                          # followed by optional spaces
+      /x
+
+      # Matches:
+      #   partial: "comments/comment", collection: @all_comments => "comments/comment"
+      #   (object: @single_comment, partial: "comments/comment") => "comments/comment"
+      #
+      #   "comments/comments"
+      #   'comments/comments'
+      #   ('comments/comments')
+      #
+      #   (@topic)         => "topics/topic"
+      #    topics          => "topics/topic"
+      #   (message.topics) => "topics/topic"
+      RENDER_ARGUMENTS = /\A
+        (?:\s*\(?\s*)                                  # optional opening paren surrounded by spaces
+        (?:.*?#{PARTIAL_HASH_KEY}|#{LAYOUT_HASH_KEY})? # optional hash, up to the partial or layout key declaration
+        (?:#{STRING}|#{VARIABLE_OR_METHOD_CHAIN})      # finally, the dependency name of interest
+      /xm
+
+      LAYOUT_DEPENDENCY = /\A
+        (?:\s*\(?\s*)                                  # optional opening paren surrounded by spaces
+        (?:.*?#{LAYOUT_HASH_KEY})                      # check if the line has layout key declaration
+        (?:#{STRING}|#{VARIABLE_OR_METHOD_CHAIN})      # finally, the dependency name of interest
+      /xm
+
+      def self.supports_view_paths? # :nodoc:
+        true
+      end
+
+      def self.call(name, template, view_paths = nil)
+        new(name, template, view_paths).dependencies
+      end
+
+      def initialize(name, template, view_paths = nil)
+        @name, @template, @view_paths = name, template, view_paths
+      end
+
+      def dependencies
+        render_dependencies + explicit_dependencies
+      end
+
+      attr_reader :name, :template
+      private :name, :template
+
+      private
+        def source
+          template.source
+        end
+
+        def directory
+          name.split("/")0..-2.join("/")
+        end
+
+        def render_dependencies
+          render_dependencies = 
+          render_calls = source.split(/\brender\b/).drop(1)
+
+          render_calls.each do |arguments|
+            add_dependencies(render_dependencies, arguments, LAYOUT_DEPENDENCY)
+            add_dependencies(render_dependencies, arguments, RENDER_ARGUMENTS)
+          end
+
+          render_dependencies.uniq
+        end
+
+        def add_dependencies(render_dependencies, arguments, pattern)
+          arguments.scan(pattern) do
+            match = Regexp.last_match
+            add_dynamic_dependency(render_dependencies, match:dynamic)
+            add_static_dependency(render_dependencies, match:static, match:quote)
+          end
+        end
+
+        def add_dynamic_dependency(dependencies, dependency)
+          if dependency
+            dependencies << "#{dependency.pluralize}/#{dependency.singularize}"
+          end
+        end
+
+        def add_static_dependency(dependencies, dependency, quote_type)
+          if quote_type == '"'
+            # Ignore if there is interpolation
+            return if dependency.include?('#{')
+          end
+
+          if dependency
+            if dependency.include?("/")
+              dependencies << dependency
+            else
+              dependencies << "#{directory}/#{dependency}"
+            end
+          end
+        end
+
+        def resolve_directories(wildcard_dependencies)
+          return  unless @view_paths
+          return  if wildcard_dependencies.empty?
+
+          # Remove trailing "/*"
+          prefixes = wildcard_dependencies.map { |query| query0..-3 }
+
+          @view_paths.flat_map(&:all_template_paths).uniq.filter_map { |path|
+            path.to_s if prefixes.include?(path.prefix)
+          }.sort
+        end
+
+        def explicit_dependencies
+          dependencies = source.scan(EXPLICIT_DEPENDENCY).flatten.uniq
+
+          wildcards, explicits = dependencies.partition { |dependency| dependency.end_with?("/*") }
+
+          (explicits + resolve_directories(wildcards)).uniq
+        end
+    end
+  end
+end

_service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/dependency_tracker/ripper_tracker.rb Added

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module ActionView
+  class DependencyTracker # :nodoc:
+    class RipperTracker # :nodoc:
+      EXPLICIT_DEPENDENCY = /# Template Dependency: (\S+)/
+
+      def self.call(name, template, view_paths = nil)
+        new(name, template, view_paths).dependencies
+      end
+
+      def dependencies
+        render_dependencies + explicit_dependencies
+      end
+
+      def self.supports_view_paths? # :nodoc:
+        true
+      end
+
+      def initialize(name, template, view_paths = nil)
+        @name, @template, @view_paths = name, template, view_paths
+      end
+
+      private
+        attr_reader :template, :name, :view_paths
+
+        def render_dependencies
+          return  unless template.source.include?("render")
+
+          compiled_source = template.handler.call(template, template.source)
+
+          RenderParser.new(@name, compiled_source).render_calls.filter_map do |render_call|
+            next if render_call.end_with?("/_")
+            render_call.gsub(%r|/_|, "/")
+          end
+        end
+
+        def explicit_dependencies
+          dependencies = template.source.scan(EXPLICIT_DEPENDENCY).flatten.uniq
+
+          wildcards, explicits = dependencies.partition { |dependency| dependency.end_with?("/*") }
+
+          (explicits + resolve_directories(wildcards)).uniq
+        end
+
+        def resolve_directories(wildcard_dependencies)
+          return  unless view_paths
+          return  if wildcard_dependencies.empty?
+
+          # Remove trailing "/*"
+          prefixes = wildcard_dependencies.map { |query| query0..-3 }
+
+          view_paths.flat_map(&:all_template_paths).uniq.filter_map { |path|
+            path.to_s if prefixes.include?(path.prefix)
+          }.sort
+        end
+    end
+  end
+end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/digestor.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/digestor.rb Changed

@@ -17,15 +17,16 @@
         if dependencies.nil? || dependencies.empty?
           cache_key = "#{name}.#{format}"
         else
-          cache_key =  name, format, dependencies .flatten.compact.join(".")
+          dependencies_suffix = dependencies.flatten.tap(&:compact!).join(".")
+          cache_key = "#{name}.#{format}.#{dependencies_suffix}"
         end
 
         # this is a correctly done double-checked locking idiom
         # (Concurrent::Map's lookups have volatile semantics)
         finder.digest_cachecache_key || @@digest_mutex.synchronize do
           finder.digest_cache.fetch(cache_key) do # re-check under lock
-            partial = name.include?("/_")
-            root = tree(name, finder, partial)
+            path = TemplatePath.parse(name)
+            root = tree(path.to_s, finder, path.partial?)
             dependencies.each do |injected_dep|
               root.children << Injected.new(injected_dep, nil, nil)
             end if dependencies
@@ -43,7 +44,9 @@
         logical_name = name.gsub(%r|/_|, "/")
         interpolated = name.include?("#")
 
-        if !interpolated && (template = find_template(finder, logical_name, , partial, ))
+        path = TemplatePath.parse(name)
+
+        if !interpolated && (template = find_template(finder, path.name, path.prefix, partial, ))
           if node = seentemplate.identifier # handle cycles in the tree
             node
           else

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/flows.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/flows.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/gem_version.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/gem_version.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers.rb Changed

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
 require "active_support/benchmarkable"
+require "action_view/helpers/capture_helper"
+require "action_view/helpers/output_safety_helper"
+require "action_view/helpers/tag_helper"
+require "action_view/helpers/url_helper"
+require "action_view/helpers/sanitize_helper"
+require "action_view/helpers/text_helper"
+require "action_view/helpers/active_model_helper"
+require "action_view/helpers/asset_tag_helper"
+require "action_view/helpers/asset_url_helper"
+require "action_view/helpers/atom_feed_helper"
+require "action_view/helpers/cache_helper"
+require "action_view/helpers/controller_helper"
+require "action_view/helpers/csp_helper"
+require "action_view/helpers/csrf_helper"
+require "action_view/helpers/date_helper"
+require "action_view/helpers/debug_helper"
+require "action_view/helpers/form_tag_helper"
+require "action_view/helpers/form_helper"
+require "action_view/helpers/form_options_helper"
+require "action_view/helpers/javascript_helper"
+require "action_view/helpers/number_helper"
+require "action_view/helpers/rendering_helper"
+require "action_view/helpers/translation_helper"
 
-module ActionView #:nodoc:
-  module Helpers #:nodoc:
+module ActionView # :nodoc:
+  module Helpers # :nodoc:
     extend ActiveSupport::Autoload
 
-    autoload :ActiveModelHelper
-    autoload :AssetTagHelper
-    autoload :AssetUrlHelper
-    autoload :AtomFeedHelper
-    autoload :CacheHelper
-    autoload :CaptureHelper
-    autoload :ControllerHelper
-    autoload :CspHelper
-    autoload :CsrfHelper
-    autoload :DateHelper
-    autoload :DebugHelper
-    autoload :FormHelper
-    autoload :FormOptionsHelper
-    autoload :FormTagHelper
-    autoload :JavaScriptHelper, "action_view/helpers/javascript_helper"
-    autoload :NumberHelper
-    autoload :OutputSafetyHelper
-    autoload :RenderingHelper
-    autoload :SanitizeHelper
-    autoload :TagHelper
-    autoload :TextHelper
-    autoload :TranslationHelper
-    autoload :UrlHelper
     autoload :Tags
 
     def self.eager_load!

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/active_model_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/active_model_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/asset_tag_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/asset_tag_helper.rb Changed

@@ -8,7 +8,7 @@
 
 module ActionView
   # = Action View Asset Tag Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # This module provides methods for generating HTML that links views to assets such
     # as images, JavaScripts, stylesheets, and feeds. These methods do not verify
     # the assets exist before linking to them:
@@ -16,14 +16,15 @@
     #   image_tag("rails.png")
     #   # => <img src="/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="/assets/application.css?body=1" media="screen" rel="stylesheet" />
+    #   # => <link href="/assets/application.css?body=1" rel="stylesheet" />
     module AssetTagHelper
-      extend ActiveSupport::Concern
-
       include AssetUrlHelper
       include TagHelper
 
+      mattr_accessor :image_loading
+      mattr_accessor :image_decoding
       mattr_accessor :preload_links_header
+      mattr_accessor :apply_stylesheet_media_default
 
       # Returns an HTML script tag for each of the +sources+ provided.
       #
@@ -93,11 +94,12 @@
         crossorigin = options.delete("crossorigin")
         crossorigin = "anonymous" if crossorigin == true
         integrity = options"integrity"
+        rel = options"type" == "module" ? "modulepreload" : "preload"
 
         sources_tags = sources.uniq.map { |source|
           href = path_to_javascript(source, path_options)
-          if preload_links_header && !options"defer"
-            preload_link = "<#{href}>; rel=preload; as=script"
+          if preload_links_header && !options"defer" && href.present? && !href.start_with?("data:")
+            preload_link = "<#{href}>; rel=#{rel}; as=script"
             preload_link += "; crossorigin=#{crossorigin}" unless crossorigin.nil?
             preload_link += "; integrity=#{integrity}" unless integrity.nil?
             preload_link += "; nopush" if nopush
@@ -120,24 +122,41 @@
         sources_tags
       end
 
-      # Returns a stylesheet link tag for the sources specified as arguments. If
-      # you don't specify an extension, <tt>.css</tt> will be appended automatically.
+      # Returns a stylesheet link tag for the sources specified as arguments.
+      #
+      # When passing paths, the <tt>.css</tt> extension is optional.
+      # If you don't specify an extension, <tt>.css</tt> will be appended automatically.
+      # If you do not want <tt>.css</tt> appended to the path,
+      # set <tt>extname: false</tt> in the options.
       # You can modify the link attributes by passing a hash as the last argument.
-      # For historical reasons, the 'media' attribute will always be present and defaults
-      # to "screen", so you must explicitly set it to "all" for the stylesheet(s) to
-      # apply to all media types.
       #
       # If the server supports Early Hints header links for these assets will be
       # automatically pushed.
       #
+      # ==== Options
+      #
+      # * <tt>:extname</tt>  - Append an extension to the generated URL unless the extension
+      #   already exists. This only applies for relative URLs.
+      # * <tt>:protocol</tt>  - Sets the protocol of the generated URL. This option only
+      #   applies when a relative URL and +host+ options are provided.
+      # * <tt>:host</tt>  - When a relative URL is provided the host is added to the
+      #   that path.
+      # * <tt>:skip_pipeline</tt>  - This option is used to bypass the asset pipeline
+      #   when it is set to true.
+      #
+      # ==== Examples
+      #
       #   stylesheet_link_tag "style"
-      #   # => <link href="/assets/style.css" media="screen" rel="stylesheet" />
+      #   # => <link href="/assets/style.css" rel="stylesheet" />
       #
       #   stylesheet_link_tag "style.css"
-      #   # => <link href="/assets/style.css" media="screen" rel="stylesheet" />
+      #   # => <link href="/assets/style.css" rel="stylesheet" />
       #
       #   stylesheet_link_tag "http://www.example.com/style.css"
-      #   # => <link href="http://www.example.com/style.css" media="screen" rel="stylesheet" />
+      #   # => <link href="http://www.example.com/style.css" rel="stylesheet" />
+      #
+      #   stylesheet_link_tag "style.less", extname: false, skip_pipeline: true, rel: "stylesheet/less"
+      #   # => <link href="/stylesheets/style.less" rel="stylesheet/less">
       #
       #   stylesheet_link_tag "style", media: "all"
       #   # => <link href="/assets/style.css" media="all" rel="stylesheet" />
@@ -146,11 +165,11 @@
       #   # => <link href="/assets/style.css" media="print" rel="stylesheet" />
       #
       #   stylesheet_link_tag "random.styles", "/css/stylish"
-      #   # => <link href="/assets/random.styles" media="screen" rel="stylesheet" />
-      #   #    <link href="/css/stylish.css" media="screen" rel="stylesheet" />
+      #   # => <link href="/assets/random.styles" rel="stylesheet" />
+      #   #    <link href="/css/stylish.css" rel="stylesheet" />
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        path_options = options.extract!("protocol", "host", "skip_pipeline").symbolize_keys
+        path_options = options.extract!("protocol", "extname", "host", "skip_pipeline").symbolize_keys
         preload_links = 
         crossorigin = options.delete("crossorigin")
         crossorigin = "anonymous" if crossorigin == true
@@ -159,7 +178,7 @@
 
         sources_tags = sources.uniq.map { |source|
           href = path_to_stylesheet(source, path_options)
-          if preload_links_header
+          if preload_links_header && href.present? && !href.start_with?("data:")
             preload_link = "<#{href}>; rel=preload; as=style"
             preload_link += "; crossorigin=#{crossorigin}" unless crossorigin.nil?
             preload_link += "; integrity=#{integrity}" unless integrity.nil?
@@ -168,10 +187,14 @@
           end
           tag_options = {
             "rel" => "stylesheet",
-            "media" => "screen",
             "crossorigin" => crossorigin,
             "href" => href
           }.merge!(options)
+
+          if apply_stylesheet_media_default && tag_options"media".blank?
+            tag_options"media" = "screen"
+          end
+
           tag(:link, tag_options)
         }.join("\n").html_safe
 
@@ -235,14 +258,14 @@
       #
       # The helper gets the name of the favicon file as first argument, which
       # defaults to "favicon.ico", and also supports +:rel+ and +:type+ options
-      # to override their defaults, "shortcut icon" and "image/x-icon"
+      # to override their defaults, "icon" and "image/x-icon"
       # respectively:
       #
       #   favicon_link_tag
-      #   # => <link href="/assets/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+      #   # => <link href="/assets/favicon.ico" rel="icon" type="image/x-icon" />
       #
       #   favicon_link_tag 'myicon.ico'
-      #   # => <link href="/assets/myicon.ico" rel="shortcut icon" type="image/x-icon" />
+      #   # => <link href="/assets/myicon.ico" rel="icon" type="image/x-icon" />
       #
       # Mobile Safari looks for a different link tag, pointing to an image that
       # will be used if you add the page to the home screen of an iOS device.
@@ -252,7 +275,7 @@
       #   # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" />
       def favicon_link_tag(source = "favicon.ico", options = {})
         tag("link", {
-          rel: "shortcut icon",
+          rel: "icon",
           type: "image/x-icon",
           href: path_to_image(source, skip_pipeline: options.delete(:skip_pipeline))
         }.merge!(options.symbolize_keys))
@@ -302,16 +325,17 @@
         crossorigin = "anonymous" if crossorigin == true || (crossorigin.blank? && as_type == "font")
         integrity = options:integrity
         nopush = options.delete(:nopush) || false
+        rel = mime_type == "module" ? "modulepreload" : "preload"
 
         link_tag = tag.link(**{
-          rel: "preload",
+          rel: rel,
           href: href,
           as: as_type,
           type: mime_type,
           crossorigin: crossorigin
         }.merge!(options.symbolize_keys))
 
-        preload_link = "<#{href}>; rel=preload; as=#{as_type}"
+        preload_link = "<#{href}>; rel=#{rel}; as=#{as_type}"
         preload_link += "; type=#{mime_type}" if mime_type
         preload_link += "; crossorigin=#{crossorigin}" if crossorigin
         preload_link += "; integrity=#{integrity}" if integrity
@@ -382,6 +406,10 @@
         end
 
         options:width, options:height = extract_dimensions(options.delete(:size)) if options:size
+
+        options:loading ||= image_loading if image_loading
+        options:decoding ||= image_decoding if image_decoding
+
         tag("img", options)
       end
 
@@ -489,9 +517,9 @@
 
         def extract_dimensions(size)
           size = size.to_s
-          if /\A\d+x\d+\z/.match?(size)
+          if /\A(\d+|\d+.\d+)x(\d+|\d+.\d+)\z/.match?(size)
             size.split("x")
-          elsif /\A\d+\z/.match?(size)
+          elsif /\A(\d+|\d+.\d+)\z/.match?(size)

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/asset_url_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/asset_url_helper.rb Changed

@@ -4,7 +4,7 @@
 
 module ActionView
   # = Action View Asset URL Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # This module provides methods for generating asset paths and
     # URLs.
     #
@@ -31,7 +31,7 @@
     #   image_tag("rails.png")
     #   # => <img src="http://assets.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets.example.com/assets/application.css" media="screen" rel="stylesheet" />
+    #   # => <link href="http://assets.example.com/assets/application.css" rel="stylesheet" />
     #
     # Browsers open a limited number of simultaneous connections to a single
     # host. The exact number varies by browser and version. This limit may cause
@@ -44,7 +44,7 @@
     #   image_tag("rails.png")
     #   # => <img src="http://assets0.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets2.example.com/assets/application.css" media="screen" rel="stylesheet" />
+    #   # => <link href="http://assets2.example.com/assets/application.css" rel="stylesheet" />
     #
     # This may improve the asset loading performance of your application.
     # It is also possible the combination of additional connection overhead
@@ -65,12 +65,12 @@
     # +asset_host+ to a proc like this:
     #
     #   ActionController::Base.asset_host = Proc.new { |source|
-    #     "http://assets#{Digest::MD5.hexdigest(source).to_i(16) % 2 + 1}.example.com"
+    #     "http://assets#{OpenSSL::Digest::SHA256.hexdigest(source).to_i(16) % 2 + 1}.example.com"
     #   }
     #   image_tag("rails.png")
     #   # => <img src="http://assets1.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets2.example.com/assets/application.css" media="screen" rel="stylesheet" />
+    #   # => <link href="http://assets2.example.com/assets/application.css" rel="stylesheet" />
     #
     # The example above generates "http://assets1.example.com" and
     # "http://assets2.example.com". This option is useful for example if
@@ -89,7 +89,7 @@
     #   image_tag("rails.png")
     #   # => <img src="http://assets.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://stylesheets.example.com/assets/application.css" media="screen" rel="stylesheet" />
+    #   # => <link href="http://stylesheets.example.com/assets/application.css" rel="stylesheet" />
     #
     # Alternatively you may ask for a second parameter +request+. That one is
     # particularly useful for serving assets from an SSL-protected page. The
@@ -121,7 +121,7 @@
       URI_REGEXP = %r{^-a-z+://|^(?:cid|data):|^//}i
 
       # This is the entry point for all assets.
-      # When using the asset pipeline (i.e. sprockets and sprockets-rails), the
+      # When using an asset pipeline gem (e.g. propshaft or sprockets-rails), the
       # behavior is "enhanced". You can bypass the asset pipeline by passing in
       # <tt>skip_pipeline: true</tt> to the options.
       #
@@ -130,7 +130,7 @@
       # === With the asset pipeline
       #
       # All options passed to +asset_path+ will be passed to +compute_asset_path+
-      # which is implemented by sprockets-rails.
+      # which is implemented by asset pipeline gems.
       #
       #   asset_path("application.js") # => "/assets/application-60aa4fdc5cea14baf5400fba1abf4f2a46a5166bad4772b1effe341570f07de9.js"
       #   asset_path('application.js', host: 'example.com') # => "//example.com/assets/application.js"
@@ -190,7 +190,7 @@
         return "" if source.blank?
         return source if URI_REGEXP.match?(source)
 
-        tail, source = source/(\?#.+)$/, source.sub(/(\?#.+)$/, "")
+        tail, source = source/(?#.+)$/, source.sub(/(?#.+)$/, "")
 
         if extname = compute_asset_extname(source, options)
           source = "#{source}#{extname}"
@@ -219,7 +219,7 @@
 
       # Computes the full URL to an asset in the public directory. This
       # will use +asset_path+ internally, so most of their behaviors
-      # will be the same. If :host options is set, it overwrites global
+      # will be the same. If +:host+ options is set, it overwrites global
       # +config.action_controller.asset_host+ setting.
       #
       # All other options provided are forwarded to +asset_path+ call.
@@ -324,7 +324,7 @@
 
       # Computes the full URL to a JavaScript asset in the public javascripts directory.
       # This will use +javascript_path+ internally, so most of their behaviors will be the same.
-      # Since +javascript_url+ is based on +asset_url+ method you can set :host options. If :host
+      # Since +javascript_url+ is based on +asset_url+ method you can set +:host+ options. If +:host+
       # options is set, it overwrites global +config.action_controller.asset_host+ setting.
       #
       #   javascript_url "js/xmlhr.js", host: "http://stage.example.com" # => http://stage.example.com/assets/js/xmlhr.js
@@ -351,7 +351,7 @@
 
       # Computes the full URL to a stylesheet asset in the public stylesheets directory.
       # This will use +stylesheet_path+ internally, so most of their behaviors will be the same.
-      # Since +stylesheet_url+ is based on +asset_url+ method you can set :host options. If :host
+      # Since +stylesheet_url+ is based on +asset_url+ method you can set +:host+ options. If +:host+
       # options is set, it overwrites global +config.action_controller.asset_host+ setting.
       #
       #   stylesheet_url "css/style.css", host: "http://stage.example.com" # => http://stage.example.com/assets/css/style.css
@@ -381,7 +381,7 @@
 
       # Computes the full URL to an image asset.
       # This will use +image_path+ internally, so most of their behaviors will be the same.
-      # Since +image_url+ is based on +asset_url+ method you can set :host options. If :host
+      # Since +image_url+ is based on +asset_url+ method you can set +:host+ options. If +:host+
       # options is set, it overwrites global +config.action_controller.asset_host+ setting.
       #
       #   image_url "edit.png", host: "http://stage.example.com" # => http://stage.example.com/assets/edit.png
@@ -407,7 +407,7 @@
 
       # Computes the full URL to a video asset in the public videos directory.
       # This will use +video_path+ internally, so most of their behaviors will be the same.
-      # Since +video_url+ is based on +asset_url+ method you can set :host options. If :host
+      # Since +video_url+ is based on +asset_url+ method you can set +:host+ options. If +:host+
       # options is set, it overwrites global +config.action_controller.asset_host+ setting.
       #
       #   video_url "hd.avi", host: "http://stage.example.com" # => http://stage.example.com/videos/hd.avi
@@ -433,7 +433,7 @@
 
       # Computes the full URL to an audio asset in the public audios directory.
       # This will use +audio_path+ internally, so most of their behaviors will be the same.
-      # Since +audio_url+ is based on +asset_url+ method you can set :host options. If :host
+      # Since +audio_url+ is based on +asset_url+ method you can set +:host+ options. If +:host+
       # options is set, it overwrites global +config.action_controller.asset_host+ setting.
       #
       #   audio_url "horse.wav", host: "http://stage.example.com" # => http://stage.example.com/audios/horse.wav
@@ -458,7 +458,7 @@
 
       # Computes the full URL to a font asset.
       # This will use +font_path+ internally, so most of their behaviors will be the same.
-      # Since +font_url+ is based on +asset_url+ method you can set :host options. If :host
+      # Since +font_url+ is based on +asset_url+ method you can set +:host+ options. If +:host+
       # options is set, it overwrites global +config.action_controller.asset_host+ setting.
       #
       #   font_url "font.ttf", host: "http://stage.example.com" # => http://stage.example.com/fonts/font.ttf

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/atom_feed_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/atom_feed_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/cache_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/cache_helper.rb Changed

@@ -2,8 +2,10 @@
 
 module ActionView
   # = Action View Cache Helper
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     module CacheHelper
+      class UncacheableFragmentError < StandardError; end
+
       # This helper exposes a method for caching fragments of a view
       # rather than an entire action or page. This technique is useful
       # caching pieces like menus, lists of new topics, static HTML
@@ -165,8 +167,10 @@
       # expire the cache.
       def cache(name = {}, options = {}, &block)
         if controller.respond_to?(:perform_caching) && controller.perform_caching
-          name_options = options.slice(:skip_digest)
-          safe_concat(fragment_for(cache_fragment_name(name, **name_options), options, &block))
+          CachingRegistry.track_caching do
+            name_options = options.slice(:skip_digest)
+            safe_concat(fragment_for(cache_fragment_name(name, **name_options), options, &block))
+          end
         else
           yield
         end
@@ -174,6 +178,34 @@
         nil
       end
 
+      # Returns whether the current view fragment is within a +cache+ block.
+      #
+      # Useful when certain fragments aren't cacheable:
+      #
+      #   <% cache project do %>
+      #     <% raise StandardError, "Caching private data!" if caching? %>
+      #   <% end %>
+      def caching?
+        CachingRegistry.caching?
+      end
+
+      # Raises +UncacheableFragmentError+ when called from within a +cache+ block.
+      #
+      # Useful to denote helper methods that can't participate in fragment caching:
+      #
+      #   def project_name_with_time(project)
+      #     uncacheable!
+      #     "#{project.name} - #{Time.now}"
+      #   end
+      #
+      #   # Which will then raise if used within a +cache+ block:
+      #   <% cache project do %>
+      #     <%= project_name_with_time(project) %>
+      #   <% end %>
+      def uncacheable!
+        raise UncacheableFragmentError, "can't be fragment cached" if caching?
+      end
+
       # Cache fragments of a view if +condition+ is true
       #
       #   <% cache_if admin?, project do %>
@@ -259,6 +291,23 @@
         end
         controller.write_fragment(name, fragment, options)
       end
+
+      module CachingRegistry # :nodoc:
+        extend self
+
+        def caching?
+          ActiveSupport::IsolatedExecutionState:action_view_caching ||= false
+        end
+
+        def track_caching
+          caching_was = ActiveSupport::IsolatedExecutionState:action_view_caching
+          ActiveSupport::IsolatedExecutionState:action_view_caching = true
+
+          yield
+        ensure
+          ActiveSupport::IsolatedExecutionState:action_view_caching = caching_was
+        end
+      end
     end
   end
 end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/capture_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/capture_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/controller_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/controller_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/csp_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/csp_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/csrf_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/csrf_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/date_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/date_helper.rb Changed

@@ -9,7 +9,7 @@
 require "active_support/core_ext/object/with_options"
 
 module ActionView
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # = Action View Date Helpers
     #
     # The Date Helper primarily creates select/option tags for different kinds of dates and times or date and time
@@ -26,7 +26,7 @@
       MINUTES_IN_QUARTER_YEAR = 131400
       MINUTES_IN_THREE_QUARTERS_YEAR = 394200
 
-      # Reports the approximate distance in time between two Time, Date or DateTime objects or integers as seconds.
+      # Reports the approximate distance in time between two Time, Date, or DateTime objects or integers as seconds.
       # Pass <tt>include_seconds: true</tt> if you want more detailed approximations when distance < 1 min, 29 secs.
       # Distances are reported based on the following table:
       #
@@ -140,7 +140,7 @@
             minute_offset_for_leap_year = leap_years * 1440
             # Discount the leap year days when calculating year distance.
             # e.g. if there are 20 leap year days between 2 dates having the same day
-            # and month then the based on 365 days calculation
+            # and month then based on 365 days calculation
             # the distance in years will come out to over 80 years when in written
             # English it would read better as about 80 years.
             minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
@@ -206,6 +206,7 @@
       #   you are creating new record. While editing existing record, <tt>:end_year</tt> defaults to
       #   the current selected year plus 5.
       # * <tt>:year_format</tt>       - Set format of years for year select. Lambda should be passed.
+      # * <tt>:day_format</tt>        - Set format of days for day select. Lambda should be passed.
       # * <tt>:discard_day</tt>       - Set to true if you don't want to show a day select. This includes the day
       #   as a hidden field instead of showing a select field. Also note that this implicitly sets the day to be the
       #   first of the given month in order to not create invalid dates like 31 February.
@@ -279,6 +280,9 @@
       #   # Generates a date select with custom year format.
       #   date_select("article", "written_on", year_format: ->(year) { "Heisei #{year - 1988}" })
       #
+      #   # Generates a date select with custom day format.
+      #   date_select("article", "written_on", day_format: ->(day) { day.ordinalize })
+      #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       #
       # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
@@ -287,12 +291,12 @@
         Tags::DateSelect.new(object_name, method, self, options, html_options).render
       end
 
-      # Returns a set of select tags (one for hour, minute and optionally second) pre-selected for accessing a
+      # Returns a set of select tags (one for hour, minute, and optionally second) pre-selected for accessing a
       # specified time-based attribute (identified by +method+) on an object assigned to the template (identified by
       # +object+). You can include the seconds with <tt>:include_seconds</tt>. You can get hours in the AM/PM format
       # with <tt>:ampm</tt> option.
       #
-      # This method will also generate 3 input hidden tags, for the actual year, month and day unless the option
+      # This method will also generate 3 input hidden tags, for the actual year, month, and day unless the option
       # <tt>:ignore_date</tt> is set to +true+. If you set the <tt>:ignore_date</tt> to +true+, you must have a
       # +date_select+ on the same method within the form otherwise an exception will be raised.
       #
@@ -699,7 +703,7 @@
         end
     end
 
-    class DateTimeSelector #:nodoc:
+    class DateTimeSelector # :nodoc:
       include ActionView::Helpers::TagHelper
 
       DEFAULT_PREFIX = "date"
@@ -811,7 +815,7 @@
         if @options:use_hidden || @options:discard_day
           build_hidden(:day, day || 1)
         else
-          build_options_and_select(:day, day, start: 1, end: 31, leading_zeros: false, use_two_digit_numbers: @options:use_two_digit_numbers)
+          build_select(:day, build_day_options(day))
         end
       end
 
@@ -867,6 +871,10 @@
           end
         end
 
+        def prompt_text(prompt, type)
+          prompt.kind_of?(String) ? prompt : I18n.translate(:"datetime.prompts.#{type}", locale: @options:locale)
+        end
+
         # If the day is hidden, the day should be set to the 1st so all month and year choices are
         # valid. Otherwise, February 31st or February 29th, 2011 can be selected, which are invalid.
         def set_day_if_discarded
@@ -880,7 +888,7 @@
         def month_names
           @month_names ||= begin
             month_names = @options:use_month_names || translated_month_names
-            month_names.unshift(nil) if month_names.size < 13
+            month_names = nil, *month_names if month_names.size < 13
             month_names
           end
         end
@@ -899,6 +907,27 @@
           I18n.translate(key, locale: @options:locale)
         end
 
+        # Looks up day names by number.
+        #
+        #   day_name(1) # => 1
+        #
+        # If the <tt>use_two_digit_numbers: true</tt> option is passed to DateTimeSelector:
+        #
+        #   day_name(1) # => "01"
+        #
+        # If the <tt>day_format: ->(day) { day.ordinalize }</tt> option is passed to DateTimeSelector:
+        #
+        #   day_name(1) # => "1st"
+        def day_name(number)
+          if day_format_lambda = @options:day_format
+            day_format_lambda.call(number)
+          elsif @options:use_two_digit_numbers
+            "%02d" % number
+          else
+            number
+          end
+        end
+
         # Looks up month names by number (1-based):
         #
         #   month_name(1) # => "January"
@@ -1011,6 +1040,35 @@
           (select_options.join("\n") + "\n").html_safe
         end
 
+        # Build select option HTML for day.
+        #  build_day_options(2)
+        #  => "<option value="1">1</option>
+        #      <option value="2" selected="selected">2</option>
+        #      <option value="3">3</option>..."
+        #
+        # If <tt>day_format: ->(day) { day.ordinalize }</tt> option is passed to DateTimeSelector
+        #  build_day_options(2)
+        #  => "<option value="1">1st</option>
+        #      <option value="2" selected="selected">2nd</option>
+        #      <option value="3">3rd</option>..."
+        #
+        # If <tt>use_two_digit_numbers: true</tt> option is passed to DateTimeSelector
+        #  build_day_options(2)
+        #  => "<option value="1">01</option>
+        #      <option value="2" selected="selected">02</option>
+        #      <option value="3">03</option>..."
+        def build_day_options(selected)
+          select_options = 
+          (1..31).each do |value|
+            tag_options = { value: value }
+            tag_options:selected = "selected" if selected == value
+            text = day_name(value)
+            select_options << content_tag("option", text, tag_options)
+          end
+
+          (select_options.join("\n") + "\n").html_safe
+        end
+
         # Build select option HTML for year.
         # If <tt>year_format</tt> option is not passed
         #  build_year_options(1998, start: 1998, end: 2000)
@@ -1060,7 +1118,7 @@
           (content_tag("select", select_html.html_safe, select_options) + "\n").html_safe
         end
 
-        # Builds the css class value for the select element
+        # Builds the CSS class value for the select element
         #  css_class_attribute(:year, 'date optional', { year: 'my-year' })
         #  => "date optional my-year"
         def css_class_attribute(type, html_options_class, options) # :nodoc:
@@ -1090,18 +1148,19 @@
               I18n.translate(:"datetime.prompts.#{type}", locale: @options:locale)
             end
 
-          prompt ? content_tag("option", prompt, value: "") : ""
+          prompt ? content_tag("option", prompt_text(prompt, type), value: "") : ""
         end
 
         # Builds hidden input tag for date part and value.
         #  build_hidden(:year, 2008)
-        #  => "<input id="post_written_on_1i" name="postwritten_on(1i)" type="hidden" value="2008" />"
+        #  => "<input type="hidden" id="date_year" name="dateyear" value="2008" autocomplete="off" />"
         def build_hidden(type, value)
           select_options = {
             type: "hidden",
             id: input_id_from_type(type),
             name: input_name_from_type(type),
-            value: value
+            value: value,
+            autocomplete: "off"
           }.merge!(@html_options.slice(:disabled))
           select_options:disabled = "disabled" if @options:disabled
 
@@ -1125,7 +1184,7 @@
         # Returns the id attribute for the input tag.
         #  => "post_written_on_1i"
         def input_id_from_type(type)
-          id = input_name_from_type(type).gsub(/(\$)|(\$/, "_").gsub(/\\)/, "")
+          id = input_name_from_type(type).gsub(/($)|(\$/, "_").gsub(/\)/, "")

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/debug_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/debug_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/form_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/form_helper.rb Changed

@@ -2,7 +2,7 @@
 
 require "cgi"
 require "action_view/helpers/date_helper"
-require "action_view/helpers/tag_helper"
+require "action_view/helpers/url_helper"
 require "action_view/helpers/form_tag_helper"
 require "action_view/helpers/active_model_helper"
 require "action_view/model_naming"
@@ -11,11 +11,10 @@
 require "active_support/core_ext/hash/slice"
 require "active_support/core_ext/string/output_safety"
 require "active_support/core_ext/string/inflections"
-require "active_support/core_ext/symbol/starts_ends_with"
 
 module ActionView
   # = Action View Form Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # Form helpers are designed to make working with resources much easier
     # compared to using vanilla HTML.
     #
@@ -283,6 +282,12 @@
       #     ...
       #   <% end %>
       #
+      # You can omit the <tt>action</tt> attribute by passing <tt>url: false</tt>:
+      #
+      #   <%= form_for(@post, url: false) do |f| %>
+      #     ...
+      #   <% end %>
+      #
       # You can also set the answer format, like this:
       #
       #   <%= form_for(@post, format: :json) do |f| %>
@@ -427,50 +432,45 @@
       #   <% end %>
       def form_for(record, options = {}, &block)
         raise ArgumentError, "Missing block" unless block_given?
-        html_options = options:html ||= {}
 
         case record
         when String, Symbol
+          model       = nil
           object_name = record
-          object      = nil
         else
-          object      = record.is_a?(Array) ? record.last : record
+          model       = convert_to_model(record)
+          object      = _object_for_form_builder(record)
           raise ArgumentError, "First argument in form cannot contain nil or be empty" unless object
           object_name = options:as || model_name_from_record_or_class(object).param_key
-          apply_form_for_options!(record, object, options)
+          apply_form_for_options!(object, options)
         end
 
-        html_options:data   = options.delete(:data)   if options.has_key?(:data)
-        html_options:remote = options.delete(:remote) if options.has_key?(:remote)
-        html_options:method = options.delete(:method) if options.has_key?(:method)
-        html_options:enforce_utf8 = options.delete(:enforce_utf8) if options.has_key?(:enforce_utf8)
-        html_options:authenticity_token = options.delete(:authenticity_token)
+        remote = options.delete(:remote)
+
+        if remote && !embed_authenticity_token_in_remote_forms && options:authenticity_token.blank?
+          options:authenticity_token = false
+        end
 
-        builder = instantiate_builder(object_name, object, options)
-        output  = capture(builder, &block)
-        html_options:multipart ||= builder.multipart?
+        options:model                               = model
+        options:scope                               = object_name
+        options:local                               = !remote
+        options:skip_default_ids                    = false
+        options:allow_method_names_outside_object   = options.fetch(:allow_method_names_outside_object, false)
 
-        html_options = html_options_for_form(options:url || {}, html_options)
-        form_tag_with_body(html_options, output)
+        form_with(**options, &block)
       end
 
-      def apply_form_for_options!(record, object, options) #:nodoc:
+      def apply_form_for_options!(object, options) # :nodoc:
         object = convert_to_model(object)
 
         as = options:as
         namespace = options:namespace
-        action, method = object.respond_to?(:persisted?) && object.persisted? ? :edit, :patch : :new, :post
+        action = object.respond_to?(:persisted?) && object.persisted? ? :edit : :new
+        options:html ||= {}
         options:html.reverse_merge!(
           class:  as ? "#{action}_#{as}" : dom_class(object, action),
           id:     (as ? namespace, action, as : namespace, dom_id(object, action)).compact.join("_").presence,
-          method: method
         )
-
-        options:url ||= if options.key?(:format)
-          polymorphic_path(record, format: options.delete(:format))
-        else
-          polymorphic_path(record, {})
-        end
       end
       private :apply_form_for_options!
 
@@ -478,6 +478,8 @@
 
       mattr_accessor :form_with_generates_ids, default: false
 
+      mattr_accessor :multiple_file_field_include_hidden, default: false
+
       # Creates a form tag based on mixing URLs, scopes, or models.
       #
       #   # Using just a URL:
@@ -485,7 +487,16 @@
       #     <%= form.text_field :title %>
       #   <% end %>
       #   # =>
-      #   <form action="/posts" method="post" data-remote="true">
+      #   <form action="/posts" method="post">
+      #     <input type="text" name="title">
+      #   </form>
+      #
+      #   # With an intentionally empty URL:
+      #   <%= form_with url: false do |form| %>
+      #     <%= form.text_field :title %>
+      #   <% end %>
+      #   # =>
+      #   <form method="post" data-remote="true">
       #     <input type="text" name="title">
       #   </form>
       #
@@ -494,7 +505,7 @@
       #     <%= form.text_field :title %>
       #   <% end %>
       #   # =>
-      #   <form action="/posts" method="post" data-remote="true">
+      #   <form action="/posts" method="post">
       #     <input type="text" name="posttitle">
       #   </form>
       #
@@ -503,7 +514,7 @@
       #     <%= form.text_field :title %>
       #   <% end %>
       #   # =>
-      #   <form action="/posts" method="post" data-remote="true">
+      #   <form action="/posts" method="post">
       #     <input type="text" name="posttitle">
       #   </form>
       #
@@ -512,7 +523,7 @@
       #     <%= form.text_field :title %>
       #   <% end %>
       #   # =>
-      #   <form action="/posts/1" method="post" data-remote="true">
+      #   <form action="/posts/1" method="post">
       #     <input type="hidden" name="_method" value="patch">
       #     <input type="text" name="posttitle" value="<the title of the post>">
       #   </form>
@@ -523,7 +534,7 @@
       #     <%= form.text_field :but_in_forms_they_can %>
       #   <% end %>
       #   # =>
-      #   <form action="/cats" method="post" data-remote="true">
+      #   <form action="/cats" method="post">
       #     <input type="text" name="catcats_dont_have_gills">
       #     <input type="text" name="catbut_in_forms_they_can">
       #   </form>
@@ -604,10 +615,16 @@
       #   This is helpful when fragment-caching the form. Remote forms
       #   get the authenticity token from the <tt>meta</tt> tag, so embedding is
       #   unnecessary unless you support browsers without JavaScript.
-      # * <tt>:local</tt> - By default form submits via typical HTTP requests.
-      #   Enable remote and unobtrusive XHRs submits with <tt>local: false</tt>.
-      #   Remote forms may be enabled by default by setting
-      #   <tt>config.action_view.form_with_generates_remote_forms = true</tt>.
+      # * <tt>:local</tt> - Whether to use standard HTTP form submission.
+      #   When set to <tt>true</tt>, the form is submitted via standard HTTP.
+      #   When set to <tt>false</tt>, the form is submitted as a "remote form", which
+      #   is handled by Rails UJS as an XHR. When unspecified, the behavior is derived
+      #   from <tt>config.action_view.form_with_generates_remote_forms</tt> where the
+      #   config's value is actually the inverse of what <tt>local</tt>'s value would be.
+      #   As of Rails 6.1, that configuration option defaults to <tt>false</tt>
+      #   (which has the equivalent effect of passing <tt>local: true</tt>).
+      #   In previous versions of Rails, that configuration option defaults to
+      #   <tt>true</tt> (the equivalent of passing <tt>local: false</tt>).
       # * <tt>:skip_enforcing_utf8</tt> - If set to true, a hidden input with name
       #   utf8 is not output.
       # * <tt>:builder</tt> - Override the object used to build the form.
@@ -735,13 +752,14 @@
       #     form_with(**options.merge(builder: LabellingFormBuilder), &block)
       #   end
       def form_with(model: nil, scope: nil, url: nil, format: nil, **options, &block)
-        options:allow_method_names_outside_object = true
-        options:skip_default_ids = !form_with_generates_ids
+        options = { allow_method_names_outside_object: true, skip_default_ids: !form_with_generates_ids }.merge!(options)
 
         if model
-          url ||= polymorphic_path(model, format: format)
+          if url != false
+            url ||= polymorphic_path(model, format: format)

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/form_options_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/form_options_helper.rb Changed

@@ -2,21 +2,21 @@
 
 require "cgi"
 require "erb"
-require "action_view/helpers/form_helper"
 require "active_support/core_ext/string/output_safety"
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/array/wrap"
+require "action_view/helpers/text_helper"
 
 module ActionView
   # = Action View Form Option Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # Provides a number of methods for turning different kinds of containers into a set of option tags.
     #
     # The <tt>collection_select</tt>, <tt>select</tt> and <tt>time_zone_select</tt> methods take an <tt>options</tt> parameter, a hash:
     #
     # * <tt>:include_blank</tt> - set to true or a prompt string if the first option element of the select element is a blank. Useful if there is not a default value required for the select element.
     #
-    #     select("post", "category", Post::CATEGORIES, { include_blank: true })
+    #     select(:post, :category, Post::CATEGORIES, { include_blank: true })
     #
     #   could become:
     #
@@ -30,7 +30,7 @@
     #
     #   Example with <tt>@post.person_id => 2</tt>:
     #
-    #     select("post", "person_id", Person.all.collect { |p|  p.name, p.id  }, { include_blank: 'None' })
+    #     select(:post, :person_id, Person.all.collect { |p|  p.name, p.id  }, { include_blank: "None" })
     #
     #   could become:
     #
@@ -43,7 +43,7 @@
     #
     # * <tt>:prompt</tt> - set to true or a prompt string. When the select element doesn't have a value yet, this prepends an option with a generic prompt -- "Please select" -- or the given prompt string.
     #
-    #     select("post", "person_id", Person.all.collect { |p|  p.name, p.id  }, { prompt: 'Select Person' })
+    #     select(:post, :person_id, Person.all.collect { |p|  p.name, p.id  }, { prompt: "Select Person" })
     #
     #   could become:
     #
@@ -54,10 +54,10 @@
     #       <option value="3">Rafael</option>
     #     </select>
     #
-    # * <tt>:index</tt> - like the other form helpers, +select+ can accept an <tt>:index</tt> option to manually set the ID used in the resulting output. Unlike other helpers, +select+ expects this
+    # * <tt>:index</tt> - like the other form helpers, <tt>select</tt> can accept an <tt>:index</tt> option to manually set the ID used in the resulting output. Unlike other helpers, <tt>select</tt> expects this
     #   option to be in the +html_options+ parameter.
     #
-    #     select("album", "genre", %wrap rock country, {}, { index: nil })
+    #     select("album", :genre, %w rap rock country , {}, { index: nil })
     #
     #   becomes:
     #
@@ -69,7 +69,7 @@
     #
     # * <tt>:disabled</tt> - can be a single value or an array of values that will be disabled options in the final output.
     #
-    #     select("post", "category", Post::CATEGORIES, { disabled: 'restricted' })
+    #     select(:post, :category, Post::CATEGORIES, { disabled: "restricted" })
     #
     #   could become:
     #
@@ -90,7 +90,6 @@
     #       <option value="3">Jokes</option>
     #       <option value="4">Poems</option>
     #     </select>
-    #
     module FormOptionsHelper
       # ERB::Util can mask some helpers like textilize. Make sure to include them.
       include TextHelper
@@ -100,25 +99,22 @@
       #
       # There are two possible formats for the +choices+ parameter, corresponding to other helpers' output:
       #
-      # * A flat collection (see +options_for_select+).
-      #
-      # * A nested collection (see +grouped_options_for_select+).
+      # * A flat collection (see <tt>options_for_select</tt>).
+      # * A nested collection (see <tt>grouped_options_for_select</tt>).
       #
-      # For example:
+      # Example with <tt>@post.person_id => 2</tt>:
       #
-      #   select("post", "person_id", Person.all.collect { |p|  p.name, p.id  }, { include_blank: true })
+      #   select :post, :person_id, Person.all.collect { |p|  p.name, p.id  }, { include_blank: true })
       #
       # would become:
       #
       #   <select name="postperson_id" id="post_person_id">
       #     <option value="" label=" "></option>
-      #     <option value="1" selected="selected">David</option>
-      #     <option value="2">Eileen</option>
+      #     <option value="1">David</option>
+      #     <option value="2" selected="selected">Eileen</option>
       #     <option value="3">Rafael</option>
       #   </select>
       #
-      # assuming the associated person has ID 1.
-      #
       # This can be used to provide a default set of options in the standard way: before rendering the create form, a
       # new model instance is assigned the default options and bound to @model_name. Usually this model is not saved
       # to the database. Instead, a second model object is created when the create request is received.
@@ -132,9 +128,9 @@
       # A block can be passed to +select+ to customize how the options tags will be rendered. This
       # is useful when the options tag has complex attributes.
       #
-      #   select(report, "campaign_ids") do
+      #   select(report, :campaign_ids) do
       #     available_campaigns.each do |c|
-      #       content_tag(:option, c.name, value: c.id, data: { tags: c.tags.to_json })
+      #       tag.option(c.name, value: c.id, data: { tags: c.tags.to_json })
       #     end
       #   end
       #
@@ -159,7 +155,6 @@
       #
       # In case if you don't want the helper to generate this hidden field you can specify
       # <tt>include_hidden: false</tt> option.
-      #
       def select(object, method, choices = nil, options = {}, html_options = {}, &block)
         Tags::Select.new(object, method, self, choices, options, html_options, &block).render
       end
@@ -183,6 +178,7 @@
       #
       #   class Author < ActiveRecord::Base
       #     has_many :posts
+      #
       #     def name_with_initial
       #       "#{first_name.first}. #{last_name}"
       #     end
@@ -227,19 +223,19 @@
       #
       # Example object structure for use with this method:
       #
+      #   # attributes: id, name
       #   class Continent < ActiveRecord::Base
       #     has_many :countries
-      #     # attribs: id, name
       #   end
       #
+      #   # attributes: id, name, continent_id
       #   class Country < ActiveRecord::Base
       #     belongs_to :continent
-      #     # attribs: id, name, continent_id
       #   end
       #
+      #   # attributes: id, name, country_id
       #   class City < ActiveRecord::Base
       #     belongs_to :country
-      #     # attribs: id, name, country_id
       #   end
       #
       # Sample usage:
@@ -258,7 +254,6 @@
       #       <option value="2">Ireland</option>
       #     </optgroup>
       #   </select>
-      #
       def grouped_collection_select(object, method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
         Tags::GroupedCollectionSelect.new(object, method, self, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options).render
       end
@@ -282,21 +277,27 @@
       # Finally, this method supports a <tt>:default</tt> option, which selects
       # a default ActiveSupport::TimeZone if the object's time zone is +nil+.
       #
-      #   time_zone_select("user", "time_zone", nil, include_blank: true)
+      #   time_zone_select(:user, :time_zone, nil, include_blank: true)
       #
-      #   time_zone_select("user", "time_zone", nil, default: "Pacific Time (US & Canada)")
+      #   time_zone_select(:user, :time_zone, nil, default: "Pacific Time (US & Canada)")
       #
-      #   time_zone_select("user", 'time_zone', ActiveSupport::TimeZone.us_zones, default: "Pacific Time (US & Canada)")
+      #   time_zone_select(:user, :time_zone, ActiveSupport::TimeZone.us_zones, default: "Pacific Time (US & Canada)")
       #
-      #   time_zone_select("user", 'time_zone',  ActiveSupport::TimeZone'Alaska', ActiveSupport::TimeZone'Hawaii' )
+      #   time_zone_select(:user, :time_zone,  ActiveSupport::TimeZone"Alaska", ActiveSupport::TimeZone"Hawaii" )
       #
-      #   time_zone_select("user", 'time_zone', /Australia/)
+      #   time_zone_select(:user, :time_zone, /Australia/)
       #
-      #   time_zone_select("user", "time_zone", ActiveSupport::TimeZone.all.sort, model: ActiveSupport::TimeZone)
+      #   time_zone_select(:user, :time_zone, ActiveSupport::TimeZone.all.sort, model: ActiveSupport::TimeZone)
       def time_zone_select(object, method, priority_zones = nil, options = {}, html_options = {})
         Tags::TimeZoneSelect.new(object, method, self, priority_zones, options, html_options).render
       end
 
+      # Returns select and option tags for the given object and method, using
+      # <tt>weekday_options_for_select</tt> to generate the list of option tags.
+      def weekday_select(object, method, options = {}, html_options = {}, &block)
+        Tags::WeekdaySelect.new(object, method, self, options, html_options, &block).render
+      end
+
       # Accepts a container (hash, array, enumerable, your type) and returns a string of option tags. Given a container
       # where the elements respond to first and last (such as a two-element array), the "lasts" serve as option values and
       # the "firsts" as option text. Hashes are turned into this form automatically, so the keys become "firsts" and values
@@ -593,6 +594,25 @@
         zone_options.safe_concat options_for_select(convert_zoneszones, selected)

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/form_tag_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/form_tag_helper.rb Changed

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require "cgi"
-require "action_view/helpers/tag_helper"
+require "action_view/helpers/url_helper"
+require "action_view/helpers/text_helper"
 require "active_support/core_ext/string/output_safety"
 require "active_support/core_ext/module/attribute_accessors"
-require "active_support/core_ext/symbol/starts_ends_with"
 
 module ActionView
   # = Action View Form Tag Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # Provides a number of methods for creating form tags that don't rely on an Active Record object assigned to the template like
     # FormHelper does. Instead, you provide the names and values manually.
     #
@@ -63,6 +63,9 @@
       #   <%= form_tag('/posts', remote: true) %>
       #   # => <form action="/posts" method="post" data-remote="true">
       #
+      #   form_tag(false, method: :get)
+      #   # => <form method="get">
+      #
       #   form_tag('http://far.away.com/form', authenticity_token: false)
       #   # form without authenticity token
       #
@@ -78,6 +81,65 @@
         end
       end
 
+      # Generate an HTML <tt>id</tt> attribute value for the given name and
+      # field combination
+      #
+      # Return the value generated by the <tt>FormBuilder</tt> for the given
+      # attribute name.
+      #
+      #   <%= label_tag :post, :title %>
+      #   <%= text_field_tag :post, :title, aria: { describedby: field_id(:post, :title, :error) } %>
+      #   <%= tag.span("is blank", id: field_id(:post, :title, :error) %>
+      #
+      # In the example above, the <tt><input type="text"></tt> element built by
+      # the call to <tt>text_field_tag</tt> declares an
+      # <tt>aria-describedby</tt> attribute referencing the <tt><span></tt>
+      # element, sharing a common <tt>id</tt> root (<tt>post_title</tt>, in this
+      # case).
+      def field_id(object_name, method_name, *suffixes, index: nil, namespace: nil)
+        if object_name.respond_to?(:model_name)
+          object_name = object_name.model_name.singular
+        end
+
+        sanitized_object_name = object_name.to_s.gsub(/\\|^-a-zA-Z0-9:./, "_").delete_suffix("_")
+
+        sanitized_method_name = method_name.to_s.delete_suffix("?")
+
+        
+          namespace,
+          sanitized_object_name.presence,
+          (index unless sanitized_object_name.empty?),
+          sanitized_method_name,
+          *suffixes,
+        .tap(&:compact!).join("_")
+      end
+
+      # Generate an HTML <tt>name</tt> attribute value for the given name and
+      # field combination
+      #
+      # Return the value generated by the <tt>FormBuilder</tt> for the given
+      # attribute name.
+      #
+      #   <%= text_field_tag :post, :title, name: field_name(:post, :title, :subtitle) %>
+      #   <%# => <input type="text" name="posttitlesubtitle">
+      #
+      #   <%= text_field_tag :post, :tag, name: field_name(:post, :tag, multiple: true) %>
+      #   <%# => <input type="text" name="posttag">
+      #
+      def field_name(object_name, method_name, *method_names, multiple: false, index: nil)
+        names = method_names.map! { |name| "#{name}" }.join
+
+        # a little duplication to construct fewer strings
+        case
+        when object_name.blank?
+          "#{method_name}#{names}#{multiple ? "" : ""}"
+        when index
+          "#{object_name}#{index}#{method_name}#{names}#{multiple ? "" : ""}"
+        else
+          "#{object_name}#{method_name}#{names}#{multiple ? "" : ""}"
+        end
+      end
+
       # Creates a dropdown selection box, or if the <tt>:multiple</tt> option is set to true, a multiple
       # choice selection box.
       #
@@ -167,8 +229,8 @@
       # * <tt>:size</tt> - The number of visible characters that will fit in the input.
       # * <tt>:maxlength</tt> - The maximum number of characters that the browser will allow the user to enter.
       # * <tt>:placeholder</tt> - The text contained in the field by default which is removed when the field receives focus.
-      #   If set to true, use a translation is found in the current I18n locale
-      #   (through helpers.placeholders.<modelname>.<attribute>).
+      #   If set to true, use the translation found in the current I18n locale
+      #   (through helpers.placeholder.<modelname>.<attribute>).
       # * Any other key creates standard HTML attributes for the tag.
       #
       # ==== Examples
@@ -232,16 +294,16 @@
       #
       # ==== Examples
       #   hidden_field_tag 'tags_list'
-      #   # => <input id="tags_list" name="tags_list" type="hidden" />
+      #   # => <input type="hidden" name="tags_list" id="tags_list" autocomplete="off" />
       #
       #   hidden_field_tag 'token', 'VUBJKB23UIVI1UU1VOBVI@'
-      #   # => <input id="token" name="token" type="hidden" value="VUBJKB23UIVI1UU1VOBVI@" />
+      #   # => <input type="hidden" name="token" id="token" value="VUBJKB23UIVI1UU1VOBVI@" autocomplete="off" />
       #
       #   hidden_field_tag 'collected_input', '', onchange: "alert('Input collected!')"
-      #   # => <input id="collected_input" name="collected_input" onchange="alert('Input collected!')"
-      #   #    type="hidden" value="" />
+      #   # => <input type="hidden" name="collected_input" id="collected_input"
+      #        value="" onchange="alert(&#39;Input collected!&#39;)" autocomplete="off" />
       def hidden_field_tag(name, value = nil, options = {})
-        text_field_tag(name, value, options.merge(type: :hidden))
+        text_field_tag(name, value, options.merge(type: :hidden, autocomplete: "off"))
       end
 
       # Creates a file upload field. If you are using file uploads then you will also need
@@ -417,16 +479,6 @@
       # * <tt>:disabled</tt> - If true, the user will not be able to use this input.
       # * Any other key creates standard HTML options for the tag.
       #
-      # ==== Data attributes
-      #
-      # * <tt>confirm: 'question?'</tt> - If present the unobtrusive JavaScript
-      #   drivers will provide a prompt with the question specified. If the user accepts,
-      #   the form is processed normally, otherwise no action is taken.
-      # * <tt>:disable_with</tt> - Value of this parameter will be used as the value for a
-      #   disabled version of the submit button when the form is submitted. This feature is
-      #   provided by the unobtrusive JavaScript driver. To disable this feature for a single submit tag
-      #   pass <tt>:data => { disable_with: false }</tt> Defaults to value attribute.
-      #
       # ==== Examples
       #   submit_tag
       #   # => <input name="commit" data-disable-with="Save changes" type="submit" value="Save changes" />
@@ -437,15 +489,28 @@
       #   submit_tag "Save edits", disabled: true
       #   # => <input disabled="disabled" name="commit" data-disable-with="Save edits" type="submit" value="Save edits" />
       #
-      #   submit_tag "Complete sale", data: { disable_with: "Submitting..." }
-      #   # => <input name="commit" data-disable-with="Submitting..." type="submit" value="Complete sale" />
-      #
       #   submit_tag nil, class: "form_submit"
       #   # => <input class="form_submit" name="commit" type="submit" />
       #
       #   submit_tag "Edit", class: "edit_button"
       #   # => <input class="edit_button" data-disable-with="Edit" name="commit" type="submit" value="Edit" />
       #
+      # ==== Deprecated: Rails UJS attributes
+      #
+      # Prior to Rails 7, Rails shipped with the JavaScript library called @rails/ujs on by default. Following Rails 7,
+      # this library is no longer on by default. This library integrated with the following options:
+      #
+      # * <tt>confirm: 'question?'</tt> - If present the unobtrusive JavaScript
+      #   drivers will provide a prompt with the question specified. If the user accepts,
+      #   the form is processed normally, otherwise no action is taken.
+      # * <tt>:disable_with</tt> - Value of this parameter will be used as the value for a
+      #   disabled version of the submit button when the form is submitted. This feature is
+      #   provided by the unobtrusive JavaScript driver. To disable this feature for a single submit tag
+      #   pass <tt>:data => { disable_with: false }</tt> Defaults to value attribute.
+      #
+      #   submit_tag "Complete sale", data: { disable_with: "Submitting..." }
+      #   # => <input name="commit" data-disable-with="Submitting..." type="submit" value="Complete sale" />
+      #
       #   submit_tag "Save", data: { confirm: "Are you sure?" }
       #   # => <input name='commit' type='submit' value='Save' data-disable-with="Save" data-confirm="Are you sure?" />
       #
@@ -470,17 +535,6 @@
       #   use this input.
       # * Any other key creates standard HTML options for the tag.
       #
-      # ==== Data attributes
-      #
-      # * <tt>confirm: 'question?'</tt> - If present, the
-      #   unobtrusive JavaScript drivers will provide a prompt with
-      #   the question specified. If the user accepts, the form is
-      #   processed normally, otherwise no action is taken.
-      # * <tt>:disable_with</tt> - Value of this parameter will be
-      #   used as the value for a disabled version of the submit
-      #   button when the form is submitted. This feature is provided
-      #   by the unobtrusive JavaScript driver.
-      #
       # ==== Examples
       #   button_tag
       #   # => <button name="button" type="submit">Button</button>
@@ -501,6 +555,20 @@
       #   #     <strong>Ask me!</strong>
       #   #    </button>
       #
+      # ==== Deprecated: Rails UJS attributes
+      #

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/javascript_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/javascript_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/number_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/number_helper.rb Changed

@@ -6,16 +6,16 @@
 
 module ActionView
   # = Action View Number Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # Provides methods for converting numbers into formatted strings.
     # Methods are provided for phone numbers, currency, percentage,
-    # precision, positional notation, file size and pretty printing.
+    # precision, positional notation, file size, and pretty printing.
     #
     # Most methods expect a +number+ argument, and will return it
     # unchanged if can't be converted into a valid number.
     module NumberHelper
       # Raised when argument +number+ param given to the helpers is invalid and
-      # the option :raise is set to  +true+.
+      # the option +:raise+ is set to  +true+.
       class InvalidNumberError < StandardError
         attr_accessor :number
         def initialize(number)
@@ -448,9 +448,9 @@
         end
 
         def parse_float(number, raise_error)
-          Float(number)
-        rescue ArgumentError, TypeError
-          raise InvalidNumberError, number if raise_error
+          result = Float(number, exception: false)
+          raise InvalidNumberError, number if result.nil? && raise_error
+          result
         end
     end
   end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/output_safety_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/output_safety_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/rendering_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/rendering_helper.rb Changed

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActionView
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # = Action View Rendering
     #
     # Implements methods that allow rendering from a view context.
@@ -10,8 +10,8 @@
     module RenderingHelper
       # Returns the result of a render that's dictated by the options hash. The primary options are:
       #
-      # * <tt>:partial</tt> - See <tt>ActionView::PartialRenderer</tt>.
-      # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
+      # * <tt>:partial</tt> - See ActionView::PartialRenderer.
+      # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add +:locals+ to pass in those.
       # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
       # * <tt>:plain</tt> - Renders the text passed in out. Setting the content
       #   type as <tt>text/plain</tt>.
@@ -19,8 +19,7 @@
       #   performs HTML escape on the string first. Setting the content type as
       #   <tt>text/html</tt>.
       # * <tt>:body</tt> - Renders the text passed in, and inherits the content
-      #   type of <tt>text/plain</tt> from <tt>ActionDispatch::Response</tt>
-      #   object.
+      #   type of <tt>text/plain</tt> from ActionDispatch::Response object.
       #
       # If no <tt>options</tt> hash is passed or if <tt>:update</tt> is specified, then:
       #
@@ -47,7 +46,7 @@
         end
       end
 
-      # Overwrites _layout_for in the context object so it supports the case a block is
+      # Overrides _layout_for in the context object so it supports the case a block is
       # passed to a partial. Returns the contents that are yielded to a layout, given a
       # name or a block.
       #

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/sanitize_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/sanitize_helper.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tag_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tag_helper.rb Changed

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/enumerable"
 require "active_support/core_ext/string/output_safety"
 require "set"
+require "action_view/helpers/capture_helper"
+require "action_view/helpers/output_safety_helper"
 
 module ActionView
   # = Action View Tag Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # Provides methods to generate HTML tags programmatically both as a modern
     # HTML5 compliant builder style and legacy XHTML compliant tags.
     module TagHelper
-      extend ActiveSupport::Concern
       include CaptureHelper
       include OutputSafetyHelper
 
@@ -39,32 +41,50 @@
       PRE_CONTENT_STRINGS:textarea  = "\n"
       PRE_CONTENT_STRINGS"textarea" = "\n"
 
-      class TagBuilder #:nodoc:
+      class TagBuilder # :nodoc:
         include CaptureHelper
         include OutputSafetyHelper
 
-        VOID_ELEMENTS = %i(area base br col embed hr img input keygen link meta param source track wbr).to_set
+        HTML_VOID_ELEMENTS = %i(area base br col embed hr img input keygen link meta param source track wbr).to_set
+        SVG_SELF_CLOSING_ELEMENTS = %i(animate animateMotion animateTransform circle ellipse line path polygon polyline rect set stop use view).to_set
 
         def initialize(view_context)
           @view_context = view_context
         end
 
+        # Transforms a Hash into HTML Attributes, ready to be interpolated into
+        # ERB.
+        #
+        #   <input <%= tag.attributes(type: :text, aria: { label: "Search" }) %> >
+        #   # => <input type="text" aria-label="Search">
+        def attributes(attributes)
+          tag_options(attributes.to_h).to_s.strip.html_safe
+        end
+
         def p(*arguments, **options, &block)
           tag_string(:p, *arguments, **options, &block)
         end
 
-        def tag_string(name, content = nil, escape_attributes: true, **options, &block)
+        def tag_string(name, content = nil, **options, &block)
+          escape = handle_deprecated_escape_options(options)
+
           content = @view_context.capture(self, &block) if block_given?
-          if VOID_ELEMENTS.include?(name) && content.nil?
-            "<#{name.to_s.dasherize}#{tag_options(options, escape_attributes)}>".html_safe
+          self_closing = SVG_SELF_CLOSING_ELEMENTS.include?(name)
+          if (HTML_VOID_ELEMENTS.include?(name) || self_closing) && content.nil?
+            "<#{name.to_s.dasherize}#{tag_options(options, escape)}#{self_closing ? " />" : ">"}".html_safe
           else
-            content_tag_string(name.to_s.dasherize, content || "", options, escape_attributes)
+            content_tag_string(name.to_s.dasherize, content || "", options, escape)
           end
         end
 
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
-          content     = ERB::Util.unwrapped_html_escape(content) if escape
+
+          if escape
+            name = ERB::Util.xml_name_escape(name)
+            content = ERB::Util.unwrapped_html_escape(content)
+          end
+
           "<#{name}#{tag_options}>#{PRE_CONTENT_STRINGSname}#{content}</#{name}>".html_safe
         end
 
@@ -115,14 +135,19 @@
         end
 
         def tag_option(key, value, escape)
+          key = ERB::Util.xml_name_escape(key) if escape
+
           case value
           when Array, Hash
             value = TagHelper.build_tag_values(value) if key.to_s == "class"
             value = escape ? safe_join(value, " ") : value.join(" ")
+          when Regexp
+            value = escape ? ERB::Util.unwrapped_html_escape(value.source) : value.source
           else
             value = escape ? ERB::Util.unwrapped_html_escape(value) : value.to_s
           end
           value = value.gsub('"', "&quot;") if value.include?('"')
+
           %(#{key}="#{value}")
         end
 
@@ -139,6 +164,27 @@
             true
           end
 
+          def handle_deprecated_escape_options(options)
+            # The option :escape_attributes has been merged into the options hash to be
+            # able to warn when it is used, so we need to handle default values here.
+            escape_option_provided = options.has_key?(:escape)
+            escape_attributes_option_provided = options.has_key?(:escape_attributes)
+
+            if escape_attributes_option_provided
+              ActiveSupport::Deprecation.warn(<<~MSG)
+                Use of the option :escape_attributes is deprecated. It currently \
+                escapes both names and values of tags and attributes and it is \
+                equivalent to :escape. If any of them are enabled, the escaping \
+                is fully enabled.
+              MSG
+            end
+
+            return true unless escape_option_provided || escape_attributes_option_provided
+            escape_option = options.delete(:escape)
+            escape_attributes_option = options.delete(:escape_attributes)
+            escape_option || escape_attributes_option
+          end
+
           def method_missing(called, *args, **options, &block)
             tag_string(called, *args, **options, &block)
           end
@@ -194,7 +240,7 @@
       #
       # Thus <tt>data-user-id</tt> can be accessed as <tt>dataset.userId</tt>.
       #
-      # Data attribute values are encoded to JSON, with the exception of strings, symbols and
+      # Data attribute values are encoded to JSON, with the exception of strings, symbols, and
       # BigDecimals.
       # This may come in handy when using jQuery's HTML5-aware <tt>.data()</tt>
       # from 1.4.3.
@@ -202,13 +248,13 @@
       #   tag.div data: { city_state: %w( Chicago IL ) }
       #   # => <div data-city-state="&quot;Chicago&quot;,&quot;IL&quot;"></div>
       #
-      # The generated attributes are escaped by default. This can be disabled using
-      # +escape_attributes+.
+      # The generated tag names and attributes are escaped by default. This can be disabled using
+      # +escape+.
       #
       #   tag.img src: 'open & shut.png'
       #   # => <img src="open &amp; shut.png">
       #
-      #   tag.img src: 'open & shut.png', escape_attributes: false
+      #   tag.img src: 'open & shut.png', escape: false
       #   # => <img src="open & shut.png">
       #
       # The tag builder respects
@@ -221,6 +267,20 @@
       #   # A void element:
       #   tag.br  # => <br>
       #
+      # === Building HTML attributes
+      #
+      # Transforms a Hash into HTML attributes, ready to be interpolated into
+      # ERB. Includes or omits boolean attributes based on their truthiness.
+      # Transforms keys nested within
+      # <tt>aria:</tt> or <tt>data:</tt> objects into <tt>aria-</tt> and <tt>data-</tt>
+      # prefixed attributes:
+      #
+      #   <input <%= tag.attributes(type: :text, aria: { label: "Search" }) %>>
+      #   # => <input type="text" aria-label="Search">
+      #
+      #   <button <%= tag.attributes id: "call-to-action", disabled: false, aria: { expanded: false } %> class="primary">Get Started!</button>
+      #   # => <button id="call-to-action" aria-expanded="false" class="primary">Get Started!</button>
+      #
       # === Legacy syntax
       #
       # The following format is for legacy syntax support. It will be deprecated in future versions of Rails.
@@ -272,6 +332,7 @@
         if name.nil?
           tag_builder
         else
+          name = ERB::Util.xml_name_escape(name) if escape
           "<#{name}#{tag_builder.tag_options(options, escape) if options}#{open ? ">" : " />"}".html_safe
         end
       end
@@ -280,7 +341,7 @@
       # HTML attributes by passing an attributes hash to +options+.
       # Instead of passing the content as an argument, you can also use a block
       # in which case, you pass your +options+ as the second parameter.
-      # Set escape to false to disable attribute value escaping.
+      # Set escape to false to disable escaping.
       # Note: this is legacy syntax, see +tag+ method description for details.
       #
       # ==== Options
@@ -345,7 +406,7 @@
       #   cdata_section("hello>world")
       #   # => <!CDATAhello><!CDATA>world>
       def cdata_section(content)
-        splitted = content.to_s.gsub(/\\\>/, "><!CDATA>")
+        splitted = content.to_s.gsub(/\\>/, "><!CDATA>")
         "<!CDATA#{splitted}>".html_safe
       end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tags.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tags/base.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags/base.rb Changed

@@ -97,7 +97,7 @@
             options"name" = options.fetch("name") { tag_name(options"multiple", index) }
 
             if generate_ids?
-              options"id" = options.fetch("id") { tag_id(index) }
+              options"id" = options.fetch("id") { tag_id(index, options.delete("namespace")) }
               if namespace = options.delete("namespace")
                 options"id" = options"id" ? "#{namespace}_#{options'id'}" : namespace
               end
@@ -105,31 +105,11 @@
           end
 
           def tag_name(multiple = false, index = nil)
-            # a little duplication to construct fewer strings
-            case
-            when @object_name.empty?
-              "#{sanitized_method_name}#{multiple ? "" : ""}"
-            when index
-              "#{@object_name}#{index}#{sanitized_method_name}#{multiple ? "" : ""}"
-            else
-              "#{@object_name}#{sanitized_method_name}#{multiple ? "" : ""}"
-            end
-          end
-
-          def tag_id(index = nil)
-            # a little duplication to construct fewer strings
-            case
-            when @object_name.empty?
-              sanitized_method_name.dup
-            when index
-              "#{sanitized_object_name}_#{index}_#{sanitized_method_name}"
-            else
-              "#{sanitized_object_name}_#{sanitized_method_name}"
-            end
+            @template_object.field_name(@object_name, sanitized_method_name, multiple: multiple, index: index)
           end
 
-          def sanitized_object_name
-            @sanitized_object_name ||= @object_name.gsub(/\\|^-a-zA-Z0-9:./, "_").delete_suffix("_")
+          def tag_id(index = nil, namespace = nil)
+            @template_object.field_id(@object_name, @method_name, index: index, namespace: namespace)
           end
 
           def sanitized_method_name
@@ -137,7 +117,7 @@
           end
 
           def sanitized_value(value)
-            value.to_s.gsub(/\s\./, "_").gsub(/^-:word:/, "").downcase
+            value.to_s.gsub(/\s./, "_").gsub(/^-:word:/, "").downcase
           end
 
           def select_content_tag(option_tags, options, html_options)
@@ -153,7 +133,7 @@
             select = content_tag("select", add_options(option_tags, options, value), html_options)
 
             if html_options"multiple" && options.fetch(:include_hidden, true)
-              tag("input", disabled: html_options"disabled", name: html_options"name", type: "hidden", value: "") + select
+              tag("input", disabled: html_options"disabled", name: html_options"name", type: "hidden", value: "", autocomplete: "off") + select
             else
               select
             end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tags/check_box.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags/check_box.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tags/collection_select.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags/collection_select.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tags/file_field.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags/file_field.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tags/hidden_field.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags/hidden_field.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/tags/time_field.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags/time_field.rb Changed

_service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/tags/weekday_select.rb Added

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/text_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/text_helper.rb Changed

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/string/filters"
+require "active_support/core_ext/string/access"
 require "active_support/core_ext/array/extract_options"
+require "action_view/helpers/sanitize_helper"
+require "action_view/helpers/tag_helper"
+require "action_view/helpers/output_safety_helper"
 
 module ActionView
   # = Action View Text Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # The TextHelper module provides a set of methods for filtering, formatting
     # and transforming strings, which can reduce the amount of inline Ruby code in
     # your views. These helper methods extend Action View making them callable
@@ -129,7 +133,7 @@
       #
       #   highlight('<a href="javascript:alert(\'no!\')">ruby</a> on rails', 'rails', sanitize: false)
       #   # => <a href="javascript:alert('no!')">ruby</a> on <mark>rails</mark>
-      def highlight(text, phrases, options = {})
+      def highlight(text, phrases, options = {}, &block)
         text = sanitize(text) if options.fetch(:sanitize, true)
 
         if text.blank? || phrases.blank?
@@ -140,7 +144,7 @@
           end.join("|")
 
           if block_given?
-            text.gsub(/(#{match})(?!^<*?>)/i) { |found| yield found }
+            text.gsub(/(#{match})(?!^<*?>)/i, &block)
           else
             highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
             text.gsub(/(#{match})(?!^<*?>)/i, highlighter)
@@ -264,7 +268,7 @@
       end
 
       # Returns +text+ transformed into HTML using simple formatting rules.
-      # Two or more consecutive newlines(<tt>\n\n</tt> or <tt>\r\n\r\n</tt>) are
+      # Two or more consecutive newlines (<tt>\n\n</tt> or <tt>\r\n\r\n</tt>) are
       # considered a paragraph and wrapped in <tt><p></tt> tags. One newline
       # (<tt>\n</tt> or <tt>\r\n</tt>) is considered a linebreak and a
       # <tt><br /></tt> tag is appended. This method does not remove the
@@ -403,7 +407,7 @@
         cycle.reset if cycle
       end
 
-      class Cycle #:nodoc:
+      class Cycle # :nodoc:
         attr_reader :values
 
         def initialize(first_value, *values)
@@ -467,18 +471,25 @@
           radius   = options.fetch(:radius, 100)
           omission = options.fetch(:omission, "...")
 
-          part = part.split(separator)
-          part.delete("")
-          affix = part.size > radius ? omission : ""
+          if separator != ""
+            part = part.split(separator)
+            part.delete("")
+          end
 
-          part = if part_position == :first
-            drop_index = part.length - radius, 0.max
-            part.drop(drop_index)
-          else
-            part.first(radius)
+          affix = part.length > radius ? omission : ""
+
+          part =
+            if part_position == :first
+              part.last(radius)
+            else
+              part.first(radius)
+            end
+
+          if separator != ""
+            part = part.join(separator)
           end
 
-          return affix, part.join(separator)
+          return affix, part
         end
     end
   end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/translation_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/translation_helper.rb Changed

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 require "action_view/helpers/tag_helper"
-require "active_support/core_ext/symbol/starts_ends_with"
+require "active_support/html_safe_translation"
 
 module ActionView
   # = Action View Translation Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     module TranslationHelper
       extend ActiveSupport::Concern
 
       include TagHelper
 
+      # Specify whether an error should be raised for missing translations
+      singleton_class.attr_accessor :raise_on_missing_translations
+
       included do
         mattr_accessor :debug_missing_translation, default: true
       end
@@ -37,7 +40,7 @@
       #
       # If you would prefer missing translations to raise an error, you can
       # opt out of span-wrapping behavior globally by setting
-      # <tt>ActionView::Base.raise_on_missing_translations = true</tt> or
+      # <tt>config.i18n.raise_on_missing_translations = true</tt> or
       # individually by passing <tt>raise: true</tt> as an option to
       # <tt>translate</tt>.
       #
@@ -75,7 +78,7 @@
           options:default.is_a?(Array) ? options.delete(:default).compact : options.delete(:default)
         end
 
-        options:raise = true if options:raise.nil? && ActionView::Base.raise_on_missing_translations
+        options:raise = true if options:raise.nil? && TranslationHelper.raise_on_missing_translations
         default = MISSING_TRANSLATION
 
         translation = while key || alternatives.present?
@@ -85,14 +88,9 @@
 
           key = scope_key_by_partial(key)
 
-          if html_safe_translation_key?(key)
-            html_safe_options ||= html_escape_translation_options(options)
-            translated = I18n.translate(key, **html_safe_options, default: default)
-            break html_safe_translation(translated) unless translated.equal?(MISSING_TRANSLATION)
-          else
-            translated = I18n.translate(key, **options, default: default)
-            break translated unless translated.equal?(MISSING_TRANSLATION)
-          end
+          translated = ActiveSupport::HtmlSafeTranslation.translate(key, **options, default: default)
+
+          break translated unless translated == MISSING_TRANSLATION
 
           if alternatives.present? && !alternatives.first.is_a?(Symbol)
             break alternatives.first && I18n.translate(**options, default: alternatives)
@@ -113,7 +111,7 @@
 
       # Delegates to <tt>I18n.localize</tt> with no additional functionality.
       #
-      # See https://www.rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/Base:localize
+      # See https://www.rubydoc.info/gems/i18n/I18n/Backend/Base:localize
       # for more information.
       def localize(object, **options)
         I18n.localize(object, **options)
@@ -121,16 +119,12 @@
       alias :l :localize
 
       private
-        MISSING_TRANSLATION = Object.new
+        MISSING_TRANSLATION = -(2**60)
         private_constant :MISSING_TRANSLATION
 
         NO_DEFAULT = .freeze
         private_constant :NO_DEFAULT
 
-        def self.i18n_option?(name)
-          (@i18n_option_names ||= I18n::RESERVED_KEYS.to_set).include?(name)
-        end
-
         def scope_key_by_partial(key)
           if key&.start_with?(".")
             if @virtual_path
@@ -145,31 +139,6 @@
           end
         end
 
-        def html_escape_translation_options(options)
-          return options if options.empty?
-          html_safe_options = options.dup
-
-          options.each do |name, value|
-            unless TranslationHelper.i18n_option?(name) || (name == :count && value.is_a?(Numeric))
-              html_safe_optionsname = ERB::Util.html_escape(value.to_s)
-            end
-          end
-
-          html_safe_options
-        end
-
-        def html_safe_translation_key?(key)
-          /(?:_|\b)html\z/.match?(key)
-        end
-
-        def html_safe_translation(translation)
-          if translation.respond_to?(:map)
-            translation.map { |element| element.respond_to?(:html_safe) ? element.html_safe : element }
-          else
-            translation.respond_to?(:html_safe) ? translation.html_safe : translation
-          end
-        end
-
         def missing_translation(key, options)
           keys = I18n.normalize_keys(options:locale || I18n.locale, key, options:scope)

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/helpers/url_helper.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/helpers/url_helper.rb Changed

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "action_view/helpers/javascript_helper"
 require "active_support/core_ext/array/access"
 require "active_support/core_ext/hash/keys"
 require "active_support/core_ext/string/output_safety"
+require "action_view/helpers/tag_helper"
 
 module ActionView
   # = Action View URL Helpers
-  module Helpers #:nodoc:
+  module Helpers # :nodoc:
     # Provides a set of methods for making links and getting URLs that
     # depend on the routing subsystem (see ActionDispatch::Routing).
     # This allows you to use the same format for links in views
@@ -29,6 +29,8 @@
         end
       end
 
+      mattr_accessor :button_to_generates_button_tag, default: false
+
       # Basic implementation of url_for to allow use helpers without routes existence
       def url_for(options = nil) # :nodoc:
         case options
@@ -83,35 +85,13 @@
       #     # name
       #   end
       #
+      #   link_to(active_record_model)
+      #
       # ==== Options
       # * <tt>:data</tt> - This option can be used to add custom data attributes.
-      # * <tt>method: symbol of HTTP verb</tt> - This modifier will dynamically
-      #   create an HTML form and immediately submit the form for processing using
-      #   the HTTP verb specified. Useful for having links perform a POST operation
-      #   in dangerous actions like deleting a record (which search bots can follow
-      #   while spidering your site). Supported verbs are <tt>:post</tt>, <tt>:delete</tt>, <tt>:patch</tt>, and <tt>:put</tt>.
-      #   Note that if the user has JavaScript disabled, the request will fall back
-      #   to using GET. If <tt>href: '#'</tt> is used and the user has JavaScript
-      #   disabled clicking the link will have no effect. If you are relying on the
-      #   POST behavior, you should check for it in your controller's action by using
-      #   the request object's methods for <tt>post?</tt>, <tt>delete?</tt>, <tt>patch?</tt>, or <tt>put?</tt>.
-      # * <tt>remote: true</tt> - This will allow the unobtrusive JavaScript
-      #   driver to make an Ajax request to the URL in question instead of following
-      #   the link. The drivers each provide mechanisms for listening for the
-      #   completion of the Ajax request and performing JavaScript operations once
-      #   they're complete
-      #
-      # ==== Data attributes
-      #
-      # * <tt>confirm: 'question?'</tt> - This will allow the unobtrusive JavaScript
-      #   driver to prompt with the question specified (in this case, the
-      #   resulting text would be <tt>question?</tt>. If the user accepts, the
-      #   link is processed normally, otherwise no action is taken.
-      # * <tt>:disable_with</tt> - Value of this parameter will be used as the
-      #   name for a disabled version of the link. This feature is provided by
-      #   the unobtrusive JavaScript driver.
       #
       # ==== Examples
+      #
       # Because it relies on +url_for+, +link_to+ supports both older-style controller/action/id arguments
       # and newer RESTful routes. Current Rails style favors RESTful routes whenever possible, so base
       # your application on resources and use
@@ -144,6 +124,12 @@
       #   link_to nil, "http://example.com"
       #   # => <a href="http://www.example.com">http://www.example.com</a>
       #
+      # More concise yet, when +name+ is an Active Record model that defines a
+      # +to_s+ method returning a default value or a model instance attribute
+      #
+      #   link_to @profile
+      #   # => <a href="http://www.example.com/profiles/1">Eileen</a>
+      #
       # You can use a block as well if your link target is hard to fit into the name parameter. ERB example:
       #
       #   <%= link_to(@profile) do %>
@@ -179,27 +165,54 @@
       #   link_to "Nonsense search", searches_path(foo: "bar", baz: "quux")
       #   # => <a href="/searches?foo=bar&baz=quux">Nonsense search</a>
       #
-      # The only option specific to +link_to+ (<tt>:method</tt>) is used as follows:
+      # You can set any link attributes such as <tt>target</tt>, <tt>rel</tt>, <tt>type</tt>:
       #
-      #   link_to("Destroy", "http://www.example.com", method: :delete)
-      #   # => <a href='http://www.example.com' rel="nofollow" data-method="delete">Destroy</a>
+      #   link_to "External link", "http://www.rubyonrails.org/", target: "_blank", rel: "nofollow"
+      #   # => <a href="http://www.rubyonrails.org/" target="_blank" rel="nofollow">External link</a>
+      #
+      # ==== Deprecated: Rails UJS Attributes
       #
-      # You can also use custom data attributes using the <tt>:data</tt> option:
+      # Prior to Rails 7, Rails shipped with a JavaScript library called <tt>@rails/ujs</tt> on by default. Following Rails 7,
+      # this library is no longer on by default. This library integrated with the following options:
+      #
+      # * <tt>method: symbol of HTTP verb</tt> - This modifier will dynamically
+      #   create an HTML form and immediately submit the form for processing using
+      #   the HTTP verb specified. Useful for having links perform a POST operation
+      #   in dangerous actions like deleting a record (which search bots can follow
+      #   while spidering your site). Supported verbs are <tt>:post</tt>, <tt>:delete</tt>, <tt>:patch</tt>, and <tt>:put</tt>.
+      #   Note that if the user has JavaScript disabled, the request will fall back
+      #   to using GET. If <tt>href: '#'</tt> is used and the user has JavaScript
+      #   disabled clicking the link will have no effect. If you are relying on the
+      #   POST behavior, you should check for it in your controller's action by using
+      #   the request object's methods for <tt>post?</tt>, <tt>delete?</tt>, <tt>patch?</tt>, or <tt>put?</tt>.
+      # * <tt>remote: true</tt> - This will allow <tt>@rails/ujs</tt>
+      #   to make an Ajax request to the URL in question instead of following
+      #   the link.
+      #
+      # <tt>@rails/ujs</tt> also integrated with the following +:data+ options:
+      #
+      # * <tt>confirm: "question?"</tt> - This will allow <tt>@rails/ujs</tt>
+      #   to prompt with the question specified (in this case, the
+      #   resulting text would be <tt>question?</tt>). If the user accepts, the
+      #   link is processed normally, otherwise no action is taken.
+      # * <tt>:disable_with</tt> - Value of this parameter will be used as the
+      #   name for a disabled version of the link.
+      #
+      # ===== Rails UJS Examples
+      #
+      #   link_to "Remove Profile", profile_path(@profile), method: :delete
+      #   # => <a href="/profiles/1" rel="nofollow" data-method="delete">Remove Profile</a>
       #
       #   link_to "Visit Other Site", "http://www.rubyonrails.org/", data: { confirm: "Are you sure?" }
       #   # => <a href="http://www.rubyonrails.org/" data-confirm="Are you sure?">Visit Other Site</a>
       #
-      # Also you can set any link attributes such as <tt>target</tt>, <tt>rel</tt>, <tt>type</tt>:
-      #
-      #   link_to "External link", "http://www.rubyonrails.org/", target: "_blank", rel: "nofollow"
-      #   # => <a href="http://www.rubyonrails.org/" target="_blank" rel="nofollow">External link</a>
       def link_to(name = nil, options = nil, html_options = nil, &block)
         html_options, options, name = options, name, block if block_given?
         options ||= {}
 
         html_options = convert_options_to_data_attributes(options, html_options)
 
-        url = url_for(options)
+        url = url_target(name, options)
         html_options"href" ||= url
 
         content_tag("a", name || url, html_options, &block)
@@ -212,50 +225,59 @@
       # using the +link_to+ method with the <tt>:method</tt> modifier as described in
       # the +link_to+ documentation.
       #
-      # By default, the generated form element has a class name of <tt>button_to</tt>
-      # to allow styling of the form itself and its children. This can be changed
-      # using the <tt>:form_class</tt> modifier within +html_options+. You can control
-      # the form submission and input element behavior using +html_options+.
-      # This method accepts the <tt>:method</tt> modifier described in the +link_to+ documentation.
-      # If no <tt>:method</tt> modifier is given, it will default to performing a POST operation.
-      # You can also disable the button by passing <tt>disabled: true</tt> in +html_options+.
-      # If you are using RESTful routes, you can pass the <tt>:method</tt>
-      # to change the HTTP verb used to submit the form.
+      # You can control the form and button behavior with +html_options+. Most
+      # values in +html_options+ are passed through to the button element. For
+      # example, passing a +:class+ option within +html_options+ will set the
+      # class attribute of the button element.
+      #
+      # The class attribute of the form element can be set by passing a
+      # +:form_class+ option within +html_options+. It defaults to
+      # <tt>"button_to"</tt> to allow styling of the form and its children.
+      #
+      # The form submits a POST request by default. You can specify a different
+      # HTTP verb via the +:method+ option within +html_options+.
       #
       # ==== Options
-      # The +options+ hash accepts the same options as +url_for+.
+      # The +options+ hash accepts the same options as +url_for+. To generate a
+      # <tt><form></tt> element without an <tt>action</tt> attribute, pass
+      # <tt>false</tt>:
+      #
+      #   <%= button_to "New", false %>
+      #   # => "<form method="post" class="button_to">
+      #   #      <button type="submit">New</button>
+      #   #      <input name="authenticity_token" type="hidden" value="10f2163b45388899ad4d5ae948988266befcb6c3d1b2451cf657a0c293d605a6"/>
+      #   #    </form>"
+      #
+      # Most values in +html_options+ are passed through to the button element,
+      # but there are a few special options:
       #
-      # There are a few special +html_options+:
       # * <tt>:method</tt> - \Symbol of HTTP verb. Supported verbs are <tt>:post</tt>, <tt>:get</tt>,
       #   <tt>:delete</tt>, <tt>:patch</tt>, and <tt>:put</tt>. By default it will be <tt>:post</tt>.
       # * <tt>:disabled</tt> - If set to true, it will generate a disabled button.
       # * <tt>:data</tt> - This option can be used to add custom data attributes.
-      # * <tt>:remote</tt> -  If set to true, will allow the Unobtrusive JavaScript drivers to control the
-      #   submit behavior. By default this behavior is an ajax submit.
       # * <tt>:form</tt> - This hash will be form attributes
       # * <tt>:form_class</tt> - This controls the class of the form within which the submit button will
       #   be placed
       # * <tt>:params</tt> - \Hash of parameters to be rendered as hidden fields within the form.
       #
-      # ==== Data attributes
-      #
-      # * <tt>:confirm</tt> - This will use the unobtrusive JavaScript driver to
-      #   prompt with the question specified. If the user accepts, the link is
-      #   processed normally, otherwise no action is taken.
-      # * <tt>:disable_with</tt> - Value of this parameter will be
-      #   used as the value for a disabled version of the submit

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/layouts.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/layouts.rb Changed

@@ -183,7 +183,7 @@
   # be rendered directly, without wrapping a layout around the rendered view.
   #
   # Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so
-  # #<tt>except:  :rss, :text_only </tt> is valid, as is <tt>except: :rss</tt>.
+  # <tt>except:  :rss, :text_only </tt> is valid, as is <tt>except: :rss</tt>.
   #
   # == Using a different layout in the action render call
   #
@@ -255,14 +255,17 @@
       # true::   raise an ArgumentError
       # nil::    Force default layout behavior with inheritance
       #
-      # Return value of +Proc+ and +Symbol+ arguments should be +String+, +false+, +true+ or +nil+
+      # Return value of +Proc+ and +Symbol+ arguments should be +String+, +false+, +true+, or +nil+
       # with the same meaning as described above.
+      #
       # ==== Parameters
+      #
       # * <tt>layout</tt> - The layout to use.
       #
       # ==== Options (conditions)
-      # * :only   - A list of actions to apply this layout to.
-      # * :except - Apply this layout to all actions but this one.
+      #
+      # * +:only+   - A list of actions to apply this layout to.
+      # * +:except+ - Apply this layout to all actions but this one.
       def layout(layout, conditions = {})
         include LayoutConditions unless conditions.empty?

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/lookup_context.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/lookup_context.rb Changed

@@ -12,12 +12,11 @@
   # <tt>LookupContext</tt> is also responsible for generating a key, given to
   # view paths, used in the resolver cache lookup. Since this key is generated
   # only once during the request, it speeds up all cache accesses.
-  class LookupContext #:nodoc:
+  class LookupContext # :nodoc:
     attr_accessor :prefixes, :rendered_format
 
-    mattr_accessor :fallbacks, default: FallbackFileSystemResolver.instances
-
-    mattr_accessor :registered_details, default: 
+    singleton_class.attr_accessor :registered_details
+    self.registered_details = 
 
     def self.register_detail(name, &block)
       registered_details << name
@@ -37,7 +36,7 @@
     end
 
     # Holds accessors for the registered details.
-    module Accessors #:nodoc:
+    module Accessors # :nodoc:
       DEFAULT_PROCS = {}
     end
 
@@ -52,7 +51,7 @@
     register_detail(:variants) {  }
     register_detail(:handlers) { Template::Handlers.extensions }
 
-    class DetailsKey #:nodoc:
+    class DetailsKey # :nodoc:
       alias :eql? :equal?
 
       @details_keys = Concurrent::Map.new
@@ -68,14 +67,13 @@
           details = details.dup
           details:formats &= Template::Types.symbols
         end
-        @details_keysdetails ||= Object.new
+        @details_keysdetails ||= TemplateDetails::Requested.new(**details)
       end
 
       def self.clear
         ActionView::ViewPaths.all_view_paths.each do |path_set|
           path_set.each(&:clear_cache)
         end
-        ActionView::LookupContext.fallbacks.each(&:clear_cache)
         @view_context_class = nil
         @details_keys.clear
         @digest_cache.clear
@@ -98,7 +96,7 @@
 
       # Calculate the details key. Remove the handlers from calculation to improve performance
       # since the user cannot modify it explicitly.
-      def details_key #:nodoc:
+      def details_key # :nodoc:
         @details_key ||= DetailsKey.details_cache_key(@details) if @cache
       end
 
@@ -124,39 +122,32 @@
       attr_reader :view_paths, :html_fallback_for_js
 
       def find(name, prefixes = , partial = false, keys = , options = {})
-        @view_paths.find(*args_for_lookup(name, prefixes, partial, keys, options))
+        name, prefixes = normalize_name(name, prefixes)
+        details, details_key = detail_args_for(options)
+        @view_paths.find(name, prefixes, partial, details, details_key, keys)
       end
       alias :find_template :find
 
       def find_all(name, prefixes = , partial = false, keys = , options = {})
-        @view_paths.find_all(*args_for_lookup(name, prefixes, partial, keys, options))
+        name, prefixes = normalize_name(name, prefixes)
+        details, details_key = detail_args_for(options)
+        @view_paths.find_all(name, prefixes, partial, details, details_key, keys)
       end
 
       def exists?(name, prefixes = , partial = false, keys = , **options)
-        @view_paths.exists?(*args_for_lookup(name, prefixes, partial, keys, options))
+        name, prefixes = normalize_name(name, prefixes)
+        details, details_key = detail_args_for(options)
+        @view_paths.exists?(name, prefixes, partial, details, details_key, keys)
       end
       alias :template_exists? :exists?
 
       def any?(name, prefixes = , partial = false)
-        @view_paths.exists?(*args_for_any(name, prefixes, partial))
+        name, prefixes = normalize_name(name, prefixes)
+        details, details_key = detail_args_for_any
+        @view_paths.exists?(name, prefixes, partial, details, details_key, )
       end
       alias :any_templates? :any?
 
-      # Adds fallbacks to the view paths. Useful in cases when you are rendering
-      # a :file.
-      def with_fallbacks
-        view_paths = build_view_paths((@view_paths.paths + self.class.fallbacks).uniq)
-
-        if block_given?
-          raise ArgumentError, <<~eowarn.squish
-          Calling `with_fallbacks` with a block is not supported. Call methods on
-          the lookup context returned by `with_fallbacks` instead.
-          eowarn
-        else
-          ActionView::LookupContext.new(view_paths, @details, @prefixes)
-        end
-      end
-
     private
       # Whenever setting view paths, makes a copy so that we can manipulate them in
       # instance objects as we wish.
@@ -164,12 +155,6 @@
         ActionView::PathSet.new(Array(paths))
       end
 
-      def args_for_lookup(name, prefixes, partial, keys, details_options)
-        name, prefixes = normalize_name(name, prefixes)
-        details, details_key = detail_args_for(details_options)
-        name, prefixes, partial || false, details, details_key, keys
-      end
-
       # Compute details hash and key according to user options (e.g. passed from #render).
       def detail_args_for(options) # :doc:
         return @details, details_key if options.empty? # most common path.
@@ -184,17 +169,11 @@
         user_details, details_key
       end
 
-      def args_for_any(name, prefixes, partial)
-        name, prefixes = normalize_name(name, prefixes)
-        details, details_key = detail_args_for_any
-        name, prefixes, partial || false, details, details_key
-      end
-
       def detail_args_for_any
         @detail_args_for_any ||= begin
           details = {}
 
-          registered_details.each do |k|
+          LookupContext.registered_details.each do |k|
             if k == :variants
               detailsk = :any
             else
@@ -210,19 +189,21 @@
         end
       end
 
-      # Support legacy foo.erb names even though we now ignore .erb
-      # as well as incorrectly putting part of the path in the template
-      # name instead of the prefix.
+      # Fix when prefix is specified as part of the template name
       def normalize_name(name, prefixes)
-        prefixes = prefixes.presence
-        parts    = name.to_s.split("/")
-        parts.shift if parts.first.empty?
-        name = parts.pop
+        name = name.to_s
+        idx = name.rindex("/")
+        return name, prefixes.presence || "" unless idx
 
-        return name, prefixes || "" if parts.empty?
+        path_prefix = name0, idx
+        path_prefix = path_prefix.from(1) if path_prefix.start_with?("/")
+        name = name.from(idx + 1)
 
-        parts    = parts.join("/")
-        prefixes = prefixes ? prefixes.map { |p| "#{p}/#{parts}" } : parts
+        if !prefixes || prefixes.empty?
+          prefixes = path_prefix
+        else
+          prefixes = prefixes.map { |p| "#{p}/#{path_prefix}" }
+        end
 
         return name, prefixes
       end
@@ -254,7 +235,7 @@
     end
 
     def initialize_details(target, details)
-      registered_details.each do |k|
+      LookupContext.registered_details.each do |k|
         targetk = detailsk || Accessors::DEFAULT_PROCSk.call
       end
       target

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/model_naming.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/model_naming.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/path_set.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/path_set.rb Changed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ActionView #:nodoc:
+module ActionView # :nodoc:
   # = Action View PathSet
   #
   # This class is used to store and access paths in Action View. A number of
@@ -8,7 +8,7 @@
   # set and also perform operations on other +PathSet+ objects.
   #
   # A +LookupContext+ will use a +PathSet+ to store the paths in its context.
-  class PathSet #:nodoc:
+  class PathSet # :nodoc:
     include Enumerable
 
     attr_reader :paths
@@ -44,44 +44,38 @@
       METHOD
     end
 
-    def find(*args)
-      find_all(*args).first || raise(MissingTemplate.new(self, *args))
+    def find(path, prefixes, partial, details, details_key, locals)
+      find_all(path, prefixes, partial, details, details_key, locals).first ||
+        raise(MissingTemplate.new(self, path, prefixes, partial, details, details_key, locals))
     end
 
-    def find_all(path, prefixes = , *args)
-      _find_all path, prefixes, args
-    end
-
-    def exists?(path, prefixes, *args)
-      find_all(path, prefixes, *args).any?
-    end
-
-    def find_all_with_query(query) # :nodoc:
-      paths.each do |resolver|
-        templates = resolver.find_all_with_query(query)
+    def find_all(path, prefixes, partial, details, details_key, locals)
+      search_combinations(prefixes) do |resolver, prefix|
+        templates = resolver.find_all(path, prefix, partial, details, details_key, locals)
         return templates unless templates.empty?
       end
-
       
     end
 
+    def exists?(path, prefixes, partial, details, details_key, locals)
+      find_all(path, prefixes, partial, details, details_key, locals).any?
+    end
+
     private
-      def _find_all(path, prefixes, args)
-        prefixes = prefixes if String === prefixes
+      def search_combinations(prefixes)
+        prefixes = Array(prefixes)
         prefixes.each do |prefix|
           paths.each do |resolver|
-            templates = resolver.find_all(path, prefix, *args)
-            return templates unless templates.empty?
+            yield resolver, prefix
           end
         end
-        
       end
 
       def typecast(paths)
         paths.map do |path|
           case path
           when Pathname, String
-            OptimizedFileSystemResolver.new path.to_s
+            FileSystemResolver.new path.to_s
           else
             path
           end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/railtie.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/railtie.rb Changed

@@ -10,6 +10,9 @@
     config.action_view.embed_authenticity_token_in_remote_forms = nil
     config.action_view.debug_missing_translation = true
     config.action_view.default_enforce_utf8 = nil
+    config.action_view.image_loading = nil
+    config.action_view.image_decoding = nil
+    config.action_view.apply_stylesheet_media_default = true
 
     config.eager_load_namespaces << ActionView
 
@@ -38,18 +41,27 @@
     end
 
     config.after_initialize do |app|
+      button_to_generates_button_tag = app.config.action_view.delete(:button_to_generates_button_tag)
+      unless button_to_generates_button_tag.nil?
+        ActionView::Helpers::UrlHelper.button_to_generates_button_tag = button_to_generates_button_tag
+      end
+    end
+
+    config.after_initialize do |app|
+      frozen_string_literal = app.config.action_view.delete(:frozen_string_literal)
+      ActionView::Template.frozen_string_literal = frozen_string_literal
+    end
+
+    config.after_initialize do |app|
+      ActionView::Helpers::AssetTagHelper.image_loading = app.config.action_view.delete(:image_loading)
+      ActionView::Helpers::AssetTagHelper.image_decoding = app.config.action_view.delete(:image_decoding)
       ActionView::Helpers::AssetTagHelper.preload_links_header = app.config.action_view.delete(:preload_links_header)
+      ActionView::Helpers::AssetTagHelper.apply_stylesheet_media_default = app.config.action_view.delete(:apply_stylesheet_media_default)
     end
 
     config.after_initialize do |app|
       ActiveSupport.on_load(:action_view) do
         app.config.action_view.each do |k, v|
-          if k == :raise_on_missing_translations
-            ActiveSupport::Deprecation.warn \
-              "action_view.raise_on_missing_translations is deprecated and will be removed in Rails 6.2. " \
-              "Set i18n.raise_on_missing_translations instead. " \
-              "Note that this new setting also affects how missing translations are handled in controllers."
-          end
           send "#{k}=", v
         end
       end
@@ -85,7 +97,7 @@
       end
 
       unless enable_caching
-        app.executor.to_run ActionView::CacheExpiry::Executor.new(watcher: app.config.file_watcher)
+        app.executor.register_hook ActionView::CacheExpiry::Executor.new(watcher: app.config.file_watcher)
       end
     end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/record_identifier.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/record_identifier.rb Changed

_service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/render_parser.rb Added

@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+
+require "action_view/ripper_ast_parser"
+
+module ActionView
+  class RenderParser # :nodoc:
+    def initialize(name, code)
+      @name = name
+      @code = code
+      @parser = RipperASTParser
+    end
+
+    def render_calls
+      render_nodes = @parser.parse_render_nodes(@code)
+
+      render_nodes.map do |method, nodes|
+        nodes.map { |n| send(:parse_render, n) }
+      end.flatten.compact
+    end
+
+    private
+      def directory
+        File.dirname(@name)
+      end
+
+      def resolve_path_directory(path)
+        if path.include?("/")
+          path
+        else
+          "#{directory}/#{path}"
+        end
+      end
+
+      # Convert
+      #   render("foo", ...)
+      # into either
+      #   render(template: "foo", ...)
+      # or
+      #   render(partial: "foo", ...)
+      def normalize_args(string, options_hash)
+        if options_hash
+          { partial: string, locals: options_hash }
+        else
+          { partial: string }
+        end
+      end
+
+      def parse_render(node)
+        node = node.argument_nodes
+
+        if (node.length == 1 || node.length == 2) && !node0.hash?
+          if node.length == 1
+            options = normalize_args(node0, nil)
+          elsif node.length == 2
+            options = normalize_args(node0, node1)
+          end
+
+          return nil unless options
+
+          parse_render_from_options(options)
+        elsif node.length == 1 && node0.hash?
+          options = parse_hash_to_symbols(node0)
+
+          return nil unless options
+
+          parse_render_from_options(options)
+        else
+          nil
+        end
+      end
+
+      def parse_hash(node)
+        node.hash? && node.to_hash
+      end
+
+      def parse_hash_to_symbols(node)
+        hash = parse_hash(node)
+
+        return unless hash
+
+        hash.transform_keys do |key_node|
+          key = parse_sym(key_node)
+
+          return unless key
+
+          key
+        end
+      end
+
+      ALL_KNOWN_KEYS = :partial, :template, :layout, :formats, :locals, :object, :collection, :as, :status, :content_type, :location, :spacer_template
+
+      RENDER_TYPE_KEYS =
+        :partial, :template, :layout
+
+      def parse_render_from_options(options_hash)
+        renders = 
+        keys = options_hash.keys
+
+        if (keys & RENDER_TYPE_KEYS).size < 1
+          # Must have at least one of render keys
+          return nil
+        end
+
+        if (keys - ALL_KNOWN_KEYS).any?
+          # de-opt in case of unknown option
+          return nil
+        end
+
+        render_type = (keys & RENDER_TYPE_KEYS)0
+
+        node = options_hashrender_type
+
+        if node.string?
+          template = resolve_path_directory(node.to_string)
+        else
+          if node.variable_reference?
+            dependency = node.variable_name.sub(/\A(?:\$|@{1,2})/, "")
+          elsif node.vcall?
+            dependency = node.variable_name
+          elsif node.call?
+            dependency = node.call_method_name
+          else
+            return
+          end
+
+          object_template = true
+          template = "#{dependency.pluralize}/#{dependency.singularize}"
+        end
+
+        return unless template
+
+        if spacer_template = render_template_with_spacer?(options_hash)
+          virtual_path = partial_to_virtual_path(:partial, spacer_template)
+          renders << virtual_path
+        end
+
+        if options_hash.key?(:object) || options_hash.key?(:collection) || object_template
+          return nil if options_hash.key?(:object) && options_hash.key?(:collection)
+          return nil unless options_hash.key?(:partial)
+        end
+
+        virtual_path = partial_to_virtual_path(render_type, template)
+        renders << virtual_path
+
+        # Support for rendering multiple templates (i.e. a partial with a layout)
+        if layout_template = render_template_with_layout?(render_type, options_hash)
+          virtual_path = partial_to_virtual_path(:layout, layout_template)
+
+          renders << virtual_path
+        end
+
+        renders
+      end
+
+      def parse_str(node)
+        node.string? && node.to_string
+      end
+
+      def parse_sym(node)
+        node.symbol? && node.to_symbol
+      end
+
+      private
+        def render_template_with_layout?(render_type, options_hash)
+          if render_type != :layout && options_hash.key?(:layout)
+            parse_str(options_hash:layout)
+          end
+        end
+
+        def render_template_with_spacer?(options_hash)
+          if options_hash.key?(:spacer_template)
+            parse_str(options_hash:spacer_template)
+          end
+        end
+
+        def partial_to_virtual_path(render_type, partial_path)
+          if render_type == :partial || render_type == :layout
+            partial_path.gsub(%r{(/|^)(^/*)\z}, '\1_\2')
+          else
+            partial_path
+          end
+        end
+
+        def layout_to_virtual_path(layout_path)
+          "layouts/#{layout_path}"
+        end
+  end
+end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/renderer/abstract_renderer.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/renderer/abstract_renderer.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/renderer/partial_renderer.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/renderer/partial_renderer.rb Changed

@@ -27,7 +27,7 @@
   # This would first render <tt>advertiser/_account.html.erb</tt> with <tt>@buyer</tt> passed in as the local variable +account+, then
   # render <tt>advertiser/_ad.html.erb</tt> and pass the local variable +ad+ to the template for display.
   #
-  # == The :as and :object options
+  # == The +:as+ and +:object+ options
   #
   # By default ActionView::PartialRenderer doesn't have any local variables.
   # The <tt>:object</tt> option can be used to pass an object to the partial. For instance:
@@ -217,40 +217,6 @@
   #   </div>
   #
   # As you can see, the <tt>:locals</tt> hash is shared between both the partial and its layout.
-  #
-  # If you pass arguments to "yield" then this will be passed to the block. One way to use this is to pass
-  # an array to layout and treat it as an enumerable.
-  #
-  #   <%# app/views/users/_user.html.erb %>
-  #   <div class="user">
-  #     Budget: $<%= user.budget %>
-  #     <%= yield user %>
-  #   </div>
-  #
-  #   <%# app/views/users/index.html.erb %>
-  #   <%= render layout: @users do |user| %>
-  #     Title: <%= user.title %>
-  #   <% end %>
-  #
-  # This will render the layout for each user and yield to the block, passing the user, each time.
-  #
-  # You can also yield multiple times in one layout and use block arguments to differentiate the sections.
-  #
-  #   <%# app/views/users/_user.html.erb %>
-  #   <div class="user">
-  #     <%= yield user, :header %>
-  #     Budget: $<%= user.budget %>
-  #     <%= yield user, :footer %>
-  #   </div>
-  #
-  #   <%# app/views/users/index.html.erb %>
-  #   <%= render layout: @users do |user, section| %>
-  #     <%- case section when :header -%>
-  #       Title: <%= user.title %>
-  #     <%- when :footer -%>
-  #       Deadline: <%= user.deadline %>
-  #     <%- end -%>
-  #   <% end %>
   class PartialRenderer < AbstractRenderer
     include CollectionCaching

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/renderer/renderer.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/renderer/renderer.rb Changed

@@ -44,12 +44,12 @@
     end
 
     # Direct access to template rendering.
-    def render_template(context, options) #:nodoc:
+    def render_template(context, options) # :nodoc:
       render_template_to_object(context, options).body
     end
 
     # Direct access to partial rendering.
-    def render_partial(context, options, &block) #:nodoc:
+    def render_partial(context, options, &block) # :nodoc:
       render_partial_to_object(context, options, &block).body
     end
 
@@ -57,11 +57,11 @@
       @cache_hits ||= {}
     end
 
-    def render_template_to_object(context, options) #:nodoc:
+    def render_template_to_object(context, options) # :nodoc:
       TemplateRenderer.new(@lookup_context).render(context, options)
     end
 
-    def render_partial_to_object(context, options, &block) #:nodoc:
+    def render_partial_to_object(context, options, &block) # :nodoc:
       partial = options:partial
       if String === partial
         collection = collection_from_options(options)

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/renderer/streaming_template_renderer.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/renderer/streaming_template_renderer.rb Changed

@@ -7,11 +7,11 @@
   #
   # * Support streaming from child templates, partials and so on.
   # * Rack::Cache needs to support streaming bodies
-  class StreamingTemplateRenderer < TemplateRenderer #:nodoc:
+  class StreamingTemplateRenderer < TemplateRenderer # :nodoc:
     # A valid Rack::Body (i.e. it responds to each).
     # It is initialized with a block that, when called, starts
     # rendering the template.
-    class Body #:nodoc:
+    class Body # :nodoc:
       def initialize(&start)
         @start = start
       end
@@ -42,7 +42,7 @@
     # For streaming, instead of rendering a given a template, we return a Body
     # object that responds to each. This object is initialized with a block
     # that knows how to render the template.
-    def render_template(view, template, layout_name = nil, locals = {}) #:nodoc:
+    def render_template(view, template, layout_name = nil, locals = {}) # :nodoc:
       return super.body unless layout_name && template.supports_streaming?
 
       locals ||= {}

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/renderer/template_renderer.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/renderer/template_renderer.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/rendering.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/rendering.rb Changed

_service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/ripper_ast_parser.rb Added

@@ -0,0 +1,198 @@
+# frozen_string_literal: true
+
+require "ripper"
+
+module ActionView
+  class RenderParser
+    module RipperASTParser # :nodoc:
+      class Node < ::Array # :nodoc:
+        attr_reader :type
+
+        def initialize(type, arr, opts = {})
+          @type = type
+          super(arr)
+        end
+
+        def children
+          to_a
+        end
+
+        def inspect
+          typeinfo = type && type != :list ? ":" + type.to_s + ", " : ""
+          "s(" + typeinfo + map(&:inspect).join(", ") + ")"
+        end
+
+        def fcall?
+          type == :command || type == :fcall
+        end
+
+        def fcall_named?(name)
+          fcall? &&
+            self0.type == :@ident &&
+            self00 == name
+        end
+
+        def argument_nodes
+          raise unless fcall?
+          return  if self1.nil?
+          if self1.last == false || self1.last.type == :vcall
+            self10...-1
+          else
+            self10..-1
+          end
+        end
+
+        def string?
+          type == :string_literal
+        end
+
+        def variable_reference?
+          type == :var_ref
+        end
+
+        def vcall?
+          type == :vcall
+        end
+
+        def call?
+          type == :call
+        end
+
+        def variable_name
+          self00
+        end
+
+        def call_method_name
+          self.last.first
+        end
+
+        def to_string
+          raise unless string?
+          self000
+        end
+
+        def hash?
+          type == :bare_assoc_hash || type == :hash
+        end
+
+        def to_hash
+          if type == :bare_assoc_hash
+            hash_from_body(self0)
+          elsif type == :hash && self0 == nil
+            {}
+          elsif type == :hash && self0.type == :assoclist_from_args
+            hash_from_body(self00)
+          end
+        end
+
+        def hash_from_body(body)
+          body.map do |hash_node|
+            return nil if hash_node.type != :assoc_new
+
+            hash_node0, hash_node1
+          end.to_h
+        end
+
+        def symbol?
+          type == :@label || type == :symbol_literal
+        end
+
+        def to_symbol
+          if type == :@label && self0 =~ /\A(.+):\z/
+            $1.to_sym
+          elsif type == :symbol_literal && self0.type == :symbol && self00.type == :@ident
+            self000.to_sym
+          else
+            raise "not a symbol?: #{self.inspect}"
+          end
+        end
+      end
+
+      class NodeParser < ::Ripper # :nodoc:
+        PARSER_EVENTS.each do |event|
+          arity = PARSER_EVENT_TABLEevent
+          if arity == 0 && event.to_s.end_with?("_new")
+            module_eval(<<-eof, __FILE__, __LINE__ + 1)
+            def on_#{event}(*args)
+              Node.new(:list, args, lineno: lineno(), column: column())
+            end
+            eof
+          elsif event.to_s.match?(/_add(_.+)?\z/)
+            module_eval(<<-eof, __FILE__, __LINE__ + 1)
+            begin; undef on_#{event}; rescue NameError; end
+            def on_#{event}(list, item)
+              list.push(item)
+              list
+            end
+            eof
+          else
+            module_eval(<<-eof, __FILE__, __LINE__ + 1)
+            begin; undef on_#{event}; rescue NameError; end
+            def on_#{event}(*args)
+              Node.new(:#{event}, args, lineno: lineno(), column: column())
+            end
+            eof
+          end
+        end
+
+        SCANNER_EVENTS.each do |event|
+          module_eval(<<-End, __FILE__, __LINE__ + 1)
+          def on_#{event}(tok)
+            Node.new(:@#{event}, tok, lineno: lineno(), column: column())
+          end
+          End
+        end
+      end
+
+      class RenderCallExtractor < NodeParser # :nodoc:
+        attr_reader :render_calls
+
+        METHODS_TO_PARSE = %w(render render_to_string)
+
+        def initialize(*args)
+          super
+
+          @render_calls = 
+        end
+
+        private
+          def on_fcall(name, *args)
+            on_render_call(super)
+          end
+
+          def on_command(name, *args)
+            on_render_call(super)
+          end
+
+          def on_render_call(node)
+            METHODS_TO_PARSE.each do |method|
+              if node.fcall_named?(method)
+                @render_calls << method, node
+                return node
+              end
+            end
+            node
+          end
+
+          def on_arg_paren(content)
+            content
+          end
+
+          def on_paren(content)
+            content
+          end
+      end
+
+      extend self
+
+      def parse_render_nodes(code)
+        parser = RenderCallExtractor.new(code)
+        parser.parse
+
+        parser.render_calls.group_by(&:first).collect do |method, nodes|
+           method.to_sym, nodes.collect { |v| v1 } 
+        end.to_h
+      end
+    end
+  end
+end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/routing_url_for.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/routing_url_for.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template.rb Changed

@@ -114,6 +114,9 @@
 
     extend Template::Handlers
 
+    singleton_class.attr_accessor :frozen_string_literal
+    @frozen_string_literal = false
+
     attr_reader :identifier, :handler
     attr_reader :variable, :format, :variant, :locals, :virtual_path
 
@@ -297,7 +300,11 @@
         end
 
         begin
-          mod.module_eval(source, identifier, 0)
+          if Template.frozen_string_literal
+            mod.module_eval("# frozen_string_literal: true\n#{source}", identifier, -1)
+          else
+            mod.module_eval(source, identifier, 0)
+          end
         rescue SyntaxError
           # Account for when code in the template is not syntactically valid; e.g. if we're using
           # ERB and the user writes <%= foo( %>, attempting to call a helper `foo` and interpolate
@@ -319,7 +326,16 @@
         # Only locals with valid variable names get set directly. Others will
         # still be available in local_assigns.
         locals = @locals - Module::RUBY_RESERVED_KEYWORDS
-        locals = locals.grep(/\A@?(?!A-Z0-9)(?::alnum:_|^\0-\177)+\z/)
+        deprecated_locals = locals.grep(/\A@+/)
+        if deprecated_locals.any?
+          ActiveSupport::Deprecation.warn(<<~MSG)
+            Passing instance variables to `render` is deprecated.
+            In Rails 7.1, #{deprecated_locals.to_sentence} will be ignored.
+          MSG
+          locals = locals.grep(/\A@?(?!A-Z0-9)(?::alnum:_|^\0-\177)+\z/)
+        else
+          locals = locals.grep(/\A(?!A-Z0-9)(?::alnum:_|^\0-\177)+\z/)
+        end
 
         # Assign for the same variable is to suppress unused variable warning
         locals.each_with_object(+"") { |key, code| code << "#{key} = local_assigns:#{key}; #{key} = #{key};" }

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/error.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/error.rb Changed

@@ -4,13 +4,13 @@
 
 module ActionView
   # = Action View Errors
-  class ActionViewError < StandardError #:nodoc:
+  class ActionViewError < StandardError # :nodoc:
   end
 
-  class EncodingError < StandardError #:nodoc:
+  class EncodingError < StandardError # :nodoc:
   end
 
-  class WrongEncodingError < EncodingError #:nodoc:
+  class WrongEncodingError < EncodingError # :nodoc:
     def initialize(string, encoding)
       @string, @encoding = string, encoding
     end
@@ -26,12 +26,18 @@
     end
   end
 
-  class MissingTemplate < ActionViewError #:nodoc:
-    attr_reader :path
+  class MissingTemplate < ActionViewError # :nodoc:
+    attr_reader :path, :paths, :prefixes, :partial
 
     def initialize(paths, path, prefixes, partial, details, *)
+      if partial && path.present?
+        path = path.sub(%r{(^/+)$}, "_\\1")
+      end
+
       @path = path
-      prefixes = Array(prefixes)
+      @paths = paths
+      @prefixes = Array(prefixes)
+      @partial = partial
       template_type = if partial
         "partial"
       elsif /layouts/i.match?(path)
@@ -40,22 +46,111 @@
         "template"
       end
 
-      if partial && path.present?
-        path = path.sub(%r{(^/+)$}, "_\\1")
-      end
-      searched_paths = prefixes.map { |prefix| prefix, path.join("/") }
+      searched_paths = @prefixes.map { |prefix| prefix, path.join("/") }
 
-      out  = "Missing #{template_type} #{searched_paths.join(", ")} with #{details.inspect}. Searched in:\n"
+      out  = "Missing #{template_type} #{searched_paths.join(", ")} with #{details.inspect}.\n\nSearched in:\n"
       out += paths.compact.map { |p| "  * #{p.to_s.inspect}\n" }.join
       super out
     end
+
+    if defined?(DidYouMean::Correctable) && defined?(DidYouMean::Jaro)
+      include DidYouMean::Correctable
+
+      class Results # :nodoc:
+        Result = Struct.new(:path, :score)
+
+        def initialize(size)
+          @size = size
+          @results = 
+        end
+
+        def to_a
+          @results.map(&:path)
+        end
+
+        def should_record?(score)
+          if @results.size < @size
+            true
+          else
+            score < @results.last.score
+          end
+        end
+
+        def add(path, score)
+          if should_record?(score)
+            @results << Result.new(path, score)
+            @results.sort_by!(&:score)
+            @results.pop if @results.size > @size
+          end
+        end
+      end
+
+      # Apps may have thousands of candidate templates so we attempt to
+      # generate the suggestions as efficiently as possible.
+      # First we split templates into prefixes and basenames, so that those can
+      # be matched separately.
+      def corrections
+        candidates = paths.flat_map(&:all_template_paths).uniq
+
+        if partial
+          candidates.select!(&:partial?)
+        else
+          candidates.reject!(&:partial?)
+        end
+
+        # Group by possible prefixes
+        files_by_dir = candidates.group_by(&:prefix)
+        files_by_dir.transform_values! do |files|
+          files.map do |file|
+            # Remove prefix
+            File.basename(file.to_s)
+          end
+        end
+
+        # No suggestions if there's an exact match, but wrong details
+        if prefixes.any? { |prefix| files_by_dirprefix&.include?(path) }
+          return 
+        end
+
+        cached_distance = Hash.new do |h, args|
+          hargs = -DidYouMean::Jaro.distance(*args)
+        end
+
+        results = Results.new(6)
+
+        files_by_dir.keys.index_with do |dirname|
+          prefixes.map do |prefix|
+            cached_distanceprefix, dirname
+          end.min
+        end.sort_by(&:last).each do |dirname, dirweight|
+          # If our directory's score makes it impossible to find a better match
+          # we can prune this search branch.
+          next unless results.should_record?(dirweight - 1.0)
+
+          files = files_by_dirdirname
+
+          files.each do |file|
+            fileweight = cached_distancepath, file
+            score = dirweight + fileweight
+
+            results.add(File.join(dirname, file), score)
+          end
+        end
+
+        if partial
+          results.to_a.map { |res| res.sub(%r{_(^/+)\z}, "\\1") }
+        else
+          results.to_a
+        end
+      end
+    end
   end
 
   class Template
     # The Template::Error exception is raised when the compilation or rendering of the template
     # fails. This exception then gathers a bunch of intimate details and uses it to report a
     # precise exception message.
-    class Error < ActionViewError #:nodoc:
+    class Error < ActionViewError # :nodoc:
       SOURCE_CODE_RADIUS = 3
 
       # Override to prevent #cause resetting during re-raise.
@@ -134,7 +229,7 @@
 
   TemplateError = Template::Error
 
-  class SyntaxErrorInTemplate < TemplateError #:nodoc
+  class SyntaxErrorInTemplate < TemplateError # :nodoc:
     def initialize(template, offending_code_string)
       @offending_code_string = offending_code_string
       super(template)

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/handlers.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/handlers.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/handlers/erb.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/handlers/erb.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/html.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/html.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/inline.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/inline.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/raw_file.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/raw_file.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/resolver.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/resolver.rb Changed

@@ -10,36 +10,16 @@
 module ActionView
   # = Action View Resolver
   class Resolver
-    # Keeps all information about view path and builds virtual path.
-    class Path
-      attr_reader :name, :prefix, :partial, :virtual
-      alias_method :partial?, :partial
-
-      def self.build(name, prefix, partial)
-        virtual = +""
-        virtual << "#{prefix}/" unless prefix.empty?
-        virtual << (partial ? "_#{name}" : name)
-        new name, prefix, partial, virtual
-      end
-
-      def initialize(name, prefix, partial, virtual)
-        @name    = name
-        @prefix  = prefix
-        @partial = partial
-        @virtual = virtual
-      end
-
-      def to_str
-        @virtual
-      end
-      alias :to_s :to_str
-    end
+    Path = ActionView::TemplatePath
+    deprecate_constant :Path
 
     class PathParser # :nodoc:
+      ParsedPath = Struct.new(:path, :details)
+
       def build_path_regex
         handlers = Template::Handlers.extensions.map { |x| Regexp.escape(x) }.join("|")
         formats = Template::Types.symbols.map { |x| Regexp.escape(x) }.join("|")
-        locales = "a-z{2}(?:-A-Z{2})?"
+        locales = "a-z{2}(?:-_A-Z{2})?"
         variants = "^.*"
 
         %r{
@@ -58,79 +38,15 @@
       def parse(path)
         @regex ||= build_path_regex
         match = @regex.match(path)
-        {
-          prefix: match:prefix || "",
-          action: match:action,
-          partial: !!match:partial,
-          locale: match:locale&.to_sym,
-          handler: match:handler&.to_sym,
-          format: match:format&.to_sym,
-          variant: match:variant
-        }
-      end
-    end
-
-    # Threadsafe template cache
-    class Cache #:nodoc:
-      class SmallCache < Concurrent::Map
-        def initialize(options = {})
-          super(options.merge(initial_capacity: 2))
-        end
-      end
-
-      # Preallocate all the default blocks for performance/memory consumption reasons
-      PARTIAL_BLOCK = lambda { |cache, partial| cachepartial = SmallCache.new }
-      PREFIX_BLOCK  = lambda { |cache, prefix|  cacheprefix  = SmallCache.new(&PARTIAL_BLOCK) }
-      NAME_BLOCK    = lambda { |cache, name|    cachename    = SmallCache.new(&PREFIX_BLOCK) }
-      KEY_BLOCK     = lambda { |cache, key|     cachekey     = SmallCache.new(&NAME_BLOCK) }
-
-      # Usually a majority of template look ups return nothing, use this canonical preallocated array to save memory
-      NO_TEMPLATES = .freeze
-
-      def initialize
-        @data = SmallCache.new(&KEY_BLOCK)
-        @query_cache = SmallCache.new
-      end
-
-      def inspect
-        "#{to_s0..-2} keys=#{@data.size} queries=#{@query_cache.size}>"
-      end
-
-      # Cache the templates returned by the block
-      def cache(key, name, prefix, partial, locals)
-        @datakeynameprefixpartiallocals ||= canonical_no_templates(yield)
-      end
-
-      def cache_query(query) # :nodoc:
-        @query_cachequery ||= canonical_no_templates(yield)
-      end
-
-      def clear
-        @data.clear
-        @query_cache.clear
-      end
-
-      # Get the cache size. Do not call this
-      # method. This method is not guaranteed to be here ever.
-      def size # :nodoc:
-        size = 0
-        @data.each_value do |v1|
-          v1.each_value do |v2|
-            v2.each_value do |v3|
-              v3.each_value do |v4|
-                size += v4.size
-              end
-            end
-          end
-        end
-
-        size + @query_cache.size
+        path = TemplatePath.build(match:action, match:prefix || "", !!match:partial)
+        details = TemplateDetails.new(
+          match:locale&.to_sym,
+          match:handler&.to_sym,
+          match:format&.to_sym,
+          match:variant&.to_sym
+        )
+        ParsedPath.new(path, details)
       end
-
-      private
-        def canonical_no_templates(templates)
-          templates.empty? ? NO_TEMPLATES : templates
-        end
     end
 
     cattr_accessor :caching, default: true
@@ -139,25 +55,17 @@
       alias :caching? :caching
     end
 
-    def initialize
-      @cache = Cache.new
-    end
-
     def clear_cache
-      @cache.clear
     end
 
     # Normalizes the arguments and passes it on to find_templates.
     def find_all(name, prefix = nil, partial = false, details = {}, key = nil, locals = )
-      locals = locals.map(&:to_s).sort!.freeze
-
-      cached(key, name, prefix, partial, details, locals) do
-        _find_all(name, prefix, partial, details, key, locals)
-      end
+      _find_all(name, prefix, partial, details, key, locals)
     end
 
-    def find_all_with_query(query) # :nodoc:
-      @cache.cache_query(query) { find_template_paths(File.join(@path, query)) }
+    def all_template_paths # :nodoc:
+      # Not implemented by default
+      
     end
 
   private
@@ -173,34 +81,18 @@
     def find_templates(name, prefix, partial, details, locals = )
       raise NotImplementedError, "Subclasses must implement a find_templates(name, prefix, partial, details, locals = ) method"
     end
-
-    # Handles templates caching. If a key is given and caching is on
-    # always check the cache before hitting the resolver. Otherwise,
-    # it always hits the resolver but if the key is present, check if the
-    # resolver is fresher before returning it.
-    def cached(key, path_info, details, locals)
-      name, prefix, partial = path_info
-
-      if key
-        @cache.cache(key, name, prefix, partial, locals) do
-          yield
-        end
-      else
-        yield
-      end
-    end
   end
 
-  # An abstract class that implements a Resolver with path semantics.
-  class PathResolver < Resolver #:nodoc:
-    EXTENSIONS = { locale: ".", formats: ".", variants: "+", handlers: "." }
-    DEFAULT_PATTERN = ":prefix/:action{.:locale,}{.:formats,}{+:variants,}{.:handlers,}"
+  # A resolver that loads files from the filesystem.
+  class FileSystemResolver < Resolver
+    attr_reader :path
 
-    def initialize
-      @pattern = DEFAULT_PATTERN
+    def initialize(path)
+      raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
       @unbound_templates = Concurrent::Map.new
       @path_parser = PathParser.new
-      super
+      @path = File.expand_path(path)
+      super()
     end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/text.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/text.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/template/types.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template/types.rb Changed

_service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template_details.rb Added

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module ActionView
+  class TemplateDetails # :nodoc:
+    class Requested
+      attr_reader :locale, :handlers, :formats, :variants
+      attr_reader :locale_idx, :handlers_idx, :formats_idx, :variants_idx
+
+      ANY_HASH = Hash.new(1).merge(nil => 0).freeze
+
+      def initialize(locale:, handlers:, formats:, variants:)
+        @locale = locale
+        @handlers = handlers
+        @formats = formats
+        @variants = variants
+
+        @locale_idx   = build_idx_hash(locale)
+        @handlers_idx = build_idx_hash(handlers)
+        @formats_idx  = build_idx_hash(formats)
+        if variants == :any
+          @variants_idx = ANY_HASH
+        else
+          @variants_idx = build_idx_hash(variants)
+        end
+      end
+
+      private
+        def build_idx_hash(arr)
+          *arr, nil.each_with_index.to_h.freeze
+        end
+    end
+
+    attr_reader :locale, :handler, :format, :variant
+
+    def initialize(locale, handler, format, variant)
+      @locale = locale
+      @handler = handler
+      @format = format
+      @variant = variant
+    end
+
+    def matches?(requested)
+      requested.formats_idx@format &&
+        requested.locale_idx@locale &&
+        requested.variants_idx@variant &&
+        requested.handlers_idx@handler
+    end
+
+    def sort_key_for(requested)
+      
+        requested.formats_idx@format,
+        requested.locale_idx@locale,
+        requested.variants_idx@variant,
+        requested.handlers_idx@handler
+      
+    end
+
+    def handler_class
+      Template.handler_for_extension(handler)
+    end
+
+    def format_or_default
+      format || handler_class.try(:default_format)
+    end
+  end
+end

_service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/template_path.rb Added

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module ActionView
+  # Represents a template path within ActionView's lookup and rendering system,
+  # like "users/show"
+  #
+  # TemplatePath makes it convenient to convert between separate name, prefix,
+  # partial arguments and the virtual path.
+  class TemplatePath
+    attr_reader :name, :prefix, :partial, :virtual
+    alias_method :partial?, :partial
+    alias_method :virtual_path, :virtual
+
+    # Convert name, prefix, and partial into a virtual path string
+    def self.virtual(name, prefix, partial)
+      if prefix.empty?
+        "#{partial ? "_" : ""}#{name}"
+      elsif partial
+        "#{prefix}/_#{name}"
+      else
+        "#{prefix}/#{name}"
+      end
+    end
+
+    # Build a TemplatePath form a virtual path
+    def self.parse(virtual)
+      if nameidx = virtual.rindex("/")
+        prefix = virtual0, nameidx
+        name = virtual.from(nameidx + 1)
+        prefix = prefix1.. if prefix.start_with?("/")
+      else
+        prefix = ""
+        name = virtual
+      end
+      partial = name.start_with?("_")
+      name = name1.. if partial
+      new name, prefix, partial, virtual
+    end
+
+    # Convert name, prefix, and partial into a TemplatePath
+    def self.build(name, prefix, partial)
+      new name, prefix, partial, virtual(name, prefix, partial)
+    end
+
+    def initialize(name, prefix, partial, virtual)
+      @name    = name
+      @prefix  = prefix
+      @partial = partial
+      @virtual = virtual
+    end
+
+    alias :to_str :virtual
+    alias :to_s :virtual
+
+    def hash # :nodoc:
+      @virtual.hash
+    end
+
+    def eql?(other) # :nodoc:
+      @virtual == other.virtual
+    end
+    alias :== :eql? # :nodoc:
+  end
+end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/test_case.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/test_case.rb Changed

@@ -24,6 +24,10 @@
         self.class.controller_path = path
       end
 
+      def self.controller_name
+        "test"
+      end
+
       def initialize
         super
         self.class.controller_path = ""
@@ -53,7 +57,7 @@
       include ActiveSupport::Testing::ConstantLookup
 
       delegate :lookup_context, to: :controller
-      attr_accessor :controller, :output_buffer, :rendered
+      attr_accessor :controller, :request, :output_buffer, :rendered
 
       module ClassMethods
         def tests(helper_class)
@@ -74,11 +78,11 @@
         def helper_method(*methods)
           # Almost a duplicate from ActionController::Helpers
           methods.flatten.each do |method|
-            _helpers_for_modification.module_eval <<-end_eval, __FILE__, __LINE__ + 1
+            _helpers_for_modification.module_eval <<~end_eval, __FILE__, __LINE__ + 1
               def #{method}(*args, &block)                    # def current_user(*args, &block)
                 _test_case.send(:'#{method}', *args, &block)  #   _test_case.send(:'current_user', *args, &block)
               end                                             # end
-              ruby2_keywords(:'#{method}') if respond_to?(:ruby2_keywords, true)
+              ruby2_keywords(:'#{method}')
             end_eval
           end
         end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/testing/resolvers.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/testing/resolvers.rb Changed

@@ -2,12 +2,12 @@
 
 require "action_view/template/resolver"
 
-module ActionView #:nodoc:
+module ActionView # :nodoc:
   # Use FixtureResolver in your tests to simulate the presence of files on the
   # file system. This is used internally by Rails' own test suite, and is
   # useful for testing extensions that have no way of knowing what the file
   # system will look like at runtime.
-  class FixtureResolver < OptimizedFileSystemResolver
+  class FixtureResolver < FileSystemResolver
     def initialize(hash = {})
       super("")
       @hash = hash
@@ -23,23 +23,22 @@
     end
 
     private
-      def find_candidate_template_paths(path)
-        @hash.keys.select do |fixture|
-          fixture.start_with?(path.virtual)
-        end.map do |fixture|
-          "/#{fixture}"
+      def template_glob(glob)
+        @hash.keys.filter_map do |path|
+          "/#{path}" if File.fnmatch(glob, path)
         end
       end
 
       def source_for_template(template)
-        @hashtemplate1..template.size
+        @hashtemplate.from(1)
       end
   end
 
-  class NullResolver < PathResolver
-    def query(path, exts, _, locals, cache:)
-      handler, format, variant = extract_handler_and_format_and_variant(path)
-      ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: format, variant: variant, locals: locals)
+  class NullResolver < Resolver
+    def find_templates(name, prefix, partial, details, locals = )
+      path = TemplatePath.build(name, prefix, partial)
+      handler = ActionView::Template::Handlers::Raw
+      ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: nil, variant: nil, locals: locals)
     end
   end
 end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/unbound_template.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/unbound_template.rb Changed

@@ -4,28 +4,54 @@
 
 module ActionView
   class UnboundTemplate
-    def initialize(source, identifier, handler, options)
+    attr_reader :virtual_path, :details
+    delegate :locale, :format, :variant, :handler, to: :@details
+
+    def initialize(source, identifier, details:, virtual_path:)
       @source = source
       @identifier = identifier
-      @handler = handler
-      @options = options
+      @details = details
+      @virtual_path = virtual_path
 
       @templates = Concurrent::Map.new(initial_capacity: 2)
+      @write_lock = Mutex.new
     end
 
     def bind_locals(locals)
-      @templateslocals ||= build_template(locals)
+      if template = @templateslocals
+        template
+      else
+        @write_lock.synchronize do
+          normalized_locals = normalize_locals(locals)
+
+          # We need ||=, both to dedup on the normalized locals and to check
+          # while holding the lock.
+          @templatesnormalized_locals ||= build_template(normalized_locals)
+
+          # This may have already been assigned, but we've already de-dup'd so
+          # reassignment is fine.
+          @templateslocals.dup = @templatesnormalized_locals
+        end
+      end
     end
 
     private
       def build_template(locals)
-        options = @options.merge(locals: locals)
         Template.new(
           @source,
           @identifier,
-          @handler,
-          **options
+          details.handler_class,
+
+          format: details.format_or_default,
+          variant: variant&.to_s,
+          virtual_path: @virtual_path,
+
+          locals: locals.map(&:to_s)
         )
       end
+
+      def normalize_locals(locals)
+        locals.map(&:to_sym).sort!.freeze
+      end
   end
 end

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/version.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/version.rb Changed

_service:tar_scm:actionview-6.1.4.1.gem/data/lib/action_view/view_paths.rb -> _service:tar_scm:actionview-7.0.4.gem/data/lib/action_view/view_paths.rb Changed

@@ -91,9 +91,9 @@
       self.class._prefixes
     end
 
-    # <tt>LookupContext</tt> is the object responsible for holding all
+    # LookupContext is the object responsible for holding all
     # information required for looking up templates, i.e. view paths and
-    # details. Check <tt>ActionView::LookupContext</tt> for more information.
+    # details. Check ActionView::LookupContext for more information.
     def lookup_context
       @_lookup_context ||=
         ActionView::LookupContext.new(self.class._view_paths, details_for_lookup, _prefixes)
@@ -103,7 +103,7 @@
       {}
     end
 
-    # Append a path to the list of view paths for the current <tt>LookupContext</tt>.
+    # Append a path to the list of view paths for the current LookupContext.
     #
     # ==== Parameters
     # * <tt>path</tt> - If a String is provided, it gets converted into
@@ -113,7 +113,7 @@
       lookup_context.view_paths.push(*path)
     end
 
-    # Prepend a path to the list of view paths for the current <tt>LookupContext</tt>.
+    # Prepend a path to the list of view paths for the current LookupContext.
     #
     # ==== Parameters
     # * <tt>path</tt> - If a String is provided, it gets converted into

_service:tar_scm:actionview-6.1.4.1.gem/metadata.gz -> _service:tar_scm:actionview-7.0.4.gem/metadata.gz Changed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 6.1.4.1
+  version: 7.0.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: 
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.4
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: 
@@ -129,6 +129,8 @@
 - lib/action_view/cache_expiry.rb
 - lib/action_view/context.rb
 - lib/action_view/dependency_tracker.rb
+- lib/action_view/dependency_tracker/erb_tracker.rb
+- lib/action_view/dependency_tracker/ripper_tracker.rb
 - lib/action_view/digestor.rb
 - lib/action_view/flows.rb
 - lib/action_view/gem_version.rb
@@ -189,6 +191,7 @@
 - lib/action_view/helpers/tags/translator.rb
 - lib/action_view/helpers/tags/url_field.rb
 - lib/action_view/helpers/tags/week_field.rb
+- lib/action_view/helpers/tags/weekday_select.rb
 - lib/action_view/helpers/text_helper.rb
 - lib/action_view/helpers/translation_helper.rb
 - lib/action_view/helpers/url_helper.rb
@@ -200,6 +203,7 @@
 - lib/action_view/path_set.rb
 - lib/action_view/railtie.rb
 - lib/action_view/record_identifier.rb
+- lib/action_view/render_parser.rb
 - lib/action_view/renderer/abstract_renderer.rb
 - lib/action_view/renderer/collection_renderer.rb
 - lib/action_view/renderer/object_renderer.rb
@@ -209,6 +213,7 @@
 - lib/action_view/renderer/streaming_template_renderer.rb
 - lib/action_view/renderer/template_renderer.rb
 - lib/action_view/rendering.rb
+- lib/action_view/ripper_ast_parser.rb
 - lib/action_view/routing_url_for.rb
 - lib/action_view/tasks/cache_digests.rake
 - lib/action_view/template.rb
@@ -228,6 +233,8 @@
 - lib/action_view/template/sources/file.rb
 - lib/action_view/template/text.rb
 - lib/action_view/template/types.rb
+- lib/action_view/template_details.rb
+- lib/action_view/template_path.rb
 - lib/action_view/test_case.rb
 - lib/action_view/testing/resolvers.rb
 - lib/action_view/unbound_template.rb
@@ -239,10 +246,11 @@
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.1/actionview/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.4/actionview/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.4.1/actionview
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.4/actionview
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: 
 require_paths:
@@ -251,7 +259,7 @@
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -259,7 +267,7 @@
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Rendering framework putting the V in MVC (part of Rails).

_service:tar_scm:rails-6.1.4.1-tools.txz Deleted

_service:tar_scm:rails-7.0.4-tools.txz Added

Changes of Revision 2