omah 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d06eb4457018bb8014de125b696636a9482903275d61989f0c638e67324eb7b
-  data.tar.gz: ee80906ff711cf99a89785f78ef9d97de4074d187ddebbe008cd76f04a32be80
+  metadata.gz: 5775bda4b445e69339cecb256cb6535d64a2c82e00102a56020a45d3c4baad59
+  data.tar.gz: 426d302bd522404ed6fadcd9fedede85037e02d490198f2059c3174b657993e0
 SHA512:
-  metadata.gz: 1c112dbc1d4b9086fc18f74392db282a23b4e5762454bb01d1f1ea9100e3e6b2fcb7dcedacc279d30819f10ab1e48c72130e56057028bbdd2db65c40dfae549f
-  data.tar.gz: f54bae7520efefd38c0a1141ce29bef6517515dc16eca4c784367064758a9e5fa8a6a11de9dcf4277e20cb0b62f8a79689b3b01822584e3e0c5e423e086af6d4
+  metadata.gz: d3d9080cb5c4f92bbbd1990b1a65b25efc3a87a89847aa5c64809cbb943ec17995080793140873b4b5537f9ab118a6021627b1d114829de1e736f96390a81c1d
+  data.tar.gz: 86e1c0f6c3e8271d3cdc8ec26b665f5f91ab8b30478d3c8b8e2ff90765d56d524106cfb3d250fca01374c8c9b553deeaa8afcfc2c5c608b235049ab1d39f6f11

data/lib/omah.rb

@@ -3,7 +3,6 @@
 # file: omah.rb
 # title: Offline Mail Helper
 
-require 'zip'
 require 'nokorexi'
 require 'dynarex-daily'
 require 'novowels'
@@ -49,7 +48,7 @@ class Omah
 
     FileX.chdir @filepath_user
     
-    dailyfile = 'dynarexdaily.xml'
+    dailyfile = File.join(@filepath_user, 'dynarexdaily.xml')
     
     x = if FileX.exists? dailyfile then dailyfile
 
@@ -57,18 +56,20 @@ class Omah
       
       'messages[date, prev_date, next_date]/message(msg_id, tags, from, ' + \
       'to, subject, date, txt_filepath, html_filepath, attachment1, ' + \
-      'attachment2, attachment3)'        
+      'attachment2, attachment3, attachments)'        
 
     end
 
     puts 'Omah::initialize before DynarexDaily' if @debug
-    @dd = DynarexDaily.new x, dir_archive: :yearly   
+    @dd = DynarexDaily.new x, dir_archive: :yearly, debug: @debug   
     puts 'Omah::initialize after DynarexDaily' if @debug
     # is it a new day?
     
     if @dd.records.empty? then
             
-      date_yesterday = (Date.today - 1).strftime("%Y/%b/%d").downcase
+      date_yesterday = File.join(@filepath_user, 
+                                (Date.today - 1).strftime("%Y/%b/%d").downcase)
+      
       @dd.prev_date = File.join(@webpath_user, date_yesterday)
       
       # add the next_day field value to the previous day file
@@ -110,58 +111,60 @@ class Omah
 
   def store(messages)
 
-    messages.each.with_index do |msg,i|
-
-      puts "i: %d msg: %s" % [i, msg]
-      subject = msg[:subject] || ''
+    messages.each.with_index do |x,i|
+      
+      email, msg = x
       
-      title = subject.gsub(/\W+/,'-')[0,30].sub(/^-/,'').sub(/-$/,'')
+      begin
+        
+        puts "i: %d msg: %s" % [i, msg] if @debug
+        subject = msg[:subject] || ''
+        
+        title = subject.gsub(/\W+/,'-')[0,30].sub(/^-/,'').sub(/-$/,'')
 
-      a = @dd.all.select {|x| x.subject == subject}
+        a = @dd.all.select {|x| x.subject == subject}
 
-      ordinal = a.any? ? '.' + a.length.to_s : ''
+        ordinal = a.any? ? '.' + a.length.to_s : ''
 
-      x_file = title + ordinal
+        x_file = title + ordinal
 
-      id = msg[:msg_id]
+        id = msg[:msg_id]
 
-      next if @dd.find_by_msg_id id
+        next if @dd.find_by_msg_id id
 
-      path = archive()
+        path = archive()
 
-      x_filepath = File.join(path, x_file)            
+        x_filepath = File.join(path, x_file)            
 
-      puts 'FileX.pwd ' + FileX.pwd if @debug
-      puts 'Omah::store before mkdir_p path: ' + path.inspect if @debug
-      FileX.mkdir_p path
+        puts 'FileX.pwd ' + FileX.pwd if @debug
+        puts 'Omah::store before mkdir_p path: ' + path.inspect if @debug
+        FileX.mkdir_p path
 
-      if msg[:raw_source] then
-        FileX.write File.join(@filepath_user, x_filepath + '.eml'), \
-                    msg[:raw_source]
-      end
+        if msg[:raw_source] then
+          FileX.write File.join(@filepath_user, x_filepath + '.eml'), \
+                      msg[:raw_source]
+        end
 
-      header = %i(from to subject).inject({}) {|r,x| r.merge(x => msg[x]) }
-      Kvx.new(header).save File.join(@filepath_user, x_filepath + '.kvx')
-      
-      txt_filepath = x_filepath + '.txt'
-      FileX.write File.join(@filepath_user, txt_filepath), \
-                                      text_sanitiser(msg[:body_text].to_s)
+        header = %i(from to subject).inject({}) {|r,x| r.merge(x => msg[x]) }
+        Kvx.new(header).save File.join(@filepath_user, x_filepath + '.kvx')
+        
+        txt_filepath = x_filepath + '.txt'
+        FileX.write File.join(@filepath_user, txt_filepath), \
+                                        text_sanitiser(msg[:body_text].to_s)
 
-      html_filepath = x_filepath + '.html'
-      FileX.write File.join(@filepath_user, html_filepath), \
-                                      html_sanitiser(msg[:body_html].to_s)
-      
-      parts_path = []
-      
-      # save the attachments
-      if msg[:attachments].length > 0 then
+        html_filepath = x_filepath + '.html'
+        FileX.write File.join(@filepath_user, html_filepath), \
+                                        html_sanitiser(msg[:body_html].to_s)
         
-        attachment_path = File.join(path, title + ordinal)
-        FileX.mkdir_p attachment_path
+        parts_path = []
         
-        if msg[:attachments].length < 4 then
+        # save the attachments
+        if msg[:attachments].length > 0 then
+          
+          attachment_path = File.join(path, title + ordinal)
+          FileX.mkdir_p attachment_path
           
-          msg[:attachments].each.with_index do |x, i|
+          msg[:attachments][0..2].each.with_index do |x, i|
             
             name, buffer = x
             parts_path[i] = File.join(attachment_path, name.gsub('/',''))
@@ -171,39 +174,28 @@ class Omah
               puts ($!)
             end
             
-          end
-          
-        else
+          end          
           
-          # make a zip file and add the attachments to it
-          
-          zipfile = File.join(@filepath_user, attachment_path, 
-                              title[0,12].downcase + '.zip')
-          parts_path[0] = zipfile
-          
-          FileX.zip zipfile, msg[:attachments]
-          
-        end        
-        
+          h[:attachments] = msg[:attachments].map(&:first)
 
-      end
-      
-      msg.delete :attachments
-
-      h = msg.merge(txt_filepath: txt_filepath, \
-                       html_filepath: html_filepath)
-      parts_path.each.with_index do |path, i|
-        h.merge!("attachment#{i+1}" => @webpath_user + '/' + path)
-      end
-      
-      if parts_path.any? then
-        
-        attachments = parts_path.map do |path|
-          "<li><a href='%s'>%s</a></li>" % [@webpath_user + '/' + path, 
-                                            File.basename(path)]
         end
         
+        msg.delete :attachments
+
+        h = msg.merge(txt_filepath: txt_filepath, \
+                        html_filepath: html_filepath)
+        parts_path.each.with_index do |path, i|
+          h.merge!("attachment#{i+1}" => @webpath_user + '/' + path)
+        end
         
+        if parts_path.any? then
+          
+          attachments = parts_path.map do |path|
+            "<li><a href='%s'>%s</a></li>" % [@webpath_user + '/' + path, 
+                                              File.basename(path)]
+          end
+          
+          
 html_page= %Q(
 <html>
   <head>
@@ -221,15 +213,23 @@ html_page= %Q(
 </html>
 )
 
-        FileX.write File.join(attachment_path, 'index.html'), html_page
-        h[:html_filepath] = File.join(attachment_path, 'index.html')
-      end
+          FileX.write File.join(attachment_path, 'index.html'), html_page
+          h[:html_filepath] = File.join(attachment_path, 'index.html')
+        end
 
-      h[:link] = File.join(@url_base, @webpath_user, html_filepath)
+        h[:link] = File.join(@url_base, @webpath_user, html_filepath)
 
-      @plugins.each {|x| x.on_newmessage(h) if x.respond_to? :on_newmessage }
+        @plugins.each {|x| x.on_newmessage(h) if x.respond_to? :on_newmessage }
+        
+        @dd.create h
+      
       
-      @dd.create h      
+        # remove the message from the server
+        #jr250918 email.delete
+        
+      rescue
+        puts 'Omah::store warning: ' + ($!).inspect
+      end
 
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omah
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   QYtaxpGWTpAPjszaFSAGnt9wrzAMCFPhpqXanwuDYpQ0rmo/GgWyJNEJuUgvMZBi
   WfE=
   -----END CERTIFICATE-----
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-daily
@@ -41,7 +41,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,27 +51,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: nokorexi
   requirement: !ruby/object:Gem::Requirement