wicked_pdf 0.9.5 → 0.9.6

data/lib/wicked_pdf.rb

@@ -37,7 +37,7 @@ class WickedPdf
     begin
       stdin, stdout, stderr = Open3.popen3(@exe_path + ' -V')
       @binary_version = parse_version(stdout.gets(nil))
-    rescue StandardError      
+    rescue StandardError
     end
   end
 
@@ -56,6 +56,9 @@ class WickedPdf
     err = Open3.popen3(command) do |stdin, stdout, stderr|
       stderr.read
     end
+    if return_file = options.delete(:return_file)
+      return generated_pdf_file
+    end
     generated_pdf_file.rewind
     generated_pdf_file.binmode
     pdf = generated_pdf_file.read
@@ -65,7 +68,7 @@ class WickedPdf
     raise "Failed to execute:\n#{command}\nError: #{e}"
   ensure
     string_file.close! if string_file
-    generated_pdf_file.close! if generated_pdf_file
+    generated_pdf_file.close! if generated_pdf_file && !return_file
   end
 
   private
@@ -88,8 +91,8 @@ class WickedPdf
     end
 
     def parse_version(version_info)
-      match_data = /wkhtmltopdf\s*(\d*\.\d*\.\d*\w*)/.match(version_info)      
-      if (match_data && (2 == match_data.length))        
+      match_data = /wkhtmltopdf\s*(\d*\.\d*\.\d*\w*)/.match(version_info)
+      if (match_data && (2 == match_data.length))
         Gem::Version.new(match_data[1])
       else
         DEFAULT_BINARY_VERSION

data/lib/wicked_pdf_railtie.rb

@@ -3,7 +3,16 @@ require 'wicked_pdf_helper'
 
 if defined?(Rails)
 
-  if Rails::VERSION::MAJOR == 2
+  if Rails::VERSION::MAJOR == 4
+
+    class WickedRailtie < Rails::Railtie
+      initializer "wicked_pdf.register" do |app|
+        ActionController::Base.send :include, PdfHelper
+        ActionView::Base.send :include, WickedPdfHelper::Assets
+      end
+    end
+
+  elsif Rails::VERSION::MAJOR == 2
 
     unless ActionController::Base.instance_methods.include? "render_with_wicked_pdf"
       ActionController::Base.send :include, PdfHelper

data/lib/wicked_pdf_version.rb

@@ -1,3 +1,3 @@
 class WickedPdf
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Miles Z. Sterret
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-12 00:00:00 -04:00
+date: 2013-04-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency