wicked_pdf 1.1.0 → 2.1.0

data/README.md

@@ -1,10 +1,10 @@
-# Wicked PDF [![Build Status](https://secure.travis-ci.org/mileszs/wicked_pdf.png)](http://travis-ci.org/mileszs/wicked_pdf) [![Gem Version](https://badge.fury.io/rb/wicked_pdf.svg)](http://badge.fury.io/rb/wicked_pdf)
+# Wicked PDF [![Gem Version](https://badge.fury.io/rb/wicked_pdf.svg)](http://badge.fury.io/rb/wicked_pdf) [![Build Status](https://secure.travis-ci.org/mileszs/wicked_pdf.svg)](http://travis-ci.org/mileszs/wicked_pdf) [![Code Climate](https://codeclimate.com/github/mileszs/wicked_pdf/badges/gpa.svg)](https://codeclimate.com/github/mileszs/wicked_pdf) [![Open Source Helpers](https://www.codetriage.com/mileszs/wicked_pdf/badges/users.svg)](https://www.codetriage.com/mileszs/wicked_pdf)
 
 ## A PDF generation plugin for Ruby on Rails
 
 Wicked PDF uses the shell utility [wkhtmltopdf](http://wkhtmltopdf.org) to serve a PDF file to a user from HTML.  In other words, rather than dealing with a PDF generation DSL of some sort, you simply write an HTML view as you would normally, then let Wicked PDF take care of the hard stuff.
 
-_Wicked PDF has been verified to work on Ruby versions 1.8.7 through 2.3; Rails 2 through 5.0_
+_Wicked PDF has been verified to work on Ruby versions 2.2 through 2.6; Rails 4 through 6.1_
 
 ### Installation
 
@@ -26,8 +26,8 @@ to `config/initializers/mime_types.rb` in older versions of Rails.
 
 Because `wicked_pdf` is a wrapper for  [wkhtmltopdf](http://wkhtmltopdf.org/), you'll need to install that, too.
 
-The simplest way to install all of the binaries (Linux, OSX, Windows) is through the gem [wkhtmltopdf-binary](https://github.com/steerio/wkhtmltopdf-binary).
-To install that, add a second gem
+The simplest way to install all of the binaries on most Linux or OSX systems is through the gem [wkhtmltopdf-binary](https://github.com/zakird/wkhtmltopdf_binary_gem). Builds for other systems are available [here](https://wkhtmltopdf.org/downloads.html)
+To install that gem, add this:
 
 ```ruby
 gem 'wkhtmltopdf-binary'
@@ -35,7 +35,9 @@ gem 'wkhtmltopdf-binary'
 
 To your Gemfile and run `bundle install`.
 
-This wrapper may trail in versions, at the moment it wraps the 0.9 version of `wkhtmltopdf` while there is 0.12 version available. Some of the advanced options listed below are not available with 0.9.
+This gem currently installs version 0.12.x of `wkhtmltopdf`. Some of the options listed below are specific 0.9 or below, and others are for 0.12 and up.
+
+You can see what flags are supported for the current version in [wkhtmltopdf's auto-generated manual](https://wkhtmltopdf.org/usage/wkhtmltopdf.txt)
 
 If your wkhtmltopdf executable is not on your webserver's path, you can configure it in an initializer:
 
@@ -83,7 +85,6 @@ The wkhtmltopdf binary is run outside of your Rails application; therefore, your
   </body>
 </html>
 ```
-
 Using wicked_pdf_helpers with asset pipeline raises `Asset names passed to helpers should not include the "/assets/" prefix.` error. To work around this, you can use `wicked_pdf_asset_base64` with the normal Rails helpers, but be aware that this will base64 encode your content and inline it in the page. This is very quick for small assets, but large ones can take a long time.
 
 ```html
@@ -106,6 +107,21 @@ Using wicked_pdf_helpers with asset pipeline raises `Asset names passed to helpe
 </html>
 ```
 
+#### Webpacker usage
+
+wicked_pdf supports webpack assets.
+
+Use `wicked_pdf_stylesheet_pack_tag` for stylesheets
+Use `wicked_pdf_javascript_pack_tag` for javascripts
+
+Use `wicked_pdf_asset_pack_path` to access an asset directly, for example: `image_tag wicked_pdf_asset_pack_path("media/images/foobar.png")`
+
+#### Asset pipeline usage
+
+It is best to precompile assets used in PDF views. This will help avoid issues when it comes to deploying, as Rails serves asset files differently between development and production (`config.assets.compile = false`), which can make it look like your PDFs work in development, but fail to load assets in production.
+
+    config.assets.precompile += ['blueprint/screen.css', 'pdf.css', 'jquery.ui.datepicker.js', 'pdf.js', ...etc...]
+
 #### CDN reference
 
 In this case, you can use that standard Rails helpers and point to the current CDN for whichever framework you are using. For jQuery, it would look somethng like this, given the current versions at the time of this writing.
@@ -116,13 +132,11 @@ In this case, you can use that standard Rails helpers and point to the current C
         <%= javascript_include_tag "http://code.jquery.com/jquery-1.10.0.min.js" %>
         <%= javascript_include_tag "http://code.jquery.com/ui/1.10.3/jquery-ui.min.js" %>
 ```
-#### Asset pipeline usage
 
-The way to handle this for the asset pipeline on Heroku is to include these files in your asset precompile list, as follows:
+### Advanced Usage with all available options
 
-    config.assets.precompile += ['blueprint/screen.css', 'pdf.css', 'jquery.ui.datepicker.js', 'pdf.js', ...etc...]
+_NOTE: Certain options are only supported in specific versions of wkhtmltopdf._
 
-### Advanced Usage with all available options
 ```ruby
 class ThingsController < ApplicationController
   def show
@@ -132,8 +146,10 @@ class ThingsController < ApplicationController
         render pdf:                            'file_name',
                disposition:                    'attachment',                 # default 'inline'
                template:                       'things/show',
-               file:                           "#{Rails.root}/files/foo.erb"
-               layout:                         'pdf',                        # for a pdf.html.erb file
+               locals:                         {foo: @bar},
+               file:                           "#{Rails.root}/files/foo.erb",
+               inline:                         '<!doctype html><html><head></head><body>INLINE HTML</body></html>',
+               layout:                         'pdf',                        # for a pdf.pdf.erb file
                wkhtmltopdf:                    '/usr/local/bin/wkhtmltopdf', # path to binary
                show_as_html:                   params.key?('debug'),         # allow debugging based on url param
                orientation:                    'Landscape',                  # default Portrait
@@ -142,6 +158,7 @@ class ThingsController < ApplicationController
                page_width:                     NUMBER,
                save_to_file:                   Rails.root.join('pdfs', "#{filename}.pdf"),
                save_only:                      false,                        # depends on :save_to_file being set first
+               default_protocol:               'http',
                proxy:                          'TEXT',
                basic_auth:                     false                         # when true username & password are automatically sent from session
                username:                       'TEXT',
@@ -169,12 +186,21 @@ class ThingsController < ApplicationController
                disable_internal_links:         true,
                disable_external_links:         true,
                print_media_type:               true,
+
+               # define as true the key 'disable_local_file_access' or 'enable_local_file_access', not both
+               disable_local_file_access:      true,
+               enable_local_file_access:       false,
+
                disable_smart_shrinking:        true,
                use_xserver:                    true,
-               background:                     false,                     # backround needs to be true to enable background colors to render
+               background:                     false,                     # background needs to be true to enable background colors to render
                no_background:                  true,
+               no_stop_slow_scripts:           false,
                viewport_size:                  'TEXT',                    # available only with use_xserver or patched QT
                extra:                          '',                        # directly inserted into the command to wkhtmltopdf
+               raise_on_all_errors:            nil,                       # raise error for any stderr output.  Such as missing media, image assets
+               log_level:                      'info',                    # Available values: none, error, warn, or info - only available with wkhtmltopdf 0.12.5+
+               quiet:                          false,                     # `false` is same as `log_level: 'info'`, `true` is same as `log_level: 'none'`
                outline: {   outline:           true,
                             outline_depth:     LEVEL },
                margin:  {   top:               SIZE,                     # default 10 (mm)
@@ -230,7 +256,8 @@ class ThingsController < ApplicationController
                             disable_links:     true,
                             disable_toc_links: true,
                             disable_back_links:true,
-                            xsl_style_sheet:   'file.xsl'} # optional XSLT stylesheet to use for styling table of contents
+                            xsl_style_sheet:   'file.xsl'}, # optional XSLT stylesheet to use for styling table of contents
+               progress: proc { |output| puts output } # proc called when console output changes
       end
     end
   end
@@ -267,9 +294,20 @@ pdf = WickedPdf.new.pdf_from_url('https://github.com/mileszs/wicked_pdf')
 
 # create a pdf from string using templates, layouts and content option for header or footer
 pdf = WickedPdf.new.pdf_from_string(
-  render_to_string('templates/pdf', layout: 'pdfs/layout_pdf'),
+  render_to_string('templates/pdf', layout: 'pdfs/layout_pdf.html'),
   footer: {
-    content: render_to_string(layout: 'pdfs/layout_pdf')
+    content: render_to_string(
+  		'templates/footer',
+  		layout: 'pdfs/layout_pdf.html'
+  	)
+  }
+)
+
+# It is possible to use footer/header templates without a layout, in that case you need to provide a valid HTML document
+pdf = WickedPdf.new.pdf_from_string(
+  render_to_string('templates/full_pdf_template'),
+  header: {
+    content: render_to_string('templates/full_header_template')
   }
 )
 
@@ -281,12 +319,33 @@ save_path = Rails.root.join('pdfs','filename.pdf')
 File.open(save_path, 'wb') do |file|
   file << pdf
 end
+
+# you can also track progress on your PDF generation, such as when using it from within a Resque job
+class PdfJob
+  def perform
+    blk = proc { |output|
+      match = output.match(/\[.+\] Page (?<current_page>\d+) of (?<total_pages>\d+)/)
+      if match
+        current_page = match[:current_page].to_i
+        total_pages = match[:total_pages].to_i
+        message = "Generated #{current_page} of #{total_pages} pages"
+        at current_page, total_pages, message
+      end
+    }
+    WickedPdf.new.pdf_from_string(html, progress: blk)
+  end
+end
 ```
 If you need to display utf encoded characters, add this to your pdf views or layouts:
 ```html
 <meta charset="utf-8" />
 ```
-
+If you need to return a PDF in a controller with Rails in API mode:
+```ruby
+pdf_html = ActionController::Base.new.render_to_string(template: 'controller_name/action_name', layout: 'pdf')
+pdf = WickedPdf.new.pdf_from_string(pdf_html)
+send_data pdf, filename: 'file.pdf'
+```
 ### Page Breaks
 
 You can control page breaks with CSS.
@@ -340,7 +399,7 @@ If you would like to have WickedPdf automatically generate PDF views for all (or
 require 'wicked_pdf'
 config.middleware.use WickedPdf::Middleware
 ```
-If you want to turn on or off the middleware for certain urls, use the `:only` or `:except` conditions like so:
+If you want to turn on or off the middleware for certain URLs, use the `:only` or `:except` conditions like so:
 ```ruby
 # conditions can be plain strings or regular expressions, and you can supply only one or an array
 config.middleware.use WickedPdf::Middleware, {}, only: '/invoice'
@@ -348,6 +407,19 @@ config.middleware.use WickedPdf::Middleware, {}, except: [ %r[^/admin], '/secret
 ```
 If you use the standard `render pdf: 'some_pdf'` in your app, you will want to exclude those actions from the middleware.
 
+
+### Include in an email as an attachment
+
+To include a rendered pdf file in an email you can do the following:
+
+```ruby
+attachments['attachment.pdf'] = WickedPdf.new.pdf_from_string(
+  render_to_string('link_to_view.pdf.erb', layout: 'pdf')
+)
+```
+
+This will render the pdf to a string and include it in the email. This is very slow so make sure you schedule your email delivery in a job.
+
 ### Further Reading
 
 Mike Ackerman's post [How To Create PDFs in Rails](https://www.viget.com/articles/how-to-create-pdfs-in-rails)
@@ -375,7 +447,9 @@ However, the wicked_pdf_* helpers will use file:/// paths for assets when using
 
 #### Gotchas
 
-If one image from your HTML cannot be found (relative or wrong path for ie), others images with right paths **may not** be displayed in the output PDF as well (it seems to be an issue with wkhtmltopdf).
+If one image from your HTML cannot be found (relative or wrong path for example), others images with right paths **may not** be displayed in the output PDF as well (it seems to be an issue with wkhtmltopdf).
+
+wkhtmltopdf may render at different resolutions on different platforms. For example, Linux prints at 75 dpi (native for WebKit) while on Windows it's at the desktop's DPI (which is normally 96 dpi). [Use `:zoom => 0.78125`](https://github.com/wkhtmltopdf/wkhtmltopdf/issues/2184) (75/96) to match Linux rendering to Windows.
 
 ### Inspiration
 

data/Rakefile

@@ -34,18 +34,28 @@ desc 'Generate dummy application for test cases'
 task :dummy_generate do
   Rake::Task[:dummy_remove].invoke
   puts 'Creating dummy application to run tests'
-  command = Rails::VERSION::MAJOR == 2 ? '' : 'new'
-  system("rails #{command} test/dummy")
+  if Rails::VERSION::MAJOR > 2
+    system('rails new test/dummy --database=sqlite3')
+  else
+    system('rails test/dummy')
+  end
   system('touch test/dummy/db/schema.rb')
+  FileUtils.cp 'test/fixtures/database.yml', 'test/dummy/config/'
   FileUtils.rm_r Dir.glob('test/dummy/test/*')
+
+  # rails 6 needs this to be present before start:
+  FileUtils.mkdir_p('test/dummy/app/assets/config')
+  FileUtils.mkdir_p('test/dummy/app/assets/javascripts')
+  FileUtils.cp 'test/fixtures/manifest.js', 'test/dummy/app/assets/config/'
+  FileUtils.cp 'test/fixtures/wicked.js', 'test/dummy/app/assets/javascripts/'
 end
 
 desc 'Remove dummy application'
 task :dummy_remove do
-  FileUtils.rm_r Dir.glob('test/dummy/*')
+  FileUtils.rm_r Dir.glob('test/dummy/')
 end
 
-desc 'Generate documentation for the wicked_pdf plugin.'
+desc 'Generate documentation for the wicked_pdf gem.'
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'WickedPdf'

data/gemfiles/4.0.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem 'rdoc'
 gem 'rails', '~> 4.0.0'
+gem 'sqlite3', '~> 1.3.6'
 
 gemspec path: '../'

data/gemfiles/4.1.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem 'rdoc'
 gem 'rails', '~> 4.1.0'
+gem 'sqlite3', '~> 1.3.6'
 
 gemspec path: '../'

data/gemfiles/4.2.gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
 gem 'rdoc'
+gem 'bundler', '~>1.3'
+gem 'sqlite3', '~> 1.3.6'
+gem 'sprockets', '~>3.0'
 gem 'rails', '~> 4.2.0'
 
 gemspec path: '../'

data/gemfiles/5.0.gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'rdoc'
+gem 'sqlite3', '~> 1.3.6'
+gem 'sprockets', '~>3.0' # v4 strips newlines from assets causing tests to fail
 gem 'rails', '~> 5.0.0'
 
 gemspec path: '../'

data/gemfiles/5.1.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'rdoc'
+gem 'sqlite3', '~> 1.3.6'
+gem 'sprockets', '~>3.0' # v4 strips newlines from assets causing tests to fail
+gem 'rails', '~> 5.1.0'
+
+gemspec path: '../'

data/gemfiles/5.2.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'rdoc'
+gem 'rails', '~> 5.2'
+gem 'sqlite3', '~> 1.3.6'
+gem 'sprockets', '~>3.0' # v4 strips newlines from assets causing tests to fail
+gem 'bootsnap' # required to run `rake test` in Rails 5.2
+gem 'mocha', '= 1.3' # newer versions blow up
+
+gemspec path: '../'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'bundler', '~>2'
+gem 'rdoc'
+gem 'rails', '~>6.0.1'
+gem 'sqlite3', '~> 1.4'
+gem 'sprockets', '~>3.0'
+gem 'bootsnap' # required to run `rake test` in Rails 6.0
+gem 'mocha', '= 1.3' # newer versions blow up
+
+gemspec path: '../'

data/gemfiles/rails_edge.gemfile

@@ -1,6 +1,9 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'rdoc'
-gem 'rails', git:  "https://github.com/rails/rails.git"
+gem 'rails', git:  'https://github.com/rails/rails.git'
+gem 'sqlite3', '~> 1.4'
+gem 'bootsnap' # required to run `rake test` in Rails 6.0
+gem 'mocha', '= 1.3' # newer versions blow up
 
 gemspec path: '../'

data/generators/wicked_pdf/templates/wicked_pdf.rb

@@ -18,4 +18,10 @@ WickedPdf.config = {
   # Layout file to be used for all PDFs
   # (but can be overridden in `render :pdf` calls)
   # layout: 'pdf.html',
+
+  # Using wkhtmltopdf without an X server can be achieved by enabling the
+  # 'use_xvfb' flag. This will wrap all wkhtmltopdf commands around the
+  # 'xvfb-run' command, in order to simulate an X server.
+  #
+  # use_xvfb: true,
 }

data/lib/generators/wicked_pdf_generator.rb

@@ -1,11 +1,7 @@
-if defined?(Rails) && Rails::VERSION::MAJOR != 2
-
-  # Rails3 generator invoked with 'rails generate wicked_pdf'
-  class WickedPdfGenerator < Rails::Generators::Base
-    source_root(File.expand_path(File.dirname(__FILE__) + '/../../generators/wicked_pdf/templates'))
-    def copy_initializer
-      copy_file 'wicked_pdf.rb', 'config/initializers/wicked_pdf.rb'
-    end
+# Rails generator invoked with 'rails generate wicked_pdf'
+class WickedPdfGenerator < Rails::Generators::Base
+  source_root(File.expand_path(File.dirname(__FILE__) + '/../../generators/wicked_pdf/templates'))
+  def copy_initializer
+    copy_file 'wicked_pdf.rb', 'config/initializers/wicked_pdf.rb'
   end
-
 end

data/lib/wicked_pdf.rb

@@ -1,32 +1,19 @@
 # wkhtml2pdf Ruby interface
-# http://code.google.com/p/wkhtmltopdf/
+# http://wkhtmltopdf.org/
 
 require 'logger'
 require 'digest/md5'
 require 'rbconfig'
+require 'open3'
 
-if (RbConfig::CONFIG['target_os'] =~ /mswin|mingw/) && (RUBY_VERSION < '1.9')
-  require 'win32/open3'
-else
-  require 'open3'
-end
-
-begin
-  require 'active_support/core_ext/module/attribute_accessors'
-rescue LoadError
-  require 'active_support/core_ext/class/attribute_accessors'
-end
-
-begin
-  require 'active_support/core_ext/object/blank'
-rescue LoadError
-  require 'active_support/core_ext/blank'
-end
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/object/blank'
 
 require 'wicked_pdf/version'
 require 'wicked_pdf/railtie'
 require 'wicked_pdf/tempfile'
 require 'wicked_pdf/middleware'
+require 'wicked_pdf/progress'
 
 class WickedPdf
   DEFAULT_BINARY_VERSION = Gem::Version.new('0.9.9')
@@ -36,6 +23,8 @@ class WickedPdf
   cattr_accessor :config
   attr_accessor :binary_version
 
+  include Progress
+
   def initialize(wkhtmltopdf_binary_path = nil)
     @exe_path = wkhtmltopdf_binary_path || find_wkhtmltopdf_binary_path
     raise "Location of #{EXE_NAME} unknown" if @exe_path.empty?
@@ -68,15 +57,19 @@ class WickedPdf
     options.merge!(WickedPdf.config) { |_key, option, _config| option }
     generated_pdf_file = WickedPdfTempfile.new('wicked_pdf_generated_file.pdf', options[:temp_path])
     command = [@exe_path]
-    command << '-q' unless on_windows? # suppress errors on stdout
+    command.unshift(find_xvfb_run_binary_path) if options[:use_xvfb]
     command += parse_options(options)
     command << url
     command << generated_pdf_file.path.to_s
 
     print_command(command.inspect) if in_development_mode?
 
-    err = Open3.popen3(*command) do |_stdin, _stdout, stderr|
-      stderr.read
+    if track_progress?(options)
+      invoke_with_progress(command, options)
+    else
+      err = Open3.popen3(*command) do |_stdin, _stdout, stderr|
+        stderr.read
+      end
     end
     if options[:return_file]
       return_file = options.delete(:return_file)
@@ -85,9 +78,10 @@ class WickedPdf
     generated_pdf_file.rewind
     generated_pdf_file.binmode
     pdf = generated_pdf_file.read
+    raise "Error generating PDF\n Command Error: #{err}" if options[:raise_on_all_errors] && !err.empty?
     raise "PDF could not be generated!\n Command Error: #{err}" if pdf && pdf.rstrip.empty?
     pdf
-  rescue => e
+  rescue StandardError => e
     raise "Failed to execute:\n#{command}\nError: #{e}"
   ensure
     generated_pdf_file.close! if generated_pdf_file && !return_file
@@ -96,7 +90,7 @@ class WickedPdf
   private
 
   def in_development_mode?
-    return Rails.env == 'development' if defined?(Rails)
+    return Rails.env == 'development' if defined?(Rails.env)
     RAILS_ENV == 'development' if defined?(RAILS_ENV)
   end
 
@@ -105,19 +99,19 @@ class WickedPdf
   end
 
   def print_command(cmd)
-    p '*' * 15 + cmd + '*' * 15
+    Rails.logger.debug '[wicked_pdf]: ' + cmd
   end
 
   def retrieve_binary_version
     _stdin, stdout, _stderr = Open3.popen3(@exe_path + ' -V')
     @binary_version = parse_version(stdout.gets(nil))
-  rescue
+  rescue StandardError
     DEFAULT_BINARY_VERSION
   end
 
   def parse_version(version_info)
     match_data = /wkhtmltopdf\s*(\d*\.\d*\.\d*\w*)/.match(version_info)
-    if match_data && (2 == match_data.length)
+    if match_data && (match_data.length == 2)
       Gem::Version.new(match_data[1])
     else
       DEFAULT_BINARY_VERSION
@@ -195,24 +189,26 @@ class WickedPdf
 
   def parse_header_footer(options)
     r = []
-    [:header, :footer].collect do |hf|
-      next if options[hf].blank?
-      opt_hf = options[hf]
-      r += make_options(opt_hf, [:center, :font_name, :left, :right], hf.to_s)
-      r += make_options(opt_hf, [:font_size, :spacing], hf.to_s, :numeric)
-      r += make_options(opt_hf, [:line], hf.to_s, :boolean)
-      if options[hf] && options[hf][:content]
-        @hf_tempfiles = [] unless defined?(@hf_tempfiles)
-        @hf_tempfiles.push(tf = WickedPdfTempfile.new("wicked_#{hf}_pdf.html"))
-        tf.write options[hf][:content]
-        tf.flush
-        options[hf][:html] = {}
-        options[hf][:html][:url] = "file:///#{tf.path}"
-      end
-      unless opt_hf[:html].blank?
-        r += make_option("#{hf}-html", opt_hf[:html][:url]) unless opt_hf[:html][:url].blank?
+    unless options.blank?
+      [:header, :footer].collect do |hf|
+        next if options[hf].blank?
+        opt_hf = options[hf]
+        r += make_options(opt_hf, [:center, :font_name, :left, :right], hf.to_s)
+        r += make_options(opt_hf, [:font_size, :spacing], hf.to_s, :numeric)
+        r += make_options(opt_hf, [:line], hf.to_s, :boolean)
+        if options[hf] && options[hf][:content]
+          @hf_tempfiles = [] unless defined?(@hf_tempfiles)
+          @hf_tempfiles.push(tf = WickedPdfTempfile.new("wicked_#{hf}_pdf.html"))
+          tf.write options[hf][:content]
+          tf.flush
+          options[hf][:html] = {}
+          options[hf][:html][:url] = "file:///#{tf.path}"
+        end
+        unless opt_hf[:html].blank?
+          r += make_option("#{hf}-html", opt_hf[:html][:url]) unless opt_hf[:html][:url].blank?
+        end
       end
-    end unless options.blank?
+    end
     r
   end
 
@@ -284,10 +280,12 @@ class WickedPdf
                                   :dpi,
                                   :page_size,
                                   :page_width,
-                                  :title])
+                                  :title,
+                                  :log_level])
       r += make_options(options, [:lowquality,
                                   :grayscale,
-                                  :no_pdf_compression], '', :boolean)
+                                  :no_pdf_compression,
+                                  :quiet], '', :boolean)
       r += make_options(options, [:image_dpi,
                                   :image_quality,
                                   :page_height], '', :numeric)
@@ -319,24 +317,40 @@ class WickedPdf
                                   :disable_internal_links,
                                   :disable_external_links,
                                   :print_media_type,
+                                  :disable_local_file_access,
+                                  :enable_local_file_access,
                                   :disable_smart_shrinking,
                                   :use_xserver,
                                   :no_background,
+                                  :images,
+                                  :no_images,
                                   :no_stop_slow_scripts], '', :boolean)
     end
     r
   end
 
+  def possible_binary_locations
+    possible_locations = (ENV['PATH'].split(':') + %w[/usr/bin /usr/local/bin]).uniq
+    possible_locations += %w[~/bin] if ENV.key?('HOME')
+  end
+
   def find_wkhtmltopdf_binary_path
-    possible_locations = (ENV['PATH'].split(':') + %w(/usr/bin /usr/local/bin ~/bin)).uniq
+    possible_locations = possible_binary_locations
     exe_path ||= WickedPdf.config[:exe_path] unless WickedPdf.config.empty?
     exe_path ||= begin
-      detected_path = (defined?(Bundler) ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
+      detected_path = (defined?(Bundler) ? Bundler.which('wkhtmltopdf') : `which wkhtmltopdf`).chomp
       detected_path.present? && detected_path
-    rescue
+    rescue StandardError
       nil
     end
     exe_path ||= possible_locations.map { |l| File.expand_path("#{l}/#{EXE_NAME}") }.find { |location| File.exist?(location) }
     exe_path || ''
   end
+
+  def find_xvfb_run_binary_path
+    possible_locations = possible_binary_locations
+    path = possible_locations.map { |l| File.expand_path("#{l}/xvfb-run") }.find { |location| File.exist?(location) }
+    raise StandardError.new('Could not find binary xvfb-run on the system.') unless path
+    path
+  end
 end