pdfkit 0.8.4.3.1 → 0.8.4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1abe171f52890a9f122ae67cfc5c743ac486414bf6ffe78a72d767fccb7b43a6
-  data.tar.gz: c979fcb4caa6d667be6b2f636e1acff3e4edaa59bf9e5ce45a709225fd4a3491
+  metadata.gz: a9763236251a08873c269bb76fa8cbc81e64111a9bd94ea7a167c0e96ad1e0dc
+  data.tar.gz: ab65d5b9648ec671a22191cf7eca7b14d6c4b07917e45adf479046360f7adfd7
 SHA512:
-  metadata.gz: 70ac2e72c5aab61b4cfffe9bd26da109dee62286f8486d3596522dff5c0eb9b9ae5c1886b53d2b979247b2b6f38d9e8de07344d4963b8f1109879fd077550d0a
-  data.tar.gz: 28c303321d80381c13e3071442cfd9652469e8c15cd977224762ddb93342ec3f5bed8be6e9b014f771490f38f365b7d3b21d771ead7931b751b7eee1cebf962f
+  metadata.gz: 8ce66b221fce28fb3be395a199fdb4fc3c660a1702302c4b453bc40f39033cadc41fff9ea8a5f0e612f12a1040fbdad31e738823c6d9cf3ea2456a9ebf55b999
+  data.tar.gz: 73827642f8a0d5a87745eb9d853f9a9a9e0d62ea7ab9f31e552be71cba2c4ce7b340da992ab0eabd145a0fbb6395a30d953396fc1bf25f7410db5df9572eb6e1

data/.github/workflows/release-drafter.yml

@@ -0,0 +1,19 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        with:
+          # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+          # config-name: my-config.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2020-08-16
+=================
+  * Bump to 0.8.4.3.2
+  * Reduce scope of middleware exception handling (#476)
+
 2020-07-05
 =================
   * Bump to 0.8.4.3.1

data/lib/pdfkit/middleware.rb

@@ -19,43 +19,42 @@ class PDFKit
       set_request_to_render_as_pdf(env) if render_as_pdf?
       status, headers, response = @app.call(env)
 
-      if rendering_pdf? && headers['Content-Type'] =~ /text\/html|application\/xhtml\+xml/
-        body = response.respond_to?(:body) ? response.body : response.join
-        body = body.join if body.is_a?(Array)
-
-        root_url = root_url(env)
-        protocol = protocol(env)
-        options = @options.merge(root_url: root_url, protocol: protocol)
-
-        if headers['PDFKit-javascript-delay']
-          options.merge!(javascript_delay: headers.delete('PDFKit-javascript-delay').to_i)
-        end
-
-        body = PDFKit.new(body, options).to_pdf
-        response = [body]
-
-        if headers['PDFKit-save-pdf']
-          File.open(headers['PDFKit-save-pdf'], 'wb') { |file| file.write(body) } rescue nil
-          headers.delete('PDFKit-save-pdf')
+      begin
+        if rendering_pdf? && headers['Content-Type'] =~ /text\/html|application\/xhtml\+xml/
+          body = response.respond_to?(:body) ? response.body : response.join
+          body = body.join if body.is_a?(Array)
+
+          root_url = root_url(env)
+          protocol = protocol(env)
+          options = @options.merge(root_url: root_url, protocol: protocol)
+
+          if headers['PDFKit-javascript-delay']
+            options.merge!(javascript_delay: headers.delete('PDFKit-javascript-delay').to_i)
+          end
+
+          body = PDFKit.new(body, options).to_pdf
+          response = [body]
+
+          if headers['PDFKit-save-pdf']
+            File.open(headers['PDFKit-save-pdf'], 'wb') { |file| file.write(body) } rescue nil
+            headers.delete('PDFKit-save-pdf')
+          end
+
+          unless @caching
+            # Do not cache PDFs
+            headers.delete('ETag')
+            headers.delete('Cache-Control')
+          end
+
+          headers['Content-Length'] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
+          headers['Content-Type']   = 'application/pdf'
+          headers['Content-Disposition'] ||= @conditions[:disposition] || 'inline'
         end
-
-        unless @caching
-          # Do not cache PDFs
-          headers.delete('ETag')
-          headers.delete('Cache-Control')
-        end
-
-        headers['Content-Length'] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
-        headers['Content-Type']   = 'application/pdf'
-        headers['Content-Disposition'] ||= @conditions[:disposition] || 'inline'
+      rescue StandardError => e
+        status = 500
+        response = [e.message]
       end
 
-      [status, headers, response]
-
-    rescue StandardError => e
-      status = 500
-      response = [e.message]
-
       [status, headers, response]
     end
 

data/lib/pdfkit/version.rb

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

data/spec/middleware_spec.rb

@@ -395,12 +395,27 @@ describe PDFKit::Middleware do
       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")
+        let(:error) { StandardError.new("Something went wrong") }
+
+        context "errors raised by PDF generation" do
+          specify do
+            mock_app
+            allow(PDFKit).to receive(:new).and_raise(error)
+            get 'http://www.example.org/public/test.pdf'
+            expect(last_response.status).to eq(500)
+            expect(last_response.body).to eq(error.message)
+          end
+        end
+
+        context "errors raised upstream" do
+          specify do
+            mock_app
+            allow(@app).to receive(:call).and_raise(error)
+
+            expect {
+              get 'http://www.example.org/public/test.pdf'
+            }.to raise_error(error)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdfkit
 version: !ruby/object:Gem::Version
-  version: 0.8.4.3.1
+  version: 0.8.4.3.2
 platform: ruby
 authors:
 - Jared Pace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/release-drafter.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rspec"