omah 0.9.1 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5775bda4b445e69339cecb256cb6535d64a2c82e00102a56020a45d3c4baad59
-  data.tar.gz: 426d302bd522404ed6fadcd9fedede85037e02d490198f2059c3174b657993e0
+  metadata.gz: 5f76c05ecaceb71b58cfb8f74a84108474fa51a887fdb85ec63af7a5f18e986b
+  data.tar.gz: 16145d2ccae4990dba144b1ffa27d193bc21287b5ebc0fa79f7d67cae36d628a
 SHA512:
-  metadata.gz: d3d9080cb5c4f92bbbd1990b1a65b25efc3a87a89847aa5c64809cbb943ec17995080793140873b4b5537f9ab118a6021627b1d114829de1e736f96390a81c1d
-  data.tar.gz: 86e1c0f6c3e8271d3cdc8ec26b665f5f91ab8b30478d3c8b8e2ff90765d56d524106cfb3d250fca01374c8c9b553deeaa8afcfc2c5c608b235049ab1d39f6f11
+  metadata.gz: 2a8cb70d398453b9301dcd6456151cb84a77ba49fdfe57af29bef6f608365ca6e2571072768866c0147772fd506c7fa28503ae695756e53c3d853e697e9d400d
+  data.tar.gz: fbd391990d5d32668981da65d0a4d365e830d7438c4c48ec85a102b47997085e059157a750f657b4449a8a599a9718b9558c4f311150ccf3ca7f75d15e54c733

data/lib/omah.rb

@@ -6,13 +6,14 @@
 require 'nokorexi'
 require 'dynarex-daily'
 require 'novowels'
+require 'rxfreadwrite'
 
 module Library
 
   def fetch_file(filename)
 
     lib = File.dirname(__FILE__)
-    File.read File.join(lib,'..','stylesheet',filename)
+    File.read filename
 
   end
 end
@@ -20,15 +21,15 @@ end
 class Omah
 
   include Library
-  include RXFHelperModule
-  
+  include RXFReadWriteModule
+
   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]
@@ -40,86 +41,87 @@ 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 = 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, attachments)'        
+      'attachment2, attachment3, attachments)'
 
     end
 
     puts 'Omah::initialize before DynarexDaily' if @debug
-    @dd = DynarexDaily.new x, dir_archive: :yearly, debug: @debug   
+    @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 = File.join(@filepath_user, 
+
+      date_yesterday = File.join(@filepath_user,
                                 (Date.today - 1).strftime("%Y/%b/%d").downcase)
-      
-      @dd.prev_date = File.join(@webpath_user, date_yesterday)
-      
+
+      @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 |x,i|
-      
+
       email, msg = x
-      
+
       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}
@@ -134,7 +136,7 @@ class Omah
 
         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
@@ -146,8 +148,9 @@ class Omah
         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')
-        
+        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)
@@ -155,17 +158,20 @@ class Omah
         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|
-            
+
             name, buffer = x
             parts_path[i] = File.join(attachment_path, name.gsub('/',''))
             begin
@@ -173,29 +179,27 @@ class Omah
             rescue
               puts ($!)
             end
-            
-          end          
-          
+
+          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, 
+            "<li><a href='%s'>%s</a></li>" % [@webpath_user + '/' + path,
                                               File.basename(path)]
           end
-          
-          
+
+
 html_page= %Q(
 <html>
   <head>
@@ -204,7 +208,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")}
@@ -220,70 +224,70 @@ html_page= %Q(
         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 +300,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 +316,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.1
+  version: 0.9.5
 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-09-26 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-daily
@@ -58,20 +63,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: novowels
   requirement: !ruby/object:Gem::Requirement
@@ -93,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: []
@@ -120,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.22
 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: []