nguyen 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f506bb08df03fd015f7b9abac64a8788717daf5c3f3c7eaacc58f9c96590c7ef
-  data.tar.gz: 7f425f695f794dbddef3e7550e212e845b9cbb85cd6c5e121c9f066e3b1beb53
+  metadata.gz: 74a1c2e3015f9f5338b2e3140a85f26bc7190d6884f5fcfcd22b76bf0e5ed23a
+  data.tar.gz: 9704aa598ac801cd59171aa081ca3c3d9b76d2dc3d9d0001ea33e9dceba9e217
 SHA512:
-  metadata.gz: 0ed2625129d36a1175e10316e771591815b6f1ed71dd85c9d6a07c38ec237cc80dad4fd6df20c2fb6de4a165d067434bafb095ab1d93d70bc3c7a58fe3da0f07
-  data.tar.gz: 4ceb1deadd047804d440e31230eeb49eaca8ddd6be5cf2c4295b6dbedb6001ea7aa9c9e63cc7c4336baa20a7ccb7c7dd803cff847f5ef60128910b5236ec9135
+  metadata.gz: 22d0fe163418da9d6023d757d1a2a48ccd5dd976ee186d6c68e5a5965d8b49ddba1638e324e286dfeee536bd310e5ec506b62270a55fe33472119c15b6bde85f
+  data.tar.gz: 8b8328c35cd0a98be573d9dd50fb6ddb79e27b9275df57be34b682016ca7c85ecc7e88e5e966f36a99e62d2de4e107018e1927eec23b13aaf83a494c39b63b8e

data/lib/nguyen/pdftk_wrapper.rb

@@ -1,4 +1,6 @@
 require 'tempfile'
+require 'open3'
+require 'shellwords'
 module Nguyen
   class PdftkError < StandardError
   end
@@ -19,10 +21,10 @@ module Nguyen
       tmp = Tempfile.new('pdf_forms-fdf')
       tmp.close
       form_data.respond_to?(:save_to) ? form_data.save_to(tmp.path) : File.write(tmp.path, form_data)
-      command = pdftk_command %Q("#{template}"), 'fill_form', %Q("#{tmp.path}"), 'output', destination, add_options(tmp.path)
-      output = %x{#{command}}
+      args = [template, 'fill_form', tmp.path, 'output', destination, add_options(tmp.path)]
+      output = call_pdftk(*args)
       unless File.readable?(destination) && File.size(destination) > 0
-        raise PdftkError.new("failed to fill form with command\n#{command}\ncommand output was:\n#{output}")
+        raise PdftkError.new("failed to fill form with command\n#{describe_command(args)}\ncommand output was:\n#{output}")
       end
     ensure
       tmp.unlink if tmp
@@ -50,28 +52,37 @@ module Nguyen
       read(template).fields
     end
 
+    # invokes pdftk with the given arguments and returns its output (stdout
+    # and stderr combined); arguments are passed to the process verbatim,
+    # without any shell involved, so paths need no quoting or escaping
     def call_pdftk(*args)
-      %x{#{pdftk_command args}}
+      output, _status = Open3.capture2e(pdftk, *normalize_args(args))
+      output
     end
 
-    def cat(*files,output)
-      files = files[0] if files[0].class == Array
-      input = files.map{|f| %Q(#{f})}
-      call_pdftk(*input,'output',output)
+    def cat(*files, output)
+      files = files.flatten
+      input = files.flat_map { |f| f.to_s.include?('*') ? Dir.glob(f) : [f] }
+      call_pdftk(*input, 'output', output)
     end
 
     protected
 
       def stamp_operation(operation, template, stamp_file, destination)
-        command = pdftk_command %Q("#{template}"), operation, %Q("#{stamp_file}"), 'output', %Q("#{destination}")
-        output = %x{#{command}}
+        args = [template, operation, stamp_file, 'output', destination]
+        output = call_pdftk(*args)
         unless File.readable?(destination) && File.size(destination) > 0
-          raise PdftkError.new("failed to #{operation} with command\n#{command}\ncommand output was:\n#{output}")
+          raise PdftkError.new("failed to #{operation} with command\n#{describe_command(args)}\ncommand output was:\n#{output}")
         end
       end
 
-      def pdftk_command(*args)
-        "#{pdftk} #{args.flatten.compact.join ' '} 2>&1"
+      def normalize_args(args)
+        args.flatten.compact.map(&:to_s)
+      end
+
+      # human readable rendition of a pdftk invocation, for error messages
+      def describe_command(args)
+        Shellwords.join([pdftk, *normalize_args(args)])
       end
 
       def add_options(pwd)
@@ -81,7 +92,8 @@ module Nguyen
           opt_args << 'flatten'
         end
         if options[:encrypt]
-          opt_args.concat ['encrypt_128bit', 'owner_pw', pwd, options[:encrypt_options]]
+          opt_args.concat ['encrypt_128bit', 'owner_pw', pwd]
+          opt_args.concat Shellwords.split(options[:encrypt_options]) if options[:encrypt_options]
         end
         opt_args
       end

data/lib/nguyen/version.rb

@@ -1,3 +1,3 @@
 module Nguyen
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nguyen
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Trung Lê