actionview 6.0.3.2 → 6.0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60266b7d1f108c429f1a44c662b1ee37852d87a40208e7e24e8c69a581709ca7
-  data.tar.gz: b96dbf43106ac6046f45fe141e821fc5c22d0fd8f867382f1dc9d9c39136b87e
+  metadata.gz: '0901467d038615517c4bb844ada76405c5881b51faf764c6620b593c33cdc32d'
+  data.tar.gz: 511ca67c07b8a6a900c4e124cc810b5d83c9b7fda92c401058a974aecf4653ec
 SHA512:
-  metadata.gz: ae70597cc8c0c4a8b036921477ef4a105571c5f996c5941689b511b7c3efc827d3d4c4095dd3fd1e5cc91116d76e4be46bfd212f9f3b2140d058d031833121c1
-  data.tar.gz: 84a325b4f9816c31edff2298897ebe4af7a03bd5f0d7375b941c9bbd0dc991467c1f459e00b79b241e82457a817a541761f4ebd02fd3bf5bd6ab77615e75107c
+  metadata.gz: 77ca182510ca79fc7de26c58a5a86790938eec97cbea0f69d7ad374e3910017181e533ad4925752407f765f7d9db2c4d51725cac1b6d7aff09d0abcd29533d04
+  data.tar.gz: 1c987532210718e9d512c14c143418c378cf9ce1e7e83b87b79876899e3ae9bb1baa13931efdbf17f29100b7d1f70e03f9ffb702fe6536271d1bf8c6964c7e4a

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## Rails 6.0.3.7 (May 05, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.0.3.6 (March 26, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.0.3.5 (February 10, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.0.3.4 (October 07, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.3.3 (September 09, 2020) ##
+
+*   [CVE-2020-8185] Fix potential XSS vulnerability in the `translate`/`t` helper.
+
+    *Jonathan Hefner*
+
+
 ## Rails 6.0.3.2 (June 17, 2020) ##
 
 *   No changes.

data/lib/action_view/gem_version.rb

@@ -10,7 +10,7 @@ module ActionView
     MAJOR = 6
     MINOR = 0
     TINY  = 3
-    PRE   = "2"
+    PRE   = "7"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_view/helpers/translation_helper.rb

@@ -76,13 +76,20 @@ module ActionView
 
         if html_safe_translation_key?(key)
           html_safe_options = options.dup
+
           options.except(*I18n::RESERVED_KEYS).each do |name, value|
             unless name == :count && value.is_a?(Numeric)
               html_safe_options[name] = ERB::Util.html_escape(value.to_s)
             end
           end
+
+          html_safe_options[:default] = MISSING_TRANSLATION unless html_safe_options[:default].blank?
+
           translation = I18n.translate(scope_key_by_partial(key), **html_safe_options.merge(raise: i18n_raise))
-          if translation.respond_to?(:map)
+
+          if translation.equal?(MISSING_TRANSLATION)
+            options[:default].first
+          elsif 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
@@ -121,6 +128,9 @@ module ActionView
       alias :l :localize
 
       private
+        MISSING_TRANSLATION = Object.new
+        private_constant :MISSING_TRANSLATION
+
         def scope_key_by_partial(key)
           stringified_key = key.to_s
           if stringified_key.first == "."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 6.0.3.2
+  version: 6.0.3.7
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.7
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.7
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.7
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: []
@@ -236,10 +236,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.3.2/actionview/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.3.2/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.3.7/actionview/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.3.7/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.2/actionview
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.7/actionview
 post_install_message:
 rdoc_options: []
 require_paths: