Remove deprecated support for non-string template code in PrawnTemplate

jeremyevans · Jun 5, 2023 · 6927599 · 6927599
1 parent 6dbfd43
commit 6927599
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## master
 
+* Remove deprecated support for non-string template code in PrawnTemplate (jeremyevans)
 * 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)

diff --git a/lib/tilt/prawn.rb b/lib/tilt/prawn.rb
@@ -15,16 +15,9 @@ def prepare
 
     def evaluate(scope, locals, &block)
       pdf = @engine
-      if @data.respond_to?(:to_str)
-        locals = locals.dup
-        locals[:pdf] = pdf
-        super
-      else
-        warn "Non-string provided as prawn template data. This is no longer supported and support for it will be removed in Tilt 2.3", :uplevel=>2
-        # :nocov:
-        @data.call(pdf) if @data.kind_of?(Proc)
-        # :nocov:
-      end
+      locals = locals.dup
+      locals[:pdf] = pdf
+      super
       pdf.render
     end
 

diff --git a/test/tilt_prawntemplate_test.rb b/test/tilt_prawntemplate_test.rb
@@ -25,11 +25,6 @@ def page_attributes(page_num=1)
       assert_equal Tilt::PrawnTemplate, Tilt['test.prawn']
     end
 
-    deprecated "can be initialized without a string" do
-      template = Tilt::PrawnTemplate.new{}
-      assert_equal true, template.render.start_with?('%PDF')
-    end
-
     it "renders inline prawn templates" do
       template = Tilt::PrawnTemplate.new { |t| "pdf.text \"Hello PDF!\"" }
       3.times do