libis-format 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19055f943473fa0d2a9a1fdebf499c87652fcab845239a4b1f21341229ad08ad
-  data.tar.gz: f6f64bcaf5472f0e11aceb2cbe97b3f367b0ed4ccc4dfc389e5857f191c59897
+  metadata.gz: 703d88e70d66ce9cc627d87f933393c63fd73d02e39c747ffe35233286d88bdc
+  data.tar.gz: a11d05c5f03dae0fcfd31c1c38511febf2344decc2c7e548e521afa6ffd5c54f
 SHA512:
-  metadata.gz: 7b0ee24177c3f541a8cd12733e04a04649d03b2785c68c8eaa44ca3fdebd7c657346afc9a824d59e872666bfa3a657483b00b6126970cc739ef8433889621847
-  data.tar.gz: 0bdbc5a928d6e556a816f65d05f2151e6b6ac331de37ce2d12030ace291f2b4cae452420236d9d5371f3566a7346f60854976dc33181e17549663b8ada5302f6
+  metadata.gz: 1d4b2ec090f1e03330926040c8238da70b77c4af578b81a82456507a46bceeef7a9edbc91919191f6928f4903e2e6b81862ae4fd6b21221d73848039e7ad3bea
+  data.tar.gz: 2b6d4040121d50e088566a878439ce2dde1b0805f06fcb727e9b58812f8ab9751b2747c01187025d0baa0582e9b40f853f21474531a58de2ee83827f365d9265

data/lib/libis/format/tool/msg_to_pdf.rb

@@ -49,7 +49,7 @@ module Libis
           target_format = options.delete(:to_html) ? :HTML : :PDF
           result = msg_to_pdf(msg, target, target_format, options)
           msg.close
-          return result
+          result
         end
 
         def msg_to_pdf(msg, target, target_format, pdf_options, reraise: false)
@@ -139,26 +139,28 @@ module Libis
           body.gsub!(IMG_CID_PLAIN_REGEX) do |match|
 # puts "CID found: #{match}, looking for #{$1}"
             data = getAttachmentData(attachments, $1)
-            unless data
-# puts "cid #{$1} not found"
-              return '<img src=""/>'
-            end
+            if data
 # puts "cid #{$1} data: #{data.inspect}"
-            used_files << $1
-            "<img src=\"data:#{data[:mime_type]};base64,#{data[:base64]}\"/>"
+              used_files << $1
+              "<img src=\"data:#{data[:mime_type]};base64,#{data[:base64]}\"/>"
+            else
+  # puts "cid #{$1} not found"
+              '<img src=""/>'
+            end
           end
           
           # Then process HTML img tags with CID entries
           body.gsub!(IMG_CID_HTML_REGEX) do |match|
 # puts "CID found: #{match}, looking for #{$1}"
             data = getAttachmentData(attachments, $1)
-            unless data
-# puts "cid #{$1} not found"
-              return ''
-            end
+            if  data
 # puts "cid #{$1} data: #{data.inspect}"
             used_files << $1
             "data:#{data[:mime_type]};base64,#{data[:base64]}"
+            else
+# puts "cid #{$1} not found"
+              ''
+            end
           end
 
           # Create PDF
@@ -196,7 +198,7 @@ module Libis
           # ----------------
           outdir = File.join(outdir, "#{File.basename(target)}.attachments")
           digits = ((attachments.count + 1)/ 10) + 1
-          i = 0
+          i = 1
           attachments.delete_if {|a| a.properties.attachment_hidden}.each do |a|
             prefix = "#{"%0*d" % [digits, i]}-"
             if sub_msg = a.instance_variable_get(:@embedded_msg)
@@ -285,7 +287,7 @@ module Libis
               }
             end
           end
-          return nil
+          nil
         end
 
         def read_header(headers_file)

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '1.2.5'
+    VERSION = '1.2.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake