pdfkit 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 048ce8fc28094271f811791bb5df9a3e3a43d554
-  data.tar.gz: 6875a66817930100a7e34ddc20797415d9882af7
+  metadata.gz: 4a7e2a27521d1d1a34a809f5b3d2ce8db2b893ca
+  data.tar.gz: e336025cf967c7a673e46c8b289aa5f80edc97ae
 SHA512:
-  metadata.gz: bbfda59e38109cbb5191c602e788a6179121bd2fbd65b6ac4cff153afc219ee1ea99a74ac2612ec251834cfa1c34af8078a11ab61822dd9eb0b5f9df8bfbeffc
-  data.tar.gz: fdd6f50e21b9abbacaa93f93eaf7cd705bc2c7db1be207d57b2683f02c8c2a8afc08576e39de8a934100ca9504dfefc7c6cecff2e97b6f23016ec3a4b9eb2b73
+  metadata.gz: 74ffa36e6a43b1d9b0e1b45d821a5974e0c58e651cb5bf5e13666dae61cdd19bb0626ec4133186777931df25db5b63899adcf6cdcafb550d691a4ec55935c91c
+  data.tar.gz: 1aafe95aa04762e43484cb619c0572406156a309891a090e7021ad7fc27890a0d4f728d55e4f4efbeedfd42529ba051fc0ddfaa611cd7a7b47da9f63e523fed2

data/.gitignore

@@ -22,3 +22,4 @@ pkg
 .bundle
 spec/custom_wkhtmltopdf_path.rb
 spec/test_save.pdf
+Gemfile.lock

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
 - 1.9.2
 - 1.9.3
-- 2.0.0
+- 2.0
+- 2.1
 
 before_script:
   - "export DISPLAY=:99.0"

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+2015-05-06
+=================
+  * Bump to 0.7.0
+  * Fix issue #230 where PDFKit called `bundle exec` without a Gemfile
+  * Fix issue #183 where PDFKit broke the path to wkhtmltopdf.exe by escaping
+    spaces in paths
+  * Improve performance by not storing the PDF in memory if a path is
+    provided. Thanks @mikefarah
+  * Middleware now infers HTTP or HTTPS from environment for relative URLs
+
 2014-04-20
 ==================
   * Bump to 0.6.2

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
+group :test do
+  gem 'activesupport', '~> 3.0'
+end
+
 gemspec

data/lib/pdfkit/configuration.rb

@@ -19,7 +19,7 @@ class PDFKit
     end
 
     def wkhtmltopdf
-      @wkhtmltopdf ||= (defined?(Bundler::GemfileError) ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
+      @wkhtmltopdf ||= (defined?(Bundler::GemfileError) && File.exists?('Gemfile') ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
     end
 
     def quiet?

data/lib/pdfkit/middleware.rb

@@ -1,11 +1,10 @@
 class PDFKit
-
   class Middleware
-
     def initialize(app, options = {}, conditions = {})
       @app        = app
       @options    = options
       @conditions = conditions
+      @render_pdf = false
     end
 
     def call(env)
@@ -42,12 +41,22 @@ class PDFKit
 
     private
 
-    # Change relative paths to absolute
+    # Change relative paths to absolute, and relative protocols to absolute protocols
     def translate_paths(body, env)
-      # Host with protocol
+      body = translate_relative_paths(body, env)
+      translate_relative_protocols(body, env)
+    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/vmuGSkheuu
+      body.gsub(/(href|src)=(['"])\/([^\/]([^\"']*|[^"']*))['"]/, "\\1=\\2#{root}\\3\\2")
+    end
 
-      body.gsub(/(href|src)=(['"])\/([^\/]([^\"']*|[^"']*))['"]/, '\1=\2' + root + '\3\2')
+    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")
     end
 
     def rendering_pdf?
@@ -55,25 +64,16 @@ class PDFKit
     end
 
     def render_as_pdf?
-      request_path_is_pdf = @request.path.match(%r{\.pdf$})
+      request_path = @request.path
+      request_path_is_pdf = request_path.match(%r{\.pdf$})
 
       if request_path_is_pdf && @conditions[:only]
-        rules = [@conditions[:only]].flatten
-        rules.any? do |pattern|
-          if pattern.is_a?(Regexp)
-            @request.path =~ pattern
-          else
-            @request.path[0, pattern.length] == pattern
-          end
+        conditions_as_regexp(@conditions[:only]).any? do |pattern|
+          request_path =~ pattern
         end
       elsif request_path_is_pdf && @conditions[:except]
-        rules = [@conditions[:except]].flatten
-        rules.map do |pattern|
-          if pattern.is_a?(Regexp)
-            return false if @request.path =~ pattern
-          else
-            return false if @request.path[0, pattern.length] == pattern
-          end
+        conditions_as_regexp(@conditions[:except]).each do |pattern|
+          return false if request_path =~ pattern
         end
 
         return true
@@ -98,5 +98,10 @@ class PDFKit
       (accepts || '').split(',').unshift(type).compact.join(',')
     end
 
+    def conditions_as_regexp(conditions)
+      [conditions].flatten.map do |pattern|
+        pattern.is_a?(Regexp) ? pattern : Regexp.new('^' + pattern)
+      end
+    end
   end
 end

data/lib/pdfkit/pdfkit.rb

@@ -1,7 +1,6 @@
 require 'shellwords'
 
 class PDFKit
-
   class NoExecutableError < StandardError
     def initialize
       msg  = "No wkhtmltopdf executable found at #{PDFKit.configuration.wkhtmltopdf}\n"
@@ -33,8 +32,7 @@ class PDFKit
   end
 
   def command(path = nil)
-    args = [executable]
-    args += @options.to_a.flatten.compact
+    args = @options.to_a.flatten.compact
 
     if @source.html?
       args << '-' # Get HTML from stdin
@@ -44,7 +42,7 @@ class PDFKit
 
     args << (path || '-') # Write to file or stdout
 
-    args.shelljoin
+    [executable, args.shelljoin].join ' '
   end
 
   def executable
@@ -65,12 +63,12 @@ class PDFKit
     result = IO.popen(invoke, "wb+") do |pdf|
       pdf.puts(@source.to_s) if @source.html?
       pdf.close_write
-      pdf.gets(nil)
+      pdf.gets(nil) if path.nil?
     end
-    result = File.read(path) if path
 
-    # $? 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 result.to_s.strip.empty? or !successful?($?)
+    # $? 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?($?)
     return result
   end
 
@@ -81,114 +79,117 @@ 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]
-
-    def find_options_in_meta(content)
-      # Read file if content is a File
-      content = content.read if content.is_a?(File)
+  # Pulled from:
+  # https://github.com/wkhtmltopdf/wkhtmltopdf/blob/ebf9b6cfc4c58a31349fb94c568b254fac37b3d3/README_WKHTMLTOIMAGE#L27
+  REPEATABLE_OPTIONS = %w[--allow --cookie --custom-header --post --post-file --run-script]
 
-      found = {}
-      content.scan(/<meta [^>]*>/) do |meta|
-        if meta.match(/name=["']#{PDFKit.configuration.meta_tag_prefix}/)
-          name = meta.scan(/name=["']#{PDFKit.configuration.meta_tag_prefix}([^"']*)/)[0][0].split
-          found[name] = meta.scan(/content=["']([^"'\\]+)["']/)[0][0]
-        end
-      end
+  def find_options_in_meta(content)
+    # Read file if content is a File
+    content = content.read if content.is_a?(File)
 
-      tuple_keys = found.keys.select { |k| k.is_a? Array }
-      tuple_keys.each do |key|
-        value = found.delete key
-        new_key = key.shift
-        found[new_key] ||= {}
-        found[new_key][key] = value
+    found = {}
+    content.scan(/<meta [^>]*>/) do |meta|
+      if meta.match(/name=["']#{PDFKit.configuration.meta_tag_prefix}/)
+        name = meta.scan(/name=["']#{PDFKit.configuration.meta_tag_prefix}([^"']*)/)[0][0].split
+        found[name] = meta.scan(/content=["']([^"'\\]+)["']/)[0][0]
       end
-
-      found
     end
 
-    def style_tag_for(stylesheet)
-      "<style>#{File.read(stylesheet)}</style>"
+    tuple_keys = found.keys.select { |k| k.is_a? Array }
+    tuple_keys.each do |key|
+      value = found.delete key
+      new_key = key.shift
+      found[new_key] ||= {}
+      found[new_key][key] = value
     end
 
-    def append_stylesheets
-      raise ImproperSourceError.new('Stylesheets may only be added to an HTML source') if stylesheets.any? && !@source.html?
+    found
+  end
 
-      stylesheets.each do |stylesheet|
-        if @source.to_s.match(/<\/head>/)
-          @source = Source.new(@source.to_s.gsub(/(<\/head>)/) {|s| style_tag_for(stylesheet) + s })
-        else
-          @source.to_s.insert(0, style_tag_for(stylesheet))
-        end
+  def style_tag_for(stylesheet)
+    "<style>#{File.read(stylesheet)}</style>"
+  end
+
+  def append_stylesheets
+    raise ImproperSourceError.new('Stylesheets may only be added to an HTML source') if stylesheets.any? && !@source.html?
+
+    stylesheets.each do |stylesheet|
+      if @source.to_s.match(/<\/head>/)
+        @source = Source.new(@source.to_s.gsub(/(<\/head>)/) {|s| style_tag_for(stylesheet) + s })
+      else
+        @source.to_s.insert(0, style_tag_for(stylesheet))
       end
     end
+  end
 
-    def normalize_options(options)
-      normalized_options = {}
+  def normalize_options(options)
+    normalized_options = {}
 
-      options.each do |key, value|
-        next if !value
+    options.each do |key, value|
+      next if !value
 
-        # The actual option for wkhtmltopdf
-        normalized_key = "--#{normalize_arg key}"
+      # The actual option for wkhtmltopdf
+      normalized_key = "--#{normalize_arg key}"
 
-        # If the option is repeatable, attempt to normalize all values
-        if REPEATABLE_OPTIONS.include? normalized_key
-          normalize_repeatable_value(value) do |normalized_key_piece, normalized_value|
-            normalized_options[[normalized_key, normalized_key_piece]] = normalized_value
-          end
-        else # Otherwise, just normalize it like usual
-          normalized_options[normalized_key] = normalize_value(value)
+      # If the option is repeatable, attempt to normalize all values
+      if REPEATABLE_OPTIONS.include? normalized_key
+        normalize_repeatable_value(value) do |normalized_key_piece, normalized_value|
+          normalized_options[[normalized_key, normalized_key_piece]] = normalized_value
         end
+      else # Otherwise, just normalize it like usual
+        normalized_options[normalized_key] = normalize_value(value)
       end
-
-      normalized_options
     end
 
-    def normalize_arg(arg)
-      arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
-    end
+    normalized_options
+  end
 
-    def normalize_value(value)
-      case value
-      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
-        value.to_s
-      end
+  def normalize_arg(arg)
+    arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
+  end
+
+  def normalize_value(value)
+    case value
+    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
+      value.to_s
     end
+  end
 
-    def normalize_repeatable_value(value)
-      case value
-      when Hash, Array
-        value.each do |(key, value)|
-          yield [normalize_value(key), normalize_value(value)]
-        end
-      else
-        [normalize_value(value), '']
+  def normalize_repeatable_value(value)
+    case value
+    when Hash, Array
+      value.each do |(key, val)|
+        yield [normalize_value(key), normalize_value(val)]
       end
+    else
+      [normalize_value(value), '']
     end
+  end
 
-    def successful?(status)
-      return true if status.success?
+  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?
+    # 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?
 
-      false
-    end
+    false
+  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 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
 end

data/lib/pdfkit/version.rb

@@ -1,3 +1,3 @@
 class PDFKit
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/pdfkit.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<activesupport>, [">= 3.0.8"])
   s.add_development_dependency(%q<mocha>, [">= 0.9.10"])
   s.add_development_dependency(%q<rack-test>, [">= 0.5.6"])
+  s.add_development_dependency(%q<i18n>, ["~>0.6.11"]) # Ruby 1.9.2 compatibility
   s.add_development_dependency(%q<rake>, ["~>0.9.2"])
   s.add_development_dependency(%q<rdoc>, ["~> 4.0.1"])
-  s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
+  s.add_development_dependency(%q<rspec>, ["~> 3.0"])
 end

data/spec/middleware_spec.rb

@@ -16,22 +16,30 @@ def mock_app(options = {}, conditions = {}, custom_headers = {})
 end
 
 describe PDFKit::Middleware do
-  let(:headers) { {'Content-Type' => "text/html"} }
+  let(:headers) do
+    {'Content-Type' => "text/html"}
+  end
 
   describe "#call" do
     describe "caching" do
-      let(:headers) { {'Content-Type' => "text/html", 'ETag' => 'foo', 'Cache-Control' => 'max-age=2592000, public'} }
+      let(:headers) do
+        {
+          'Content-Type' => "text/html",
+          'ETag' => 'foo',
+          'Cache-Control' => 'max-age=2592000, public'
+        }
+      end
 
       context "by default" do
         before { mock_app }
 
         it "deletes ETag" do
           get 'http://www.example.org/public/test.pdf'
-          last_response.headers["ETag"].should be_nil
+          expect(last_response.headers["ETag"]).to be_nil
         end
         it "deletes Cache-Control" do
           get 'http://www.example.org/public/test.pdf'
-          last_response.headers["Cache-Control"].should be_nil
+          expect(last_response.headers["Cache-Control"]).to be_nil
         end
       end
 
@@ -40,11 +48,12 @@ describe PDFKit::Middleware do
 
         it "preserves ETag" do
           get 'http://www.example.org/public/test.pdf'
-          last_response.headers["ETag"].should_not be_nil
+          expect(last_response.headers["ETag"]).not_to be_nil
         end
+
         it "preserves Cache-Control" do
           get 'http://www.example.org/public/test.pdf'
-          last_response.headers["Cache-Control"].should_not be_nil
+          expect(last_response.headers["Cache-Control"]).not_to be_nil
         end
       end
     end
@@ -59,16 +68,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # one regex
@@ -79,16 +88,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # multiple regex
@@ -101,16 +110,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # one string
@@ -121,16 +130,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # multiple string
@@ -147,16 +156,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # one regex
@@ -167,16 +176,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # multiple regex
@@ -189,16 +198,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # one string
@@ -209,16 +218,16 @@ describe PDFKit::Middleware do
             context "matching" do
               specify do
                 get 'http://www.example.org/public/test.pdf'
-                last_response.headers["Content-Type"].should == "application/pdf"
-                last_response.body.bytesize.should == PDFKit.new("Hello world!").to_pdf.bytesize
+                expect(last_response.headers["Content-Type"]).to eq("application/pdf")
+                expect(last_response.body.bytesize).to eq(PDFKit.new("Hello world!").to_pdf.bytesize)
               end
             end
 
             context "not matching" do
               specify do
                 get 'http://www.example.org/secret/test.pdf'
-                last_response.headers["Content-Type"].should == "text/html"
-                last_response.body.should == "Hello world!"
+                expect(last_response.headers["Content-Type"]).to eq("text/html")
+                expect(last_response.body).to eq("Hello world!")
               end
             end
           end # multiple string
@@ -230,7 +239,7 @@ describe PDFKit::Middleware do
 	before do
           #make sure tests don't find an old test_save.pdf
           File.delete('spec/test_save.pdf') if File.exists?('spec/test_save.pdf')
-          File.exists?('spec/test_save.pdf').should be_false
+          expect(File.exists?('spec/test_save.pdf')).to eq(false)
 	end
 
         context "when header PDFKit-save-pdf is present" do
@@ -238,7 +247,7 @@ describe PDFKit::Middleware do
 	    headers = { 'PDFKit-save-pdf' => 'spec/test_save.pdf' }
             mock_app({}, {only: '/public'}, headers)
 	    get 'http://www.example.org/public/test_save.pdf'
-            File.exists?('spec/test_save.pdf').should be_true
+            expect(File.exists?('spec/test_save.pdf')).to eq(true)
 	  end
 
           it "should not raise when target directory does not exist" do
@@ -246,7 +255,7 @@ describe PDFKit::Middleware do
             mock_app({}, {only: '/public'}, headers)
             expect {
               get 'http://www.example.com/public/test_save.pdf'
-            }.not_to raise_error(Exception)
+            }.not_to raise_error
           end
         end
 
@@ -254,7 +263,7 @@ describe PDFKit::Middleware do
           it "should not saved the .pdf to disk" do
             mock_app({}, {only: '/public'}, {} )
 	    get 'http://www.example.org/public/test_save.pdf'
-            File.exists?('spec/test_save.pdf').should be_false
+            expect(File.exists?('spec/test_save.pdf')).to eq(false)
           end
         end
       end
@@ -267,15 +276,15 @@ describe PDFKit::Middleware do
 
         specify do
           get 'http://www.example.org/public/file.pdf'
-          @env["PATH_INFO"].should == "/public/file"
-          @env["REQUEST_URI"].should == "/public/file"
-          @env["SCRIPT_NAME"].should be_empty
+          expect(@env["PATH_INFO"]).to eq("/public/file")
+          expect(@env["REQUEST_URI"]).to eq("/public/file")
+          expect(@env["SCRIPT_NAME"]).to be_empty
         end
         specify do
           get 'http://www.example.org/public/file.txt'
-          @env["PATH_INFO"].should == "/public/file.txt"
-          @env["REQUEST_URI"].should be_nil
-          @env["SCRIPT_NAME"].should be_empty
+          expect(@env["PATH_INFO"]).to eq("/public/file.txt")
+          expect(@env["REQUEST_URI"]).to be_nil
+          expect(@env["SCRIPT_NAME"]).to be_empty
         end
       end
 
@@ -295,15 +304,15 @@ describe PDFKit::Middleware do
         end
         specify do
           get 'http://example.org/sub/public/file.pdf'
-          @env["PATH_INFO"].should == "/sub/public/file"
-          @env["REQUEST_URI"].should == "/sub/public/file"
-          @env["SCRIPT_NAME"].should == "/example.org"
+          expect(@env["PATH_INFO"]).to eq("/sub/public/file")
+          expect(@env["REQUEST_URI"]).to eq("/sub/public/file")
+          expect(@env["SCRIPT_NAME"]).to eq("/example.org")
         end
         specify do
           get 'http://example.org/sub/public/file.txt'
-          @env["PATH_INFO"].should == "/sub/public/file.txt"
-          @env["REQUEST_URI"].should be_nil
-          @env["SCRIPT_NAME"].should == "/example.org"
+          expect(@env["PATH_INFO"]).to eq("/sub/public/file.txt")
+          expect(@env["REQUEST_URI"]).to be_nil
+          expect(@env["SCRIPT_NAME"]).to eq("/example.org")
         end
       end
 
@@ -319,25 +328,25 @@ describe PDFKit::Middleware do
     it "should correctly parse relative url with single quotes" do
       @body = %{<html><head><link href='/stylesheets/application.css' media='screen' rel='stylesheet' type='text/css' /></head><body><img alt='test' src="/test.png" /></body></html>}
       body = @pdf.send :translate_paths, @body, @env
-      body.should == "<html><head><link href='http://example.com/stylesheets/application.css' media='screen' rel='stylesheet' type='text/css' /></head><body><img alt='test' src=\"http://example.com/test.png\" /></body></html>"
+      expect(body).to eq("<html><head><link href='http://example.com/stylesheets/application.css' media='screen' rel='stylesheet' type='text/css' /></head><body><img alt='test' src=\"http://example.com/test.png\" /></body></html>")
     end
 
     it "should correctly parse relative url with double quotes" do
       @body = %{<link href="/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />}
       body = @pdf.send :translate_paths, @body, @env
-      body.should == "<link href=\"http://example.com/stylesheets/application.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />"
+      expect(body).to eq("<link href=\"http://example.com/stylesheets/application.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />")
     end
 
     it "should correctly parse relative url with double quotes" do
       @body = %{<link href='//fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>}
       body = @pdf.send :translate_paths, @body, @env
-      body.should == "<link href='//fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>"
+      expect(body).to eq("<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600' rel='stylesheet' type='text/css'>")
     end
 
     it "should return the body even if there are no valid substitutions found" do
       @body = "NO MATCH"
       body = @pdf.send :translate_paths, @body, @env
-      body.should == "NO MATCH"
+      expect(body).to eq("NO MATCH")
     end
   end
 
@@ -353,7 +362,7 @@ describe PDFKit::Middleware do
     it "should add the root_url" do
       @body = %{<html><head><link href='/stylesheets/application.css' media='screen' rel='stylesheet' type='text/css' /></head><body><img alt='test' src="/test.png" /></body></html>}
       body = @pdf.send :translate_paths, @body, @env
-      body.should == "<html><head><link href='http://example.net/stylesheets/application.css' media='screen' rel='stylesheet' type='text/css' /></head><body><img alt='test' src=\"http://example.net/test.png\" /></body></html>"
+      expect(body).to eq("<html><head><link href='http://example.net/stylesheets/application.css' media='screen' rel='stylesheet' type='text/css' /></head><body><img alt='test' src=\"http://example.net/test.png\" /></body></html>")
     end
 
     after do
@@ -366,19 +375,18 @@ describe PDFKit::Middleware do
   it "should not get stuck rendering each request as pdf" do
     mock_app
     # false by default. No requests.
-    @app.send(:rendering_pdf?).should be_false
+    expect(@app.send(:rendering_pdf?)).to eq(false)
 
     # Remain false on a normal request
     get 'http://www.example.org/public/file'
-    @app.send(:rendering_pdf?).should be_false
+    expect(@app.send(:rendering_pdf?)).to eq(false)
 
     # Return true on a pdf request.
     get 'http://www.example.org/public/file.pdf'
-    @app.send(:rendering_pdf?).should be_true
+    expect(@app.send(:rendering_pdf?)).to eq(true)
 
     # Restore to false on any non-pdf request.
     get 'http://www.example.org/public/file'
-    @app.send(:rendering_pdf?).should be_false
+    expect(@app.send(:rendering_pdf?)).to eq(false)
   end
-
 end