wicked_pdf 0.7.0 → 0.7.2

data/README.md

@@ -48,6 +48,7 @@ Next:
                    :save_to_file                   => Rails.root.join('pdfs', "#{filename}.pdf"),
                    :save_only                      => false,                        # depends on :save_to_file being set first
                    :proxy                          => 'TEXT',
+                   :basic_auth                     => false                         # when true username & password are automatically sent from session
                    :username                       => 'TEXT',
                    :password                       => 'TEXT',
                    :cover                          => 'URL',

data/lib/pdf_helper.rb

@@ -13,7 +13,7 @@ module PdfHelper
   def render_with_wicked_pdf(options = nil, *args, &block)
     if options.is_a?(Hash) && options.has_key?(:pdf)
       log_pdf_creation
-      options[:basic_auth] = set_basic_auth
+      options[:basic_auth] = set_basic_auth(options)
       make_and_send_pdf(options.delete(:pdf), (WickedPdf.config || {}).merge(options))
     else
       render_without_wicked_pdf(options, *args, &block)
@@ -23,7 +23,7 @@ module PdfHelper
   def render_to_string_with_wicked_pdf(options = nil, *args, &block)
     if options.is_a?(Hash) && options.has_key?(:pdf)
       log_pdf_creation
-      options[:basic_auth] = set_basic_auth
+      options[:basic_auth] = set_basic_auth(options)
       options.delete :pdf
       make_pdf((WickedPdf.config || {}).merge(options))
     else
@@ -37,8 +37,11 @@ module PdfHelper
       logger.info '*'*15 + 'WICKED' + '*'*15
     end
 
-    def set_basic_auth
-      request.env["HTTP_AUTHORIZATION"].split(" ").last if request.env["HTTP_AUTHORIZATION"]
+    def set_basic_auth(options={})
+      options[:basic_auth] ||= WickedPdf.config.fetch(:basic_auth){ false }
+      if options[:basic_auth] && request.env["HTTP_AUTHORIZATION"]
+        request.env["HTTP_AUTHORIZATION"].split(" ").last
+      end
     end
 
     def clean_temp_files

data/lib/wicked_pdf.rb

@@ -23,22 +23,20 @@ class WickedPdf
   end
 
   def pdf_from_string(string, options={})
-    command_for_stdin_stdout = "#{@exe_path} #{parse_options(options)} -q - - " # -q for no errors on stdout
-    p "*"*15 + command_for_stdin_stdout + "*"*15 unless defined?(Rails) and Rails.env != 'development'
-    pdf, err = begin
-      Open3.popen3(command_for_stdin_stdout) do |stdin, stdout, stderr|
-        stdin.binmode
-        stdout.binmode
-        stderr.binmode
-        stdin.write(string)
-        stdin.close
-        [stdout.read, stderr.read]
-      end
-    rescue Exception => e
-      raise "Failed to execute #{@exe_path}: #{e}"
+    command = "#{@exe_path} #{parse_options(options)} -q - - " # -q for no errors on stdout
+    p "*"*15 + command + "*"*15 unless defined?(Rails) and Rails.env != 'development'
+    pdf, err = Open3.popen3(command) do |stdin, stdout, stderr|
+      stdin.binmode
+      stdout.binmode
+      stderr.binmode
+      stdin.write(string)
+      stdin.close
+      [stdout.read, stderr.read]
     end
-    raise "PDF could not be generated!\n#{err}" if pdf and pdf.length == 0
+    raise "PDF could not be generated!" if pdf and pdf.rstrip.length == 0
     pdf
+  rescue Exception => e
+    raise "Failed to execute:\n#{command}\nError: #{e}"
   end
 
   private
@@ -59,7 +57,7 @@ class WickedPdf
     def parse_basic_auth(options)
       if options[:basic_auth]
         user, passwd = Base64.decode64(options[:basic_auth]).split(":")
-        "--username #{user} --password #{passwd} "
+        "--username '#{user}' --password '#{passwd}'"
       else
         ""
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wicked_pdf
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Miles Z. Sterret
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -04:00
+date: 2011-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: []