RubyGems - pdfkit - Versions diffs - 0.8.2 → 0.8.4.3.1 - Mend

pdfkit 0.8.2 → 0.8.4.3.1

Potentially problematic release.

This version of pdfkit might be problematic. Click here for more details.

Files changed (24) hide show

checksums.yaml +5 -5
data/.github/workflows/stale.yml +19 -0
data/.ruby-version +1 -1
data/.travis.yml +12 -8
data/CHANGELOG.md +30 -0
data/Gemfile +1 -1
data/README.md +31 -10
data/lib/pdfkit.rb +3 -0
data/lib/pdfkit/configuration.rb +36 -3
data/lib/pdfkit/html_preprocessor.rb +23 -0
data/lib/pdfkit/middleware.rb +36 -28
data/lib/pdfkit/os.rb +19 -0
data/lib/pdfkit/pdfkit.rb +40 -101
data/lib/pdfkit/source.rb +2 -1
data/lib/pdfkit/version.rb +1 -1
data/lib/pdfkit/wkhtmltopdf.rb +80 -0
data/pdfkit.gemspec +6 -6
data/spec/configuration_spec.rb +83 -12
data/spec/html_preprocessor_spec.rb +69 -0
data/spec/middleware_spec.rb +164 -71
data/spec/os_spec.rb +65 -0
data/spec/pdfkit_spec.rb +33 -2
data/spec/source_spec.rb +25 -0
metadata +39 -44

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de8b4012d74460425f75d1374c727da61833b7a7
-  data.tar.gz: e723e3a6a1820d56bba814abe11531e2b50a8cbe
+SHA256:
+  metadata.gz: 1abe171f52890a9f122ae67cfc5c743ac486414bf6ffe78a72d767fccb7b43a6
+  data.tar.gz: c979fcb4caa6d667be6b2f636e1acff3e4edaa59bf9e5ce45a709225fd4a3491
 SHA512:
-  metadata.gz: 1adb6a986fe7f6ac50399478a378228031da51a45584ecdc87e6dcdaa706c85242166f5748e50cf073fde18f4607f53fa6bc96bb64e2ddf2121c9f4b2a4743b9
-  data.tar.gz: 44b2ce9e91809c74af26484f610d0ae7fa0cc322b6d7f3cf3b613292cf1e075d2fa5cd6e5d354b2443a2003fca6586044ee4ad90baa932380b637aa508211da7
+  metadata.gz: 70ac2e72c5aab61b4cfffe9bd26da109dee62286f8486d3596522dff5c0eb9b9ae5c1886b53d2b979247b2b6f38d9e8de07344d4963b8f1109879fd077550d0a
+  data.tar.gz: 28c303321d80381c13e3071442cfd9652469e8c15cd977224762ddb93342ec3f5bed8be6e9b014f771490f38f365b7d3b21d771ead7931b751b7eee1cebf962f

data/.github/workflows/stale.yml ADDED

@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+on:
+  schedule:
+  - cron: "0 0 * * *"
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue has been marked as stale and will be automatically closed.'
+        stale-pr-message: 'This pull request has been marked as stale and will be automatically closed.'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

data/.ruby-version CHANGED

	@@ -1 +1 @@
1	- ~~ruby-~~2.0.0
1	+ 2.6.4

data/.travis.yml CHANGED

@@ -1,12 +1,16 @@
+language: ruby
 rvm:
-- 1.9.2
-- 1.9.3
-- 2.0
-- 2.1
+- 2.3
+- 2.4
+- 2.5
+- 2.6
+before_install:
+  - gem update --system
+  - gem update bundler
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
   - "sudo apt-get -qq -y install fontconfig libxrender1"
-  - "wget http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1_linux-precise-amd64.deb"
-  - "sudo dpkg -i wkhtmltox-0.12.1_linux-precise-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 CHANGED

@@ -1,3 +1,33 @@
+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
+  * Improve path detection feedback (#460)
+  * Fix typos (#444)
+  * Update readme (#439)
+2019-02-22
+=================
+  * Bump to 0.8.4.1
+  * Make PDFkit threadsafe (#377)
+  * Update activesupport (#434)
+2019-02-21
+=================
+  * Bump to 0.8.4
+  * Removed support for Ruby < 2.2
+  * Xvfb support (#277)
+  * Remove 'config.protocol' from the README (#389)
 2015-08-26
 =================
   * Bump to 0.8.2

data/Gemfile CHANGED

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 group :test do
-  gem 'activesupport', '~> 3.0'
+  gem 'activesupport', '~> 4.1'
   gem 'simplecov', require: false
 end

data/README.md CHANGED

@@ -14,7 +14,7 @@ gem install pdfkit
     <https://github.com/pdfkit/pdfkit/wiki/Installing-WKHTMLTOPDF>
-2.  Try using the `wkhtmltopdf-binary` gem (mac + linux i386)
+2.  Try using the `wkhtmltopdf-binary-edge` gem (mac + linux i386)
 ```
 gem install wkhtmltopdf-binary
 ```
@@ -34,7 +34,7 @@ pdf = kit.to_pdf
 file = kit.to_file('/path/to/save/pdf')
 # PDFKit.new can optionally accept a URL or a File.
-# Stylesheets can not be added when source is provided as a URL of File.
+# Stylesheets can not be added when source is provided as a URL or File.
 kit = PDFKit.new('http://google.com')
 kit = PDFKit.new(File.new('/path/to/html'))
@@ -43,8 +43,22 @@ PDFKit.new('
 PDFKit.new('<html><head><meta name="pdfkit-cookie cookie_name1" content="cookie_value1"')
 PDFKit.new('<html><head><meta name="pdfkit-cookie cookie_name2" content="cookie_value2"')
 ```
+### Resolving relative URLs and protocols
+If the source HTML has relative URLs (`/images/cat.png`) or
+[protocols](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#prurl)
+(`//example.com/site.css`) that need to be resolved, you can pass `:root_url`
+and `:protocol` options to PDFKit:
+```ruby
+PDFKit.new(html, root_url: 'http://mysite.com/').to_file
+# or:
+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 cookie to pdfkit to scrape a website, you can
 pass it in a hash:
 ```ruby
 kit = PDFKit.new(url, cookie: {cookie_name: :cookie_value})
@@ -102,6 +116,13 @@ config.middleware.use PDFKit::Middleware, {}, :except => [%r[^/prawn], %r[^/secr
 # conditions can be strings (either one or an array)
 config.middleware.use PDFKit::Middleware, {}, :except => ['/secret']
 ```
+**With conditions to force download**
+```ruby
+# force download with attachment disposition
+config.middleware.use PDFKit::Middleware, {}, :disposition => 'attachment'
+# conditions can force a filename
+config.middleware.use PDFKit::Middleware, {}, :disposition => 'attachment; filename=report.pdf'
+```
 **Saving the generated .pdf to disk**
 Setting the `PDFKit-save-pdf` header will cause PDFKit to write the generated .pdf to the file indicated by the value of the header.
@@ -111,7 +132,7 @@ For example:
 headers['PDFKit-save-pdf'] = 'path/to/saved.pdf'
 ```
-Will cause the .pdf to be saved to `path/to/saved.pdf` in addition to being sent back to the client.  If the path is not writable/non-existant the write will fail silently.  The `PDFKit-save-pdf` header is never sent back to the client.
+Will cause the .pdf to be saved to `path/to/saved.pdf` in addition to being sent back to the client.  If the path is not writable/non-existent the write will fail silently.  The `PDFKit-save-pdf` header is never sent back to the client.
 ## Troubleshooting
@@ -126,13 +147,13 @@ Will cause the .pdf to be saved to `path/to/saved.pdf` in addition to being sent
    around this issue you may want to run a server with multiple workers
    like Passenger or try to embed your resources within your HTML to
    avoid extra HTTP requests.
-   Example solution (rails / bundler), add unicorn to the development
-   group in your Gemfile `gem 'unicorn'` then run `bundle`. Next, add a
+   Example solution (rails / bundler), add unicorn to the development
+   group in your Gemfile `gem 'unicorn'` then run `bundle`. Next, add a
    file `config/unicorn.conf` with
         worker_processes 3
    Then to run the app `unicorn_rails -c config/unicorn.conf` (from rails_root)
 *  **Resources aren't included in the PDF:** Images, CSS, or JavaScript
@@ -146,7 +167,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.rb CHANGED

@@ -1,4 +1,7 @@
 require 'pdfkit/source'
 require 'pdfkit/pdfkit'
 require 'pdfkit/middleware'
+require 'pdfkit/html_preprocessor'
+require 'pdfkit/os'
 require 'pdfkit/configuration'
+require 'pdfkit/wkhtmltopdf'

data/lib/pdfkit/configuration.rb CHANGED

@@ -1,10 +1,12 @@
 class PDFKit
   class Configuration
-    attr_accessor :meta_tag_prefix, :default_options, :root_url
-    attr_writer :wkhtmltopdf, :verbose
+    attr_accessor :meta_tag_prefix, :root_url
+    attr_writer :use_xvfb, :verbose
+    attr_reader :default_options
     def initialize
       @verbose         = false
+      @use_xvfb        = false
       @meta_tag_prefix = 'pdfkit-'
       @default_options = {
         :disable_smart_shrinking => false,
@@ -19,7 +21,33 @@ class PDFKit
     end
     def wkhtmltopdf
-      @wkhtmltopdf ||= (defined?(Bundler::GemfileError) && File.exists?('Gemfile') ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
+      @wkhtmltopdf ||= default_wkhtmltopdf
+    end
+    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.lines.last
+      end
+      @default_command_path = `which wkhtmltopdf`.chomp if @default_command_path.nil? || @default_command_path.empty?
+      @default_command_path
+    end
+    def wkhtmltopdf=(path)
+      if File.exist?(path)
+        @wkhtmltopdf = path
+      else
+        warn "No executable found at #{path}. Will fall back to #{default_wkhtmltopdf}"
+        @wkhtmltopdf = default_wkhtmltopdf
+      end
+    end
+    def executable
+      using_xvfb? ? "xvfb-run #{wkhtmltopdf}" : wkhtmltopdf
+    end
+    def using_xvfb?
+      @use_xvfb
     end
     def quiet?
@@ -29,6 +57,10 @@ class PDFKit
     def verbose?
       @verbose
     end
+    def default_options=(options)
+      @default_options.merge!(options)
+    end
   end
   class << self
@@ -41,6 +73,7 @@ class PDFKit
   # @example
   #   PDFKit.configure do |config|
   #     config.wkhtmltopdf = '/usr/bin/wkhtmltopdf'
+  #     config.use_xvfb    = true
   #     config.verbose     = true
   #   end

data/lib/pdfkit/html_preprocessor.rb ADDED

@@ -0,0 +1,23 @@
+class PDFKit
+  module HTMLPreprocessor
+    # Change relative paths to absolute, and relative protocols to absolute protocols
+    def self.process(html, root_url, protocol)
+      html = translate_relative_paths(html, root_url) if root_url
+      html = translate_relative_protocols(html, protocol) if protocol
+      html
+    end
+    private
+    def self.translate_relative_paths(html, root_url)
+      # Try out this regexp using rubular http://rubular.com/r/hiAxBNX7KE
+      html.gsub(/(href|src)=(['"])\/([^\/"']([^\"']*|[^"']*))?['"]/, "\\1=\\2#{root_url}\\3\\2")
+    end
+    def self.translate_relative_protocols(body, protocol)
+      # Try out this regexp using rubular http://rubular.com/r/0Ohk0wFYxV
+      body.gsub(/(href|src)=(['"])\/\/([^\"']*|[^"']*)['"]/, "\\1=\\2#{protocol}://\\3\\2")
+    end
+  end
+end

data/lib/pdfkit/middleware.rb CHANGED

@@ -9,6 +9,10 @@ class PDFKit
     end
     def call(env)
+      dup._call(env)
+    end
+    def _call(env)
       @request    = Rack::Request.new(env)
       @render_pdf = false
@@ -18,7 +22,16 @@ class PDFKit
       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)
-        body = PDFKit.new(translate_paths(body, env), @options).to_pdf
+        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']
@@ -32,31 +45,28 @@ class PDFKit
           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-Length'] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
+        headers['Content-Type']   = 'application/pdf'
+        headers['Content-Disposition'] ||= @conditions[:disposition] || 'inline'
       end
       [status, headers, response]
-    end
-    private
+    rescue StandardError => e
+      status = 500
+      response = [e.message]
-    # Change relative paths to absolute, and relative protocols to absolute protocols
-    def translate_paths(body, env)
-      body = translate_relative_paths(body, env)
-      translate_relative_protocols(body, env)
+      [status, headers, response]
     end
-    def translate_relative_paths(body, env)
-      root = PDFKit.configuration.root_url || "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}/"
-      # Try out this regexp using rubular http://rubular.com/r/hiAxBNX7KE
-      body.gsub(/(href|src)=(['"])\/([^\/"']([^\"']*|[^"']*))?['"]/, "\\1=\\2#{root}\\3\\2")
+    private
+    def root_url(env)
+      PDFKit.configuration.root_url || "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}/"
     end
-    def translate_relative_protocols(body, env)
-      protocol = "#{env['rack.url_scheme']}://"
-      # Try out this regexp using rubular http://rubular.com/r/0Ohk0wFYxV
-      body.gsub(/(href|src)=(['"])\/\/([^\"']*|[^"']*)['"]/, "\\1=\\2#{protocol}\\3\\2")
+    def protocol(env)
+      env['rack.url_scheme']
     end
     def rendering_pdf?
@@ -65,20 +75,18 @@ class PDFKit
     def render_as_pdf?
       request_path = @request.path
-      request_path_is_pdf = request_path.match(%r{\.pdf$})
+      return false unless request_path.end_with?('.pdf')
-      if request_path_is_pdf && @conditions[:only]
+      if @conditions[:only]
         conditions_as_regexp(@conditions[:only]).any? do |pattern|
-          request_path =~ pattern
+          pattern === request_path
         end
-      elsif request_path_is_pdf && @conditions[:except]
-        conditions_as_regexp(@conditions[:except]).each do |pattern|
-          return false if request_path =~ pattern
+      elsif @conditions[:except]
+        conditions_as_regexp(@conditions[:except]).none? do |pattern|
+          pattern === request_path
         end
-        return true
       else
-        request_path_is_pdf
+        true
       end
     end
@@ -99,8 +107,8 @@ class PDFKit
     end
     def conditions_as_regexp(conditions)
-      [conditions].flatten.map do |pattern|
-        pattern.is_a?(Regexp) ? pattern : Regexp.new('^' + pattern)
+      Array(conditions).map do |pattern|
+        pattern.is_a?(Regexp) ? pattern : Regexp.new("^#{pattern}")
       end
     end
   end

data/lib/pdfkit/os.rb ADDED

@@ -0,0 +1,19 @@
+require 'rbconfig'
+class PDFKit
+  module OS
+    def self.host_is_windows?
+      !(RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince/).nil?
+    end
+    def self.shell_escape_for_os(args)
+      if (host_is_windows?)
+        # Windows reserved shell characters are: & | ( ) < > ^
+        # See http://technet.microsoft.com/en-us/library/cc723564.aspx#XSLTsection123121120120
+        args.map { |arg| arg.gsub(/([&|()<>^])/,'^\1') }.join(" ")
+      else
+        args.shelljoin
+      end
+    end
+  end
+end

data/lib/pdfkit/pdfkit.rb CHANGED

@@ -1,8 +1,10 @@
 require 'shellwords'
-require 'rbconfig'
+require 'tempfile'
 class PDFKit
-  class NoExecutableError < StandardError
+  class Error < StandardError; end
+  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"
@@ -10,31 +12,40 @@ class PDFKit
     end
   end
-  class ImproperSourceError < StandardError
+  class ImproperSourceError < Error
     def initialize(msg)
       super("Improper Source: #{msg}")
     end
   end
+  class ImproperWkhtmltopdfExitStatus < Error
+    def initialize(invoke)
+      super("Command failed (exitstatus=#{$?.exitstatus}): #{invoke}")
+    end
+  end
   attr_accessor :source, :stylesheets
-  attr_reader :options
+  attr_reader :renderer
   def initialize(url_file_or_html, options = {})
     @source = Source.new(url_file_or_html)
     @stylesheets = []
-    @options = PDFKit.configuration.default_options.merge(options)
-    @options.delete(:quiet) if PDFKit.configuration.verbose?
-    @options.merge! find_options_in_meta(url_file_or_html) unless source.url?
-    @options = normalize_options(@options)
+    options = PDFKit.configuration.default_options.merge(options)
+    options.delete(:quiet) if PDFKit.configuration.verbose?
+    options.merge! find_options_in_meta(url_file_or_html) unless source.url?
+    @root_url = options.delete(:root_url)
+    @protocol = options.delete(:protocol)
+    @renderer = WkHTMLtoPDF.new options
+    @renderer.normalize_options
-    raise NoExecutableError.new unless File.exists?(PDFKit.configuration.wkhtmltopdf)
+    raise NoExecutableError unless File.exists?(PDFKit.configuration.wkhtmltopdf)
   end
   def command(path = nil)
-    args = @options.to_a.flatten.compact
-    shell_escaped_command = [executable, shell_escape_for_os(args)].join ' '
+    args = @renderer.options_for_command
+    shell_escaped_command = [executable, OS::shell_escape_for_os(args)].join ' '
     # In order to allow for URL parameters (e.g. https://www.google.com/search?q=pdfkit) we do
     # not escape the source. The user is responsible for ensuring that no vulnerabilities exist
@@ -45,17 +56,17 @@ class PDFKit
     "#{shell_escaped_command} #{input_for_command} #{output_for_command}"
   end
+  def options
+    # TODO(cdwort,sigmavirus24): Replace this with an attr_reader for @renderer instead in 1.0.0
+    @renderer.options
+  end
   def executable
-    default = PDFKit.configuration.wkhtmltopdf
-    return default if default !~ /^\// # its not a path, so nothing we can do
-    if File.exist?(default)
-      default
-    else
-      default.split('/').last
-    end
+    PDFKit.configuration.executable
   end
   def to_pdf(path=nil)
+    preprocess_html
     append_stylesheets
     invoke = command(path)
@@ -68,7 +79,7 @@ class PDFKit
     # $? is thread safe per
     # http://stackoverflow.com/questions/2164887/thread-safe-external-process-in-ruby-plus-checking-exitstatus
-    raise "command failed (exitstatus=#{$?.exitstatus}): #{invoke}" if empty_result?(path, result) or !successful?($?)
+    raise ImproperWkhtmltopdfExitStatus, invoke if empty_result?(path, result) || !successful?($?)
     return result
   end
@@ -79,14 +90,9 @@ class PDFKit
   protected
-  # 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]
   def find_options_in_meta(content)
     # Read file if content is a File
-    content = content.read if content.is_a?(File)
+    content = content.read if content.is_a?(File) || content.is_a?(Tempfile)
     found = {}
     content.scan(/<meta [^>]*>/) do |meta|
@@ -111,8 +117,15 @@ class PDFKit
     "<style>#{File.read(stylesheet)}</style>"
   end
+  def preprocess_html
+    if @source.html?
+      processed_html = PDFKit::HTMLPreprocessor.process(@source.to_s, @root_url, @protocol)
+      @source = Source.new(processed_html)
+    end
+  end
   def append_stylesheets
-    raise ImproperSourceError.new('Stylesheets may only be added to an HTML source') if stylesheets.any? && !@source.html?
+    raise ImproperSourceError, 'Stylesheets may only be added to an HTML source' if stylesheets.any? && !@source.html?
     stylesheets.each do |stylesheet|
       if @source.to_s.match(/<\/head>/)
@@ -123,65 +136,12 @@ class PDFKit
     end
   end
-  def normalize_options(options)
-    normalized_options = {}
-    options.each do |key, value|
-      next if !value
-      # The actual option for wkhtmltopdf
-      normalized_key = normalize_arg key
-      normalized_key = "--#{normalized_key}" unless SPECIAL_OPTIONS.include?(normalized_key)
-      # If the option is repeatable, attempt to normalize all values
-      if REPEATABLE_OPTIONS.include? normalized_key
-        normalize_repeatable_value(normalized_key, value) do |normalized_unique_key, normalized_value|
-          normalized_options[normalized_unique_key] = normalized_value
-        end
-      else # Otherwise, just normalize it like usual
-        normalized_options[normalized_key] = normalize_value(value)
-      end
-    end
-    normalized_options
-  end
-  def normalize_arg(arg)
-    arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
-  end
-  def normalize_value(value)
-    case value
-    when nil
-      nil
-    when TrueClass, 'true' #ie, ==true, see http://www.ruby-doc.org/core-1.9.3/TrueClass.html
-      nil
-    when Hash
-      value.to_a.flatten.collect{|x| normalize_value(x)}.compact
-    when Array
-      value.flatten.collect{|x| x.to_s}
-    else
-      (host_is_windows? && value.to_s.index(' ')) ? "'#{ value.to_s }'" : value.to_s
-    end
-  end
-  def normalize_repeatable_value(option_name, value)
-    case value
-    when Hash, Array
-      value.each do |(key, val)|
-        yield [[option_name, normalize_value(key)], normalize_value(val)]
-      end
-    else
-      yield [[option_name, normalize_value(value)], nil]
-    end
-  end
   def successful?(status)
     return true if status.success?
     # Some of the codes: https://code.google.com/p/wkhtmltopdf/issues/detail?id=1088
     # returned when assets are missing (404): https://code.google.com/p/wkhtmltopdf/issues/detail?id=548
-    return true if status.exitstatus == 2 && error_handling?
+    return true if status.exitstatus == 2 && @renderer.error_handling?
     false
   end
@@ -189,25 +149,4 @@ class PDFKit
   def empty_result?(path, result)
     (path && File.size(path) == 0) || (path.nil? && result.to_s.strip.empty?)
   end
-  def error_handling?
-    @options.key?('--ignore-load-errors') ||
-      # wkhtmltopdf v0.10.0 beta4 replaces ignore-load-errors with load-error-handling
-      # https://code.google.com/p/wkhtmltopdf/issues/detail?id=55
-      %w(skip ignore).include?(@options['--load-error-handling'])
-  end
-  def host_is_windows?
-    @host_is_windows ||= !(RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince/).nil?
-  end
-  def shell_escape_for_os(args)
-    if (host_is_windows?)
-      # Windows reserved shell characters are: & | ( ) < > ^
-      # See http://technet.microsoft.com/en-us/library/cc723564.aspx#XSLTsection123121120120
-      args.map { |arg| arg.gsub(/([&|()<>^])/,'^\1') }.join(" ")
-    else
-      args.shelljoin
-    end
-  end
 end