Remove deprecated Erubis ERB handler

rails · Oct 23, 2017 · 7de7f12 · 7de7f12
1 parent 40cadf5
commit 7de7f12
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 117 deletions.
diff --git a/Gemfile b/Gemfile
@@ -51,9 +51,6 @@ gem "dalli", ">= 2.2.1"
 gem "listen", ">= 3.0.5", "< 3.2", require: false
 gem "libxml-ruby", platforms: :ruby
 
-# Action View. For testing Erubis handler deprecation.
-gem "erubis", "~> 2.7.0", require: false
-
 # for railties app_generator_test
 gem "bootsnap", ">= 1.1.0", require: false
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -253,7 +253,6 @@ GEM
     em-socksify (0.3.1)
       eventmachine (>= 1.0.0.beta.4)
     erubi (1.6.1)
-    erubis (2.7.0)
     et-orbi (1.0.5)
       tzinfo
     event_emitter (0.2.6)
@@ -540,7 +539,6 @@ DEPENDENCIES
   delayed_job
   delayed_job_active_record
   em-hiredis
-  erubis (~> 2.7.0)
   google-cloud-storage (~> 1.3)
   hiredis
   json (>= 2.0.0)

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated Erubis ERB handler.
+
+    *Rafael Mendonça França*
+
 *   Remove default `alt` text generation.
 
     Fixes #30096

diff --git a/actionview/lib/action_view/template/handlers/erb.rb b/actionview/lib/action_view/template/handlers/erb.rb
@@ -3,11 +3,8 @@
 module ActionView
   class Template
     module Handlers
-      autoload :Erubis, "action_view/template/handlers/erb/deprecated_erubis"
-
       class ERB
         autoload :Erubi, "action_view/template/handlers/erb/erubi"
-        autoload :Erubis, "action_view/template/handlers/erb/erubis"
 
         # Specify trim mode for the ERB compiler. Defaults to '-'.
         # See ERB documentation for suitable values.

diff --git a/actionview/lib/action_view/template/handlers/erb/deprecated_erubis.rb b/actionview/lib/action_view/template/handlers/erb/deprecated_erubis.rb
diff --git a/actionview/lib/action_view/template/handlers/erb/erubis.rb b/actionview/lib/action_view/template/handlers/erb/erubis.rb
diff --git a/actionview/test/template/erb/deprecated_erubis_implementation_test.rb b/actionview/test/template/erb/deprecated_erubis_implementation_test.rb