wicked_pdf 0.9.1 → 0.9.2

data/lib/pdf_helper.rb

@@ -55,7 +55,9 @@ module PdfHelper
     end
 
     def make_pdf(options = {})
-      html_string = render_to_string(:template => options[:template], :file => options[:file], :layout => options[:layout], :formats => options[:formats], :handlers => options[:handlers])
+      render_opts = {:template => options[:template], :layout => options[:layout], :formats => options[:formats], :handlers => options[:handlers]}
+      render_opts.merge!(:file => options[:file]) if options[:file]
+      html_string = render_to_string(render_opts)
       options = prerender_header_and_footer(options)
       w = WickedPdf.new(options[:wkhtmltopdf])
       w.pdf_from_string(html_string, options)
@@ -67,7 +69,9 @@ module PdfHelper
       options[:template]    ||= File.join(controller_path, action_name)
       options[:disposition] ||= "inline"
       if options[:show_as_html]
-        render :template => options[:template], :file => options[:file], :layout => options[:layout], :formats => options[:formats], :handlers => options[:handlers], :content_type => "text/html"
+        render_opts = {:template => options[:template], :layout => options[:layout], :formats => options[:formats], :handlers => options[:handlers], :content_type => "text/html"}
+        render_opts.merge!(:file => options[:file]) if options[:file]
+        render(render_opts)
       else
         pdf_content = make_pdf(options)
         File.open(options[:save_to_file], 'wb') {|file| file << pdf_content } if options[:save_to_file]
@@ -83,7 +87,9 @@ module PdfHelper
           @hf_tempfiles = [] if ! defined?(@hf_tempfiles)
           @hf_tempfiles.push( tf=WickedPdfTempfile.new("wicked_#{hf}_pdf.html") )
           options[hf][:html][:layout] ||=  options[:layout]
-          tf.write render_to_string(:template => options[hf][:html][:template], :file => options[hf][:html][:file], :layout => options[hf][:html][:layout], :locals => options[hf][:html][:locals], :formats => options[hf][:html][:formats], :handlers => options[hf][:html][:handlers])
+          render_opts = {:template => options[hf][:html][:template], :file => options[hf][:html][:file], :layout => options[hf][:html][:layout], :locals => options[hf][:html][:locals], :formats => options[hf][:html][:formats], :handlers => options[hf][:html][:handlers]}
+          render_opts.merge!({:file => options[hf][:html][:file]}) if options[:file]
+          tf.write render_to_string(render_opts)
           tf.flush
           options[hf][:html].delete(:template)
           options[hf][:html][:url] = "file:///#{tf.path}"

data/lib/wicked_pdf_helper.rb

@@ -3,10 +3,15 @@ module WickedPdfHelper
     String === Rails.root ? Pathname.new(Rails.root) : Rails.root
   end
 
+  def self.add_extension(filename, extension)
+    (File.extname(filename.to_s)[1..-1] == extension) ? filename : "#{filename}.#{extension}"
+  end
+
   def wicked_pdf_stylesheet_link_tag(*sources)
     css_dir = WickedPdfHelper.root_path.join('public', 'stylesheets')
     css_text = sources.collect { |source|
-      "<style type='text/css'>#{File.read(css_dir.join(source+'.css'))}</style>"
+      source = WickedPdfHelper.add_extension(source, 'css')
+      "<style type='text/css'>#{File.read(css_dir.join(source))}</style>"
     }.join("\n")
     css_text.respond_to?(:html_safe) ? css_text.html_safe : css_text
   end
@@ -16,6 +21,7 @@ module WickedPdfHelper
   end
 
   def wicked_pdf_javascript_src_tag(jsfile, options={})
+    jsfile = WickedPdfHelper.add_extension(jsfile, 'js')
     javascript_src_tag "file:///#{WickedPdfHelper.root_path.join('public', 'javascripts', jsfile)}", options
   end
 
@@ -27,7 +33,8 @@ module WickedPdfHelper
   module Assets
     def wicked_pdf_stylesheet_link_tag(*sources)
       sources.collect { |source|
-        "<style type='text/css'>#{read_asset(source+".css")}</style>"
+        source = WickedPdfHelper.add_extension(source, 'css')
+        "<style type='text/css'>#{read_asset(source)}</style>"
       }.join("\n").html_safe
     end
 
@@ -36,12 +43,14 @@ module WickedPdfHelper
     end
 
     def wicked_pdf_javascript_src_tag(jsfile, options={})
+      jsfile = WickedPdfHelper.add_extension(jsfile, 'js')
       javascript_include_tag "file:///#{asset_pathname(jsfile).to_s}", options
     end
 
     def wicked_pdf_javascript_include_tag(*sources)
       sources.collect { |source|
-        "<script type='text/javascript'>#{read_asset(source+".js")}</script>"
+        source = WickedPdfHelper.add_extension(source, 'js')
+        "<script type='text/javascript'>#{read_asset(source)}</script>"
       }.join("\n").html_safe
     end
 

metadata

@@ -1,62 +1,63 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wicked_pdf
-version: !ruby/object:Gem::Version
-  version: 0.9.1
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 2
+  version: 0.9.2
 platform: ruby
-authors:
+authors: 
 - Miles Z. Sterret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'Wicked PDF uses the shell utility wkhtmltopdf to serve a PDF file
-  to a user from HTML.
-
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: |
+  Wicked PDF 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 Wicked take care of the hard stuff.
 
-  you simply write an HTML view as you would normally, and let Wicked take care of
-  the hard stuff.
-
-'
 email: miles.sterrett@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - Rakefile
 - MIT-LICENSE
@@ -77,26 +78,36 @@ files:
 - generators/wicked_pdf/wicked_pdf_generator.rb
 homepage: https://github.com/mileszs/wicked_pdf
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: PDF generator (from HTML) plugin for Ruby on Rails
 test_files: []
+