Fix Rails 6 Deprecation

Author: TJKruitbosch

.travis.yml

@@ -1,21 +1,24 @@
-sudo: false
 language: ruby
 script: bundle exec rspec spec
+
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0
   - jruby-19mode
-gemfile:
-  - spec/gemfiles/Gemfile.rails-3.2.x
-  - spec/gemfiles/Gemfile.rails-4.0.x
-  - spec/gemfiles/Gemfile.rails-4.1.x
+
+  gemfile:
   - spec/gemfiles/Gemfile.rails-4.2.x
+  - spec/gemfiles/Gemfile.rails-5.0.x
+  - spec/gemfiles/Gemfile.rails-6.0.x
+
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: spec/gemfiles/rails-4.1.x.gemfile
     - rvm: 1.9.3
       gemfile: spec/gemfiles/rails-4.2.x.gemfile
+    - rvm: 1.9.3
+      gemfile: spec/gemfiles/rails-5.0.x.gemfile
+    - rvm: 1.9.3
+      gemfile: spec/gemfiles/rails-6.0.x.gemfile
   fast_finish: true

Gemfile

@@ -1,8 +1,2 @@
 source "https://rubygems.org"
 gemspec
-
-gem "guard"
-gem "guard-rspec"
-
-gem "rails", "5.2.1"
-gem "test-unit"

lib/prawnto/compile_support.rb

@@ -65,7 +65,7 @@ def set_cache_control
     end
 
     def set_content_type
-      @controller.response.content_type ||= Mime[:pdf]
+      @controller.response.content_type = Mime[:pdf]
     end
 
     def set_disposition
@@ -76,6 +76,3 @@ def set_disposition
 
   end
 end
-
-
-

lib/prawnto/template_handlers/base.rb

@@ -3,12 +3,13 @@
 module Prawnto
   module TemplateHandlers
     class Base
-      def self.call(template)
-        check_for_pdf_redefine(template.source)
+      def self.call(template, source = nil)
+        source ||= template.source
+        check_for_pdf_redefine(source)
 
         "_prawnto_compile_setup;" +
         "renderer = Prawnto::TemplateHandlers::Renderer.new(self);"+
-        "renderer.to_pdf(self) do; #{template.source}\nend;"
+        "renderer.to_pdf(self) do; #{source}\nend;"
       end
 
     private
@@ -21,5 +22,3 @@ def self.check_for_pdf_redefine(template_source)
     end
   end
 end
-
-

prawnto.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "prawnto_2"
-  s.version = '0.3.0'
+  s.version = '0.3.1'
   s.author = ["Jobber", "Forrest Zeisler", "Nathan Youngman"]
   s.email = ["[email protected]"]
   s.date = Time.now.utc.strftime("%Y-%m-%d")
@@ -19,6 +19,5 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 
-  s.has_rdoc = true
   s.extra_rdoc_files = ["README.rdoc"]
 end

spec/assets/2.5/default_render-2.3.0.pdf

@@ -6,7 +6,7 @@
   describe "simple" do
     it "returns correct PDF" do
       get :default_render, :format => :pdf
-      expect(response).to be_success
+      expect(response).to be_successful
 
       asset_binary = File.open(asset_path("default_render")).read.bytes.to_a
       body_binary = response.body.bytes.to_a
@@ -20,7 +20,7 @@
 
     it "should render items in a block passed to a helper" do
       get :yield_block_in_helper_test, :format => :pdf
-      expect(response).to be_success
+      expect(response).to be_successful
 
       asset_binary = File.open(asset_path("yield_block_in_helper_test")).read.bytes.to_a
       body_binary = response.body.bytes.to_a
@@ -32,7 +32,7 @@
   describe "dsl" do
     it "returns correct PDF" do
       get :dsl_render, :format => :pdf
-      expect(response).to be_success
+      expect(response).to be_successful
 
       asset_binary = File.open(asset_path("dsl_render")).read.bytes.to_a
       body_binary = response.body.bytes.to_a
@@ -43,7 +43,7 @@
   describe "partials" do
     it "renders partials" do
       get :partial_render, :format => :pdf
-      expect(response).to be_success
+      expect(response).to be_successful
 
       asset_binary = File.open(asset_path("partial_render")).read.bytes.to_a
       body_binary = response.body.bytes.to_a
@@ -54,7 +54,7 @@
   describe "complex headers" do
     it "should return a file with a specified filename" do
       get :filename_test, :format => :pdf
-      expect(response).to be_success
+      expect(response).to be_successful
 
       expect(response.header["Content-Disposition"]).to eq("attachment;filename=\"fancy_name.pdf\"")
     end

spec/assets/2.5/dsl_render-2.3.0.pdf

@@ -0,0 +1,2 @@
+//= link application.css.scss
+//= link application.js

spec/assets/2.5/fancy_name-2.3.0.pdf

@@ -27,4 +27,7 @@
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  # Do not eager load code on boot.
+  config.eager_load = false
 end

spec/assets/2.5/instance_var_test-2.3.0.pdf

@@ -9,7 +9,7 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
@@ -57,4 +57,7 @@
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # Eager load code on boot.
+  config.eager_load = true
 end

spec/assets/2.5/partial_render-2.3.0.pdf

@@ -8,7 +8,7 @@
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
@@ -36,4 +36,12 @@
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Use sort order with tests
+  config.active_support.test_order = :sorted
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+
 end

spec/assets/2.5/yield_block_in_helper_test-2.3.0.pdf

@@ -4,4 +4,7 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '8f4cbaa2b5177e95c5ec90b258ddd53b6c7efdcb4fa0a5bb098f5fd9d034b82ad56889231e2c2cdba5dc821042bdc4f9919cb94f1522b49f4e1a0a08d6b2d166'
+if Rails::VERSION::MAJOR < 5
+  Dummy::Application.config.secret_token = '8f4cbaa2b5177e95c5ec90b258ddd53b6c7efdcb4fa0a5bb098f5fd9d034b82ad56889231e2c2cdba5dc821042bdc4f9919cb94f1522b49f4e1a0a08d6b2d166'
+end
+Dummy::Application.config.secret_key_base = '6e645b1c4eb2351e8e90ae0194ad60f6f3c6e2e77e92c352e87e39e075e2ce0e22ef35fb813681ab23fb735ea54046c613beb03885946167159e4370c7afe3a4'

spec/controllers/test_controller_spec.rb

@@ -1,5 +1,8 @@
 source "https://rubygems.org"
 gemspec :path => "./../.."
 
+gem "guard"
+gem "guard-rspec"
+
 gem "rails", "~> 4.2.0"
 gem "test-unit" # for Ruby 2.2.0

spec/dummy/app/assets/config/manifest.js

@@ -1,5 +1,8 @@
 source "https://rubygems.org"
 gemspec :path => "./../.."
 
+gem "guard"
+gem "guard-rspec"
+
 gem "rails", "~> 5.2.1"
 gem "test-unit" # for Ruby 2.2.0

spec/dummy/config/environments/development.rb

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem "guard"
+gem "guard-rspec"
+
+gem "rails", "~> 6.0.3.3"
+gem "test-unit" # for Ruby 2.2.0

spec/dummy/config/environments/production.rb

@@ -3,19 +3,19 @@
 describe PdfEmailer do
   describe "email_with_attachment" do
     before(:all) do
-      @email = PdfEmailer.email_with_attachment.deliver 
+      @email = PdfEmailer.email_with_attachment.deliver_now
     end
-    
+
     it "should have the plain text on the body" do
       expect(@email.encoded).to include "text\/plain"
       expect(@email.encoded).to include "Please see attached PDF"
     end
-    
+
     it "should have the PDF attached" do
       expect(@email.encoded).to include "application\/pdf"
       expect(@email.encoded).to include "Content-Disposition: attachment;"
       expect(@email.encoded).to include "filename=hello_world.pdf"
     end
-    
+
   end
 end