pdfkit 0.8.4.2 → 0.8.4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d07f9293cf2555d6bf3f44fce50ff185524fd202073fcd00fe0e6b2fb094963d
-  data.tar.gz: ede68296b5314d8572b002945360e0c2cb90d95f57440f8a6213d9054a436dcc
+  metadata.gz: 1abe171f52890a9f122ae67cfc5c743ac486414bf6ffe78a72d767fccb7b43a6
+  data.tar.gz: c979fcb4caa6d667be6b2f636e1acff3e4edaa59bf9e5ce45a709225fd4a3491
 SHA512:
-  metadata.gz: 2447695954315c580730d87c1f0ed2353228ca3e564a5692fef67d4d2d2fc244e6f2442e1b69c433f35b92c685acc35cd3764c111dcaa69f773cd67e77d725e7
-  data.tar.gz: b106bb8ead667a62cca3f4790ea0c074301ea02ab693e7b39a5b7006ddc314700a95eed42507c007010c8134c40665024d32a421e664541aff8a0d6bd9ddd4db
+  metadata.gz: 70ac2e72c5aab61b4cfffe9bd26da109dee62286f8486d3596522dff5c0eb9b9ae5c1886b53d2b979247b2b6f38d9e8de07344d4963b8f1109879fd077550d0a
+  data.tar.gz: 28c303321d80381c13e3071442cfd9652469e8c15cd977224762ddb93342ec3f5bed8be6e9b014f771490f38f365b7d3b21d771ead7931b751b7eee1cebf962f

data/.travis.yml

@@ -12,5 +12,5 @@ before_install:
 
 before_script:
   - "sudo apt-get -qq -y install fontconfig libxrender1"
-  - "wget https://downloads.wkhtmltopdf.org/0.12/0.12.5/wkhtmltox_0.12.5-1.xenial_amd64.deb"
+  - "wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.xenial_amd64.deb"
   - "sudo apt-get install ./wkhtmltox_0.12.5-1.xenial_amd64.deb"

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+2020-07-05
+=================
+  * Bump to 0.8.4.3.1
+  * Don't override request level Content-Disposition header if it exists (#466)
+  * Update rake (#471)
+  * Add missing require statements for tempfile (#467)
+  * Only grab last line of bundle exec which output (#464)
+  * Return 500 status when an exception is caught in middleware (#469)
+  * Update Travis CI URL for wkhtmltopf (#473)
+  
 2020-04-01
 =================
   * Bump to 0.8.4.2

data/README.md

@@ -119,9 +119,9 @@ config.middleware.use PDFKit::Middleware, {}, :except => ['/secret']
 **With conditions to force download**
 ```ruby
 # force download with attachment disposition
-config.middleware.use PDFKit::Middleware, {}, :dispositon => 'attachment'
+config.middleware.use PDFKit::Middleware, {}, :disposition => 'attachment'
 # conditions can force a filename
-config.middleware.use PDFKit::Middleware, {}, :dispositon => 'attachment; filename=report.pdf'
+config.middleware.use PDFKit::Middleware, {}, :disposition => 'attachment; filename=report.pdf'
 ```
 **Saving the generated .pdf to disk**
 

data/lib/pdfkit/configuration.rb

@@ -27,7 +27,7 @@ class PDFKit
     def default_wkhtmltopdf
       return @default_command_path if @default_command_path
       if defined?(Bundler::GemfileError) && File.exists?('Gemfile')
-        @default_command_path = `bundle exec which wkhtmltopdf`.chomp
+        @default_command_path = `bundle exec which wkhtmltopdf`.chomp.lines.last
       end
       @default_command_path = `which wkhtmltopdf`.chomp if @default_command_path.nil? || @default_command_path.empty?
       @default_command_path

data/lib/pdfkit/middleware.rb

@@ -47,9 +47,15 @@ class PDFKit
 
         headers['Content-Length'] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
         headers['Content-Type']   = 'application/pdf'
-        headers['Content-Disposition'] = @conditions[:disposition] || 'inline'
+        headers['Content-Disposition'] ||= @conditions[:disposition] || 'inline'
       end
 
+      [status, headers, response]
+
+    rescue StandardError => e
+      status = 500
+      response = [e.message]
+
       [status, headers, response]
     end
 

data/lib/pdfkit/pdfkit.rb

@@ -1,4 +1,5 @@
 require 'shellwords'
+require 'tempfile'
 
 class PDFKit
   class Error < StandardError; end

data/lib/pdfkit/source.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 require 'uri'
 
 class PDFKit

data/lib/pdfkit/version.rb

@@ -1,3 +1,3 @@
 class PDFKit
-  VERSION = '0.8.4.2'
+  VERSION = '0.8.4.3.1'
 end

data/pdfkit.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<activesupport>, [">= 4.1.11"])
   s.add_development_dependency(%q<mocha>, [">= 0.9.10"])
   s.add_development_dependency(%q<rack-test>, [">= 0.5.6"])
-  s.add_development_dependency(%q<rake>, ["~>0.9.2"])
+  s.add_development_dependency(%q<rake>, ["~>12.3.3"])
   s.add_development_dependency(%q<rdoc>, ["~> 4.0.1"])
   s.add_development_dependency(%q<rspec>, ["~> 3.0"])
 end

data/spec/configuration_spec.rb

@@ -34,6 +34,17 @@ describe PDFKit::Configuration do
           expect(subject).to receive(:`).with('which wkhtmltopdf').and_return("c:\\windows\\path.exe\n")
           expect(subject.wkhtmltopdf).to eq('c:\windows\path.exe')
         end
+
+        it "returns last line of 'bundle exec which' output" do
+          # Happens when the user does not have a HOME directory on their system and runs bundler < 2
+          expect(subject).to receive(:`).with('bundle exec which wkhtmltopdf').and_return(<<~EOT
+            `/home/myuser` is not a directory.
+            Bundler will use `/tmp/bundler/home/myuser' as your home directory temporarily.
+            /usr/bin/wkhtmltopdf
+          EOT
+          )
+          expect(subject.wkhtmltopdf).to eq('/usr/bin/wkhtmltopdf')
+        end
       end
 
       context "when running without bundler" do

data/spec/middleware_spec.rb

@@ -343,6 +343,20 @@ describe PDFKit::Middleware do
       end
 
       describe ":disposition" do
+        describe "doesn't overwrite existing value" do
+          let(:headers) do
+            super().merge({
+              'Content-Disposition' => 'attachment; filename=report-20200101.pdf'
+            })
+          end
+
+          specify do
+            mock_app({}, { :disposition => 'inline' })
+            get 'http://www.example.org/public/test.pdf'
+            expect(last_response.headers["Content-Disposition"]).to eq('attachment; filename=report-20200101.pdf')
+          end
+        end
+
         describe "inline or blank" do
           context "default" do
             specify do
@@ -379,6 +393,16 @@ describe PDFKit::Middleware do
           end
         end
       end
+
+      describe "error handling" do
+        specify do
+          mock_app
+          allow(PDFKit).to receive(:new).and_raise(StandardError.new("Something went wrong"))
+          get 'http://www.example.org/public/test.pdf'
+          expect(last_response.status).to eq(500)
+          expect(last_response.body).to eq("Something went wrong")
+        end
+      end
     end
 
     describe "remove .pdf from PATH_INFO and REQUEST_URI" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdfkit
 version: !ruby/object:Gem::Version
-  version: 0.8.4.2
+  version: 0.8.4.3.1
 platform: ruby
 authors:
 - Jared Pace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement