wicked_pdf 2.1.0 → 2.6.0

data/lib/wicked_pdf.rb

@@ -11,27 +11,25 @@ require 'active_support/core_ext/object/blank'
 
 require 'wicked_pdf/version'
 require 'wicked_pdf/railtie'
+require 'wicked_pdf/option_parser'
 require 'wicked_pdf/tempfile'
+require 'wicked_pdf/binary'
 require 'wicked_pdf/middleware'
 require 'wicked_pdf/progress'
 
 class WickedPdf
   DEFAULT_BINARY_VERSION = Gem::Version.new('0.9.9')
-  BINARY_VERSION_WITHOUT_DASHES = Gem::Version.new('0.12.0')
-  EXE_NAME = 'wkhtmltopdf'.freeze
   @@config = {}
   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?
-    raise "Bad #{EXE_NAME}'s path: #{@exe_path}" unless File.exist?(@exe_path)
-    raise "#{EXE_NAME} is not executable" unless File.executable?(@exe_path)
+    @binary = Binary.new(wkhtmltopdf_binary_path, DEFAULT_BINARY_VERSION)
+  end
 
-    retrieve_binary_version
+  def binary_version
+    @binary.version
   end
 
   def pdf_from_html_file(filepath, options = {})
@@ -41,23 +39,19 @@ class WickedPdf
   def pdf_from_string(string, options = {})
     options = options.dup
     options.merge!(WickedPdf.config) { |_key, option, _config| option }
-    string_file = WickedPdfTempfile.new('wicked_pdf.html', options[:temp_path])
-    string_file.binmode
-    string_file.write(string)
-    string_file.close
-
-    pdf = pdf_from_html_file(string_file.path, options)
-    pdf
+    string_file = WickedPdf::Tempfile.new('wicked_pdf.html', options[:temp_path])
+    string_file.write_in_chunks(string)
+    pdf_from_html_file(string_file.path, options)
   ensure
-    string_file.close! if string_file
+    string_file.close if string_file
   end
 
   def pdf_from_url(url, options = {})
     # merge in global config options
     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.unshift(find_xvfb_run_binary_path) if options[:use_xvfb]
+    generated_pdf_file = WickedPdf::Tempfile.new('wicked_pdf_generated_file.pdf', options[:temp_path])
+    command = [@binary.path]
+    command.unshift(@binary.xvfb_run_path) if options[:use_xvfb]
     command += parse_options(options)
     command << url
     command << generated_pdf_file.path.to_s
@@ -75,11 +69,12 @@ class WickedPdf
       return_file = options.delete(:return_file)
       return generated_pdf_file
     end
-    generated_pdf_file.rewind
-    generated_pdf_file.binmode
-    pdf = generated_pdf_file.read
+
+    pdf = generated_pdf_file.read_in_chunks
+
     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 StandardError => e
     raise "Failed to execute:\n#{command}\nError: #{e}"
@@ -91,6 +86,7 @@ class WickedPdf
 
   def in_development_mode?
     return Rails.env == 'development' if defined?(Rails.env)
+
     RAILS_ENV == 'development' if defined?(RAILS_ENV)
   end
 
@@ -102,255 +98,7 @@ class WickedPdf
     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 StandardError
-    DEFAULT_BINARY_VERSION
-  end
-
-  def parse_version(version_info)
-    match_data = /wkhtmltopdf\s*(\d*\.\d*\.\d*\w*)/.match(version_info)
-    if match_data && (match_data.length == 2)
-      Gem::Version.new(match_data[1])
-    else
-      DEFAULT_BINARY_VERSION
-    end
-  end
-
   def parse_options(options)
-    [
-      parse_extra(options),
-      parse_others(options),
-      parse_global(options),
-      parse_outline(options.delete(:outline)),
-      parse_header_footer(:header => options.delete(:header),
-                          :footer => options.delete(:footer),
-                          :layout => options[:layout]),
-      parse_cover(options.delete(:cover)),
-      parse_toc(options.delete(:toc)),
-      parse_basic_auth(options)
-    ].flatten
-  end
-
-  def parse_extra(options)
-    return [] if options[:extra].nil?
-    return options[:extra].split if options[:extra].respond_to?(:split)
-    options[:extra]
-  end
-
-  def parse_basic_auth(options)
-    if options[:basic_auth]
-      user, passwd = Base64.decode64(options[:basic_auth]).split(':')
-      ['--username', user, '--password', passwd]
-    else
-      []
-    end
-  end
-
-  def make_option(name, value, type = :string)
-    if value.is_a?(Array)
-      return value.collect { |v| make_option(name, v, type) }
-    end
-    if type == :name_value
-      parts = value.to_s.split(' ')
-      ["--#{name.tr('_', '-')}", *parts]
-    elsif type == :boolean
-      if value
-        ["--#{name.tr('_', '-')}"]
-      else
-        []
-      end
-    else
-      ["--#{name.tr('_', '-')}", value.to_s]
-    end
-  end
-
-  def valid_option(name)
-    if binary_version < BINARY_VERSION_WITHOUT_DASHES
-      "--#{name}"
-    else
-      name
-    end
-  end
-
-  def make_options(options, names, prefix = '', type = :string)
-    return [] if options.nil?
-    names.collect do |o|
-      if options[o].blank?
-        []
-      else
-        make_option("#{prefix.blank? ? '' : prefix + '-'}#{o}",
-                    options[o],
-                    type)
-      end
-    end
-  end
-
-  def parse_header_footer(options)
-    r = []
-    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
-    r
-  end
-
-  def parse_cover(argument)
-    arg = argument.to_s
-    return [] if arg.blank?
-    # Filesystem path or URL - hand off to wkhtmltopdf
-    if argument.is_a?(Pathname) || (arg[0, 4] == 'http')
-      [valid_option('cover'), arg]
-    else # HTML content
-      @hf_tempfiles ||= []
-      @hf_tempfiles << tf = WickedPdfTempfile.new('wicked_cover_pdf.html')
-      tf.write arg
-      tf.flush
-      [valid_option('cover'), tf.path]
-    end
-  end
-
-  def parse_toc(options)
-    return [] if options.nil?
-    r = [valid_option('toc')]
-    unless options.blank?
-      r += make_options(options, [:font_name, :header_text], 'toc')
-      r += make_options(options, [:xsl_style_sheet])
-      r += make_options(options, [:depth,
-                                  :header_fs,
-                                  :text_size_shrink,
-                                  :l1_font_size,
-                                  :l2_font_size,
-                                  :l3_font_size,
-                                  :l4_font_size,
-                                  :l5_font_size,
-                                  :l6_font_size,
-                                  :l7_font_size,
-                                  :level_indentation,
-                                  :l1_indentation,
-                                  :l2_indentation,
-                                  :l3_indentation,
-                                  :l4_indentation,
-                                  :l5_indentation,
-                                  :l6_indentation,
-                                  :l7_indentation], 'toc', :numeric)
-      r += make_options(options, [:no_dots,
-                                  :disable_links,
-                                  :disable_back_links], 'toc', :boolean)
-      r += make_options(options, [:disable_dotted_lines,
-                                  :disable_toc_links], nil, :boolean)
-    end
-    r
-  end
-
-  def parse_outline(options)
-    r = []
-    unless options.blank?
-      r = make_options(options, [:outline], '', :boolean)
-      r += make_options(options, [:outline_depth], '', :numeric)
-    end
-    r
-  end
-
-  def parse_margins(options)
-    make_options(options, [:top, :bottom, :left, :right], 'margin', :numeric)
-  end
-
-  def parse_global(options)
-    r = []
-    unless options.blank?
-      r += make_options(options, [:orientation,
-                                  :dpi,
-                                  :page_size,
-                                  :page_width,
-                                  :title,
-                                  :log_level])
-      r += make_options(options, [:lowquality,
-                                  :grayscale,
-                                  :no_pdf_compression,
-                                  :quiet], '', :boolean)
-      r += make_options(options, [:image_dpi,
-                                  :image_quality,
-                                  :page_height], '', :numeric)
-      r += parse_margins(options.delete(:margin))
-    end
-    r
-  end
-
-  def parse_others(options)
-    r = []
-    unless options.blank?
-      r += make_options(options, [:proxy,
-                                  :username,
-                                  :password,
-                                  :encoding,
-                                  :user_style_sheet,
-                                  :viewport_size,
-                                  :window_status])
-      r += make_options(options, [:cookie,
-                                  :post], '', :name_value)
-      r += make_options(options, [:redirect_delay,
-                                  :zoom,
-                                  :page_offset,
-                                  :javascript_delay], '', :numeric)
-      r += make_options(options, [:book,
-                                  :default_header,
-                                  :disable_javascript,
-                                  :enable_plugins,
-                                  :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 = possible_binary_locations
-    exe_path ||= WickedPdf.config[:exe_path] unless WickedPdf.config.empty?
-    exe_path ||= begin
-      detected_path = (defined?(Bundler) ? Bundler.which('wkhtmltopdf') : `which wkhtmltopdf`).chomp
-      detected_path.present? && detected_path
-    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
+    OptionParser.new(binary_version).parse(options)
   end
 end

data/test/functional/pdf_helper_test.rb

@@ -76,7 +76,7 @@ class PdfHelperTest < ActionController::TestCase
 
         # test that calling render does not trigger infinite loop
         ac = ActionController::Base.new
-        assert_equal [:base, :patched], ac.render(:cats)
+        assert_equal %i[base patched], ac.render(:cats)
       rescue SystemStackError
         assert_equal true, false # force spec failure
       ensure

data/test/unit/wicked_pdf_binary_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class WickedPdfBinaryTest < ActiveSupport::TestCase
+  test 'should extract old wkhtmltopdf version' do
+    version_info_sample = "Name:\n  wkhtmltopdf 0.9.9\n\nLicense:\n  Copyright (C) 2008,2009 Wkhtmltopdf Authors.\n\n\n\n  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n  This is free software: you are free to change and redistribute it. There is NO\n  WARRANTY, to the extent permitted by law.\n\nAuthors:\n  Written by Jakob Truelsen. Patches by Mrio Silva, Benoit Garret and Emmanuel\n  Bouthenot.\n"
+    assert_equal WickedPdf::DEFAULT_BINARY_VERSION, binary.parse_version_string(version_info_sample)
+  end
+
+  test 'should extract new wkhtmltopdf version' do
+    version_info_sample = "Name:\n  wkhtmltopdf 0.11.0 rc2\n\nLicense:\n  Copyright (C) 2010 wkhtmltopdf/wkhtmltoimage Authors.\n\n\n\n  License LGPLv3+: GNU Lesser General Public License version 3 or later\n  <http://gnu.org/licenses/lgpl.html>. This is free software: you are free to\n  change and redistribute it. There is NO WARRANTY, to the extent permitted by\n  law.\n\nAuthors:\n  Written by Jan Habermann, Christian Sciberras and Jakob Truelsen. Patches by\n  Mehdi Abbad, Lyes Amazouz, Pascal Bach, Emmanuel Bouthenot, Benoit Garret and\n  Mario Silva."
+    assert_equal Gem::Version.new('0.11.0'), binary.parse_version_string(version_info_sample)
+  end
+
+  test 'should extract wkhtmltopdf version with nondigit symbols' do
+    version_info_sample = "Name:\n  wkhtmltopdf 0.10.4b\n\nLicense:\n  Copyright (C) 2008,2009 Wkhtmltopdf Authors.\n\n\n\n  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n  This is free software: you are free to change and redistribute it. There is NO\n  WARRANTY, to the extent permitted by law.\n\nAuthors:\n  Written by Jakob Truelsen. Patches by Mrio Silva, Benoit Garret and Emmanuel\n  Bouthenot.\n"
+    assert_equal Gem::Version.new('0.10.4b'), binary.parse_version_string(version_info_sample)
+  end
+
+  test 'should fallback to default version on parse error' do
+    assert_equal WickedPdf::DEFAULT_BINARY_VERSION, binary.parse_version_string('')
+  end
+
+  def binary(path = nil)
+    WickedPdf::Binary.new(path)
+  end
+end

data/test/unit/wicked_pdf_option_parser_test.rb

@@ -0,0 +1,128 @@
+require 'test_helper'
+
+class WickedPdfOptionParserTest < ActiveSupport::TestCase
+  test 'should parse header and footer options' do
+    %i[header footer].each do |hf|
+      %i[center font_name left right].each do |o|
+        assert_equal "--#{hf}-#{o.to_s.tr('_', '-')} header_footer",
+                     parse_options(hf => { o => 'header_footer' }).strip
+      end
+
+      %i[font_size spacing].each do |o|
+        assert_equal "--#{hf}-#{o.to_s.tr('_', '-')} 12",
+                     parse_options(hf => { o => '12' }).strip
+      end
+
+      assert_equal "--#{hf}-line",
+                   parse_options(hf => { :line => true }).strip
+      assert_equal "--#{hf}-html http://www.abc.com",
+                   parse_options(hf => { :html => { :url => 'http://www.abc.com' } }).strip
+    end
+  end
+
+  test 'should parse toc options' do
+    toc_option = option_parser.valid_option('toc')
+
+    %i[font_name header_text].each do |o|
+      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')} toc",
+                   parse_options(:toc => { o => 'toc' }).strip
+    end
+
+    %i[
+      depth header_fs l1_font_size l2_font_size l3_font_size l4_font_size
+      l5_font_size l6_font_size l7_font_size l1_indentation l2_indentation
+      l3_indentation l4_indentation l5_indentation l6_indentation l7_indentation
+    ].each do |o|
+      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')} 5",
+                   parse_options(:toc => { o => 5 }).strip
+    end
+
+    %i[no_dots disable_links disable_back_links].each do |o|
+      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')}",
+                   parse_options(:toc => { o => true }).strip
+    end
+  end
+
+  test 'should parse outline options' do
+    assert_equal '--outline', parse_options(:outline => { :outline => true }).strip
+    assert_equal '--outline-depth 5', parse_options(:outline => { :outline_depth => 5 }).strip
+  end
+
+  test 'should parse no_images option' do
+    assert_equal '--no-images', parse_options(:no_images => true).strip
+    assert_equal '--images', parse_options(:images => true).strip
+  end
+
+  test 'should parse margins options' do
+    %i[top bottom left right].each do |o|
+      assert_equal "--margin-#{o} 12", parse_options(:margin => { o => '12' }).strip
+    end
+  end
+
+  test 'should parse cover' do
+    cover_option = option_parser.valid_option('cover')
+
+    pathname = Rails.root.join('app', 'views', 'pdf', 'file.html')
+    assert_equal "#{cover_option} http://example.org", parse_options(:cover => 'http://example.org').strip, 'URL'
+    assert_equal "#{cover_option} #{pathname}", parse_options(:cover => pathname).strip, 'Pathname'
+    assert_match(/#{cover_option} .+wicked_cover_pdf.+\.html/, parse_options(:cover => '<html><body>HELLO</body></html>').strip, 'HTML')
+  end
+
+  test 'should parse other options' do
+    %i[
+      orientation page_size proxy username password dpi
+      encoding user_style_sheet
+    ].each do |o|
+      assert_equal "--#{o.to_s.tr('_', '-')} opts", parse_options(o => 'opts').strip
+    end
+
+    %i[cookie post].each do |o|
+      assert_equal "--#{o.to_s.tr('_', '-')} name value", parse_options(o => 'name value').strip
+
+      nv_formatter = proc { |number| "--#{o.to_s.tr('_', '-')} par#{number} val#{number}" }
+      assert_equal "#{nv_formatter.call(1)} #{nv_formatter.call(2)}", parse_options(o => ['par1 val1', 'par2 val2']).strip
+    end
+
+    %i[redirect_delay zoom page_offset].each do |o|
+      assert_equal "--#{o.to_s.tr('_', '-')} 5", parse_options(o => 5).strip
+    end
+
+    %i[
+      book default_header disable_javascript grayscale lowquality
+      enable_plugins disable_internal_links disable_external_links
+      print_media_type disable_smart_shrinking use_xserver no_background
+    ].each do |o|
+      assert_equal "--#{o.to_s.tr('_', '-')}", parse_options(o => true).strip
+    end
+  end
+
+  test 'should not use double dash options for version without dashes' do
+    op = option_parser(WickedPdf::OptionParser::BINARY_VERSION_WITHOUT_DASHES)
+
+    %w[toc cover].each do |name|
+      assert_equal op.valid_option(name), name
+    end
+  end
+
+  test 'should use double dash options for version with dashes' do
+    op = option_parser(Gem::Version.new('0.11.0'))
+
+    %w[toc cover].each do |name|
+      assert_equal op.valid_option(name), "--#{name}"
+    end
+  end
+
+  test '-- options should not be given after object' do
+    options = { :header => { :center => 3 }, :cover => 'http://example.org', :disable_javascript => true }
+    cover_option = option_parser.valid_option('cover')
+    assert_equal parse_options(options), "--disable-javascript --header-center 3 #{cover_option} http://example.org"
+  end
+
+  def parse_options(options, version = WickedPdf::DEFAULT_BINARY_VERSION)
+    option_parser(version).parse(options).join(' ')
+  end
+
+  def option_parser(version = WickedPdf::DEFAULT_BINARY_VERSION)
+    WickedPdf::OptionParser.new(version)
+  end
+end

data/test/unit/wicked_pdf_test.rb

@@ -2,23 +2,6 @@ require 'test_helper'
 WickedPdf.config = { :exe_path => ENV['WKHTMLTOPDF_BIN'] || '/usr/local/bin/wkhtmltopdf' }
 HTML_DOCUMENT = '<html><body>Hello World</body></html>'.freeze
 
-# Provide a public accessor to the normally-private parse_options function.
-# Also, smash the returned array of options into a single string for
-# convenience in testing below.
-class WickedPdf
-  undef :binary_version
-  undef :binary_version=
-  attr_accessor :binary_version
-
-  def get_parsed_options(opts)
-    parse_options(opts).join(' ')
-  end
-
-  def get_valid_option(name)
-    valid_option(name)
-  end
-end
-
 class WickedPdfTest < ActiveSupport::TestCase
   def setup
     @wp = WickedPdf.new
@@ -86,146 +69,6 @@ class WickedPdfTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should parse header and footer options' do
-    [:header, :footer].each do |hf|
-      [:center, :font_name, :left, :right].each do |o|
-        assert_equal "--#{hf}-#{o.to_s.tr('_', '-')} header_footer",
-                     @wp.get_parsed_options(hf => { o => 'header_footer' }).strip
-      end
-
-      [:font_size, :spacing].each do |o|
-        assert_equal "--#{hf}-#{o.to_s.tr('_', '-')} 12",
-                     @wp.get_parsed_options(hf => { o => '12' }).strip
-      end
-
-      assert_equal "--#{hf}-line",
-                   @wp.get_parsed_options(hf => { :line => true }).strip
-      assert_equal "--#{hf}-html http://www.abc.com",
-                   @wp.get_parsed_options(hf => { :html => { :url => 'http://www.abc.com' } }).strip
-    end
-  end
-
-  test 'should parse toc options' do
-    toc_option = @wp.get_valid_option('toc')
-
-    [:font_name, :header_text].each do |o|
-      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')} toc",
-                   @wp.get_parsed_options(:toc => { o => 'toc' }).strip
-    end
-
-    [
-      :depth, :header_fs, :l1_font_size, :l2_font_size, :l3_font_size, :l4_font_size,
-      :l5_font_size, :l6_font_size, :l7_font_size, :l1_indentation, :l2_indentation,
-      :l3_indentation, :l4_indentation, :l5_indentation, :l6_indentation, :l7_indentation
-    ].each do |o|
-      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')} 5",
-                   @wp.get_parsed_options(:toc => { o => 5 }).strip
-    end
-
-    [:no_dots, :disable_links, :disable_back_links].each do |o|
-      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')}",
-                   @wp.get_parsed_options(:toc => { o => true }).strip
-    end
-  end
-
-  test 'should parse outline options' do
-    assert_equal '--outline', @wp.get_parsed_options(:outline => { :outline => true }).strip
-    assert_equal '--outline-depth 5', @wp.get_parsed_options(:outline => { :outline_depth => 5 }).strip
-  end
-
-  test 'should parse no_images option' do
-    assert_equal '--no-images', @wp.get_parsed_options(:no_images => true).strip
-    assert_equal '--images', @wp.get_parsed_options(:images => true).strip
-  end
-
-  test 'should parse margins options' do
-    [:top, :bottom, :left, :right].each do |o|
-      assert_equal "--margin-#{o} 12", @wp.get_parsed_options(:margin => { o => '12' }).strip
-    end
-  end
-
-  test 'should parse cover' do
-    cover_option = @wp.get_valid_option('cover')
-
-    pathname = Rails.root.join('app', 'views', 'pdf', 'file.html')
-    assert_equal "#{cover_option} http://example.org", @wp.get_parsed_options(:cover => 'http://example.org').strip, 'URL'
-    assert_equal "#{cover_option} #{pathname}", @wp.get_parsed_options(:cover => pathname).strip, 'Pathname'
-    assert_match %r{#{cover_option} .+wicked_cover_pdf.+\.html}, @wp.get_parsed_options(:cover => '<html><body>HELLO</body></html>').strip, 'HTML'
-  end
-
-  test 'should parse other options' do
-    [
-      :orientation, :page_size, :proxy, :username, :password, :dpi,
-      :encoding, :user_style_sheet
-    ].each do |o|
-      assert_equal "--#{o.to_s.tr('_', '-')} opts", @wp.get_parsed_options(o => 'opts').strip
-    end
-
-    [:cookie, :post].each do |o|
-      assert_equal "--#{o.to_s.tr('_', '-')} name value", @wp.get_parsed_options(o => 'name value').strip
-
-      nv_formatter = proc { |number| "--#{o.to_s.tr('_', '-')} par#{number} val#{number}" }
-      assert_equal "#{nv_formatter.call(1)} #{nv_formatter.call(2)}", @wp.get_parsed_options(o => ['par1 val1', 'par2 val2']).strip
-    end
-
-    [:redirect_delay, :zoom, :page_offset].each do |o|
-      assert_equal "--#{o.to_s.tr('_', '-')} 5", @wp.get_parsed_options(o => 5).strip
-    end
-
-    [
-      :book, :default_header, :disable_javascript, :grayscale, :lowquality,
-      :enable_plugins, :disable_internal_links, :disable_external_links,
-      :print_media_type, :disable_smart_shrinking, :use_xserver, :no_background
-    ].each do |o|
-      assert_equal "--#{o.to_s.tr('_', '-')}", @wp.get_parsed_options(o => true).strip
-    end
-  end
-
-  test 'should extract old wkhtmltopdf version' do
-    version_info_sample = "Name:\n  wkhtmltopdf 0.9.9\n\nLicense:\n  Copyright (C) 2008,2009 Wkhtmltopdf Authors.\n\n\n\n  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n  This is free software: you are free to change and redistribute it. There is NO\n  WARRANTY, to the extent permitted by law.\n\nAuthors:\n  Written by Jakob Truelsen. Patches by Mrio Silva, Benoit Garret and Emmanuel\n  Bouthenot.\n"
-    assert_equal WickedPdf::DEFAULT_BINARY_VERSION, @wp.send(:parse_version, version_info_sample)
-  end
-
-  test 'should extract new wkhtmltopdf version' do
-    version_info_sample = "Name:\n  wkhtmltopdf 0.11.0 rc2\n\nLicense:\n  Copyright (C) 2010 wkhtmltopdf/wkhtmltoimage Authors.\n\n\n\n  License LGPLv3+: GNU Lesser General Public License version 3 or later\n  <http://gnu.org/licenses/lgpl.html>. This is free software: you are free to\n  change and redistribute it. There is NO WARRANTY, to the extent permitted by\n  law.\n\nAuthors:\n  Written by Jan Habermann, Christian Sciberras and Jakob Truelsen. Patches by\n  Mehdi Abbad, Lyes Amazouz, Pascal Bach, Emmanuel Bouthenot, Benoit Garret and\n  Mario Silva."
-    assert_equal Gem::Version.new('0.11.0'), @wp.send(:parse_version, version_info_sample)
-  end
-
-  test 'should extract wkhtmltopdf version with nondigit symbols' do
-    version_info_sample = "Name:\n  wkhtmltopdf 0.10.4b\n\nLicense:\n  Copyright (C) 2008,2009 Wkhtmltopdf Authors.\n\n\n\n  License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n  This is free software: you are free to change and redistribute it. There is NO\n  WARRANTY, to the extent permitted by law.\n\nAuthors:\n  Written by Jakob Truelsen. Patches by Mrio Silva, Benoit Garret and Emmanuel\n  Bouthenot.\n"
-    assert_equal Gem::Version.new('0.10.4b'), @wp.send(:parse_version, version_info_sample)
-  end
-
-  test 'should fallback to default version on parse error' do
-    assert_equal WickedPdf::DEFAULT_BINARY_VERSION, @wp.send(:parse_version, '')
-  end
-
-  test 'should set version on initialize' do
-    assert_not_equal @wp.send(:binary_version), ''
-  end
-
-  test 'should not use double dash options for version without dashes' do
-    @wp.binary_version = WickedPdf::BINARY_VERSION_WITHOUT_DASHES
-
-    %w[toc cover].each do |name|
-      assert_equal @wp.get_valid_option(name), name
-    end
-  end
-
-  test 'should use double dash options for version with dashes' do
-    @wp.binary_version = Gem::Version.new('0.11.0')
-
-    %w[toc cover].each do |name|
-      assert_equal @wp.get_valid_option(name), "--#{name}"
-    end
-  end
-
-  test '-- options should not be given after object' do
-    options = { :header => { :center => 3 }, :cover => 'http://example.org', :disable_javascript => true }
-    cover_option = @wp.get_valid_option('cover')
-    assert_equal @wp.get_parsed_options(options), "--disable-javascript --header-center 3 #{cover_option} http://example.org"
-  end
-
   test 'should output progress when creating pdfs on compatible hosts' do
     wp = WickedPdf.new
     output = []

data/test/unit/wkhtmltopdf_location_test.rb

@@ -1,5 +1,3 @@
-
-
 class WkhtmltopdfLocationTest < ActiveSupport::TestCase
   setup do
     @saved_config = WickedPdf.config