pdf-forms 0.4.0 → 0.4.2

data/lib/pdf_forms.rb

@@ -1,8 +1,10 @@
 require 'pdf_forms/version'
+require 'pdf_forms/safe_path'
 require 'pdf_forms/fdf'
 require 'pdf_forms/pdf'
 require 'pdf_forms/pdftk_wrapper'
 
+
 module PdfForms
   # shorthand for PdfForms::PdftkWrapper.new(...)
   def self.new(*args)

data/lib/pdf_forms/pdf.rb

@@ -1,10 +1,13 @@
 module PdfForms
   class Pdf
+
+    include SafePath
+
     attr_reader :path
 
     def initialize(path, pdftk)
-      @path = path
-      raise IOError unless File.readable?(path)
+      @path = file_path(path)
+      raise IOError unless File.readable?(@path)
       @pdftk = pdftk
     end
 
@@ -15,7 +18,7 @@ module PdfForms
     protected
 
     def read_fields
-      field_output = @pdftk.call_pdftk %Q("#{path}"), 'dump_data_fields'
+      field_output = @pdftk.call_pdftk quote_path(path), 'dump_data_fields'
       @fields = field_output.split(/^---\n/).map do |field_text|
         if field_text =~ /^FieldName: (\w+)$/
           $1

data/lib/pdf_forms/pdftk_wrapper.rb

@@ -6,21 +6,25 @@ module PdfForms
   # Wraps calls to PdfTk
   class PdftkWrapper
 
+    include SafePath
+
     attr_reader :pdftk, :options
 
     # PdftkWrapper.new('/usr/bin/pdftk', :flatten => true, :encrypt => true, :encrypt_options => 'allow Printing')
     def initialize(pdftk_path, options = {})
-      @pdftk = pdftk_path
+      @pdftk = file_path(pdftk_path)
       @options = options
     end
 
     # pdftk.fill_form '/path/to/form.pdf', '/path/to/destination.pdf', :field1 => 'value 1'
     def fill_form(template, destination, data = {})
+      q_template = safe_path(template)
+      q_destination = safe_path(destination)
       fdf = Fdf.new(data)
       tmp = Tempfile.new('pdf_forms-fdf')
       tmp.close
       fdf.save_to tmp.path
-      command = pdftk_command %Q("#{template}"), 'fill_form', %Q("#{tmp.path}"), 'output', %Q("#{destination}"), add_options(tmp.path)
+      command = pdftk_command q_template, 'fill_form', safe_path(tmp.path), 'output', q_destination, add_options(tmp.path)
       output = %x{#{command}}
       unless File.readable?(destination) && File.size(destination) > 0
         raise PdftkError.new("failed to fill form with command\n#{command}\ncommand output was:\n#{output}")
@@ -44,15 +48,19 @@ module PdfForms
     end
 
     def cat(*files,output)
-      files = files[0] if files[0].class == Array
-      input = files.map{|f| %Q("#{f}")}
+      input_array, output_file = Array(files.flatten.compact), output
+      input = input_array.map{|path| safe_path(path)}
+      output = safe_path(output_file)
       call_pdftk(*input,'output',output)
     end
 
     protected
 
+
+
+
     def pdftk_command(*args)
-      "#{pdftk} #{args.flatten.compact.join ' '} 2>&1"
+      quote_path(pdftk) + " #{args.flatten.compact.join ' '} 2>&1"
     end
 
     def add_options(pwd)

data/lib/pdf_forms/safe_path.rb

@@ -0,0 +1,22 @@
+module PdfForms
+
+  module SafePath
+
+    def normalize_path(path)
+      fpath = file_path(path)
+      quote_path(fpath)
+    end
+
+    alias :safe_path :normalize_path
+
+    def quote_path(path)
+      %Q("#{path}")
+    end
+
+    def file_path(path)
+      path = path.to_path if path.respond_to? :to_path
+      path.to_str
+    end
+  end
+
+end

data/lib/pdf_forms/version.rb

@@ -1,3 +1,3 @@
 module PdfForms
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

metadata

@@ -2,7 +2,7 @@
 name: pdf-forms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
 - "Jens Kr\xC3\xA4mer"
@@ -10,9 +10,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-04 00:00:00 Z
-dependencies: []
-
+date: 2012-08-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: pry
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: "0.0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: pry-nav
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: "0.0"
+  type: :development
+  version_requirements: *id002
 description: Fill out PDF forms with pdftk (http://www.accesspdf.com/pdftk/).
 email: 
 - jk@jkraemer.net
@@ -26,6 +47,7 @@ files:
 - lib/pdf_forms/fdf.rb
 - lib/pdf_forms/pdf.rb
 - lib/pdf_forms/pdftk_wrapper.rb
+- lib/pdf_forms/safe_path.rb
 - lib/pdf_forms/version.rb
 - lib/pdf_forms.rb
 - LICENSE