Move implementation to the gems

Now we keep only the common code and move the specific code to the gems

2 files changed, 11 insertions, 22 deletions

diff --git a/Gemfile b/Gemfile
index b7357231e7..1d135a1af1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ gem 'rack-cache', '~> 1.2'
 gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'rails-html-sanitizer', github: 'rails/rails-html-sanitizer'
+gem 'rails-deprecated_sanitizer', github: 'rails/rails-deprecated_sanitizer'
 gem 'turbolinks', '~> 2.2.3'
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
diff --git a/actionview/lib/action_view/helpers/sanitize_helper.rb b/actionview/lib/action_view/helpers/sanitize_helper.rb
index dfbc52e3ac..394250f058 100644
--- a/actionview/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionview/lib/action_view/helpers/sanitize_helper.rb
@@ -121,22 +121,6 @@ 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.
@@ -189,25 +173,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