Merge remote-tracking branch 'origin/master' into guides-template-inheritance

3 files changed, 20 insertions, 34 deletions

diff --git a/actionview/lib/action_view/helpers/sanitize_helper.rb b/actionview/lib/action_view/helpers/sanitize_helper.rb
index dfbc52e3ac..4f2db0a0c4 100644
--- a/actionview/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionview/lib/action_view/helpers/sanitize_helper.rb
@@ -1,6 +1,6 @@
 require 'active_support/core_ext/object/try'
 require 'active_support/deprecation'
-require 'rails-deprecated_sanitizer'
+require 'rails-html-sanitizer'
 
 module ActionView
   # = Action View Sanitize Helpers
@@ -121,31 +121,10 @@ module ActionView
       module ClassMethods #:nodoc:
         attr_writer :full_sanitizer, :link_sanitizer, :white_list_sanitizer
 
-        [:protocol_separator,
-         :uri_attributes,
-         :bad_tags,
-         :allowed_css_properties,
-         :allowed_css_keywords,
-         :shorthand_css_properties,
-         :allowed_protocols].each do |meth|
-          meth_name = "sanitized_#{meth}"
-          imp = lambda do |name|
-            ActiveSupport::Deprecation.warn("#{name} is deprecated and has no effect.")
-          end
-
-          define_method(meth_name) { imp.(meth_name) }
-          define_method("#{meth_name}=") { |value| imp.("#{meth_name}=") }
-        end
-
         # Vendors the full, link and white list sanitizers.
-        # This uses html-scanner for the HTML sanitization.
-        # In the next Rails version this will use Rails::Html::Sanitizer instead.
-        # To get this new behavior now, in your Gemfile, add:
-        #
-        #  gem 'rails-html-sanitizer'
-        #
+        # Provided strictly for compabitility and can be removed in Rails 5.
         def sanitizer_vendor
-          Rails::DeprecatedSanitizer
+          Rails::Html::Sanitizer
         end
 
         def sanitized_allowed_tags
@@ -189,25 +168,29 @@ module ActionView
           @white_list_sanitizer ||= sanitizer_vendor.white_list_sanitizer.new
         end
 
+        ##
+        # :method: sanitized_allowed_tags=
+        #
+        # :call-seq: sanitized_allowed_tags=(tags)
+        #
         # Replaces the allowed tags for the +sanitize+ helper.
         #
         #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
         #   end
         #
-        def sanitized_allowed_tags=(tags)
-          sanitizer_vendor.white_list_sanitizer.allowed_tags = tags
-        end
 
+        ##
+        # :method: sanitized_allowed_attributes=
+        #
+        # :call-seq: sanitized_allowed_attributes=(attributes)
+        #
         # Replaces the allowed HTML attributes for the +sanitize+ helper.
         #
         #   class Application < Rails::Application
         #     config.action_view.sanitized_allowed_attributes = ['onclick', 'longdesc']
         #   end
         #
-        def sanitized_allowed_attributes=(attributes)
-          sanitizer_vendor.white_list_sanitizer.allowed_attributes = attributes
-        end
       end
     end
   end
diff --git a/actionview/lib/action_view/helpers/tag_helper.rb b/actionview/lib/action_view/helpers/tag_helper.rb
index 268558669e..c20800598f 100644
--- a/actionview/lib/action_view/helpers/tag_helper.rb
+++ b/actionview/lib/action_view/helpers/tag_helper.rb
@@ -20,6 +20,8 @@ module ActionView
 
       BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map {|attribute| attribute.to_sym })
 
+      TAG_PREFIXES = ['aria', 'data', :aria, :data].to_set
+
       PRE_CONTENT_STRINGS = {
         :textarea => "\n"
       }
@@ -148,9 +150,9 @@ module ActionView
           return if options.blank?
           attrs = []
           options.each_pair do |key, value|
-            if key.to_s == 'data' && value.is_a?(Hash)
+            if TAG_PREFIXES.include?(key) && value.is_a?(Hash)
               value.each_pair do |k, v|
-                attrs << data_tag_option(k, v, escape)
+                attrs << prefix_tag_option(key, k, v, escape)
               end
             elsif BOOLEAN_ATTRIBUTES.include?(key)
               attrs << boolean_tag_option(key) if value
@@ -161,8 +163,8 @@ module ActionView
           " #{attrs.sort! * ' '}" unless attrs.empty?
         end
 
-        def data_tag_option(key, value, escape)
-          key   = "data-#{key.to_s.dasherize}"
+        def prefix_tag_option(prefix, key, value, escape)
+          key = "#{prefix}-#{key.to_s.dasherize}"
           unless value.is_a?(String) || value.is_a?(Symbol) || value.is_a?(BigDecimal)
             value = value.to_json
           end
diff --git a/actionview/lib/action_view/helpers/translation_helper.rb b/actionview/lib/action_view/helpers/translation_helper.rb
index 1d50ea2ff5..c2fda42396 100644
--- a/actionview/lib/action_view/helpers/translation_helper.rb
+++ b/actionview/lib/action_view/helpers/translation_helper.rb
@@ -6,6 +6,7 @@ module ActionView
   # = Action View Translation Helpers
   module Helpers
     module TranslationHelper
+      include TagHelper
       # Delegates to <tt>I18n#translate</tt> but also performs three additional functions.
       #
       # First, it will ensure that any thrown +MissingTranslation+ messages will be turned