prawn-rails 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf8e2fcbecb181b9a2a09c14fc393dfe94852e556c662f4e1a90254705bc5e2
-  data.tar.gz: 27efe009afe9618dcde1f2fd46b82586ab05ce69fadebb105a6c7234b7c00235
+  metadata.gz: b7b43fa3d4d79c190d6dc82e6f883c893e0cb148e22894264ffba862cae17c6b
+  data.tar.gz: 699da6374e86a0c32e14638752961d23b4daa9bdc4d19c9bb1edfcb42f9b858c
 SHA512:
-  metadata.gz: f1f204eff5f570c1ba0bebb6602421051d8a983ab84ade21bf36eb8522eb45e30fb42019d251a73bcb5aefed11933c15c084a68bd18adba44ca61fa754e43e78
-  data.tar.gz: a4f1f589c9a9f2dcc90925be191371dac28bc4e700ea719cd59b4f66bdfdcbbe549263d04c19ad7e643d88f1ee607059161c13b02548f6290802d1c2b6ec9473
+  metadata.gz: '091d86d558e578d37e5d41d65a0b4ff82e996ec9ec00a1fa923efe19fe8c115027f53633dea6307891de8d5834616d1e8aac8436597572ce2f260f19b456d87b'
+  data.tar.gz: e0801642f59f9276b03d1cce777b45d5499866a3381acf1d09588011eb986d6808cddbda55f59287e1557e93c62dcad497a3ceae80f5fefacfec830f6b826e43

data/CHANGELOG.md

@@ -2,11 +2,15 @@
 
 * `Unreleased`
   - Nothing yet
-  
+
+* `v1.3.0`
+  - [PR #40](https://github.com/cortiz/prawn-rails/pull/40) - Add `:filename` and `:disposition` options for `prawn_document
+  - [PR #40](https://github.com/cortiz/prawn-rails/pull/40) - Do not override existing`Content-Disposition` headers
+
 * `v1.2.1`
   - [PR #39](https://github.com/cortiz/prawn-rails/pull/39) - Fix Rails 6 deprecation warning for single arity template handlers
   - Remove unnecessary option logic from `prawn_document` method
-  
+
 * `v1.2.0`
   - [PR #31](https://github.com/cortiz/prawn-rails/pull/31) - Use Prawn::Document.extensions in favor of custom plug-in loading. This removes all changes made in PR #29 and should behave much more appropriately now.
   - [Undo PR #29](https://github.com/cortiz/prawn-rails/pull/31) - Use Prawn::Document.extensions in favor of custom plug-in loading
@@ -28,5 +32,5 @@
 
 * `v0.1.1`
 * `v0.1.0`
-* `v0.0.2` 
+* `v0.0.2`
 * `v0.0.1`

data/README.md

@@ -1,7 +1,7 @@
 # Prawn-Rails
 <a href="https://badge.fury.io/rb/prawn-rails" target="_blank"><img height="21" style='border:0px;height:21px;' border='0' src="https://badge.fury.io/rb/prawn-rails.svg" alt="Gem Version"></a>
 <a href='https://rubygems.org/gems/prawn-rails' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://ruby-gem-downloads-badge.herokuapp.com/prawn-rails?label=rubygems&type=total&total_label=downloads&color=brightgreen' border='0' alt='RubyGems Downloads' /></a>
-<a href='https://ko-fi.com/A5071NK' target='_blank'><img height='22' style='border:0px;height:22px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a> 
+<a href='https://ko-fi.com/A5071NK' target='_blank'><img height='22' style='border:0px;height:22px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a>
 
 
 # Install
@@ -12,7 +12,7 @@ gem 'prawn-rails'
 Note: `prawn` and `prawn-table` are dependencies of `prawn-rails` so there is no need to mention it in the projects Gemfile unless you want to use a specific version of either of those libraries.
 
 # Usage
-Create a view with `pdf` as format and `prawn` as handler so filename should look like `example.pdf.prawn`
+Create a view with `pdf` as format and `prawn` as handler so filename should look like `example.pdf.prawn`.
 
 It provides a helper called `prawn_document` which builds a PrawnRails::Document with default options. You can override any options as you please. Example:
 
@@ -22,19 +22,41 @@ prawn_document do |pdf|
 end
 ```
 
-No need to call `pdf.render`, it is called by `prawn_document`
+No need to call `pdf.render`, it is called by `prawn_document`.
 
-If you want to customize the name of the file should a user try to save it, you can specify the filename in your action:
+You can customize the name of the generated PDF and the file's delivery format with the `:filename` and `:disposition` keys:
+
+```ruby
+prawn_document(filename: "my-file.pdf", disposition: "attachment") do |pdf|
+  pdf.text "Direct download incoming!"
+end
+```
+
+You can also override the content disposition using the [`Content-Disposition` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition#As_a_response_header_for_the_main_body). If you've already set this, `prawn-rails` will *not* override it. Here's an example of setting the header directly:
+
+```ruby
+def download
+  respond_to do |format|
+    format.pdf do
+      headers["Content-Disposition"] = "attachment; filename=\"charts-#{Time.now.to_i}.pdf\""
+    end
+  end
+end
+```
+
+You can also override the file's name from the controller via `@filename`:
 
 ```ruby
 def show
-  @filename = 'my_report.pdf'
+  @filename = "my_report.pdf"
 end
 ```
 
+If no options are given, the file's name will match to your browser's default and the delivery format will default to `inline`.
+
 # Default configuration
 
-Add a `prawn-rails.rb` config to your Rails app under `config/initializers` like this
+Add a `prawn-rails.rb` config to your Rails app under `config/initializers` like this:
 
 ```ruby
 PrawnRails.config do |config|
@@ -44,11 +66,11 @@ PrawnRails.config do |config|
 end
 ```
 
-Please note that these are the defaults. 
+Please note that these are the defaults.
 
-For a list of all available options: [http://www.rubydoc.info/gems/prawn/Prawn%2FDocument:initialize](http://www.rubydoc.info/gems/prawn/Prawn%2FDocument:initialize). 
+For a list of all available options: [http://www.rubydoc.info/gems/prawn/Prawn%2FDocument:initialize](http://www.rubydoc.info/gems/prawn/Prawn%2FDocument:initialize).
 
-For a list of all metadata the the `:info` option supports, please see [https://github.com/prawnpdf/prawn/blob/master/manual/document_and_page_options/metadata.rb](https://github.com/prawnpdf/prawn/blob/master/manual/document_and_page_options/metadata.rb) 
+For a list of all metadata the the `:info` option supports, please see [https://github.com/prawnpdf/prawn/blob/master/manual/document_and_page_options/metadata.rb](https://github.com/prawnpdf/prawn/blob/master/manual/document_and_page_options/metadata.rb).
 
 If `skip_page_creation` is set to true then you have to create the first page yourself. Example:
 
@@ -62,7 +84,7 @@ pdf.start_new_page size: "A4", page_layout: :portrait
 
 #### Hello World
 
-```ruby	
+```ruby
 # hello.pdf.prawn
 
 prawn_document do |pdf|

data/lib/prawn-rails/rails_helper.rb

@@ -4,18 +4,35 @@ module PrawnRails
   module RailsHelper
 
     def prawn_document(options={})
-      options.reverse_merge!({
-        info: {
-          Title: @filename.sub(/\.(p|P)(d|D)(f|F)$/, '')
-        }
-      })
+      @filename ||= options[:filename]
+
+      options.reverse_merge!(get_metadata)
 
       pdf = PrawnRails::Document.new(options)
 
+      # Ignore headers when we're not rendering from an ActionController context.
+      if defined?(controller) && controller.respond_to?(:response) && !controller.response.nil?
+        disposition = options[:disposition] || "inline"
+        disposition += "; filename=\"#{@filename}\"" if @filename
+
+        # Don't override 'Content-Disposition' if we've chosen to set it elsewhere.
+        controller.response.headers['Content-Disposition'] ||= disposition
+      end
+
       yield pdf if block_given?
 
       pdf.render
     end
 
+    def get_metadata
+      return {} unless @filename
+
+      {
+        info: {
+          Title: @filename.sub(/\.pdf$/i, '')
+        }
+      }
+    end
+
   end
 end

data/lib/prawn-rails/renderer.rb

@@ -3,17 +3,8 @@ require "prawn-rails/document"
 module PrawnRails
   class Renderer
 
-    ### WARNING: BE VERY CAREFUL IF EDITING THIS METHOD
     def self.call(template, source = nil)
-      %{
-        @filename ||= "\#{controller.action_name}.pdf"
-
-        if controller.respond_to?(:response) && !controller.response.nil?
-          controller.response.headers['Content-Disposition'] = "inline; filename=\\\"\#{@filename}\\\""
-        end
-
-        #{(source || template.source).strip}
-      }
+      (source || template.source).strip
     end
 
   end

data/lib/prawn-rails/version.rb

@@ -1,3 +1,3 @@
 module PrawnRails
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/dummy_app/app/controllers/reports_controller.rb

@@ -1,5 +1,5 @@
 class ReportsController < ApplicationController
-  
+
   def sample
     @items = [
       {name: "Hello"},
@@ -14,5 +14,24 @@ class ReportsController < ApplicationController
       [7,8,9],
     ]
   end
- 
+
+  def custom_filename
+  end
+
+  def custom_disposition
+  end
+
+  def custom
+  end
+
+  def ivar_filename
+    @filename = "ivar-filename.pdf"
+    render :custom
+  end
+
+  def custom_headers
+    headers['Content-Disposition'] = "attachment;filename=\"custom-headers.pdf\""
+    render :custom
+  end
+
 end

data/test/dummy_app/app/views/reports/custom.pdf.prawn

@@ -0,0 +1,3 @@
+prawn_document(filename: "from-options.pdf", disposition: "attachment") do |pdf|
+  pdf.text "Hello World!"
+end

data/test/dummy_app/app/views/reports/custom_disposition.pdf.prawn

@@ -0,0 +1,3 @@
+prawn_document(disposition: "attachment") do |pdf|
+  pdf.text "Hello World!"
+end

data/test/dummy_app/app/views/reports/custom_filename.pdf.prawn

@@ -0,0 +1,3 @@
+prawn_document(filename: "from-options.pdf") do |pdf|
+  pdf.text "Hello World!"
+end

data/test/dummy_app/config/routes.rb

@@ -1,4 +1,9 @@
 Dummy::Application.routes.draw do
+  get "reports/custom"
+  get "reports/custom_disposition"
+  get "reports/custom_filename"
+  get "reports/custom_headers"
+  get "reports/ivar_filename"
   get "reports/sample"
   get "reports/table"
 end

data/test/dummy_app/log/test.log

@@ -0,0 +1,117 @@
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------------
+NavigationTest: test_Renders_table_pdf_action_using_auto-required_plugin_Prawn-Table
+------------------------------------------------------------------------------------
+Started GET "/reports/table?format=pdf" for 127.0.0.1 at 2019-08-07 11:33:33 -0700
+Processing by ReportsController#table as PDF
+  Rendering reports/table.pdf.prawn
+  Rendered reports/table.pdf.prawn (112.7ms)
+Completed 200 OK in 121ms (Views: 120.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+NavigationTest: test_Registers_:prawn_template_handler
+------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------
+NavigationTest: test_Respects_both_options_on_'prawn-document'_together
+-----------------------------------------------------------------------
+Started GET "/reports/custom.pdf" for 127.0.0.1 at 2019-08-07 11:33:33 -0700
+Processing by ReportsController#custom as PDF
+  Rendering reports/custom.pdf.prawn
+  Rendered reports/custom.pdf.prawn (2.2ms)
+Completed 200 OK in 4ms (Views: 2.9ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------
+NavigationTest: test_Sets_file_name_from_'@filename'_when_present
+-----------------------------------------------------------------
+Started GET "/reports/ivar_filename.pdf" for 127.0.0.1 at 2019-08-07 11:33:33 -0700
+Processing by ReportsController#ivar_filename as PDF
+  Rendering reports/custom.pdf.prawn
+  Rendered reports/custom.pdf.prawn (1.8ms)
+Completed 200 OK in 3ms (Views: 2.4ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------
+NavigationTest: test_Renders_html_action
+----------------------------------------
+Started GET "/reports/sample" for 127.0.0.1 at 2019-08-07 11:33:33 -0700
+Processing by ReportsController#sample as HTML
+  Rendering reports/sample.html.erb within layouts/application
+  Rendered reports/sample.html.erb within layouts/application (1.2ms)
+Completed 200 OK in 203ms (Views: 202.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------
+NavigationTest: test_Respects_the_'disposition'_option_alone
+------------------------------------------------------------
+Started GET "/reports/custom_disposition.pdf" for 127.0.0.1 at 2019-08-07 11:33:33 -0700
+Processing by ReportsController#custom_disposition as PDF
+  Rendering reports/custom_disposition.pdf.prawn
+  Rendered reports/custom_disposition.pdf.prawn (16.4ms)
+Completed 200 OK in 20ms (Views: 19.4ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------
+NavigationTest: test_Registers_:pdf_mime_type
+---------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------
+NavigationTest: test_Renders_pdf_to_string
+------------------------------------------
+  Rendering reports/sample.pdf.prawn
+  Rendered reports/sample.pdf.prawn (72.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------
+NavigationTest: test_Renders_sample_pdf_action
+----------------------------------------------
+Started GET "/reports/sample?format=pdf" for 127.0.0.1 at 2019-08-07 11:33:33 -0700
+Processing by ReportsController#sample as PDF
+  Rendering reports/sample.pdf.prawn
+  Rendered reports/sample.pdf.prawn (20.5ms)
+Completed 200 OK in 22ms (Views: 21.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------------
+NavigationTest: test_Maintains_existing_'Content-Disposition'_header
+--------------------------------------------------------------------
+Started GET "/reports/custom_headers.pdf" for 127.0.0.1 at 2019-08-07 11:33:33 -0700
+Processing by ReportsController#custom_headers as PDF
+  Rendering reports/custom.pdf.prawn
+  Rendered reports/custom.pdf.prawn (1.9ms)
+Completed 200 OK in 3ms (Views: 2.5ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------
+NavigationTest: test_render_to_string_in_mailer
+-----------------------------------------------
+  Rendering reports/sample.pdf.prawn
+  Rendered reports/sample.pdf.prawn (19.5ms)
+  Rendering reports_mailer/send_report.html.erb
+  Rendered reports_mailer/send_report.html.erb (0.4ms)
+ReportsMailer#send_report: processed outbound mail in 280.1ms
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------
+NavigationTest: test_Respects_the_'filename'_option_alone
+---------------------------------------------------------
+Started GET "/reports/custom_filename.pdf" for 127.0.0.1 at 2019-08-07 11:33:34 -0700
+Processing by ReportsController#custom_filename as PDF
+  Rendering reports/custom_filename.pdf.prawn
+  Rendered reports/custom_filename.pdf.prawn (2.1ms)
+Completed 200 OK in 4ms (Views: 2.8ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------
+PrawnRailsTest: test_matches_.PDF_extension_regardless_of_case
+--------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------
+PrawnRailsTest: test_text_can_take_non_strings
+----------------------------------------------
+   (0.1ms)  rollback transaction

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/0Q/0QR6jgJcsDY23uF8NGHFYajkal8CGG4d3kOZQCD8Oj8.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=7b3a99820c71d7042d0378186f81e6ffd61c650a55f27cebcb852601ae05fa83:ET

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/1K/1KcQYwe3g9uhY2WePD1_5P38IzP0Veu8rDPI0wXQSP8.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=de1f6ddbeed2af709dcf36381627b030f3002cda655cc621dcb78b60b6120a69:ET

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/3N/3NnKgR2TsTI1qCXKZpts0uJzp2dRJcoYp3nnFU6YE4o.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Lprocessors:type=application/javascript&file_type=application/javascript;TTI"8file-digest://app/assets/javascripts/application.js;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTF

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/4O/4O6Anm3R8aSIVfMhGtp5tZK3x17fcY1SbWoDN_6hb-o.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"0processors:type=text/css&file_type=text/css;TTI"9file-digest://app/assets/stylesheets/application.css;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTF

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/7z/7zB4MNaDZMfwUPQ7LsLGHLt1EAx1oMCEUjywneVyoyY.cache

@@ -0,0 +1 @@
+"%�汷g�d�Q~�A�fǟ��#�R��&�j�

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/8D/8D13-8wUZxyVgrsD9RHdWUPhLlWcqnHXtOBMOPQRX-Q.cache

@@ -0,0 +1 @@
+"%��B�����șo�$'�A�d��L���xR�U

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/LR/LRLaw7viwBb9Mi_VFZxGbKIooy8Fqf1aB_iOTETsMyc.cache

@@ -0,0 +1,3 @@
+[o:Set:
+@hash}
+I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"9file-digest://app/assets/stylesheets/application.css;TTF

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/Mj/MjwYGG9GkHD1fwwH2bg66EBYl3zCA_mqeDF9otey4-U.cache

@@ -0,0 +1,3 @@
+[o:Set:
+@hash}
+I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"8file-digest://app/assets/javascripts/application.js;TTF

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/mO/mOu9n3QmqPXFbaUP-4RAuwabvsLdudRBvk9LMIOTSoI.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=1111edca24b3df6c2857a3e3fe10a1fc3030827fb4be5ce1c5072f75d77c88fb:ET

data/test/dummy_app/tmp/cache/assets/sprockets/v3.0/wt/wtoVyr5IaVgQI72M_TLZFUNHeStJ5maRaHlfA8Vt6d0.cache

@@ -0,0 +1 @@
+I"}app/assets/stylesheets/application.css?type=text/css&id=1fef9fc1245c63a4668490c81d3c6c1e5b485f76b14c9805b2f4bfbb005aebfe:ET

data/test/integration/prawn_rails_test.rb

@@ -6,6 +6,15 @@ require 'pdf/reader'
 class NavigationTest < ActionDispatch::IntegrationTest
   fixtures :all
 
+  def confirm_pdf_format(source)
+    reader = PDF::Reader.new(StringIO.new(source))
+    assert_not_nil(reader)
+    assert_equal(1, reader.page_count)
+    page_str = reader.pages[0].to_s
+    assert page_str.include?('Hello World!')
+    assert_not page_str.include?("<h1>Hello World!</h1>")
+  end
+
   test "Registers :pdf mime type" do
     assert Mime::Type.lookup_by_extension(:pdf)
   end
@@ -17,35 +26,20 @@ class NavigationTest < ActionDispatch::IntegrationTest
   test "Renders html action" do
     get '/reports/sample'
     assert_response :success
-    #assert @response.body.include?("<h1>Hello World!</h1>")
     assert_match("<h1>Hello World!</h1>", @response.body)
   end
 
   test "Renders pdf to string" do
     pdf_str = ApplicationController.new.render_to_string("reports/sample.pdf", locals: {:@items => []})
 
-    reader = PDF::Reader.new(StringIO.new(pdf_str))
-    assert_not_nil(reader)
-
-    page_str = reader.pages[0].to_s
-    assert page_str.include?('Hello World!')
-    assert_not page_str.include?("<h1>Hello World!</h1>")
+    confirm_pdf_format(pdf_str)
   end
 
   test "Renders sample pdf action" do
     get '/reports/sample', params: {format: :pdf}
     assert_response :success
-    assert_not @response.body.include?("<h1>Hello World!</h1>")
-
-    reader = PDF::Reader.new(StringIO.new(@response.body))
-    assert_not_nil(reader)
-
-    assert_equal(1, reader.page_count)
 
-    page_str = reader.pages[0].to_s
-
-    assert page_str.include?('Hello World!')
-    assert_not page_str.include?("<h1>Hello World!</h1>")
+    confirm_pdf_format(@response.body)
   end
 
   test "Renders table pdf action using auto-required plugin Prawn-Table" do
@@ -62,17 +56,50 @@ class NavigationTest < ActionDispatch::IntegrationTest
     assert_equal(page_str, "1 2 3\n\n4 5 6\n\n7 8 9")
   end
 
+  test "Sets file name from '@filename' when present" do
+    get '/reports/ivar_filename.pdf'
+
+    disposition_header = @response.headers["Content-Disposition"]
+    assert disposition_header.include?("attachment")
+    assert disposition_header.include?("ivar-filename.pdf")
+  end
+
+  test "Maintains existing 'Content-Disposition' header" do
+    get '/reports/custom_headers.pdf'
+
+    disposition_header = @response.headers["Content-Disposition"]
+    assert disposition_header.include?("attachment")
+    assert disposition_header.include?("custom-headers.pdf")
+  end
+
+  test "Respects the 'filename' option alone" do
+    get '/reports/custom_filename.pdf'
+
+    disposition_header = @response.headers["Content-Disposition"]
+    assert disposition_header.include?("inline")
+    assert disposition_header.include?("from-options.pdf")
+  end
+
+  test "Respects the 'disposition' option alone" do
+    get '/reports/custom_disposition.pdf'
+
+    disposition_header = @response.headers["Content-Disposition"]
+    assert disposition_header.include?("attachment")
+    assert_not disposition_header.include?("filename")
+  end
+
+  test "Respects both options on 'prawn-document' together" do
+    get '/reports/custom.pdf'
+
+    disposition_header = @response.headers["Content-Disposition"]
+    assert disposition_header.include?("attachment")
+    assert disposition_header.include?("from-options.pdf")
+  end
+
   test "render_to_string in mailer" do
     mail = ReportsMailer.send_report
     assert_equal(1, mail.attachments.size)
 
-    reader = PDF::Reader.new(StringIO.new(mail.attachments["report.pdf"].body.raw_source))
-    assert_not_nil(reader)
-    assert_equal(1, reader.page_count)
-
-    page_str = reader.pages[0].to_s
-
-    assert page_str.include?('Hello World!')
-    assert_not page_str.include?("<h1>Hello World!</h1>")
+    confirm_pdf_format(mail.attachments["report.pdf"].body.raw_source)
   end
 end

data/test/prawn_rails_test.rb

@@ -7,8 +7,6 @@ class PrawnRailsTest < ActiveSupport::TestCase
   include PrawnRails::RailsHelper
 
   test "text can take non strings" do
-    @filename = ""
-
     output = prawn_document do |pdf|
       pdf.text "Number:"
       pdf.text 10
@@ -20,4 +18,11 @@ class PrawnRailsTest < ActiveSupport::TestCase
     page = reader.page(1).to_s
     assert page.include?("Number:\n10")
   end
+
+  test "matches .PDF extension regardless of case" do
+    ["pDf", "pdf", "PDF"].each do |ext|
+      @filename = "test.#{ext}"
+      assert_equal get_metadata[:info][:Title], "test"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Carlos Ortiz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -147,6 +147,9 @@ files:
 - test/dummy_app/app/controllers/reports_controller.rb
 - test/dummy_app/app/mailers/reports_mailer.rb
 - test/dummy_app/app/views/layouts/application.html.erb
+- test/dummy_app/app/views/reports/custom.pdf.prawn
+- test/dummy_app/app/views/reports/custom_disposition.pdf.prawn
+- test/dummy_app/app/views/reports/custom_filename.pdf.prawn
 - test/dummy_app/app/views/reports/sample.html.erb
 - test/dummy_app/app/views/reports/sample.pdf.prawn
 - test/dummy_app/app/views/reports/table.pdf.prawn
@@ -170,6 +173,22 @@ files:
 - test/dummy_app/config/routes.rb
 - test/dummy_app/config/secrets.yml
 - test/dummy_app/db/schema.rb
+- test/dummy_app/db/test.sqlite3
+- test/dummy_app/log/test.log
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/0Q/0QR6jgJcsDY23uF8NGHFYajkal8CGG4d3kOZQCD8Oj8.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/1K/1KcQYwe3g9uhY2WePD1_5P38IzP0Veu8rDPI0wXQSP8.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/3N/3NnKgR2TsTI1qCXKZpts0uJzp2dRJcoYp3nnFU6YE4o.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/4O/4O6Anm3R8aSIVfMhGtp5tZK3x17fcY1SbWoDN_6hb-o.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/4X/4XWDJRe7gZAeojFwJq7j6jJxRr152aQBfyhVtPPSHDY.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/7z/7zB4MNaDZMfwUPQ7LsLGHLt1EAx1oMCEUjywneVyoyY.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/8D/8D13-8wUZxyVgrsD9RHdWUPhLlWcqnHXtOBMOPQRX-Q.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/LR/LRLaw7viwBb9Mi_VFZxGbKIooy8Fqf1aB_iOTETsMyc.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/Mj/MjwYGG9GkHD1fwwH2bg66EBYl3zCA_mqeDF9otey4-U.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/Yr/YrGeNwkHFUXGwgJhi0aqJdEHL--OyRwU5aN5azmIXM4.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/ib/ibSeAobTqAE0a-v_-umXpnbXaIEx_WOtSsQkSRJCwwI.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/mO/mOu9n3QmqPXFbaUP-4RAuwabvsLdudRBvk9LMIOTSoI.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/vt/vtyC4n-7HZNOJV7EprjE7ThndKZkG00OVD8sO8cUFAM.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/wt/wtoVyr5IaVgQI72M_TLZFUNHeStJ5maRaHlfA8Vt6d0.cache
 - test/integration/prawn_rails_test.rb
 - test/prawn_rails_test.rb
 - test/test_helper.rb
@@ -196,36 +215,55 @@ signing_key:
 specification_version: 4
 summary: Prawn Handler for Rails
 test_files:
-- test/integration/prawn_rails_test.rb
-- test/prawn_rails_test.rb
-- test/test_helper.rb
-- test/dummy_app/Rakefile
-- test/dummy_app/db/schema.rb
-- test/dummy_app/app/mailers/reports_mailer.rb
-- test/dummy_app/app/controllers/reports_controller.rb
-- test/dummy_app/app/controllers/application_controller.rb
-- test/dummy_app/app/assets/javascripts/application.js
-- test/dummy_app/app/assets/stylesheets/application.css
 - test/dummy_app/app/views/reports_mailer/send_report.html.erb
-- test/dummy_app/app/views/layouts/application.html.erb
-- test/dummy_app/app/views/reports/table.pdf.prawn
+- test/dummy_app/app/views/reports/custom_filename.pdf.prawn
 - test/dummy_app/app/views/reports/sample.pdf.prawn
+- test/dummy_app/app/views/reports/custom.pdf.prawn
 - test/dummy_app/app/views/reports/sample.html.erb
-- test/dummy_app/config.ru
-- test/dummy_app/config/application.rb
-- test/dummy_app/config/environments/production.rb
-- test/dummy_app/config/environments/development.rb
-- test/dummy_app/config/environments/test.rb
-- test/dummy_app/config/locales/en.yml
-- test/dummy_app/config/routes.rb
-- test/dummy_app/config/secrets.yml
+- test/dummy_app/app/views/reports/table.pdf.prawn
+- test/dummy_app/app/views/reports/custom_disposition.pdf.prawn
+- test/dummy_app/app/views/layouts/application.html.erb
+- test/dummy_app/app/mailers/reports_mailer.rb
+- test/dummy_app/app/assets/javascripts/application.js
+- test/dummy_app/app/assets/stylesheets/application.css
+- test/dummy_app/app/controllers/reports_controller.rb
+- test/dummy_app/app/controllers/application_controller.rb
 - test/dummy_app/config/environment.rb
+- test/dummy_app/config/secrets.yml
+- test/dummy_app/config/application.rb
+- test/dummy_app/config/database.yml
 - test/dummy_app/config/initializers/mime_types.rb
-- test/dummy_app/config/initializers/prawn-rails.rb
-- test/dummy_app/config/initializers/secret_token.rb
 - test/dummy_app/config/initializers/backtrace_silencers.rb
-- test/dummy_app/config/initializers/inflections.rb
 - test/dummy_app/config/initializers/session_store.rb
+- test/dummy_app/config/initializers/secret_token.rb
 - test/dummy_app/config/initializers/wrap_parameters.rb
-- test/dummy_app/config/database.yml
+- test/dummy_app/config/initializers/prawn-rails.rb
+- test/dummy_app/config/initializers/inflections.rb
+- test/dummy_app/config/routes.rb
+- test/dummy_app/config/locales/en.yml
+- test/dummy_app/config/environments/production.rb
+- test/dummy_app/config/environments/test.rb
+- test/dummy_app/config/environments/development.rb
 - test/dummy_app/config/boot.rb
+- test/dummy_app/log/test.log
+- test/dummy_app/config.ru
+- test/dummy_app/Rakefile
+- test/dummy_app/db/test.sqlite3
+- test/dummy_app/db/schema.rb
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/1K/1KcQYwe3g9uhY2WePD1_5P38IzP0Veu8rDPI0wXQSP8.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/8D/8D13-8wUZxyVgrsD9RHdWUPhLlWcqnHXtOBMOPQRX-Q.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/4O/4O6Anm3R8aSIVfMhGtp5tZK3x17fcY1SbWoDN_6hb-o.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/4X/4XWDJRe7gZAeojFwJq7j6jJxRr152aQBfyhVtPPSHDY.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/LR/LRLaw7viwBb9Mi_VFZxGbKIooy8Fqf1aB_iOTETsMyc.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/Mj/MjwYGG9GkHD1fwwH2bg66EBYl3zCA_mqeDF9otey4-U.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/mO/mOu9n3QmqPXFbaUP-4RAuwabvsLdudRBvk9LMIOTSoI.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/3N/3NnKgR2TsTI1qCXKZpts0uJzp2dRJcoYp3nnFU6YE4o.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/wt/wtoVyr5IaVgQI72M_TLZFUNHeStJ5maRaHlfA8Vt6d0.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/Yr/YrGeNwkHFUXGwgJhi0aqJdEHL--OyRwU5aN5azmIXM4.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/vt/vtyC4n-7HZNOJV7EprjE7ThndKZkG00OVD8sO8cUFAM.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/0Q/0QR6jgJcsDY23uF8NGHFYajkal8CGG4d3kOZQCD8Oj8.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/7z/7zB4MNaDZMfwUPQ7LsLGHLt1EAx1oMCEUjywneVyoyY.cache
+- test/dummy_app/tmp/cache/assets/sprockets/v3.0/ib/ibSeAobTqAE0a-v_-umXpnbXaIEx_WOtSsQkSRJCwwI.cache
+- test/prawn_rails_test.rb
+- test/integration/prawn_rails_test.rb
+- test/test_helper.rb