pdfkit 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 709b9d124eeb6e972d0095d078ce39be54ef3335eb57b4042cc5499a423ac3ba
-  data.tar.gz: 7de22b6ec750dc0f4aebe1f0c58b871cba29253a455310b9cc00b5915627ccce
+  metadata.gz: 824738b3d4f198d080bb590e5db7489da39ffb40f5f8c24b97652793160ac0d9
+  data.tar.gz: 963701136ddf00dd42502b2d564135c675ae1ae313c6cd40d8dd92761a70b3af
 SHA512:
-  metadata.gz: c76d4d622db3fa8250aa396d5782e6b04d3569da187a740fd600b757956226514c01ccee0ab4e9ffc0d1e9ee828a50efb37d92109aa7a461b0ff0de2e2cdf0e6
-  data.tar.gz: a09547f979b4742c9e4d2ddf898fea4ead8c86906ed89c100cbd476c1f022db46ecb3e0d7c6fa614c3f4ea5173699678d5621230706ad0ea3527ef3968b5a989
+  metadata.gz: 6340e287849a0c43b8883cc1f2b78138fc5628fd2da4670c5f5d8a150632b56dbf27c9716bea49c1007cc2359148a4b3c1af1fed8c264ff89cf3d379976bfe30
+  data.tar.gz: b1b4f6d302ec4c407ebac2dfcc6bf3d72d7882520ba407bdb0d2b0316684ddcc09d3eecf0967305976292210a21304dc9b399fa39a9c4055ced27c5b7b8c1677

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

@@ -12,8 +12,8 @@ jobs:
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v5
-        with:
+        # 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 }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -0,0 +1,59 @@
+name: Test workflow
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        rails:
+          - '~> 4.1'
+          - '~> 5.2'
+          - '~> 6.0.0'
+          - '~> 6.1'
+          - '~> 7.0.0'
+        exclude:
+          - ruby: '2.5'
+            rails: '~> 7.0.0'
+          - ruby: '2.6'
+            rails: '~> 7.0.0'
+          - ruby: '2.7'
+            rails: '~> 4.1'
+          - ruby: '3.0'
+            rails: '~> 4.1'
+          - ruby: '3.0'
+            rails: '~> 5.2'
+          - ruby: '3.1'
+            rails: '~> 4.1'
+          - ruby: '3.1'
+            rails: '~> 5.2'
+          - ruby: '3.1'
+            rails: '~> 6.0.0'
+    runs-on: ${{ matrix.os }}
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        rubygems: latest
+        bundler: latest
+        bundler-cache: true
+
+    - name: Setup wkhtmltopdf
+      run: |
+        sudo apt-get install -y xfonts-base xfonts-75dpi
+        wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb
+        sudo dpkg -i wkhtmltox_0.12.6-1.bionic_amd64.deb
+
+    - name: Run tests
+      run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.6.4
+2.6.9

data/.travis.yml

@@ -3,12 +3,38 @@ language: ruby
 rvm:
 - 2.5
 - 2.6
+- 2.7
+- 3.0
+- 3.1
 
 env:
   matrix:
     - RAILS_VERSION="~> 4.1"
     - RAILS_VERSION="~> 5.2"
     - RAILS_VERSION="~> 6.0.0"
+    - RAILS_VERSION="~> 6.1"
+    - RAILS_VERSION="~> 7.0.0"
+
+jobs:
+  exclude:
+  - rvm: 2.5
+    env: RAILS_VERSION="~> 7.0.0"
+  - rvm: 2.6
+    env: RAILS_VERSION="~> 7.0.0"
+  - rvm: 2.7
+    env: RAILS_VERSION="~> 4.1"
+  - rvm: 3.0
+    env: RAILS_VERSION="~> 4.1"
+  - rvm: 3.0
+    env: RAILS_VERSION="~> 5.2"
+  - rvm: 3.1
+    env: RAILS_VERSION="~> 4.1"
+  - rvm: 3.1
+    env: RAILS_VERSION="~> 5.2"
+  - rvm: 3.1
+    env: RAILS_VERSION="~> 6.0.0"
+
+cache: bundler
 
 before_install:
   - gem update --system

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+2022-10-02
+=================
+  * Bump to 0.8.7
+  * Lowercase the header names for rack 3 changes (#511)
+  * Partially escaped URLs should be escaped (#509)
+
+2022-04-11
+=================
+  * Bump to 0.8.6
+  * Update ruby and rails versions
+
 2021-01-23
 =================
   * Bump to 0.8.5

data/README.md

@@ -4,8 +4,8 @@ Create PDFs using plain old HTML+CSS. Uses [wkhtmltopdf](http://github.com/antia
 
 ## Supported versions
 
-- Ruby 2.5, 2.6
-- Rails 4.2, 5.2, 6.0
+- Ruby 2.5, 2.6, 2.7, 3.0, 3.1
+- Rails 4.2, 5.2, 6.0, 6.1, 7.0
 
 ## Install
 
@@ -63,7 +63,7 @@ PDFKit.new(html, protocol: 'https').to_file
 ```
 
 ### Using cookies in scraping
-If you want to pass a cookie to cookie to pdfkit to scrape a website, you can
+If you want to pass a cookie to pdfkit to scrape a website, you can
 pass it in a hash:
 ```ruby
 kit = PDFKit.new(url, cookie: {cookie_name: :cookie_value})
@@ -172,7 +172,7 @@ Will cause the .pdf to be saved to `path/to/saved.pdf` in addition to being sent
    asset host.
 
 *  **Mangled output in the browser:** Be sure that your HTTP response
-   headers specify "Content-Type: application/pdf"
+   headers specify "content-type: application/pdf"
 
 ## Note on Patches/Pull Requests
 

data/lib/pdfkit/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PDFKit
   class Configuration
     attr_accessor :meta_tag_prefix, :root_url
@@ -26,7 +28,7 @@ class PDFKit
 
     def default_wkhtmltopdf
       return @default_command_path if @default_command_path
-      if defined?(Bundler::GemfileError) && File.exists?('Gemfile')
+      if defined?(Bundler::GemfileError) && File.exist?('Gemfile')
         @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?

data/lib/pdfkit/html_preprocessor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PDFKit
   module HTMLPreprocessor
 

data/lib/pdfkit/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PDFKit
   class Middleware
     def initialize(app, options = {}, conditions = {})
@@ -20,7 +22,7 @@ class PDFKit
       status, headers, response = @app.call(env)
 
       begin
-        if rendering_pdf? && headers['Content-Type'] =~ /text\/html|application\/xhtml\+xml/
+        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)
 
@@ -42,13 +44,13 @@ class PDFKit
 
           unless @caching
             # Do not cache PDFs
-            headers.delete('ETag')
-            headers.delete('Cache-Control')
+            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'
+          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
       rescue StandardError => e
         status = 500

data/lib/pdfkit/os.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 class PDFKit

data/lib/pdfkit/pdfkit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 require 'tempfile'
 
@@ -6,8 +8,8 @@ class PDFKit
 
   class NoExecutableError < Error
     def initialize
-      msg  = "No wkhtmltopdf executable found at #{PDFKit.configuration.wkhtmltopdf}\n"
-      msg << ">> Please install wkhtmltopdf - https://github.com/pdfkit/PDFKit/wiki/Installing-WKHTMLTOPDF"
+      msg = "No wkhtmltopdf executable found at #{PDFKit.configuration.wkhtmltopdf}\n" \
+            ">> Please install wkhtmltopdf - https://github.com/pdfkit/PDFKit/wiki/Installing-WKHTMLTOPDF"
       super(msg)
     end
   end
@@ -40,7 +42,7 @@ class PDFKit
     @renderer = WkHTMLtoPDF.new options
     @renderer.normalize_options
 
-    raise NoExecutableError unless File.exists?(PDFKit.configuration.wkhtmltopdf)
+    raise NoExecutableError unless File.exist?(PDFKit.configuration.wkhtmltopdf)
   end
 
   def command(path = nil)

data/lib/pdfkit/source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 require 'uri'
 
@@ -7,6 +9,8 @@ class PDFKit
 
     def initialize(url_file_or_html)
       @source = url_file_or_html
+      # @source is assumed to be modifiable, so make sure it is.
+      @source = @source.dup if @source.is_a?(String) && @source.frozen?
     end
 
     def url?
@@ -38,11 +42,11 @@ class PDFKit
     private
 
     def shell_safe_url
-      url_needs_escaping? ? URI::escape(@source) : @source
+      url_needs_escaping? ? URI::DEFAULT_PARSER.escape(@source) : @source
     end
 
     def url_needs_escaping?
-      URI::decode(@source) == @source
+      URI::DEFAULT_PARSER.escape(URI::DEFAULT_PARSER.unescape(@source)) != @source
     end
   end
 end

data/lib/pdfkit/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PDFKit
-  VERSION = '0.8.5'
+  VERSION = '0.8.7'
 end

data/lib/pdfkit/wkhtmltopdf.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class PDFKit
   class WkHTMLtoPDF
     attr_reader :options
     # Pulled from:
     # https://github.com/wkhtmltopdf/wkhtmltopdf/blob/ebf9b6cfc4c58a31349fb94c568b254fac37b3d3/README_WKHTMLTOIMAGE#L27
-    REPEATABLE_OPTIONS = %w[--allow --cookie --custom-header --post --post-file --run-script]
-    SPECIAL_OPTIONS = %w[cover toc]
+    REPEATABLE_OPTIONS = %w[--allow --cookie --custom-header --post --post-file --run-script].freeze
+    SPECIAL_OPTIONS = %w[cover toc].freeze
 
     def initialize(options)
       @options = options

data/lib/pdfkit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pdfkit/source'
 require 'pdfkit/pdfkit'
 require 'pdfkit/middleware'

data/pdfkit.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = ">= 2.5"
 
   s.requirements << "wkhtmltopdf"
 
@@ -26,7 +26,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>, ["~>12.3.3"])
-  s.add_development_dependency(%q<rdoc>, ["~> 4.0.1"])
+  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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PDFKit::Configuration do

data/spec/html_preprocessor_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PDFKit::HTMLPreprocessor do

data/spec/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 def app; Rack::Lint.new(@app); end
@@ -17,7 +19,7 @@ end
 
 describe PDFKit::Middleware do
   let(:headers) do
-    {'Content-Type' => "text/html"}
+    {'content-type' => "text/html"}
   end
 
   describe "#call" do
@@ -53,36 +55,36 @@ describe PDFKit::Middleware do
     describe "caching" do
       let(:headers) do
         {
-          'Content-Type' => "text/html",
-          'ETag' => 'foo',
-          'Cache-Control' => 'max-age=2592000, public'
+          'content-type' => "text/html",
+          'etag' => 'foo',
+          'cache-control' => 'max-age=2592000, public'
         }
       end
 
       context "by default" do
         before { mock_app }
 
-        it "deletes ETag" do
+        it "deletes etag" do
           get 'http://www.example.org/public/test.pdf'
-          expect(last_response.headers["ETag"]).to be_nil
+          expect(last_response.headers["etag"]).to be_nil
         end
-        it "deletes Cache-Control" do
+        it "deletes cache-control" do
           get 'http://www.example.org/public/test.pdf'
-          expect(last_response.headers["Cache-Control"]).to be_nil
+          expect(last_response.headers["cache-control"]).to be_nil
         end
       end
 
       context "when on" do
         before { mock_app({}, :caching => true) }
 
-        it "preserves ETag" do
+        it "preserves etag" do
           get 'http://www.example.org/public/test.pdf'
-          expect(last_response.headers["ETag"]).not_to be_nil
+          expect(last_response.headers["etag"]).not_to be_nil
         end
 
-        it "preserves Cache-Control" do
+        it "preserves cache-control" do
           get 'http://www.example.org/public/test.pdf'
-          expect(last_response.headers["Cache-Control"]).not_to be_nil
+          expect(last_response.headers["cache-control"]).not_to be_nil
         end
       end
     end
@@ -97,7 +99,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -105,7 +107,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -117,7 +119,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -125,7 +127,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -139,7 +141,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -147,7 +149,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -159,7 +161,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -167,7 +169,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -185,7 +187,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -193,7 +195,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -205,7 +207,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -213,7 +215,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -227,7 +229,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -235,7 +237,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -247,7 +249,7 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.headers["content-type"]).to eq("application/pdf")
                 expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
@@ -255,7 +257,7 @@ describe PDFKit::Middleware do
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.headers["content-type"]).to eq("text/html")
                 expect(last_response.body).to eq("Hello world!")
               end
             end
@@ -267,8 +269,8 @@ describe PDFKit::Middleware do
       describe "saving generated pdf to disk" do
         before do
           #make sure tests don't find an old test_save.pdf
-          File.delete('spec/test_save.pdf') if File.exists?('spec/test_save.pdf')
-          expect(File.exists?('spec/test_save.pdf')).to eq(false)
+          File.delete('spec/test_save.pdf') if File.exist?('spec/test_save.pdf')
+          expect(File.exist?('spec/test_save.pdf')).to eq(false)
         end
 
         context "when header PDFKit-save-pdf is present" do
@@ -276,7 +278,7 @@ describe PDFKit::Middleware do
             headers = { 'PDFKit-save-pdf' => 'spec/test_save.pdf' }
             mock_app({}, {only: '/public'}, headers)
             get 'http://www.example.org/public/test_save.pdf'
-            expect(File.exists?('spec/test_save.pdf')).to eq(true)
+            expect(File.exist?('spec/test_save.pdf')).to eq(true)
           end
 
           it "does not raise when target directory does not exist" do
@@ -292,7 +294,7 @@ describe PDFKit::Middleware do
           it "does not saved the .pdf to disk" do
             mock_app({}, {only: '/public'}, {} )
             get 'http://www.example.org/public/test_save.pdf'
-            expect(File.exists?('spec/test_save.pdf')).to eq(false)
+            expect(File.exist?('spec/test_save.pdf')).to eq(false)
           end
         end
       end
@@ -346,14 +348,14 @@ describe PDFKit::Middleware do
         describe "doesn't overwrite existing value" do
           let(:headers) do
             super().merge({
-              'Content-Disposition' => 'attachment; filename=report-20200101.pdf'
+              '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')
+            expect(last_response.headers["content-disposition"]).to eq('attachment; filename=report-20200101.pdf')
           end
         end
 
@@ -362,7 +364,7 @@ describe PDFKit::Middleware do
             specify do
               mock_app
               get 'http://www.example.org/public/test.pdf'
-              expect(last_response.headers["Content-Disposition"]).to eq("inline")
+              expect(last_response.headers["content-disposition"]).to eq("inline")
             end
           end
 
@@ -370,7 +372,7 @@ describe PDFKit::Middleware do
             specify do
               mock_app({}, { :disposition => 'inline'  })
               get 'http://www.example.org/public/test.pdf'
-              expect(last_response.headers["Content-Disposition"]).to eq("inline")
+              expect(last_response.headers["content-disposition"]).to eq("inline")
             end
           end
         end
@@ -380,7 +382,7 @@ describe PDFKit::Middleware do
             specify do
               mock_app({}, { :disposition => 'attachment'  })
               get 'http://www.example.org/public/test.pdf'
-              expect(last_response.headers["Content-Disposition"]).to eq("attachment")
+              expect(last_response.headers["content-disposition"]).to eq("attachment")
             end
           end
 
@@ -388,7 +390,7 @@ describe PDFKit::Middleware do
             specify do
               mock_app({}, { :disposition => 'attachment; filename=report.pdf'  })
               get 'http://www.example.org/public/test.pdf'
-              expect(last_response.headers["Content-Disposition"]).to eq("attachment; filename=report.pdf")
+              expect(last_response.headers["content-disposition"]).to eq("attachment; filename=report.pdf")
             end
           end
         end
@@ -444,7 +446,7 @@ describe PDFKit::Middleware do
           main_app = lambda { |env|
             @env = env
             @env['SCRIPT_NAME'] = '/example.org'
-            headers = {'Content-Type' => "text/html"}
+            headers = {'content-type' => "text/html"}
             [200, headers, @body || ['Hello world!']]
           }
 

data/spec/os_spec.rb

@@ -1,4 +1,6 @@
 #encoding: UTF-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rbconfig'
 

data/spec/pdfkit_spec.rb

@@ -1,4 +1,6 @@
 #encoding: UTF-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PDFKit do
@@ -27,7 +29,7 @@ describe PDFKit do
       file_path = File.join(SPEC_ROOT,'fixtures','example.html')
       pdfkit = PDFKit.new(Tempfile.new(file_path))
       expect(pdfkit.source).to be_file
-      expect(pdfkit.source.to_s).to match /^#{Dir.tmpdir}/
+      expect(pdfkit.source.to_s).to match(/^#{Dir.tmpdir}/)
     end
 
     # Options
@@ -239,12 +241,12 @@ describe PDFKit do
 
     it "read the source from stdin if it is html" do
       pdfkit = PDFKit.new('html')
-      expect(pdfkit.command).to match /- -$/
+      expect(pdfkit.command).to match(/- -$/)
     end
 
     it "specifies the URL to the source if it is a url" do
       pdfkit = PDFKit.new('http://google.com')
-      expect(pdfkit.command).to match /"http:\/\/google.com" -$/
+      expect(pdfkit.command).to match(/"http:\/\/google.com" -$/)
     end
 
     it "does not break Windows paths" do
@@ -256,19 +258,19 @@ describe PDFKit do
     it "specifies the path to the source if it is a file" do
       file_path = File.join(SPEC_ROOT,'fixtures','example.html')
       pdfkit = PDFKit.new(File.new(file_path))
-      expect(pdfkit.command).to match /#{file_path} -$/
+      expect(pdfkit.command).to match(/#{file_path} -$/)
     end
 
     it "specifies the path to the source if it is a tempfile" do
       file_path = File.join(SPEC_ROOT,'fixtures','example.html')
       pdfkit = PDFKit.new(Tempfile.new(file_path))
-      expect(pdfkit.command).to match /#{Dir.tmpdir}\S+ -$/
+      expect(pdfkit.command).to match(/#{Dir.tmpdir}\S+ -$/)
     end
 
     it "specifies the path for the ouput if a path is given" do
       file_path = "/path/to/output.pdf"
       pdfkit = PDFKit.new("html")
-      expect(pdfkit.command(file_path)).to match /#{file_path}$/
+      expect(pdfkit.command(file_path)).to match(/#{file_path}$/)
     end
 
     it "detects special pdfkit meta tags" do

data/spec/source_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PDFKit::Source do
@@ -78,6 +80,11 @@ describe PDFKit::Source do
       expect(source.to_input_for_command).to eq "\"https://www.google.com/search?q='cat%3Cdev/zero%3E/dev/null'\""
     end
 
+    it "URI escapes source URI only escape part of it" do
+      source = PDFKit::Source.new("https://www.google.com/search?q='%20 sleep 5'")
+      expect(source.to_input_for_command).to eq "\"https://www.google.com/search?q='%2520%20sleep%205'\""
+    end
+
     it "does not URI escape previously escaped source URLs" do
       source = PDFKit::Source.new("https://www.google.com/search?q='cat%3Cdev/zero%3E/dev/null'")
       expect(source.to_input_for_command).to eq "\"https://www.google.com/search?q='cat%3Cdev/zero%3E/dev/null'\""

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SPEC_ROOT = File.dirname(__FILE__)
 $LOAD_PATH.unshift(SPEC_ROOT)
 $LOAD_PATH.unshift(File.join(SPEC_ROOT, '..', 'lib'))
@@ -6,13 +8,15 @@ SimpleCov.start do
   add_filter 'spec/'
 end
 
+Warning[:deprecated] = true if defined?(Warning.[]=)
+
 require 'pdfkit'
 require 'rspec'
 require 'mocha'
 require 'rack'
 require 'rack/test'
 require 'active_support'
-require 'custom_wkhtmltopdf_path' if File.exists?(File.join(SPEC_ROOT, 'custom_wkhtmltopdf_path.rb'))
+require 'custom_wkhtmltopdf_path' if File.exist?(File.join(SPEC_ROOT, 'custom_wkhtmltopdf_path.rb'))
 
 RSpec.configure do |config|
   include Rack::Test::Methods

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pdfkit
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.7
 platform: ruby
 authors:
 - Jared Pace
 - Relevance
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,28 +57,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
@@ -105,6 +105,7 @@ files:
 - ".document"
 - ".github/workflows/release-drafter.yml"
 - ".github/workflows/stale.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -140,7 +141,7 @@ homepage: https://github.com/pdfkit/pdfkit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - wkhtmltopdf
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: HTML+CSS -> PDF
 test_files: