pdfkit 0.1.1 → 0.2.0

data/README.md

@@ -5,8 +5,8 @@ Create PDFs using plain old HTML+CSS. Uses [wkhtmltopdf](http://github.com/antia
 ## Installation
 
 1. Install wkhtmltopdf
-## Download the latest binary from http://code.google.com/p/wkhtmltopdf/downloads/list
-## Place the binary somewhere on your path (e.g /usr/local/bin)
+** Download the latest binary from http://code.google.com/p/wkhtmltopdf/downloads/list
+** Place the binary somewhere on your path (e.g /usr/local/bin)
 2. Install PDFKit
 
     $ gem install pdfkit
@@ -26,7 +26,7 @@ Create PDFs using plain old HTML+CSS. Uses [wkhtmltopdf](http://github.com/antia
    
 ## Middleware
 
-PDFKit comes with a middleware that allows users to visit any to get a PDF view of any page on your site by appending ?pdf=true to the URL.
+PDFKit comes with a middleware that allows users to visit any to get a PDF view of any page on your site by appending .pdf to the URL.
 
 ### Middleware Setup
 
@@ -41,6 +41,12 @@ PDFKit comes with a middleware that allows users to visit any to get a PDF view
     # in application.rb(Rails3) or environment.rb(Rails2)
     require 'pdfkit'
     config.middleware.use PDFKit::Middleware
+    
+**With PDFKit options**
+
+    # options will be passed to PDFKit.new
+    config.middleware.use PDFKit::Middleware, :print_media_type => true
+
 
 ## Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/pdfkit/middleware.rb

@@ -3,39 +3,67 @@ class PDFKit
   # A rack middleware for validating HTML via w3c validator
   class Middleware
     
-    def initialize( app )
+    def initialize(app, options = {})
       @app = app
+      @options = options
     end
         
-    def call( env )
+    def call(env)
+      @render_pdf = false
+      set_request_to_render_as_pdf(env) if env['PATH_INFO'].match(/\.pdf$/)
+      
       status, headers, response = @app.call( env )
       
       request = Rack::Request.new( env )
-      if !request.params['pdf'].blank?
-        if headers['Content-Type'] =~ /text\/html|application\/xhtml\+xml/
-          body = response.body
-          
-          # Make absolute urls
-          uri = env['REQUEST_URI'].split('?').first
-          uri += '/' unless uri.match(/\/$/)
-          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"')
-          
-          pdf = PDFKit.new(body)
-          body = pdf.to_pdf
-          
-          headers["Content-Length"] = body.length.to_s
-          headers["Content-Type"] = "application/pdf"
-          response = [body]
-        end
+      if @render_pdf && headers['Content-Type'] =~ /text\/html|application\/xhtml\+xml/
+        body = response.body
+        
+        body = translate_paths(body, env)
+        
+        pdf = PDFKit.new(body, @options)
+        body = pdf.to_pdf
+        
+        # Do not cache PDFs
+        puts "DELETING CACHING"
+        headers.delete('ETag')
+        headers.delete('Cache-Control')
+        
+        headers["Content-Length"] = body.length.to_s
+        headers["Content-Type"] = "application/pdf"
+        
+        response = [body]
       end
       
       [status, headers, response]
     end
+    
+    private
+    
+      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']
+        
+        # translate relative urls
+        body.gsub!(/(href|src)=['"]([^\/][^\"']*)['"]/,'\1="'+root+'/\2"')
+        
+        # translate absolute urls
+        body.gsub!(/(href|src)=['"]\/([^\"]*|[^']*)['"]/,'\1="'+uri+'\2"')
+      end
+    
+      def set_request_to_render_as_pdf(env)
+        @render_pdf = true
+        puts "Setting PDF mode"
+        
+        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'))
+      end
+      
+      def concat(accepts, type)
+        (accepts || '').split(',').unshift(type).compact.join(',')
+      end
   
   end
 end

data/pdfkit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pdfkit}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jdpace"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - jdpace