pludoni_pdfutils 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce474c026e729b7967ef861003ab2d646e965dac9424a87992f4f99d710905ad
-  data.tar.gz: e9acb01ef78eb8f0b182d8fc5489dfdac2e189930cd82af794ec4147ad7da806
+  metadata.gz: 439ff3f6cb56782dc05fe363a19d8c1f2f416b4943a201fba1c94fb72db9d9f8
+  data.tar.gz: 3501da1a290946bf56e8cde0daae07ae63d72a5c05aed5f653c245a7826e1087
 SHA512:
-  metadata.gz: f139faefe7be6a3bc2a8b327a89e26b4186c025258cc137c9a1a8d220fa924eb6cb8c389cec885d0e7814bb1e7113371e2eb88039d37df67fd45c75d8cc23ba7
-  data.tar.gz: 3deb99960c6171363944c4bcd9af2a553d9f52dbc4c8995032a448ec75bd85c2eed0ed49a30491e16b33dc91145d5c680b6e4e675b92c94681e54557fde87a0d
+  metadata.gz: 3f29026a2d7c8f40bf9a14ecad38a458ff621904f0a94fb6856a4635f0eec105027e9f9f04ba18088e8b1695cbd0469ea840ccea59f5539c46da9a34526eb7b4
+  data.tar.gz: 54b4b7b4b3096e3b8485d36a6a5becb7219af56f08f3b0b55c8c4bfd9be0f401d255a6293c1a2f03b465de1eedc974841ddf335c6618c488580540f50f6dc9bf

data/README.md

@@ -21,6 +21,8 @@ Or install it yourself as:
 
 requires ghostscript installed.
 
+Conversion of document formats (docx etc.) requires soffice installed
+
 ## Usage
 
 All method take either ActiveStorage::Blob or File/Tempfile as argument and return a Tempfile/File
@@ -41,7 +43,10 @@ Pludoni::Pdfutils.convert_all_to_pdf_and_join_max_size(blobs, max_files: 3, max_
 Individual classes:
 
 ```ruby
-tempfile = Pludoni::Pdfutils::ConvertToPdf.new(image_file).run
+# jpg
+tempfile = Pludoni::Pdfutils::ConvertImageToPdf.new(image_file).run
+# docx etc.
+tempfile = Pludoni::Pdfutils::ConvertDocumentToPdf.new(image_file).run
 
 
 tempfile = Pludoni::Pdfutils::Joiner.new(job_application.uploads.map(&:blob)).run

data/lib/pludoni/pdfutils/active_storage_wrapper.rb

@@ -6,7 +6,7 @@ module Pludoni
       end
 
       def to_tf
-        file = Tempfile.new(["ActiveStorage-#{@file.id}-", @file.filename.extension_with_delimiter])
+        file = Tempfile.new([@file.filename.base, @file.filename.extension_with_delimiter])
         ActiveStorage::Downloader.new(@file.service).send(:download, @file.key, file)
         file
       end

data/lib/pludoni/pdfutils/compressor.rb

@@ -7,7 +7,8 @@ module Pludoni::Pdfutils
     end
 
     def run
-      tf = Tempfile.new(['joiner', '.pdf'])
+      fname = File.basename(@blob.filename.to_s, '.*')
+      tf = Tempfile.new([fname, '.pdf'])
       tf.binmode
       input = @blob.to_tf
       cli = "gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/ebook -dNOPAUSE -dQUIET -dBATCH -sOutputFile=#{Shellwords.escape tf.path} #{Shellwords.escape input.path}"
@@ -17,7 +18,7 @@ module Pludoni::Pdfutils
         raise CompressionFailed, "PDF Compression failed: \nStdout: #{stdout}\nStderr: #{stderr}"
       end
 
-      FileWrapper.make(tf)
+      FileWrapper.make(tf, filename: fname + ".pdf")
     end
   end
 end

data/lib/pludoni/pdfutils/convert_document_to_pdf.rb

@@ -0,0 +1,40 @@
+require 'open3'
+
+module Pludoni::Pdfutils
+  class ConvertDocumentToPdf
+    def initialize(blob)
+      @blob = FileWrapper.make(blob)
+    end
+
+    def run(&block)
+      fname = File.basename(@blob.filename.to_s, File.extname(@blob.filename.to_s))
+      @blob.open do |source|
+        # convert image to pdf
+        tf = Tempfile.new([fname, '.pdf'])
+        tf.binmode
+
+        command = ['soffice']
+        command << '--headless'
+        command << '--convert-to'
+        command << 'pdf'
+        command << '--outdir'
+        command << File.dirname(source.path)
+        command << source.path
+        stdout, stderr, status = Open3.capture3(*command)
+        unless status.success?
+          raise ConversionFailedError, "PDF conversion failed: Command: #{cli}\nStdout: #{stdout}\nStderr: #{stderr}"
+        end
+        pdf_path = source.path.sub(/\.[a-z0-9]+$/i, '.pdf')
+        unless File.exist?(pdf_path)
+          raise ConversionFailedError, "PDF conversion failed: Command: #{cli}\nStdout: #{stdout}\nStderr: #{stderr}"
+        end
+
+        FileUtils.move(pdf_path, tf.path)
+
+        tf.open
+
+        FileWrapper.make(tf, filename: "#{fname}.pdf")
+      end
+    end
+  end
+end

data/lib/pludoni/pdfutils/{convert_to_pdf.rb → convert_image_to_pdf.rb}

@@ -1,15 +1,16 @@
 require 'open3'
 
 module Pludoni::Pdfutils
-  class ConvertToPdf
+  class ConvertImageToPdf
     def initialize(blob)
       @blob = FileWrapper.make(blob)
     end
 
     def run(&block)
+      fname = File.basename(@blob.filename.to_s, '.*')
       @blob.open do |source|
         # convert image to pdf
-        tf = Tempfile.new(['convert', '.pdf'])
+        tf = Tempfile.new([fname, '.pdf'])
         tf.binmode
         cli = "gs -dNOSAFER -dPDFSETTINGS=/prepress -sDEVICE=pdfwrite -o #{tf.path} viewjpeg.ps -c \\(#{source.path}\\) viewJPEG"
 
@@ -18,7 +19,7 @@ module Pludoni::Pdfutils
           raise ConversionFailedError, "PDF convertion failed: Command: #{cli}\nStdout: #{stdout}\nStderr: #{stderr}"
         end
 
-        FileWrapper.make(tf)
+        FileWrapper.make(tf, filename: "#{fname}.pdf")
       end
     end
   end

data/lib/pludoni/pdfutils/file_wrapper.rb

@@ -5,12 +5,16 @@ module Pludoni
         @file = file
       end
 
-      def self.make(blob_or_file)
+      def self.make(blob_or_file, filename: nil)
         case blob_or_file
         when ActiveStorage::Blob
           ActiveStorageWrapper.new(blob_or_file)
         when File, Tempfile
-          LocalFileWrapper.new(blob_or_file)
+          fw = LocalFileWrapper.new(blob_or_file)
+          if filename
+            fw.filename = filename
+          end
+          fw
         when FileWrapper
           blob_or_file
         else
@@ -32,5 +36,3 @@ module Pludoni
     end
   end
 end
-
-

data/lib/pludoni/pdfutils/joiner.rb

@@ -7,17 +7,18 @@ module Pludoni::Pdfutils
     end
 
     def run
-      tf = Tempfile.new(['joiner', '.pdf'])
+      fname = @blobs.map(&:filename).map { |i| i.split('.').first[0..20] }.join('-')
+
+      tf = Tempfile.new([fname, '.pdf'])
       tf.binmode
       tfs = @blobs.map { |i| i.to_tf }
       cli = "gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=#{tf.path} #{tfs.map(&:path).join(' ')}"
-
-        stdout, stderr, status = Open3.capture3(cli)
+      stdout, stderr, status = Open3.capture3(cli)
       unless status.success?
         raise JoiningFailedError, "PDF Joining failed: \nStdout: #{stdout}\nStderr: #{stderr}"
       end
 
-      FileWrapper.make(tf)
+      FileWrapper.make(tf, filename: "#{fname}.pdf")
     end
   end
 end

data/lib/pludoni/pdfutils/local_file_wrapper.rb

@@ -1,12 +1,14 @@
 module Pludoni
   module Pdfutils
     class LocalFileWrapper < FileWrapper
+      attr_writer :filename
+
       def filesize
         @file.size
       end
 
       def filename
-        @file.path.split("/").last
+        @filename || @file.path.split("/").last
       end
 
       def to_tf

data/lib/pludoni/pdfutils.rb

@@ -46,10 +46,17 @@ module Pludoni
 
     def convert_to_pdf(blob, &block)
       blob = FileWrapper.make(blob)
-      # TODO: convert odt docx
-      if blob.content_type.to_s['image']
+      case blob.content_type.to_s
+      when /image/
         block.call("converting #{blob.filename.to_s} to pdf") if block_given?
-        ConvertToPdf.new(blob).run(&block)
+        ConvertImageToPdf.new(blob).run(&block)
+      when "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+        "application/msword",
+        "application/vnd.ms-powerpoint",
+        "application/vnd.oasis.opendocument.text",
+        "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+        block.call("converting #{blob.filename.to_s} to pdf") if block_given?
+        ConvertDocumentToPdf.new(blob).run(&block)
       else
         blob
       end

data/pludoni_pdfutils.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "pludoni_pdfutils"
-  spec.version       = "0.1.2"
+  spec.version       = "0.3.0"
   spec.authors       = ["Stefan Wienert"]
   spec.email         = ["info@stefanwienert.de"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pludoni_pdfutils
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -99,7 +99,8 @@ files:
 - lib/pludoni/pdfutils.rb
 - lib/pludoni/pdfutils/active_storage_wrapper.rb
 - lib/pludoni/pdfutils/compressor.rb
-- lib/pludoni/pdfutils/convert_to_pdf.rb
+- lib/pludoni/pdfutils/convert_document_to_pdf.rb
+- lib/pludoni/pdfutils/convert_image_to_pdf.rb
 - lib/pludoni/pdfutils/file_wrapper.rb
 - lib/pludoni/pdfutils/joiner.rb
 - lib/pludoni/pdfutils/local_file_wrapper.rb