pludoni_pdfutils 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 561f53e393a627ae11963fa8254bb39b8445d574dd38b05a558c3088b87ab7d5
-  data.tar.gz: baa9dedf3eb2f0c76630c1f598ad8acc99b6eeba5c6ce5a6b6370f793f6263e9
+  metadata.gz: 2d8493c8060dffe855122702e48a5cb28d43292f0dc192f768d6b033c9f6a2e7
+  data.tar.gz: 18d0541e7a26189a90d97cc7ce5b16fd93a5e46f5e05b0885afc752919fa485e
 SHA512:
-  metadata.gz: 06e78bd0c4608b45415f79f132be1ac7b4adbd70dba1c2df0069fa2216582c1e71ecbf156b891692e0b49b43c071f3b32a2c18209bac52d626379311e88711fa
-  data.tar.gz: 6f69bf3240182880b623f31cb7621809df0e48d41c241db917b76b03c8e547bd8d4e3457778131d77066e758670220c90f611f541323695ca38e2694c8db5991
+  metadata.gz: 95d9e311f1cba3fa1dd0a96e294432f0c4c1d8777dfc5b137d8839ce09b709d0c4811b01f434ea2ad660484938cc0aef8d89a093af699012743af631da8a43b7
+  data.tar.gz: 5c78e1a7799432e25c2b2502fbfd1add93d3b17ebebbfc18632b721fbf2efd030161498ff5773ed6ef20a56ed531006d76b742502d0d1a561480ff2fc6ee5a6f

data/Gemfile.lock

@@ -1,88 +1,86 @@
 PATH
   remote: .
   specs:
-    pludoni-pdfutils (0.1.0)
+    pludoni_pdfutils (0.4.0)
       activestorage (>= 5.2.0)
-      mimemagic
+      marcel
       zeitwerk
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.7)
-      actionview (= 6.1.7)
-      activesupport (= 6.1.7)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.7.2)
+      actionview (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.7)
-      activesupport (= 6.1.7)
+    actionview (7.0.7.2)
+      activesupport (= 7.0.7.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7)
-      activesupport (= 6.1.7)
+    activejob (7.0.7.2)
+      activesupport (= 7.0.7.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.7)
-      activesupport (= 6.1.7)
-    activerecord (6.1.7)
-      activemodel (= 6.1.7)
-      activesupport (= 6.1.7)
-    activestorage (6.1.7)
-      actionpack (= 6.1.7)
-      activejob (= 6.1.7)
-      activerecord (= 6.1.7)
-      activesupport (= 6.1.7)
+    activemodel (7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activerecord (7.0.7.2)
+      activemodel (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activestorage (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    erubi (1.11.0)
-    globalid (1.0.0)
+    erubi (1.12.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.19.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     marcel (1.0.2)
-    mimemagic (0.4.3)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.1.2)
-    minitest (5.16.3)
-    nokogiri (1.13.8-x86_64-linux)
+    mini_mime (1.1.5)
+    minitest (5.19.0)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rake (13.0.6)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   bundler
-  pludoni-pdfutils!
+  pludoni_pdfutils!
   rake
 
 BUNDLED WITH
-   2.3.15
+   2.4.2

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

@@ -7,9 +7,10 @@ module Pludoni::Pdfutils
     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(['convert', '.pdf'])
+        tf = Tempfile.new([fname, '.pdf'])
         tf.binmode
 
         command = ['soffice']
@@ -32,7 +33,7 @@ module Pludoni::Pdfutils
 
         tf.open
 
-        FileWrapper.make(tf)
+        FileWrapper.make(tf, filename: "#{fname}.pdf")
       end
     end
   end

data/lib/pludoni/pdfutils/convert_image_to_pdf.rb

@@ -7,9 +7,10 @@ module Pludoni::Pdfutils
     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,15 @@
+require 'marcel'
 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
@@ -19,7 +22,7 @@ module Pludoni
       end
 
       def content_type
-        MimeMagic.by_magic(@file.read).type
+        Marcel::MimeType.for(@file)
       ensure
         @file.rewind
       end

data/lib/pludoni/pdfutils.rb

@@ -1,5 +1,3 @@
-require 'mimemagic'
-
 module Pludoni
   module Pdfutils
     class Error < StandardError; end

data/pludoni_pdfutils.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "pludoni_pdfutils"
-  spec.version       = "0.2.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["Stefan Wienert"]
   spec.email         = ["info@stefanwienert.de"]
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activestorage", ">= 5.2.0"
   spec.add_dependency "zeitwerk"
-  spec.add_dependency "mimemagic"
+  spec.add_dependency "marcel"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pludoni_pdfutils
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Convert to pdf, compress pdf, join pdf using Ghostscript