wisepdf 1.1.3 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/wisepdf/configuration.rb

@@ -3,17 +3,18 @@ require 'singleton'
 module Wisepdf
   class Configuration
     include Singleton
-    cattr_accessor :options
-    cattr_accessor :wkhtmltopdf
     
     class << self
+      attr_accessor :options
+      attr_accessor :wkhtmltopdf
+      
       def wkhtmltopdf
-        return @@wkhtmltopdf if @@wkhtmltopdf.present?
+        return @wkhtmltopdf if @wkhtmltopdf.present?
                 
-        if @@wkhtmltopdf.nil? && !self.windows?
-          @@wkhtmltopdf = (defined?(Bundler) ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
+        if @wkhtmltopdf.nil? && !self.windows?
+          @wkhtmltopdf = (defined?(Bundler) ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
         end
-        return @@wkhtmltopdf 
+        return @wkhtmltopdf 
       end
     
       def configure
@@ -21,11 +22,11 @@ module Wisepdf
       end
     
       def reset!
-        @@options = {
-          :layout => "pdf.html",
+        @options = {
+          :encoding => "UTF-8",
           :use_xserver => false
         }
-        @@wkhtmltopdf = nil
+        @wkhtmltopdf = nil
       end    
     
       def development?

data/lib/wisepdf/parser.rb

@@ -0,0 +1,61 @@
+module Wisepdf
+  class Parser
+    include Singleton
+    
+    ESCAPED_OPTIONS = [
+      :pdf, :layout, :template, :action, :partial,
+      :object, :collection, :as, :spacer_template,
+      :disposition, :locals, :status, :file, :text,
+      :xml, :json, :callback, :inline, :location
+    ]
+       
+    class << self
+      def parse(options)
+        options = self.escape(options)
+        options = self.flatten(options)
+        parsed_options = {}
+
+        options.each do |key, value|
+          unless( value == false || value.nil? )
+            normalized_key = "--#{self.normalize_arg(key)}"
+            parsed_options[normalized_key] = self.normalize_value(value)
+          end
+        end
+        parsed_options
+      end
+            
+    protected  
+      def escape(options)
+        options.delete_if{ |k,v| ESCAPED_OPTIONS.include?(k.to_sym) }    
+      end
+    
+      def flatten(options, prefix = nil)
+        hash = {}
+        options.each do |k,v|
+          key = prefix.nil? ? k : "#{prefix.to_s}-#{k}"
+
+          if v.is_a?(Hash)
+            hash.delete(k)              
+            hash.merge!(self.flatten(v, key))
+          else              
+            hash[key.to_s] = v  
+          end            
+        end
+        return hash
+      end    
+      
+      def normalize_arg(arg)
+        arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
+      end
+
+      def normalize_value(value)
+        case value
+        when TrueClass
+          nil
+        else
+          value.to_s
+        end
+      end
+    end  
+  end
+end

data/lib/wisepdf/render.rb

@@ -10,8 +10,11 @@ module Wisepdf
 
     def render(options = nil, *args, &block)
       if options.is_a?(Hash) && options.has_key?(:pdf)
-        log_pdf_creation
-        make_and_send_pdf(options.delete(:pdf), Wisepdf::Configuration.options.merge(options))
+        options = self.default_pdf_render_options.merge(options)        
+        super(options.merge(:content_type => "text/html"), *args, &block) and return if options[:show_as_html]
+        
+        self.log_pdf_creation
+        self.make_and_send_pdf(options)
       else
         super
       end
@@ -19,9 +22,8 @@ module Wisepdf
 
     def render_to_string(options = nil, *args, &block)
       if options.is_a?(Hash) && options.has_key?(:pdf)
-        log_pdf_creation
-        options.delete(:pdf)
-        make_pdf(Wisepdf::Configuration.options.merge(options))
+        self.log_pdf_creation
+        self.make_pdf(self.default_pdf_render_options.merge(options))
       else
         super
       end
@@ -29,7 +31,7 @@ module Wisepdf
 
   protected
     def log_pdf_creation
-      logger.info '*'*15 + 'PDF' + '*'*15
+      logger.info '*'*15 + 'WISEPDF' + '*'*15
     end
 
     def clean_temp_files
@@ -37,28 +39,30 @@ module Wisepdf
         @hf_tempfiles.each { |tf| tf.close! }
       end
     end
-
+    
+    def default_pdf_render_options
+      Wisepdf::Configuration.options.merge({
+        :wkhtmltopdf => nil,
+        :layout => false,
+        :template => File.join(controller_path, action_name),
+        :disposition => "inline"              
+      })
+    end
+    
     def make_pdf(options = {})
-      html_string = render_to_string(:template => options.delete(:template), :layout => options.delete(:layout))
-      options = prerender_header_and_footer(options)
-      w = Wisepdf::Writer.new(options[:wkhtmltopdf])
-      w.to_pdf(html_string, options)
+      options = self.prerender_header_and_footer(options)            
+      html = render_to_string(:template => options[:template], :layout => options[:layout])            
+      Wisepdf::Writer.new(options[:wkhtmltopdf], options.dup).to_pdf(html)
     end
 
-    def make_and_send_pdf(pdf_name, options={})
-      options[:wkhtmltopdf] ||= nil
-      options[:layout]      ||= false
-      options[:template]    ||= File.join(controller_path, action_name)
-      options[:disposition] ||= "inline"
-      if options[:show_as_html]
-        render :template => options[:template], :layout => options[:layout], :content_type => "text/html"
-      else
-        pdf_content = make_pdf(options)
-        File.open(options.delete(:save_to_file), 'wb') {|file| file << pdf_content } if options[:save_to_file].present?
+    def make_and_send_pdf(options = {})  
+      pdf = self.make_pdf(options)
+      File.open(options[:save_to_file], 'wb') {|file| file << pdf } if options[:save_to_file].present?
       
-        pdf_name += '.pdf' unless pdf_name =~ /.pdf\z|.PDF\Z/
-        send_data(pdf_content, :filename => pdf_name, :type => 'application/pdf', :disposition => options[:disposition]) unless options[:save_only]
-      end
+      filename = options.delete(:pdf)
+      filename += '.pdf' unless filename =~ /.pdf\z|.PDF\Z/
+      
+      send_data(pdf, options.merge(:filename => filename, :type => 'application/pdf')) unless options[:save_only]
     end
 
     def prerender_header_and_footer(arguments)
@@ -67,13 +71,13 @@ module Wisepdf
           opts = arguments[hf].delete(:html)
           
           @hf_tempfiles = [] if ! defined?(@hf_tempfiles)
-          @hf_tempfiles.push( tf = Wisepdf::Tempfile.new("wisepdf_#{hf}_pdf.html") )
+          @hf_tempfiles.push( tf = Tempfile.new("wisepdf_#{hf}_pdf", '.html') )
           opts[:layout] ||= arguments[:layout]
           
           tf.write render_to_string(:template => opts[:template], :layout => opts[:layout], :locals => opts[:locals])
           tf.flush
           
-          options[hf][:html] = "file://#{tf.path}"                        
+          arguments[hf][:html] = "file://#{tf.path}"                        
         end
       end
       arguments

data/lib/wisepdf/writer.rb

@@ -1,43 +1,21 @@
 require 'open3'
 
 module Wisepdf
-  class Writer        
-    def initialize(path=nil)
-      self.wkhtmltopdf = path unless path.nil?
+  class Writer  
+    def initialize(wkhtmltopdf = nil, options = {})
+      self.wkhtmltopdf = wkhtmltopdf unless wkhtmltopdf.nil?
+      self.options = options
     end
 
     def to_pdf(string, options={})
-      options = { :encoding => "UTF-8" }.merge(options)
-      @options = normalize_options(options)
+      invoke = self.command(options).join(' ')   
+      self.log(invoke) if Wisepdf::Configuration.development? || Wisepdf::Configuration.test?
 
-      invoke = self.command.join(' ')   
-      log(invoke) if Wisepdf::Configuration.development? || Wisepdf::Configuration.test?
-
-      # result = IO.popen(invoke, "wb+") do |f|
-      #   # f.sync = true
-      #   f.puts(string)
-      #   f.close_write
-      #   f.gets(nil)
-      #   
-      #   # pdf = f.gets(nil)
-      #   # f.close
-      #   # pdf        
-      # end
       result, err = Open3.popen3(invoke) do |stdin, stdout, stderr|
         stdin.write(string)
         stdin.close
         [stdout.read, stderr.read]
       end
-      # result, err = Open3.popen3(invoke) do |stdin, stdout, stderr|
-      #   stdin.binmode
-      #   stdout.binmode
-      #   stderr.binmode
-      #   stdin.write(string)
-      #   stdin.close_write
-      #   
-      #   [stdout.read, stderr.read]
-      # end
-      
 
       raise Wisepdf::WriteError if result.to_s.strip.empty?
 
@@ -45,23 +23,30 @@ module Wisepdf
     end
 
     def wkhtmltopdf
-      return @wkhtmltopdf if @wkhtmltopdf.present?
-
-      @wkhtmltopdf = Wisepdf::Configuration.wkhtmltopdf
-      raise Wisepdf::NoExecutableError.new(@wkhtmltopdf) if @wkhtmltopdf.nil? || !File.exists?(@wkhtmltopdf)
-
-      return @wkhtmltopdf
+      @wkhtmltopdf ||= Wisepdf::Configuration.wkhtmltopdf
+      @wkhtmltopdf
     end
 
-    def wkhtmltopdf=(value)
+    def wkhtmltopdf=(value)      
       @wkhtmltopdf = value
-      raise Wisepdf::NoExecutableError.new(@wkhtmltopdf) if @wkhtmltopdf.nil? || !File.exists?(@wkhtmltopdf)      
+      raise Wisepdf::NoExecutableError.new(@wkhtmltopdf) if @wkhtmltopdf.blank? || !File.exists?(@wkhtmltopdf)            
     end
-
-    protected
-    def command
+    
+    def options
+      @options ||= Wisepdf::Parser.parse(Wisepdf::Configuration.options.dup)
+      @options
+    end
+    
+    def options=(value)
+      self.options.merge!(Wisepdf::Parser.parse(value))
+    end
+    
+  protected
+    def command(options = {})
+      options = Wisepdf::Parser.parse(options)
+      
       args = [self.wkhtmltopdf]
-      args += @options.to_a.flatten.compact
+      args += self.options.merge(options).to_a.flatten.compact
       args << '--quiet'
 
       args << '-'        
@@ -70,46 +55,6 @@ module Wisepdf
       args.map {|arg| %Q{"#{arg.gsub('"', '\"')}"}}
     end
 
-    def normalize_options(options)
-      options = self.flatten(options)
-      normalized_options = {}
-
-      options.each do |key, value|
-        next if !value
-        normalized_key = "--#{self.normalize_arg(key)}"
-        normalized_options[normalized_key] = self.normalize_value(value)
-      end
-      normalized_options
-    end
-
-    def flatten(options, prefix = nil)
-      hash = {}
-      options.each do |k,v|
-        key = prefix.nil? ? k : "#{prefix.to_s}-#{k}"
-
-        if v.is_a?(Hash)
-          hash.delete(k)              
-          hash.merge!(self.flatten(v, key))
-        else              
-          hash[key.to_s] = v  
-        end            
-      end
-      return hash
-    end
-
-    def normalize_arg(arg)
-      arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
-    end
-
-    def normalize_value(value)
-      case value
-      when TrueClass
-        nil
-      else
-        value.to_s
-      end
-    end
-
     def log(command)
       puts "*"*15 
       puts command

data/lib/wisepdf.rb

@@ -1,7 +1,11 @@
-require 'wisepdf/tempfile'
-require 'wisepdf/errors'
-require 'wisepdf/configuration'
-require 'wisepdf/writer'
-require 'wisepdf/helper'
-require 'wisepdf/render'
-require 'wisepdf/rails' if defined?(Rails)
+WISEPDF_PATH = File.dirname(__FILE__) + "/wisepdf/"
+
+require WISEPDF_PATH + 'errors'
+require WISEPDF_PATH + 'configuration'
+require WISEPDF_PATH + 'parser'
+require WISEPDF_PATH + 'writer'
+require WISEPDF_PATH + 'helper'
+require WISEPDF_PATH + 'render'
+require WISEPDF_PATH + 'rails' if defined?(Rails)
+
+module Wisepdf; end

data/test/application_controller_test.rb

@@ -23,5 +23,10 @@ class ApplicationControllerTest < ActionController::TestCase
     should "respond to #prerender_header_and_footer" do
       assert_respond_to @controller, :prerender_header_and_footer
     end        
+    
+    should 'render pdf' do
+      get :index, :format => :pdf
+      assert_response 200
+    end
   end
 end

data/test/configuration_test.rb

@@ -0,0 +1,52 @@
+class ConfigurationTest < Test::Unit::TestCase    
+  context "Default configuration" do
+    setup do
+      Wisepdf::Configuration.reset!
+    end
+    
+    should 'read default configuration' do
+      assert_equal "UTF-8", Wisepdf::Configuration.options[:encoding]
+      assert_equal false, Wisepdf::Configuration.options[:use_xserver]
+    end
+    
+    if RbConfig::CONFIG['target_os'] != 'mingw32'
+      should 'try to find wkhtmltopdf if not on windows' do
+        path = (defined?(Bundler) ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
+        
+        assert_equal path, Wisepdf::Configuration.wkhtmltopdf
+      end
+    end
+  end
+  
+  context "Configuration" do
+    setup do
+      Wisepdf::Configuration.reset!
+    end
+    
+    should 'accept and override default configuration' do
+      Wisepdf::Configuration.configure do |config|
+        config.wkhtmltopdf = '/path/to/wkhtmltopdf'
+        config.options = {
+          :layout => "layout.html",
+          :use_xserver => true,
+          :footer => { 
+            :right => "#{Date.today.year}",
+            :font_size => 8,
+            :spacing => 8
+          },
+          :margin => {
+            :bottom => 15
+          }
+        }
+      end
+      assert_equal '/path/to/wkhtmltopdf', Wisepdf::Configuration.wkhtmltopdf
+      
+      assert_equal 'layout.html', Wisepdf::Configuration.options[:layout]
+      assert_equal true, Wisepdf::Configuration.options[:use_xserver]
+      assert_equal "#{Date.today.year}", Wisepdf::Configuration.options[:footer][:right]
+      assert_equal 8, Wisepdf::Configuration.options[:footer][:font_size]
+      assert_equal 8, Wisepdf::Configuration.options[:footer][:spacing]
+      assert_equal 15, Wisepdf::Configuration.options[:margin][:bottom]
+    end
+  end  
+end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,7 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery
+  protect_from_forgery  
+  
+  def index
+    render :pdf => 'filename'
+  end  
 end

data/test/dummy/app/views/application/index.pdf.erb

@@ -0,0 +1 @@
+HELLO

data/test/dummy/app/views/layouts/pdf.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/config/database.yml

@@ -1,3 +1,7 @@
 test:
   adapter: sqlite3
-  database: ':memory:'
+  database: ':memory:'
+  
+development:
+  adapter: sqlite3
+  database: ':memory:'  

data/test/dummy/config/routes.rb

@@ -1,2 +1,3 @@
 Dummy::Application.routes.draw do
+  get 'index' => 'application#index'
 end

data/test/parser_test.rb

@@ -0,0 +1,66 @@
+class ParserTest < Test::Unit::TestCase    
+  context "Options normalization" do
+    setup do
+      Wisepdf::Configuration.reset!
+      
+      @options = { Wisepdf::Parser::ESCAPED_OPTIONS.sample => 'value' }
+    end
+            
+    should 'escape and parse digit options' do
+      @options.merge!({
+        :key => 10
+      })
+      expected = {
+        '--key' => '10'
+      }
+      
+      assert_equal expected, Wisepdf::Parser.parse(@options)
+    end
+    
+    should 'escape and parse string options' do
+      @options.merge!({
+        :key => 'value'
+      })
+      expected = {
+        '--key' => 'value'
+      }
+      
+      assert_equal expected, Wisepdf::Parser.parse(@options)
+    end
+    
+    should 'escape and parse boolean (true) options' do
+      @options.merge!({
+        :key => true
+      })
+      expected = {
+        '--key' => nil
+      }
+      
+      assert_equal expected, Wisepdf::Parser.parse(@options)
+    end
+    
+    should 'escape and parse boolean (false) options' do
+      @options.merge!({
+        :key => false
+      })
+      expected = {}
+      
+      assert_equal expected, Wisepdf::Parser.parse(@options)
+    end
+    
+    should 'escape and parse nested options' do
+      @options.merge!({
+        :key => 'value',
+        :nested => {
+          :key => 'value'
+        }
+      })
+      expected = {
+        '--key' => 'value',
+        '--nested-key' => 'value'
+      }
+      
+      assert_equal expected, Wisepdf::Parser.parse(@options)
+    end    
+  end
+end

data/test/writer_test.rb

@@ -2,153 +2,11 @@ require 'helper'
 
 HTML_DOCUMENT = "<html><body>Hello World</body></html>"
 
-# Provide a public accessor to the normally-private parse_options function
-# class Wisepdf::Writer
-#   public :parse_options
-# end
+class Wisepdf::Writer
+  public :command
+end
 
 class WriterTest < Test::Unit::TestCase    
-  context "Default configuration" do
-    setup do
-      Wisepdf::Configuration.reset!
-    end
-    
-    should 'read default configuration' do
-      assert_equal 'pdf.html', Wisepdf::Configuration.options[:layout]
-      assert_equal false, Wisepdf::Configuration.options[:use_xserver]
-    end
-    
-    if RbConfig::CONFIG['target_os'] != 'mingw32'
-      should 'try to find wkhtmltopdf if not on windows' do
-        path = (defined?(Bundler) ? `bundle exec which wkhtmltopdf` : `which wkhtmltopdf`).chomp
-        
-        assert_equal path, Wisepdf::Configuration.wkhtmltopdf
-      end
-    end
-  end
-  
-  context "Configuration" do
-    setup do
-      Wisepdf::Configuration.reset!
-    end
-    
-    should 'accept and override default configuration' do
-      Wisepdf::Configuration.configure do |config|
-        config.wkhtmltopdf = '/path/to/wkhtmltopdf'
-        config.options = {
-          :layout => "layout.html",
-          :use_xserver => true,
-          :footer => { 
-            :right => "#{Date.today.year}",
-            :font_size => 8,
-            :spacing => 8
-          },
-          :margin => {
-            :bottom => 15
-          }
-        }
-      end
-      assert_equal '/path/to/wkhtmltopdf', Wisepdf::Configuration.wkhtmltopdf
-      
-      assert_equal 'layout.html', Wisepdf::Configuration.options[:layout]
-      assert_equal true, Wisepdf::Configuration.options[:use_xserver]
-      assert_equal "#{Date.today.year}", Wisepdf::Configuration.options[:footer][:right]
-      assert_equal 8, Wisepdf::Configuration.options[:footer][:font_size]
-      assert_equal 8, Wisepdf::Configuration.options[:footer][:spacing]
-      assert_equal 15, Wisepdf::Configuration.options[:margin][:bottom]
-    end
-  end  
-  
-  # context "Option parsing" do
-  #   setup do
-  #     Wisepdf::Configuration.reset!
-  #   end
-  #   
-  #   should "parse header and footer options" do
-  #     wp = Wisepdf::Writer.new
-  # 
-  #     [:header, :footer].each do |hf|
-  #       [:center, :font_name, :left, :right].each do |o|
-  #         assert_equal  "--#{hf.to_s}-#{o.to_s.gsub('_', '-')} \"header_footer\"",
-  #                       wp.parse_options(hf => {o => "header_footer"}).strip
-  #       end
-  # 
-  #       [:font_size, :spacing].each do |o|
-  #         assert_equal  "--#{hf.to_s}-#{o.to_s.gsub('_', '-')} 12",
-  #                       wp.parse_options(hf => {o => "12"}).strip
-  #       end
-  # 
-  #       assert_equal  "--#{hf.to_s}-line",
-  #                     wp.parse_options(hf => {:line => true}).strip
-  #       assert_equal  "--#{hf.to_s}-html \"http://www.abc.com\"",
-  #                     wp.parse_options(hf => {:html => {:url => 'http://www.abc.com'}}).strip
-  #     end
-  #   end
-  # 
-  #   should "parse toc options" do
-  #     wp = Wisepdf::Writer.new
-  #     
-  #     [:level_indentation, :header_text].each do |o|
-  #       assert_equal  "toc --toc-#{o.to_s.gsub('_', '-')} \"toc\"",
-  #                     wp.parse_options(:toc => {o => "toc"}).strip
-  #     end
-  # 
-  #     [:text_size_shrink].each do |o|
-  #       assert_equal  "toc --toc-#{o.to_s.gsub('_', '-')} 5",
-  #                     wp.parse_options(:toc => {o => 5}).strip
-  #     end
-  # 
-  #     [:disable_toc_links, :disable_dotted_lines].each do |o|
-  #       assert_equal  "toc --#{o.to_s.gsub('_', '-')}",
-  #                     wp.parse_options(:toc => {o => true}).strip
-  #     end
-  #   end
-  # 
-  #   should "parse outline options" do
-  #     wp = Wisepdf::Writer.new
-  # 
-  #     assert_equal "--outline", wp.parse_options(:outline => {:outline => true}).strip
-  #     assert_equal "--outline-depth 5", wp.parse_options(:outline => {:outline_depth => 5}).strip
-  #   end
-  # 
-  #   should "parse margins options" do
-  #     wp = Wisepdf::Writer.new
-  # 
-  #     [:top, :bottom, :left, :right].each do |o|
-  #       assert_equal "--margin-#{o.to_s} 12", wp.parse_options(:margin => {o => "12"}).strip
-  #     end
-  #   end
-  # 
-  #   should "parse other options" do
-  #     wp = Wisepdf::Writer.new
-  # 
-  #     [ :orientation, :page_size, :proxy, :username, :password, :cover, :dpi,
-  #       :encoding, :user_style_sheet
-  #     ].each do |o|
-  #       assert_equal "--#{o.to_s.gsub('_', '-')} \"opts\"", wp.parse_options(o => "opts").strip
-  #     end
-  # 
-  #     [:cookie, :post].each do |o|
-  #       assert_equal "--#{o.to_s.gsub('_', '-')} name value", wp.parse_options(o => "name value").strip
-  # 
-  #       nv_formatter = ->(number){ "--#{o.to_s.gsub('_', '-')} par#{number} val#{number}" }
-  #       assert_equal "#{nv_formatter.call(1)} #{nv_formatter.call(2)}", wp.parse_options(o => ['par1 val1', 'par2 val2']).strip
-  #     end
-  # 
-  #     [:redirect_delay, :zoom, :page_offset].each do |o|
-  #       assert_equal "--#{o.to_s.gsub('_', '-')} 5", wp.parse_options(o => 5).strip
-  #     end
-  # 
-  #     [ :book, :default_header, :disable_javascript, :greyscale, :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.gsub('_', '-')}", wp.parse_options(o => true).strip
-  #     end
-  #   end
-  #   
-  # end
-  
   context "PDF generation" do  
     should "generate PDF from html document" do
       writer = Wisepdf::Writer.new

data/wisepdf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wisepdf"
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = "2012-04-27"
+  s.date = "2012-05-02"
   s.description = "wisepdf 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 pdf take care of the hard stuff."
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [
@@ -30,15 +30,16 @@ Gem::Specification.new do |s|
     "lib/wisepdf/configuration.rb",
     "lib/wisepdf/errors.rb",
     "lib/wisepdf/helper.rb",
+    "lib/wisepdf/parser.rb",
     "lib/wisepdf/rails.rb",
     "lib/wisepdf/rails/engine.rb",
     "lib/wisepdf/rails/legacy.rb",
     "lib/wisepdf/rails/railtie.rb",
     "lib/wisepdf/render.rb",
-    "lib/wisepdf/tempfile.rb",
     "lib/wisepdf/writer.rb",
     "pdf.gemspec",
     "test/application_controller_test.rb",
+    "test/configuration_test.rb",
     "test/dummy/README.rdoc",
     "test/dummy/Rakefile",
     "test/dummy/app/assets/javascripts/application.js",
@@ -49,7 +50,9 @@ Gem::Specification.new do |s|
     "test/dummy/app/helpers/application_helper.rb",
     "test/dummy/app/mailers/.gitkeep",
     "test/dummy/app/models/.gitkeep",
+    "test/dummy/app/views/application/index.pdf.erb",
     "test/dummy/app/views/layouts/application.html.erb",
+    "test/dummy/app/views/layouts/pdf.html.erb",
     "test/dummy/config.ru",
     "test/dummy/config/application.rb",
     "test/dummy/config/boot.rb",
@@ -84,6 +87,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/helper_assets_test.rb",
     "test/helper_legacy_test.rb",
+    "test/parser_test.rb",
     "test/writer_test.rb",
     "wisepdf.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wisepdf
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70259591818540 !ruby/object:Gem::Requirement
+  requirement: &70283084149760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70259591818540
+  version_requirements: *70283084149760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70259591817820 !ruby/object:Gem::Requirement
+  requirement: &70283084148760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259591817820
+  version_requirements: *70283084148760
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
-  requirement: &70259591817220 !ruby/object:Gem::Requirement
+  requirement: &70283084147440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259591817220
+  version_requirements: *70283084147440
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70259591816520 !ruby/object:Gem::Requirement
+  requirement: &70283084146520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259591816520
+  version_requirements: *70283084146520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70259591815660 !ruby/object:Gem::Requirement
+  requirement: &70283084144820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70259591815660
+  version_requirements: *70283084144820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70259591814500 !ruby/object:Gem::Requirement
+  requirement: &70283084144340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70259591814500
+  version_requirements: *70283084144340
 description: wisepdf 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 pdf take care
@@ -101,15 +101,16 @@ files:
 - lib/wisepdf/configuration.rb
 - lib/wisepdf/errors.rb
 - lib/wisepdf/helper.rb
+- lib/wisepdf/parser.rb
 - lib/wisepdf/rails.rb
 - lib/wisepdf/rails/engine.rb
 - lib/wisepdf/rails/legacy.rb
 - lib/wisepdf/rails/railtie.rb
 - lib/wisepdf/render.rb
-- lib/wisepdf/tempfile.rb
 - lib/wisepdf/writer.rb
 - pdf.gemspec
 - test/application_controller_test.rb
+- test/configuration_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -120,7 +121,9 @@ files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/.gitkeep
+- test/dummy/app/views/application/index.pdf.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/pdf.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -155,6 +158,7 @@ files:
 - test/helper.rb
 - test/helper_assets_test.rb
 - test/helper_legacy_test.rb
+- test/parser_test.rb
 - test/writer_test.rb
 - wisepdf.gemspec
 homepage: http://github.com/igor-alexandrov/wisepdf
@@ -172,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -29506670284939891
+      hash: -3344427370032180930
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/wisepdf/tempfile.rb

@@ -1,11 +0,0 @@
-require 'tempfile'
-
-module Wisepdf
-  class Tempfile < Tempfile
-    # Replaces Tempfile's +make_tmpname+ with one that honors file extensions.
-    def make_tmpname(basename, n)
-      extension = File.extname(basename)
-      sprintf("%s_%d_%d%s", File.basename(basename, extension), $$, n.to_i, extension)
-    end
-  end
-end