pdfkit 0.3.1 → 0.3.2

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["jdpace"]
     gem.add_dependency "activesupport"
     gem.add_development_dependency "rspec", "~> 2.0.0.beta.8"
+    gem.add_development_dependency "rspec-core", "~> 2.0.0.beta.8"
     gem.add_development_dependency 'mocha'
     gem.files = [
       ".document",

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/pdfkit/middleware.rb

@@ -1,6 +1,5 @@
 class PDFKit
   
-  # A rack middleware for validating HTML via w3c validator
   class Middleware
     
     def initialize(app, options = {})
@@ -12,9 +11,9 @@ class PDFKit
       @render_pdf = false
       set_request_to_render_as_pdf(env) if env['PATH_INFO'].match(/\.pdf$/)
       
-      status, headers, response = @app.call( env )
+      status, headers, response = @app.call(env)
       
-      request = Rack::Request.new( env )
+      request = Rack::Request.new(env)
       if @render_pdf && headers['Content-Type'] =~ /text\/html|application\/xhtml\+xml/
         body = response.body
         
@@ -28,7 +27,7 @@ class PDFKit
         headers.delete('ETag')
         headers.delete('Cache-Control')
         
-        headers["Content-Length"] = body.length.to_s
+        headers["Content-Length"] = body.bytes.to_a.size.to_s
         headers["Content-Type"] = "application/pdf"
         
         response = [body]
@@ -39,17 +38,12 @@ class PDFKit
     
     private
     
+      # Change relative paths to absolute
       def translate_paths(body, env)
-        # Make absolute urls
-        uri = env['REQUEST_URI'].split('?').first
-        uri += '/' unless uri.match(/\/$/)
-        root = env['rack.url_scheme'] + "://" + env['HTTP_HOST']
+        # Host with protocol
+        root = env['rack.url_scheme'] + "://" + env['HTTP_HOST'] + "/"
         
-        # translate relative urls
-        body.gsub!(/(href|src)=['"]([^\/][^\"']*)['"]/,'\1="'+root+'/\2"')
-        
-        # translate absolute urls
-        body.gsub!(/(href|src)=['"]\/([^\"]*|[^']*)['"]/,'\1="'+uri+'\2"')
+        body.gsub!(/(href|src)=['"]\/([^\"']*|[^"']*)['"]/,'\1="'+root+'\2"')
       end
     
       def set_request_to_render_as_pdf(env)
@@ -58,7 +52,7 @@ class PDFKit
         
         path = Pathname(env['PATH_INFO'])
         env['PATH_INFO'] = path.to_s.sub(/#{path.extname}$/,'') if path.extname == '.pdf'
-        env['HTTP_ACCEPT'] = concat(env['HTTP_ACCEPT'], Rack::Mime.mime_type('html'))
+        env['HTTP_ACCEPT'] = concat(env['HTTP_ACCEPT'], Rack::Mime.mime_type('.html'))
       end
       
       def concat(accepts, type)
@@ -66,4 +60,4 @@ class PDFKit
       end
   
   end
-end
+end

data/pdfkit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pdfkit}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jdpace"]
-  s.date = %q{2010-06-15}
+  s.date = %q{2010-06-18}
   s.description = %q{Uses wkhtmltopdf to create PDFs using HTML}
   s.email = %q{jared@codewordstudios.com}
   s.executables = ["wkhtmltopdf-linux-i386-0-9-9", "wkhtmltopdf-osx-i386-0-9-9", "wkhtmltopdf-proxy"]
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
      "spec/fixtures/example.html",
      "spec/pdfkit_spec.rb",
      "spec/source_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/jdpace/PDFKit}
@@ -45,7 +44,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{HTML+CSS -> PDF}
   s.test_files = [
-    "spec/PDFKit_spec.rb",
+    "spec/middleware_spec.rb",
+     "spec/PDFKit_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -57,15 +57,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
+      s.add_development_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
+      s.add_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
+    s.add_dependency(%q<rspec-core>, ["~> 2.0.0.beta.8"])
     s.add_dependency(%q<mocha>, [">= 0"])
   end
 end

data/spec/PDFKit_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe PDFKit do
   
@@ -68,7 +68,7 @@ describe PDFKit do
     it "should generate a PDF of the HTML" do
       pdfkit = PDFKit.new('html', :page_size => 'Letter')
       pdf = pdfkit.to_pdf
-      pdf.should match(/^%PDF/) # PDF Signature at beginning of file
+      pdf[0...4].should == "%PDF" # PDF Signature at beginning of file
     end
     
     it "should have the stylesheet added to the head if it has one" do

data/spec/middleware_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe PDFKit::Middleware do
+  describe "#translate_paths" do
+    before do
+      @pdf = PDFKit::Middleware.new({})
+      @env = {'REQUEST_URI' => 'http://example.com/document.pdf', 'rack.url_scheme' => 'http', 'HTTP_HOST' => 'example.com'}
+    end
+
+    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>"
+    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\" />"
+    end
+  end
+end

data/spec/pdfkit_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe PDFKit do
   
@@ -68,7 +68,7 @@ describe PDFKit do
     it "should generate a PDF of the HTML" do
       pdfkit = PDFKit.new('html', :page_size => 'Letter')
       pdf = pdfkit.to_pdf
-      pdf.should match(/^%PDF/) # PDF Signature at beginning of file
+      pdf[0...4].should == "%PDF" # PDF Signature at beginning of file
     end
     
     it "should have the stylesheet added to the head if it has one" do

data/spec/source_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe PDFKit::Source do
   
@@ -70,4 +70,4 @@ describe PDFKit::Source do
     end
   end
   
-end
+end

data/spec/spec_helper.rb

@@ -2,14 +2,16 @@ SPEC_ROOT = File.dirname(__FILE__)
 $LOAD_PATH.unshift(SPEC_ROOT)
 $LOAD_PATH.unshift(File.join(SPEC_ROOT, '..', 'lib'))
 require 'pdfkit'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'mocha'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
   config.before do
-    PDFKit.any_instance.stubs(:wkhtmltopdf).returns(File.join(SPEC_ROOT,'..','bin','wkhtmltopdf-proxy'))
+    PDFKit.any_instance.stubs(:wkhtmltopdf).returns(
+      File.join(SPEC_ROOT,'..','bin','wkhtmltopdf-proxy')
+    )
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdfkit
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - jdpace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,9 +51,27 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec-core
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 62196467
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 8
+        version: 2.0.0.beta.8
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,7 +81,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Uses wkhtmltopdf to create PDFs using HTML
 email: jared@codewordstudios.com
 executables: 
@@ -94,8 +112,8 @@ files:
 - spec/fixtures/example.html
 - spec/pdfkit_spec.rb
 - spec/source_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
+- spec/middleware_spec.rb
 - spec/PDFKit_spec.rb
 has_rdoc: true
 homepage: http://github.com/jdpace/PDFKit
@@ -132,6 +150,7 @@ signing_key:
 specification_version: 3
 summary: HTML+CSS -> PDF
 test_files: 
+- spec/middleware_spec.rb
 - spec/PDFKit_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color