pdf-merger 0.2.0 → 0.3.0

data/History.txt

@@ -1,3 +1,6 @@
+== 0.3.0 2012-08-22
+* instead of failing completely, merge the valid files and return an array of missing and invalid PDFs
+
 == 0.2.0 2012-04-26
 * add_javascript adds JavaScript to the new file
 

data/README.txt

@@ -7,11 +7,12 @@ Merge PDFs using iText.
 == Example
 
 require "pdf/merger"
+failure_list = []
 pdf = PDF::Merger.new
 pdf.add_file "foo.pdf"
 pdf.add_file "bar.pdf"
 pdf.add_javascript "this.print(true);"
-pdf.save_as "combined.pdf"
+pdf.save_as "combined.pdf", failure_list
 
 == Encoding
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/pdf/merger.rb

@@ -10,7 +10,7 @@ include FileUtils
 
 module PDF
   class Merger
-    VERSION = "0.1.2"
+    VERSION = "0.3.0"
     
     if RUBY_PLATFORM =~ /java/ # ifdef to check if your using JRuby
       require 'pdf/merger/jruby'

data/lib/pdf/merger/jruby.rb

@@ -14,19 +14,33 @@ module PDF
   class Merger
 
     # Saves the PDF into a file defined by path given.
-    # return the number of pages in the new file
-    def save_as(output_file_path)
+    # - 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|
-        copy.addDocument(PdfReader.new(f))
+        if File.exists?(f)
+          begin
+            copy.addDocument(PdfReader.new(f))
+          rescue => e
+            failure_list << f
+            Rails.logger.warn "PDF::Merger: Invalid PDF: #{f}"            
+          end
+        else
+          failure_list << f
+          Rails.logger.warn "PDF::Merger: File does not exist: #{f}"
+        end
       end
-
-      copy.addJavaScript(@js) if @js.present?
       
-      copy.close()
-      PdfReader.new(output_file_path).getNumberOfPages
+      if @files_to_merge.size - failure_list.size > 0
+        copy.addJavaScript(@js) if @js.present?
+        copy.close()
+        PdfReader.new(output_file_path).getNumberOfPages
+      else
+        0
+      end
     end
   
   end

data/lib/pdf/merger/rjb.rb

@@ -18,9 +18,11 @@ module PDF
   #
   # Check the RJB documentation if you are having issues with this.
   class Merger
+
     # Saves the PDF into a file defined by path given.
-    # return the number of pages in the new file
-    def save_as(output_file_path)
+    # - 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=[])
       @pdfreader     = Rjb::import('com.lowagie.text.pdf.PdfReader')
       @pdfcopyfields = Rjb::import('com.lowagie.text.pdf.PdfCopyFields')
       @filestream    = Rjb::import('java.io.FileOutputStream')
@@ -29,13 +31,26 @@ module PDF
       copy = @pdfcopyfields.new(filestream)
       
       @files_to_merge.each do |f|
-        copy.addDocument(@pdfreader.new(f))
+        if File.exists?(f)
+          begin
+            copy.addDocument(@pdfreader.new(f))
+          rescue => e
+            failure_list << f
+            Rails.logger.warn "PDF::Merger: Invalid PDF: #{f}"            
+          end
+        else
+          failure_list << f
+          Rails.logger.warn "PDF::Merger: File does not exist: #{f}"
+        end
       end
       
-      copy.addJavaScript(@js) if @js.present?
-      
-      copy.close()
-      @pdfreader.new(output_file_path).getNumberOfPages
+      if @files_to_merge.size - failure_list.size > 0
+        copy.addJavaScript(@js) if @js.present?
+        copy.close()
+        @pdfreader.new(output_file_path).getNumberOfPages
+      else
+        0
+      end
     end
   
   end

data/pdf-merger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pdf-merger"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Schreiber"]
-  s.date = "2012-04-26"
+  s.date = "2012-08-22"
   s.description = "Merge multiple PDFs in to one using iText's PdfCopyFile."
   s.email = "paulschreiber@gmail.com"
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/paulschreiber/pdf-merger"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.23"
   s.summary = "Merge PDFs."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,92 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pdf-merger
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Paul Schreiber
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: *id001
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  version_requirements: *id002
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: *id003
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: *id004
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Merge multiple PDFs in to one using iText's PdfCopyFile.
 email: paulschreiber@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.txt
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -102,37 +98,31 @@ files:
 - spec/pdf_merger_spec.rb
 - spec/test_template.pdf
 homepage: http://github.com/paulschreiber/pdf-merger
-licenses: 
+licenses:
 - MIT
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3756396917728053956
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Merge PDFs.
 test_files: []
-