lib/pdf/merger/jruby.rb in pdf-merger-0.3.1 vs lib/pdf/merger/jruby.rb in pdf-merger-0.3.2

@@ -1,8 +1,8 @@
 # = pdf/merger/rjb.rb -- PDF template stamping.
 #
-#  Copyright 2010-12 Paul Schreiber
+#  Copyright 2010-14 Paul Schreiber
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'ext'))
 require 'java'
 require 'iText-4.2.0.jar'
 
@@ -17,31 +17,31 @@
     # - return the number of pages in the new file
     # - populate failure_list with paths of missing or invalid PDFs
     def save_as(output_file_path, failure_list=[])
       filestream = FileOutputStream.new(output_file_path)
       copy = PdfCopyFields.new(filestream)
-      
+
       @files_to_merge.each do |f|
         if File.exists?(f)
           begin
             copy.addDocument(PdfReader.new(f))
           rescue => e
             failure_list << f
-            Rails.logger.warn "PDF::Merger: Invalid PDF: #{f}"            
+            log "PDF::Merger: Invalid PDF: #{f}"
           end
         else
           failure_list << f
-          Rails.logger.warn "PDF::Merger: File does not exist: #{f}"
+          log "PDF::Merger: File does not exist: #{f}"
         end
       end
-      
+
       if @files_to_merge.size - failure_list.size > 0
-        copy.addJavaScript(@js) if @js.present?
+        copy.addJavaScript(@js) if @js && !@js.empty?
         copy.close()
         PdfReader.new(output_file_path).getNumberOfPages
       else
         0
       end
     end
-  
+
   end
 end