wicked_pdf 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb2f6a218b4808fb3f117148379101db09cffb8
-  data.tar.gz: 3d87582716a2d79e4f7b635f4297e50744d47e0a
+  metadata.gz: 47fe2d6d38cc265b92a54aaba23756bd4ecfcf30
+  data.tar.gz: 914991dd1656d0fb326ebf2e38a8f013ce8357b4
 SHA512:
-  metadata.gz: 0579b69ec2897374a6bac52f44306e6c15da9252f09f3f0d6bbbc89a3161f5c4cf47218593a70d9884b9a043f0ca8c5d8c8fdebf38edb9457510cf6706cf2d2a
-  data.tar.gz: be80b3dd951f1a12065237cc5db3ab019b5e048c337e8c3666cc21d7a3685bcee3b5415d566a19ca73631adf7c5757c14115769460b96b13b9497ce18ec85e46
+  metadata.gz: 166e1621757930e9ac10846569c28cc6e215eb4e81f2a8280789f9b2ffa8ba4d4a7fc53140f898dcb591c0890561e25e5f996af5c1f70a0ff81e4625a565ab7b
+  data.tar.gz: 58c3dfe3876a9941da002de9aca24283a217ebbc1da024f1caef83c92a9c1be845186382a2e7955d539c3e1bde73486219dd66eab26bf16d61be3c053365f119

data/.rubocop_todo.yml

@@ -5,13 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Offense count: 2
-Lint/HandleExceptions:
-  Enabled: false
 
 # Offense count: 9
 Metrics/AbcSize:
@@ -44,7 +37,7 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 12
 
-# Offense count: 5
+# Offense count: 2
 Style/AccessorMethodName:
   Enabled: false
 

data/.travis.yml

@@ -11,6 +11,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
 gemfile:
   - gemfiles/3.0.gemfile
@@ -33,8 +34,6 @@ matrix:
         - gem update --system 1.8.25
         - gem --version
       gemfile: gemfiles/2.3.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/4.0.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.0.0
@@ -47,11 +46,17 @@ matrix:
       gemfile: gemfiles/4.2.gemfile
     - rvm: 2.2.0
       gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_edge.gemfile
   allow_failures:
+    - rvm: 1.9.2
+      gemfile: gemfiles/3.0.gemfile
     - rvm: 1.9.2
       gemfile: gemfiles/3.1.gemfile
     - rvm: 1.9.2
       gemfile: gemfiles/3.2.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/4.0.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.0.0

data/CHANGELOG.md

@@ -2,10 +2,38 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [master] - Unpublished
+## [1.0.5] - 2016-03-28
+### Changed
+- Numerous RuboCop style violation fixes, spelling errors, and test-setup issues from [indyrb.org](http://indyrb.org/) hack night. Thank you all for your contributions!
+
+### Fixed
+- Shellescape options. A stray quote in `header` or `footer` would cause PDF to fail to generate, and this should close down many potential attack vectors if you allow user-supplied values to be passed into `wicked_pdf` render options.
+
+## [1.0.4] - 2016-01-26
+### Changed
+- Check that logger responds to info before calling it. It was possible to have a `logger` method defined as a controller helper that would override `Rails.logger`.
+
+### Fixed
+- [Issue with Sprockets 3.0](https://github.com/mileszs/wicked_pdf/issues/476) where an asset referenced in a stylesheet not existing would raise an exception `read_asset` on nil.
+
+## [1.0.3] - 2015-12-02
+### Changed
+- Revert default DPI. Some installs of `wkhtmltopdf` would experience major slowdowns or crashes with it set to 72. It is suggested that a DPI of 75 may be better, but I'm holding off on making it a default without more information.
+
+## [1.0.2] - 2015-11-30
 ### Changed
 - The default dpi is now 72. Previously the default would be whatever your `wkhtmltopdf` version specified as the default. This change [speeds up generation of documents that contain `border-radius` dramatically](https://github.com/wkhtmltopdf/wkhtmltopdf/issues/1510)
 
+## [1.0.1] - 2015-11-19
+### Changed
+- Made minor RuboCop style tweaks.
+
+### Added
+- Added default [RuboCop](https://github.com/bbatsov/rubocop) config and run after test suite.
+
+### Fixed
+- Issue with `nil.basename` from asset helpers.
+
 ## [1.0.0] - 2015-11-03
 ### Changed
 - Accepted that `WickedPDF` cannot guarantee backwards compatibility with older versions of `wkthmltopdf`, and decided to publish a new version with the MAJOR number incremented, signaling that this may have breaking changes for some people, but providing a path forward for progress. This release number also signals that this is a mature (and relatively stable) project, and should be deemed ready for production (since it has been used in production since ~2009, and downloaded over a *million* times on [RubyGems.org](https://rubygems.org/gems/wicked_pdf)).
@@ -37,10 +65,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Asset helpers no longer add a file extension if it already is specified with one
 
 # Compare Releases
-- [1.0.0...Unreleased](https://github.com/mileszs/wicked_pdf/compare/f0b49fa...HEAD)
-- [1.0.0...1.0.1](https://github.com/mileszs/wicked_pdf/compare/24303d0...f0b49fa)
-- [0.11.0...1.0.0](https://github.com/mileszs/wicked_pdf/compare/968ae69...24303d0)
-- [0.10.2...0.11.0](https://github.com/mileszs/wicked_pdf/compare/076f043...968ae69)
-- [0.10.1...0.10.2](https://github.com/mileszs/wicked_pdf/compare/a920bc9...076f043)
-- [0.10.0...0.10.1](https://github.com/mileszs/wicked_pdf/compare/df67c30...a920bc9)
-- [0.9.10...0.10.0](https://github.com/mileszs/wicked_pdf/compare/9daecee...df67c30)
+- [1.0.5...HEAD](https://github.com/mileszs/wicked_pdf/compare/1.0.5...HEAD)
+- [1.0.4...1.0.5](https://github.com/mileszs/wicked_pdf/compare/1.0.4...1.0.5)
+- [1.0.3...1.0.4](https://github.com/mileszs/wicked_pdf/compare/1.0.3...1.0.4)
+- [1.0.2...1.0.3](https://github.com/mileszs/wicked_pdf/compare/1.0.2...1.0.3)
+- [1.0.1...1.0.2](https://github.com/mileszs/wicked_pdf/compare/1.0.1...1.0.2)
+- [1.0.0...1.0.1](https://github.com/mileszs/wicked_pdf/compare/1.0.0...1.0.1)
+- [0.11.0...1.0.0](https://github.com/mileszs/wicked_pdf/compare/0.11.0...1.0.0)
+- [0.10.2...0.11.0](https://github.com/mileszs/wicked_pdf/compare/0.10.2...0.11.0)
+- [0.10.1...0.10.2](https://github.com/mileszs/wicked_pdf/compare/0.10.1...0.10.2)
+- [0.10.0...0.10.1](https://github.com/mileszs/wicked_pdf/compare/0.10.0...0.10.1)
+- [0.9.10...0.10.0](https://github.com/mileszs/wicked_pdf/compare/0.9.10...0.10.0)

data/Rakefile

@@ -36,6 +36,7 @@ task :dummy_generate do
   puts 'Creating dummy application to run tests'
   prefix = (Rails::VERSION::MAJOR == 2) ? '' : 'new '
   system("rails #{prefix}test/dummy")
+  system("touch #{prefix}test/dummy/db/schema.rb")
   FileUtils.rm_r Dir.glob('test/dummy/test/*')
 end
 

data/lib/wicked_pdf.rb

@@ -4,6 +4,7 @@
 require 'logger'
 require 'digest/md5'
 require 'rbconfig'
+require 'shellwords'
 
 if (RbConfig::CONFIG['target_os'] =~ /mswin|mingw/) && (RUBY_VERSION < '1.9')
   require 'win32/open3'
@@ -31,17 +32,18 @@ require 'wicked_pdf/middleware'
 class WickedPdf
   DEFAULT_BINARY_VERSION = Gem::Version.new('0.9.9')
   BINARY_VERSION_WITHOUT_DASHES = Gem::Version.new('0.12.0')
-  EXE_NAME = 'wkhtmltopdf'
+  EXE_NAME = 'wkhtmltopdf'.freeze
   @@config = {}
   cattr_accessor :config
+  attr_accessor :binary_version
 
   def initialize(wkhtmltopdf_binary_path = nil)
     @exe_path = wkhtmltopdf_binary_path || find_wkhtmltopdf_binary_path
-    fail "Location of #{EXE_NAME} unknown" if @exe_path.empty?
-    fail "Bad #{EXE_NAME}'s path: #{@exe_path}" unless File.exist?(@exe_path)
-    fail "#{EXE_NAME} is not executable" unless File.executable?(@exe_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)
 
-    retreive_binary_version
+    retrieve_binary_version
   end
 
   def pdf_from_html_file(filepath, options = {})
@@ -86,7 +88,7 @@ class WickedPdf
     generated_pdf_file.rewind
     generated_pdf_file.binmode
     pdf = generated_pdf_file.read
-    fail "PDF could not be generated!\n Command Error: #{err}" if pdf && pdf.rstrip.length == 0
+    fail "PDF could not be generated!\n Command Error: #{err}" if pdf && pdf.rstrip.empty?
     pdf
   rescue => e
     raise "Failed to execute:\n#{command}\nError: #{e}"
@@ -101,10 +103,6 @@ class WickedPdf
     RAILS_ENV == 'development' if defined?(RAILS_ENV)
   end
 
-  def get_binary_version
-    @binary_version
-  end
-
   def on_windows?
     RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
   end
@@ -113,10 +111,11 @@ class WickedPdf
     p '*' * 15 + cmd + '*' * 15
   end
 
-  def retreive_binary_version
+  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)
@@ -163,17 +162,17 @@ class WickedPdf
       return value.collect { |v| make_option(name, v, type) }
     end
     if type == :name_value
-      parts = value.to_s.split(' ')
+      parts = value.to_s.split(' ').map { |part| part.shellescape }
       ["--#{name.tr('_', '-')}", *parts]
     elsif type == :boolean
       ["--#{name.tr('_', '-')}"]
     else
-      ["--#{name.tr('_', '-')}", value.to_s]
+      ["--#{name.tr('_', '-')}", value.to_s.shellescape]
     end
   end
 
   def valid_option(name)
-    if get_binary_version < BINARY_VERSION_WITHOUT_DASHES
+    if binary_version < BINARY_VERSION_WITHOUT_DASHES
       "--#{name}"
     else
       name
@@ -198,9 +197,9 @@ class WickedPdf
     [: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}")
-      r += make_options(opt_hf, [:font_size, :spacing], "#{hf}", :numeric)
-      r += make_options(opt_hf, [:line], "#{hf}", :boolean)
+      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"))

data/lib/wicked_pdf/middleware.rb

@@ -67,8 +67,8 @@ class WickedPdf
         rules.map do |pattern|
           if pattern.is_a?(Regexp)
             return false if @request.fullpath =~ pattern
-          else
-            return false if @request.path[0, pattern.length] == pattern
+          elsif @request.path[0, pattern.length] == pattern
+            return false
           end
         end
 

data/lib/wicked_pdf/pdf_helper.rb

@@ -1,5 +1,4 @@
 module PdfHelper
-  require 'wicked_pdf'
   require 'tempfile'
 
   def self.included(base)
@@ -59,8 +58,8 @@ module PdfHelper
       :formats => options[:formats],
       :handlers => options[:handlers]
     }
-    render_opts.merge!(:locals => options[:locals]) if options[:locals]
-    render_opts.merge!(:file => options[:file]) if options[:file]
+    render_opts[:locals] = options[:locals] if options[:locals]
+    render_opts[:file] = options[:file] if options[:file]
     html_string = render_to_string(render_opts)
     options = prerender_header_and_footer(options)
     w = WickedPdf.new(options[:wkhtmltopdf])
@@ -80,8 +79,8 @@ module PdfHelper
         :handlers => options[:handlers],
         :content_type => 'text/html'
       }
-      render_opts.merge!(:locals => options[:locals]) if options[:locals]
-      render_opts.merge!(:file => options[:file]) if options[:file]
+      render_opts[:locals] = options[:locals] if options[:locals]
+      render_opts[:file] = options[:file] if options[:file]
       render(render_opts)
     else
       pdf_content = make_pdf(options)
@@ -104,8 +103,8 @@ module PdfHelper
         :formats => options[hf][:html][:formats],
         :handlers => options[hf][:html][:handlers]
       }
-      render_opts.merge!(:locals => options[hf][:html][:locals]) if options[hf][:html][:locals]
-      render_opts.merge!(:file => options[hf][:html][:file]) if options[:file]
+      render_opts[:locals] = options[hf][:html][:locals] if options[hf][:html][:locals]
+      render_opts[:file] = options[hf][:html][:file] if options[:file]
       tf.write render_to_string(render_opts)
       tf.flush
       options[hf][:html][:url] = "file:///#{tf.path}"

data/lib/wicked_pdf/version.rb

@@ -1,3 +1,3 @@
 class WickedPdf
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'.freeze
 end

data/lib/wicked_pdf/wicked_pdf_helper/assets.rb

@@ -58,7 +58,8 @@ module WickedPdfHelper
     def asset_pathname(source)
       if precompiled_or_absolute_asset?(source)
         asset = asset_path(source)
-        if (pathname = set_protocol(asset)) =~ URI_REGEXP
+        pathname = prepend_protocol(asset)
+        if pathname =~ URI_REGEXP
           # asset_path returns an absolute URL using asset_host if asset_host is set
           pathname
         else
@@ -72,7 +73,7 @@ module WickedPdfHelper
 
     # will prepend a http or default_protocol to a protocol relative URL
     # or when no protcol is set.
-    def set_protocol(source)
+    def prepend_protocol(source)
       protocol = WickedPdf.config[:default_protocol] || 'http'
       if source[0, 2] == '//'
         source = [protocol, ':', source].join
@@ -90,7 +91,8 @@ module WickedPdfHelper
 
     def read_asset(source)
       if precompiled_or_absolute_asset?(source)
-        if (pathname = asset_pathname(source)) =~ URI_REGEXP
+        pathname = asset_pathname(source)
+        if pathname =~ URI_REGEXP
           read_from_uri(pathname)
         elsif File.file?(pathname)
           IO.read(pathname)
@@ -102,7 +104,7 @@ module WickedPdfHelper
 
     def read_from_uri(uri)
       encoding = ':UTF-8' if RUBY_VERSION > '1.8'
-      asset = open(uri, "r#{encoding}") { |f| f.read }
+      asset = open(uri, "r#{encoding}", &:read)
       asset = gzip(asset) if WickedPdf.config[:expect_gzipped_remote_assets]
       asset
     end
@@ -112,6 +114,7 @@ module WickedPdfHelper
       gzipper = Zlib::GzipReader.new(stringified_asset)
       gzipper.read
     rescue Zlib::GzipFile::Error
+      nil
     end
   end
 end

data/test/functional/pdf_helper_test.rb

@@ -21,7 +21,7 @@ class PdfHelperTest < ActionController::TestCase
     test 'should prerender header and footer :template options' do
       options = @ac.send(:prerender_header_and_footer,
                          :header => { :html => { :template => 'hf.html.erb' } })
-      assert_match /^file:\/\/\/.*wicked_header_pdf.*\.html/, options[:header][:html][:url]
+      assert_match %r(^file:\/\/\/.*wicked_header_pdf.*\.html), options[:header][:html][:url]
     end
   end
 end

data/test/functional/wicked_pdf_helper_assets_test.rb

@@ -6,7 +6,7 @@ class WickedPdfHelperAssetsTest < ActionView::TestCase
 
   if Rails::VERSION::MAJOR > 3 || (Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR > 0)
     test 'wicked_pdf_asset_base64 returns a base64 encoded asset' do
-      assert_match /data:text\/css;base64,.+/, wicked_pdf_asset_base64('wicked.css')
+      assert_match %r(data:text\/css;base64,.+), wicked_pdf_asset_base64('wicked.css')
     end
 
     test 'wicked_pdf_asset_path should return a url when assets are served by an asset server' do
@@ -95,11 +95,11 @@ class WickedPdfHelperAssetsTest < ActionView::TestCase
       assert_no_match WickedPdfHelper::Assets::ASSET_URL_REGEX, '.url { \'http://assets.domain.com/dummy.png\' }'
     end
 
-    test 'set_protocol should properly set the protocol when the asset is precompiled' do
-      assert_equal 'http://assets.domain.com/dummy.png', set_protocol('//assets.domain.com/dummy.png')
-      assert_equal '/assets.domain.com/dummy.png', set_protocol('/assets.domain.com/dummy.png')
-      assert_equal 'http://assets.domain.com/dummy.png', set_protocol('http://assets.domain.com/dummy.png')
-      assert_equal 'https://assets.domain.com/dummy.png', set_protocol('https://assets.domain.com/dummy.png')
+    test 'prepend_protocol should properly set the protocol when the asset is precompiled' do
+      assert_equal 'http://assets.domain.com/dummy.png', prepend_protocol('//assets.domain.com/dummy.png')
+      assert_equal '/assets.domain.com/dummy.png', prepend_protocol('/assets.domain.com/dummy.png')
+      assert_equal 'http://assets.domain.com/dummy.png', prepend_protocol('http://assets.domain.com/dummy.png')
+      assert_equal 'https://assets.domain.com/dummy.png', prepend_protocol('https://assets.domain.com/dummy.png')
     end
   end
 end

data/test/test_helper.rb

@@ -21,4 +21,4 @@ if (assets_dir = Rails.root.join('app/assets')) && File.directory?(assets_dir)
   destination = assets_dir.join('stylesheets/wicked.css')
   source = File.read('test/fixtures/wicked.css')
   File.open(destination, 'w') { |f| f.write(source) }
-end
+end

data/test/unit/wicked_pdf_test.rb

@@ -1,12 +1,13 @@
 require 'test_helper'
 
 WickedPdf.config = { :exe_path => ENV['WKHTMLTOPDF_BIN'] || '/usr/local/bin/wkhtmltopdf' }
-HTML_DOCUMENT = '<html><body>Hello World</body></html>'
+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
+  attr_accessor :binary_version
   def get_parsed_options(opts)
     parse_options(opts).join(' ')
   end
@@ -14,10 +15,6 @@ class WickedPdf
   def get_valid_option(name)
     valid_option(name)
   end
-
-  def set_binary_version_to(version)
-    @binary_version = version
-  end
 end
 
 class WickedPdfTest < ActiveSupport::TestCase
@@ -26,26 +23,23 @@ class WickedPdfTest < ActiveSupport::TestCase
   end
 
   test 'should generate PDF from html document' do
-    wp = WickedPdf.new
-    pdf = wp.pdf_from_string HTML_DOCUMENT
+    pdf = @wp.pdf_from_string HTML_DOCUMENT
     assert pdf.start_with?('%PDF-1.4')
     assert pdf.rstrip.end_with?('%%EOF')
     assert pdf.length > 100
   end
 
   test 'should generate PDF from html document with long lines' do
-    wp = WickedPdf.new
     document_with_long_line_file = File.new('test/fixtures/document_with_long_line.html', 'r')
-    pdf = wp.pdf_from_string(document_with_long_line_file.read)
+    pdf = @wp.pdf_from_string(document_with_long_line_file.read)
     assert pdf.start_with?('%PDF-1.4')
     assert pdf.rstrip.end_with?('%%EOF')
     assert pdf.length > 100
   end
 
   test 'should generate PDF from html existing HTML file without converting it to string' do
-    wp = WickedPdf.new
     filepath = File.join(Dir.pwd, 'test/fixtures/document_with_long_line.html')
-    pdf = wp.pdf_from_html_file(filepath)
+    pdf = @wp.pdf_from_html_file(filepath)
     assert pdf.start_with?('%PDF-1.4')
     assert pdf.rstrip.end_with?('%%EOF')
     assert pdf.length > 100
@@ -91,33 +85,30 @@ class WickedPdfTest < ActiveSupport::TestCase
   end
 
   test 'should parse header and footer options' do
-    wp = WickedPdf.new
-
     [: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
+                     @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
+                     @wp.get_parsed_options(hf => { o => '12' }).strip
       end
 
       assert_equal "--#{hf}-line",
-                   wp.get_parsed_options(hf => { :line => true }).strip
+                   @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
+                   @wp.get_parsed_options(hf => { :html => { :url => 'http://www.abc.com' } }).strip
     end
   end
 
   test 'should parse toc options' do
-    wp = WickedPdf.new
-    toc_option = wp.get_valid_option('toc')
+    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
+                   @wp.get_parsed_options(:toc => { o => 'toc' }).strip
     end
 
     [
@@ -126,59 +117,52 @@ class WickedPdfTest < ActiveSupport::TestCase
       :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
+                   @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
+                   @wp.get_parsed_options(:toc => { o => true }).strip
     end
   end
 
   test 'should parse outline options' do
-    wp = WickedPdf.new
-
-    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
+    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 margins options' do
-    wp = WickedPdf.new
-
     [:top, :bottom, :left, :right].each do |o|
-      assert_equal "--margin-#{o} 12", wp.get_parsed_options(:margin => { o => '12' }).strip
+      assert_equal "--margin-#{o} 12", @wp.get_parsed_options(:margin => { o => '12' }).strip
     end
   end
 
   test 'should parse cover' do
-    wp = WickedPdf.new
-    cover_option = wp.get_valid_option('cover')
+    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 /#{cover_option} .+wicked_cover_pdf.+\.html/, wp.get_parsed_options(:cover => '<html><body>HELLO</body></html>').strip, '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
-    wp = WickedPdf.new
-
     [
       :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
+      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
+      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
+      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
+      assert_equal "--#{o.to_s.tr('_', '-')} 5", @wp.get_parsed_options(o => 5).strip
     end
 
     [
@@ -186,7 +170,7 @@ class WickedPdfTest < ActiveSupport::TestCase
       :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
+      assert_equal "--#{o.to_s.tr('_', '-')}", @wp.get_parsed_options(o => true).strip
     end
   end
 
@@ -210,11 +194,11 @@ class WickedPdfTest < ActiveSupport::TestCase
   end
 
   test 'should set version on initialize' do
-    assert_not_equal @wp.send(:get_binary_version), ''
+    assert_not_equal @wp.send(:binary_version), ''
   end
 
   test 'should not use double dash options for version without dashes' do
-    @wp.set_binary_version_to(WickedPdf::BINARY_VERSION_WITHOUT_DASHES)
+    @wp.binary_version = WickedPdf::BINARY_VERSION_WITHOUT_DASHES
 
     %w(toc cover).each do |name|
       assert_equal @wp.get_valid_option(name), name
@@ -222,7 +206,7 @@ class WickedPdfTest < ActiveSupport::TestCase
   end
 
   test 'should use double dash options for version with dashes' do
-    @wp.set_binary_version_to(Gem::Version.new('0.11.0'))
+    @wp.binary_version = Gem::Version.new('0.11.0')
 
     %w(toc cover).each do |name|
       assert_equal @wp.get_valid_option(name), "--#{name}"
@@ -234,4 +218,9 @@ class WickedPdfTest < ActiveSupport::TestCase
     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 'options are shellescaped' do
+    options = { :header => { :left => "That's crazy" } }
+    assert_equal "--header-left That\\'s\\ crazy", @wp.get_parsed_options(options)
+  end
 end

data/wicked_pdf.gemspec

@@ -12,8 +12,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/mileszs/wicked_pdf'
   spec.license       = 'MIT'
   spec.date          = Time.now.strftime('%Y-%m-%d')
+  spec.description   = <<desc
+Wicked PDF uses the shell utility wkhtmltopdf 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, and let Wicked take care of the hard stuff.
+desc
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
@@ -25,10 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'test-unit'
-
-  spec.description       = <<desc
-Wicked PDF uses the shell utility wkhtmltopdf 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, and let Wicked take care of the hard stuff.
-desc
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wicked_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Miles Z. Sterrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails