omah 0.9.0 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d06eb4457018bb8014de125b696636a9482903275d61989f0c638e67324eb7b
-  data.tar.gz: ee80906ff711cf99a89785f78ef9d97de4074d187ddebbe008cd76f04a32be80
+  metadata.gz: d1b29960de678baaa04b089b86091f22d62c3595a64f5304d23d32488a4333ee
+  data.tar.gz: b347eabaa96a1e72ff664d081ac70fc29d9adaea59746b3b602990d4a53c1ad3
 SHA512:
-  metadata.gz: 1c112dbc1d4b9086fc18f74392db282a23b4e5762454bb01d1f1ea9100e3e6b2fcb7dcedacc279d30819f10ab1e48c72130e56057028bbdd2db65c40dfae549f
-  data.tar.gz: f54bae7520efefd38c0a1141ce29bef6517515dc16eca4c784367064758a9e5fa8a6a11de9dcf4277e20cb0b62f8a79689b3b01822584e3e0c5e423e086af6d4
+  metadata.gz: 73585b352b0c63c2d959eb62f45954b55d1a673be0cd15b0b7c91d782ea918095689c437b73c1b82cb997b4b0be01c90427aba723e2220e634ecc368c7f7b1e5
+  data.tar.gz: ead2fe673624b908532e9caa6c2ecbf2884205778a100085e3a59e5031cdf04cbd3a127ff180739c8491b2d9a9a3373a900a148cad03302924c10e61c5c7fb4f

data/lib/omah.rb

@@ -3,7 +3,6 @@
 # file: omah.rb
 # title: Offline Mail Helper
 
-require 'zip'
 require 'nokorexi'
 require 'dynarex-daily'
 require 'novowels'
@@ -12,9 +11,11 @@ module Library
 
   def fetch_file(filename)
 
-    lib = File.dirname(__FILE__)
-    File.read File.join(lib,'..','stylesheet',filename)
-
+    #lib = File.dirname(__FILE__)
+    #File.read filename
+    lib = 'http://a0.jamesrobertson.me.uk/rorb/r/ruby/omah/'
+    URI.open(File.join(lib, filename),
+      'UserAgent' => 'Omah'){|x| x.read }
   end
 end
 
@@ -22,14 +23,14 @@ class Omah
 
   include Library
   include RXFHelperModule
-  
+
   def initialize(user: 'user', filepath: '.', \
-             options: {xslt: 'listing.xsl', url_base: 'http://localhost/' }, 
+             options: {xslt: 'listing.xsl', url_base: 'http://localhost/' },
                  plugins: [], webpath: '/email', debug: false)
 
-    
+
     puts 'inside Omah::initialize' if @debug
-    
+
     @user = user
     @xslt = options[:xslt]
     @css = options[:css]
@@ -41,128 +42,137 @@ class Omah
     @debug = debug
 
     puts 'Omah::initialize filepath: ' + filepath.inspect if @debug
-    
+
     FileX.chdir filepath
 
     puts 'Omah::initialize making directory ' + @filepath_user if @debug
-    FileX.mkdir_p @filepath_user 
+    FileX.mkdir_p @filepath_user
 
     FileX.chdir @filepath_user
-    
-    dailyfile = 'dynarexdaily.xml'
-    
+
+    dailyfile = File.join(@filepath_user, 'dynarexdaily.xml')
+
     x = if FileX.exists? dailyfile then dailyfile
 
     else
-      
+
       '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
-      @dd.prev_date = File.join(@webpath_user, date_yesterday)
-      
+
+      date_yesterday = File.join(@filepath_user,
+                                (Date.today - 1).strftime("%Y/%b/%d").downcase)
+
+      @dd.prev_date = File.join(@webpath_user,
+                                (Date.today - 1).strftime("%Y/%b/%d").downcase)
+
       # add the next_day field value to the previous day file
-      
+
       file_yesterday = date_yesterday + '/index.xml'
 
       if FileX.exists? file_yesterday then
-        
+
         dx_yesterday = Dynarex.new file_yesterday
-        dx_yesterday.next_date = File.join(@webpath_user, 
+        dx_yesterday.next_date = File.join(@webpath_user,
                                       (Date.today).strftime("%Y/%b/%d").downcase)
         dx_yesterday.xslt = options[:archive_xsl] if options[:archive_xsl]
         dx_yesterday.save
       end
-      
+
     end
-    
+
     # intialize plugins
-        
+
     puts 'Omah::initialize before plugins' if @debug
-    
+
     @plugins = plugins.inject([]) do |r, plugin|
-      
+
       name, settings = plugin
-      
+
       puts 'Omah::initialize plugin: ' + name.inspect if @debug
-      
+
       return r if settings[:active] == false and !settings[:active]
-      
+
       klass_name = 'OmahPlugin' + name.to_s.split(/[-_]/)\
           .map{|x| x.capitalize}.join
 
-      r << Kernel.const_get(klass_name).new(settings: settings, 
+      r << Kernel.const_get(klass_name).new(settings: settings,
                                             variables: @variables, debug: @debug)
 
-    end    
+    end
 
   end
 
   def store(messages)
 
-    messages.each.with_index do |msg,i|
+    messages.each.with_index do |x,i|
 
-      puts "i: %d msg: %s" % [i, msg]
-      subject = msg[:subject] || ''
-      
-      title = subject.gsub(/\W+/,'-')[0,30].sub(/^-/,'').sub(/-$/,'')
+      email, msg = x
 
-      a = @dd.all.select {|x| x.subject == subject}
+      begin
 
-      ordinal = a.any? ? '.' + a.length.to_s : ''
+        puts "i: %d msg: %s" % [i, msg] if @debug
+        subject = msg[:subject] || ''
 
-      x_file = title + ordinal
+        title = subject.gsub(/\W+/,'-')[0,30].sub(/^-/,'').sub(/-$/,'')
 
-      id = msg[:msg_id]
+        a = @dd.all.select {|x| x.subject == subject}
 
-      next if @dd.find_by_msg_id id
+        ordinal = a.any? ? '.' + a.length.to_s : ''
 
-      path = archive()
+        x_file = title + ordinal
 
-      x_filepath = File.join(path, x_file)            
+        id = msg[:msg_id]
 
-      puts 'FileX.pwd ' + FileX.pwd if @debug
-      puts 'Omah::store before mkdir_p path: ' + path.inspect if @debug
-      FileX.mkdir_p path
+        next if @dd.find_by_msg_id id
 
-      if msg[:raw_source] then
-        FileX.write File.join(@filepath_user, x_filepath + '.eml'), \
-                    msg[:raw_source]
-      end
+        path = archive()
+
+        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
+
+        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]) }
+        filepath = File.join(@filepath_user, x_filepath + '.kvx')
+        Kvx.new(header, debug: false).save filepath
+
+        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 = []
+
+        h = msg.merge(txt_filepath: txt_filepath, \
+                        html_filepath: html_filepath)
+
+        # save the attachments
+        if msg[:attachments].length > 0 then
+
+          attachment_path = File.join(path, title + ordinal)
+          FileX.mkdir_p attachment_path
+
+          msg[:attachments][0..2].each.with_index do |x, i|
 
-      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
-        
-        attachment_path = File.join(path, title + ordinal)
-        FileX.mkdir_p attachment_path
-        
-        if msg[:attachments].length < 4 then
-          
-          msg[:attachments].each.with_index do |x, i|
-            
             name, buffer = x
             parts_path[i] = File.join(attachment_path, name.gsub('/',''))
             begin
@@ -170,40 +180,27 @@ class Omah
             rescue
               puts ($!)
             end
-            
+
           end
-          
-        else
-          
-          # 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        
-        
 
-      end
-      
-      msg.delete :attachments
+          h[:attachments] = msg[:attachments].map(&:first)
 
-      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
+
+        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>
@@ -212,7 +209,7 @@ html_page= %Q(
     <style></style>
   </head>
   <body>
-    <iframe src='../#{File.basename(html_filepath)}'></iframe>   
+    <iframe src='../#{File.basename(html_filepath)}'></iframe>
     <h2>attachments</h2>
     <ul>
       #{attachments.join("\n")}
@@ -221,69 +218,77 @@ 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)
+
+        @plugins.each {|x| x.on_newmessage(h) if x.respond_to? :on_newmessage }
+
+        @dd.create h
 
-      h[:link] = File.join(@url_base, @webpath_user, html_filepath)
 
-      @plugins.each {|x| x.on_newmessage(h) if x.respond_to? :on_newmessage }
-      
-      @dd.create h      
+        # remove the message from the server
+        #jr250918 email.delete
+
+      rescue
+        puts 'Omah::store warning: ' + ($!).inspect
+      end
 
     end
-    
+
     if @xslt then
-      
+
       unless FileX.exists? @xslt then
         FileX.write File.expand_path(@xslt), fetch_file(@xslt)
         FileX.write File.expand_path(@css), fetch_file(@css) if @css and \
                                                           not FileX.exists? @css
       end
-      
+
       @dd.xslt = @xslt
 
     end
-    
-    
+
+
     doc = @dd.to_doc
 
     doc.root.xpath('records/message').each do |message|
-      
+
       classify message.element('from')
       classify message.element('to')
-      
+
     end
 
-    @plugins.each do |x| 
+    @plugins.each do |x|
       x.on_newmail(messages, doc) if x.respond_to? :on_newmail
     end
-    
+
     FileX.write File.join(@filepath_user, 'dynarexdaily.xml'), \
                                                         doc.xml(pretty: true)
-    
+
   end
-  
+
   private
-  
+
   def archive()
-    
+
     t = Time.now
     path = File.join ['archive', t.year.to_s, \
                           Date::MONTHNAMES[t.month].downcase[0..2], t.day.to_s]
 
-  end  
-  
+  end
+
   def classify(e)
-    
-    s = e.text.to_s    
+
+    s = e.text.to_s
     return if s.empty?
-    
+
     e.attributes[:css_class] = NoVowels.compact(s.gsub(/\W+/,''))
-  end    
+  end
 
   def html_sanitiser(s)
-    # Parsing HTML has proved problematic either way. Instead we will just 
+    # Parsing HTML has proved problematic either way. Instead we will just
     # return whatever is given.
 =begin
     begin
@@ -296,12 +301,12 @@ html_page= %Q(
 =end
     s
   end
-  
+
 
   def text_sanitiser(s)
-    # Parsing HTML has proved problematic either way. Instead we will just 
+    # Parsing HTML has proved problematic either way. Instead we will just
     # return whatever is given.
-=begin    
+=begin
     begin
       Rexle.new "<root>#{s}</root>"
       s2 = s
@@ -312,6 +317,6 @@ html_page= %Q(
 =end
     s
   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.4
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNzI0MjE1NDUxWhcN
-  MTkwNzI0MjE1NDUxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUFiXU
-  C+MpRXGK1y364aNZYHu0nBE58/E03G9PgNW5ey2WUG7VfqSpCHf+pnkKPvhERGcp
-  fs2c+C8xMLYBlVEDR9UWgJTgAjYx3H79tMsgWn8xurMDKLjsxYW6RwP70HQMCFGU
-  DChFrLLtNWLvW7giV00Miqlf9ZAEdphD8d+VFXIm8iDTUYitMOZE6NbmgacwZ4lu
-  VHmOwNs3Wg+K66SobXrxBTrQzmYVTjJkgmbyEORH/of/oBvcOG5tZY9ELlZCxLhX
-  sb1bQAi12cOkuOoCsV1tWtP9PVQWwoWMBjoC36sNemHmxzaNOt25BHxNdJrznlKt
-  ZB52qlYVJ0qqbU0jAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFN+DBAwxB/gSg8HcerKG5yiElimbMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAD0byFUEJePXzFGCTQVx
-  tr796ChW0Fxno+ZsR3jTvN6dMbAKUR+9/TYzXInbVx7z1edtUlDJJ02Cxpu0JCGu
-  Wiu9aMjHLXVcicTo9t73xMcO0tguhINlvfubf80Co7t8m9Cv6W8WpIRp/I7XKxGe
-  1LsGhAYGIzku126UPCzdPhZvxXEiv63N4SBbjfpiDKWZLyQ8m0NEEKIN3ak89A78
-  imC/Xwzv0SxyYibMdqD+fRP6HKhUzawMSRhNvnw4EhtqFVw6WOVjVHQHc4E9aptT
-  QYtaxpGWTpAPjszaFSAGnt9wrzAMCFPhpqXanwuDYpQ0rmo/GgWyJNEJuUgvMZBi
-  WfE=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTE4MTE0MTM3WhcN
+  MjIxMTE4MTE0MTM3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCdnMRf
+  xtV4IAaB2Ev1nAT/IZsvOs0a/oCgv/+CFyuZxDhpTF+znJRAlBW8pMSOxmQ0/V04
+  owAW7+4lt/RkAZyUbgUqnWDsNIvBZcQbVnhQcJLCNBFPLSe9LeCz8gWqnSSZD0N2
+  ZuAm7EvBlWVRbMLZDNmUxpdRskdRZQQ9NOfTc9p4QU65x91Ys3RHCuGwB67H6ulp
+  O0PgSIyfs2IaEB8CR7pQk2qyEHVn81LkJLhlUvqM07vDYNflbGSwKgsIRYcu28jI
+  Xwb0Gpsjn/UcLsBuu/CvhqVx4CEdX6wo7DWtbeV3bWIf25T8cRGHZiftCDXI5a7H
+  YjdiqW38reXuPnWa2uqtdYWYUctHIObQ7OEAMKBiFbz9OPfw1z2acWpqs9JTwJLI
+  a3jQqPE7Qlifu/mtasZ94IBv+AJoMJeVuwIEcXlO8YlbAblMDeWz0MY2317g0xwy
+  lz6J6f9EXabWSk5q2PZMX4M5qHCPMoBwPX4NWjVscWY1Cs5KYERek079KZMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUXGiFRVre
+  Vjoqpwk+D83rrR1OXpwwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAf2g/Yn2jGLrcB4UF/4aCNMqHYxw3Tc6ubW+eoH0L
+  7xXPcsFl/5i6PTusx+DrVzE4g/jsKAIOkO9spU7uVcYAitadHZqmF1Y5/D64P1xo
+  ScfV1uRp3Dbeq3QQHqSPNTj17QXlspdaNw+tBJrI1O8/aTutwDg6tkcaC/yqGwFt
+  +bh7rB9730zTdurLNUTfruHI38CRSOjt4BkucvmuC17rHhx4h9jMCi6zu5rtengR
+  lnLA6WVHlggce4nsMEBQIZZLUOssW32OPGDVbjh/24jNpVukqRm5sQFRWWuWkrwd
+  jNJY60a6JkLn4Ahvzrhm2n7anGKTOpyVS62Qu8w6cUkjXpmwXWXWVN9N7/POG7EO
+  xgj1UqJaKqMEg3TAr0auf2iXyXfhxbRVryltYk+3SkZWbITs95cEbmfWSgoVu6os
+  v/Ouz34Li0pxu+f3q+Z4+FRkBjMmW1X8RIaeSj9LAirhInezIc2b9CkS5c5zkwkZ
+  S/OWSwnVm2eKNuPrpAfd36Wk
   -----END CERTIFICATE-----
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-daily
@@ -41,7 +46,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,47 +56,27 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: novowels
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -141,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
-summary: 'Offline Mail Helper: Stores email messages in a file directory archive'
+summary: 'Offline Mail Helper: Stores email messages in a file directory archive.'
 test_files: []