wicked_pdf 0.7.8 → 0.7.9

data/README.md

@@ -44,6 +44,7 @@ or add this to your Gemfile:
           format.html
           format.pdf do
             render :pdf                            => 'file_name',
+                   :disposition	                   => 'attachment',                 # default 'inline'                   
                    :template                       => 'things/show.pdf.erb',
                    :layout                         => 'pdf.html',                   # use 'pdf.html' for a pdf.html.erb file
                    :wkhtmltopdf                    => '/usr/local/bin/wkhtmltopdf', # path to binary
@@ -92,7 +93,8 @@ or add this to your Gemfile:
                                :left               => 'TEXT',
                                :right              => 'TEXT',
                                :spacing            => REAL,
-                               :line               => true},
+                               :line               => true,
+                               :content            => 'HTML CONTENT ALREADY RENDERED'}, # optionally you can pass plain html already rendered (useful if using pdf_from_string)
                    :footer => {:html => { :template => 'shared/footer.pdf.erb', # use :template OR :url
                                           :layout   => 'pdf_plain.html',        # optional, use 'pdf_plain.html' for a pdf_plain.html.erb file, defaults to main layout
                                           :url      => 'www.example.com',
@@ -103,7 +105,8 @@ or add this to your Gemfile:
                                :left               => 'TEXT',
                                :right              => 'TEXT',
                                :spacing            => REAL,
-                               :line               => true},
+                               :line               => true,
+                               :content            => 'HTML CONTENT ALREADY RENDERED'}, # optionally you can pass plain html already rendered (useful if using pdf_from_string)
                    :toc    => {:font_name          => "NAME",
                                :depth              => LEVEL,
                                :header_text        => "TEXT",
@@ -140,6 +143,11 @@ If you need to just create a pdf and not display it:
 
     # create a pdf from a string
     pdf = WickedPdf.new.pdf_from_string('<h1>Hello There!</h1>')
+
+    # create a pdf from string using templates, layouts and content option for header or footer
+    WickedPdf.new.pdf_from_string(
+        render_to_string(:pdf => "pdf_file.pdf", :template => 'templates/pdf.html.erb', :layout => 'pdfs/layout_pdf'), 
+        :footer => {:content => render_to_string({:template => 'templates/pdf_footer.html.erb', :layout => 'pdfs/layout_pdf'})}
 		
     # or from your controller, using views & templates and all wicked_pdf options as normal
     pdf = render_to_string :pdf => "some_file_name"

data/lib/wicked_pdf.rb

@@ -107,6 +107,15 @@ class WickedPdf
           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 = [] if ! defined?(@hf_tempfiles)
+            @hf_tempfiles.push( tf=WickedPdfTempfile.new("wicked_#{hf}_pdf.html") )
+            tf.write options[hf][:content]
+            tf.flush
+            options[hf].delete(:content)
+            options[hf][:html] = {}
+            options[hf][:html][:url] = "file://#{tf.path}"
+          end
           unless opt_hf[:html].blank?
             r += make_option("#{hf.to_s}-html", opt_hf[:html][:url]) unless opt_hf[:html][:url].blank?
           end
@@ -175,7 +184,7 @@ class WickedPdf
         r +=make_options(options, [ :book,
                                     :default_header,
                                     :disable_javascript,
-                                    :greyscale,
+                                    :grayscale,
                                     :lowquality,
                                     :enable_plugins,
                                     :disable_internal_links,

data/test/wicked_pdf_test.rb

@@ -137,7 +137,7 @@ class WickedPdfTest < ActiveSupport::TestCase
       assert_equal "--#{o.to_s.gsub('_', '-')} 5", wp.get_parsed_options(o => 5).strip
     end
 
-    [ :book, :default_header, :disable_javascript, :greyscale, :lowquality,
+    [ :book, :default_header, :disable_javascript, :grayscale, :lowquality,
       :enable_plugins, :disable_internal_links, :disable_external_links,
       :print_media_type, :disable_smart_shrinking, :use_xserver, :no_background
     ].each do |o|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wicked_pdf
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - Miles Z. Sterret
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-04-30 00:00:00 Z
 dependencies: []
 
 description: |