Remove deprecated :rescue_format from exception handler

Author: carlosantoniodasilva

CHANGELOG.md

@@ -5,3 +5,4 @@
 * Remove deprecated stuff:
   - Setting `:default_exception_hander` Symbol to `I18n.exception_handler`.
   - `normalize_translation_keys` in favor of `normalize_keys`.
+  - `:rescue_format` option on the exception handler.

lib/i18n.rb

@@ -9,7 +9,7 @@ module I18n
   autoload :Locale,  'i18n/locale'
   autoload :Tests,   'i18n/tests'
 
-  RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :throw, :raise, :rescue_format]
+  RESERVED_KEYS = [:scope, :default, :separator, :resolve, :object, :fallback, :format, :cascade, :throw, :raise]
   RESERVED_KEYS_PATTERN = /%\{(#{RESERVED_KEYS.join("|")})\}/
 
   extend(Module.new {

lib/i18n/exceptions.rb

@@ -9,19 +9,7 @@ class ExceptionHandler
     include Module.new {
       def call(exception, locale, key, options)
         if exception.is_a?(MissingTranslation)
-          #
-          # TODO: this block is to be replaced by `exception.message` when
-          # rescue_format is removed
-          if options[:rescue_format] == :html
-            if !defined?(@rescue_format_deprecation)
-              $stderr.puts "[DEPRECATED] I18n's :rescue_format option will be removed from a future release. All exception messages will be plain text. If you need the exception handler to return an html format please set or pass a custom exception handler."
-              @rescue_format_deprecation = true
-            end
-            exception.html_message
-          else
-            exception.message
-          end
-
+          exception.message
         elsif exception.is_a?(Exception)
           raise exception
         else
@@ -58,12 +46,6 @@ def initialize(locale, key, options = nil)
         options.each { |k, v| self.options[k] = v.inspect if v.is_a?(Proc) }
       end
 
-      def html_message
-        key  = CGI.escapeHTML titleize(keys.last)
-        path = CGI.escapeHTML keys.join('.')
-        %(<span class="translation_missing" title="translation missing: #{path}">#{key}</span>)
-      end
-
       def keys
         @keys ||= I18n.normalize_keys(locale, key, options[:scope]).tap do |keys|
           keys << 'no key' if keys.size < 2
@@ -78,13 +60,6 @@ def message
       def to_exception
         MissingTranslationData.new(locale, key, options)
       end
-
-      protected
-
-      # TODO : remove when #html_message is removed
-      def titleize(key)
-        key.to_s.gsub('_', ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
-      end
     end
 
     include Base

test/i18n/exceptions_test.rb

@@ -27,21 +27,6 @@ def test_invalid_locale_stores_locale
     end
   end
 
-  test "MissingTranslationData html_message is a span with the titlelized last key token" do
-    exception = I18n::MissingTranslationData.new(:de, :foo, :scope => :bar)
-    assert_equal '<span class="translation_missing" title="translation missing: de.bar.foo">Foo</span>', exception.html_message
-  end
-
-  test "MissingTranslationData html_message html escapes key names" do
-    exception = I18n::MissingTranslationData.new(:de, '<script>Evil</script>', :scope => '<iframe src="example.com" />')
-    assert_equal '<span class="translation_missing" title="translation missing: de.&lt;iframe src=&quot;example.com&quot; /&gt;.&lt;script&gt;Evil&lt;/script&gt;">&lt;Script&gt;Evil&lt;/Script&gt;</span>', exception.html_message
-  end
-
-  test "ExceptionHandler returns the html_message if :rescue_format => :html was given" do
-    message = force_missing_translation_data(:rescue_format => :html)
-    assert_equal '<span class="translation_missing" title="translation missing: de.bar.foo">Foo</span>', message
-  end
-
   test "InvalidPluralizationData stores entry and count" do
     force_invalid_pluralization_data do |exception|
       assert_equal [:bar], exception.entry