drnic-princely 1.1.3 → 1.2.0

data/VERSION

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

data/init.rb

@@ -1 +1 @@
-require "./lib/princely/rails"
+require File.dirname(__FILE__) + "/lib/princely/rails"

data/lib/princely.rb

@@ -56,7 +56,7 @@ class Princely
   # Returns PDF as a stream, so we can use send_data to shoot
   # it down the pipe using Rails.
   #
-  def pdf_from_string(string)
+  def pdf_from_string(string, output_file = '-')
     path = self.exe_path()
     # Don't spew errors to the standard out...and set up to take IO 
     # as input and output
@@ -75,4 +75,21 @@ class Princely
     pdf.close_read
     return result
   end
+
+  def pdf_from_string_to_file(string, output_file)
+    path = self.exe_path()
+    # Don't spew errors to the standard out...and set up to take IO 
+    # as input and output
+    path << " --silent - -o #{output_file}"
+    
+    # Show the command used...
+    logger.info "\n\nPRINCE XML PDF COMMAND"
+    logger.info path
+    logger.info ''
+    
+    # Actually call the prince command, and pass the entire data stream back.
+    pdf = IO.popen(path, "w+")
+    pdf.puts(string)
+    pdf.close
+  end
 end

data/lib/princely/pdf_helper.rb

@@ -37,7 +37,11 @@ module PdfHelper
     html_string.gsub!( /src=["'](\S+\?\d*)["']/i ) { |m| 'src="' + $1.split('?').first + '"' }
     
     # Send the generated PDF file from our html string.
-    return prince.pdf_from_string(html_string)
+    if filename = options[:filename] || options[:file]
+      prince.pdf_from_string_to_file(html_string, filename)
+    else
+      prince.pdf_from_string(html_string)
+    end
   end
 
   def make_and_send_pdf(pdf_name, options = {})

data/princely.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{princely}
-  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 = ["Michael Bleigh", "Seth from Subimage Interactive"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drnic-princely
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Michael Bleigh