libis-format 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 703d88e70d66ce9cc627d87f933393c63fd73d02e39c747ffe35233286d88bdc
-  data.tar.gz: a11d05c5f03dae0fcfd31c1c38511febf2344decc2c7e548e521afa6ffd5c54f
+  metadata.gz: a1b5fdec2f726d83572f66f78b361b8500247bcf5bdcce56e633998b88758bc4
+  data.tar.gz: 0b09d4cc45338b9c1060c89d80f94ad171e8d2bc43da17b20cd2357521ef78f4
 SHA512:
-  metadata.gz: 1d4b2ec090f1e03330926040c8238da70b77c4af578b81a82456507a46bceeef7a9edbc91919191f6928f4903e2e6b81862ae4fd6b21221d73848039e7ad3bea
-  data.tar.gz: 2b6d4040121d50e088566a878439ce2dde1b0805f06fcb727e9b58812f8ab9751b2747c01187025d0baa0582e9b40f853f21474531a58de2ee83827f365d9265
+  metadata.gz: 5ad4a140bfa6bedf2d7b915ec1a51b23fd9b4efdacf468e1cae1505a54c72b0733c6ee3d20981347da3f9fae8a8656416a953754bdc893decb8021f40a58b499
+  data.tar.gz: '0854af4151b126b6d2cb3d8fdd04c2186dcd5dac294b9a800db0256ed0955c3f1d86d54853ea39fbb295fdf5f71d7a016e6e49e71988e3c7f7c595f5a1c9a33e'

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

@@ -5,7 +5,10 @@ require 'rfc_2047'
 require 'cgi'
 require 'pdfkit'
 
+require 'time'
+
 require 'fileutils'
+require 'pathname'
 
 require 'libis/format/config'
 
@@ -52,7 +55,7 @@ module Libis
           result
         end
 
-        def msg_to_pdf(msg, target, target_format, pdf_options, reraise: false)
+        def msg_to_pdf(msg, target, target_format, pdf_options, root_msg: true)
 
           # Make sure the target directory exists
           outdir = File.dirname(target)
@@ -116,6 +119,11 @@ module Libis
             end
           end
 
+          [:date].each do |key|
+            next unless headers[key]
+            headers[key] = DateTime.parse(headers[key]).to_time.localtime.iso8601
+          end
+
           # Add header section to the HTML body
           unless hdr_html.empty?
             # Insert header block styles
@@ -204,9 +212,9 @@ module Libis
             if sub_msg = a.instance_variable_get(:@embedded_msg)
 # puts "Embedded email message ..."
               subject = a.properties[:display_name] || sub_msg.subject || ""
-              file = File.join(outdir, "#{prefix}#{subject}.#{target_format.to_s.downcase}")
+              file = File.join(outdir, "#{prefix}#{subject}.msg.#{target_format.to_s.downcase}")
 
-              result = msg_to_pdf(sub_msg, file, target_format, pdf_options, reraise: true)
+              result = msg_to_pdf(sub_msg, file, target_format, pdf_options, root_msg: false)
               if e = result[:error]
                 raise 
               end
@@ -225,6 +233,13 @@ module Libis
             end
             i += 1
           end
+
+          if root_msg
+            p = Pathname(File.dirname(files.first))
+            files[1..].each do |f|
+              (headers[:attachments] ||= []) << Pathname.new(f).relative_path_from(p).to_s
+            end
+          end
           
           {
             command: {status: 0},
@@ -236,7 +251,7 @@ module Libis
         rescue Exception => e
 # puts "ERROR: Exception #{e.class} raised: #{e.message}"
 # e.backtrace.each {|t| puts " - #{t}"}
-          raise if reraise
+          raise unless root_msg
           msg.close
           return {
             command: {status: -1},

data/lib/libis/format/version.rb

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

data/libis-format.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'chromaprint', '~> 0.0.2'
   spec.add_runtime_dependency 'naturally', '~> 2.1'
   spec.add_runtime_dependency 'pdfinfo', '~> 1.4'
-  spec.add_runtime_dependency 'ruby-msg-nx'
+  spec.add_runtime_dependency 'libis-mapi', '~> 0.3'
   spec.add_runtime_dependency 'new_rfc_2047'
   spec.add_runtime_dependency 'pdfkit'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Kris Dekeyser
@@ -179,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: ruby-msg-nx
+  name: libis-mapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: new_rfc_2047
   requirement: !ruby/object:Gem::Requirement