From 6dbfd434418b742926dd73a1cef27e0295238398 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Mon, 5 Jun 2023 15:54:59 -0700
Subject: [PATCH] Remove deprecated support for
 {ERB,Erubis}Template#default_output_variable{,=}

---
 CHANGELOG.md                     |  1 +
 lib/tilt/erb.rb                  | 16 +---------------
 lib/tilt/erubis.rb               |  5 +----
 test/tilt_erbtemplate_test.rb    | 19 +++++--------------
 test/tilt_erubistemplate_test.rb | 18 +++++-------------
 5 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a886b1..e1b8887 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## master
 
+* Remove deprecated support for {ERB,Erubis}Template#default_output_variable{,=} (jeremyevans)
 * Remove deprecated support for CoffeeScriptTemplate.default_no_wrap{,=} (jeremyevans)
 * Remove deprecated support for RedCarpet 1.x (jeremyevans)
 * Remove deprecated support for Tilt.current_template (jeremyevans)
diff --git a/lib/tilt/erb.rb b/lib/tilt/erb.rb
index c9d06f0..a250c69 100644
--- a/lib/tilt/erb.rb
+++ b/lib/tilt/erb.rb
@@ -8,23 +8,9 @@ module Tilt
   class ERBTemplate < Template
     SUPPORTS_KVARGS = ::ERB.instance_method(:initialize).parameters.assoc(:key) rescue false
 
-    # Remove in Tilt 2.3
-    @default_output_variable = nil
-    def self._default_output_variable
-      @default_output_variable
-    end
-    def self.default_output_variable
-      warn "#{self}.default_output_variable is deprecated and will be removed in Tilt 2.3.", uplevel: 1
-      @default_output_variable
-    end
-    def self.default_output_variable=(name)
-      warn "#{self}.default_output_variable= is deprecated and will be removed in Tilt 2.3. Switch to using the :outvar option.", uplevel: 1
-      @default_output_variable = name
-    end
-
     def prepare
       @freeze_string_literals = !!@options[:freeze]
-      @outvar = @options[:outvar] || self.class._default_output_variable || '_erbout'
+      @outvar = @options[:outvar] || '_erbout'
       trim = case @options[:trim]
       when false
         nil
diff --git a/lib/tilt/erubis.rb b/lib/tilt/erubis.rb
index d0af265..faa788a 100644
--- a/lib/tilt/erubis.rb
+++ b/lib/tilt/erubis.rb
@@ -16,12 +16,9 @@ module Tilt
   #                   the engine class instead of the default. All content
   #                   within <%= %> blocks will be automatically html escaped.
   class ErubisTemplate < ERBTemplate
-    # Remove in Tilt 2.3
-    @default_output_variable = nil
-
     def prepare
       @freeze_string_literals = !!@options.delete(:freeze)
-      @outvar = @options.delete(:outvar) || self.class._default_output_variable  || '_erbout'
+      @outvar = @options.delete(:outvar) || '_erbout'
       @options[:preamble] = false
       @options[:postamble] = false
       @options[:bufvar] = @outvar
diff --git a/test/tilt_erbtemplate_test.rb b/test/tilt_erbtemplate_test.rb
index 500a568..4d02557 100644
--- a/test/tilt_erbtemplate_test.rb
+++ b/test/tilt_erbtemplate_test.rb
@@ -49,20 +49,11 @@
   end
 
   it "exposing the buffer to the template by default" do
-    verbose = $VERBOSE
-    begin
-      $VERBOSE = nil
-      Tilt::ERBTemplate.default_output_variable = '@_out_buf'
-      assert_equal '@_out_buf', Tilt::ERBTemplate.default_output_variable
-      template = Tilt::ERBTemplate.new { '<% self.exposed_buffer = @_out_buf %>hey' }
-      scope = _MockOutputVariableScope.new
-      template.render(scope)
-      refute_nil scope.exposed_buffer
-      assert_equal scope.exposed_buffer, 'hey'
-    ensure
-      Tilt::ERBTemplate.default_output_variable = '_erbout'
-      $VERBOSE = verbose
-    end
+    template = Tilt::ERBTemplate.new(:outvar=>'@_out_buf') { '<% self.exposed_buffer = @_out_buf %>hey' }
+    scope = _MockOutputVariableScope.new
+    template.render(scope)
+    refute_nil scope.exposed_buffer
+    assert_equal scope.exposed_buffer, 'hey'
   end
 
   it "passing a block for yield" do
diff --git a/test/tilt_erubistemplate_test.rb b/test/tilt_erubistemplate_test.rb
index ad7f1f3..ee30908 100644
--- a/test/tilt_erubistemplate_test.rb
+++ b/test/tilt_erubistemplate_test.rb
@@ -54,19 +54,11 @@ class MockOutputVariableScope
   end
 
   it "exposing the buffer to the template by default" do
-    verbose = $VERBOSE
-    begin
-      $VERBOSE = nil
-      Tilt::ErubisTemplate.default_output_variable = '@_out_buf'
-      template = Tilt::ErubisTemplate.new { '<% self.exposed_buffer = @_out_buf %>hey' }
-      scope = MockOutputVariableScope.new
-      template.render(scope)
-      refute_nil scope.exposed_buffer
-      assert_equal scope.exposed_buffer, 'hey'
-    ensure
-      Tilt::ErubisTemplate.default_output_variable = '_erbout'
-      $VERBOSE = verbose
-    end
+    template = Tilt::ErubisTemplate.new(:outvar=>'@_out_buf') { '<% self.exposed_buffer = @_out_buf %>hey' }
+    scope = MockOutputVariableScope.new
+    template.render(scope)
+    refute_nil scope.exposed_buffer
+    assert_equal scope.exposed_buffer, 'hey'
   end
 
   it "passing a block for yield" do