omah 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5018c944879de57659789bea4c19c513fcc80e5
-  data.tar.gz: ebba1b447f4b8abc7f60a14b97f9e88c8b6f735e
+  metadata.gz: 5e448d8dcd3df2527bacbd8332ec92270e1522e6
+  data.tar.gz: 0640adfff4ad6c98581224875062fea2a326c853
 SHA512:
-  metadata.gz: a3853a0cdd608325d8fef604da4eb6d12911a642ec01d434dacec83a83579f0ec80ff362adfe40a5e2fed9a622570573065d7bbd6c7eec4b291cbd6018a96a5b
-  data.tar.gz: f68a29f1cdf3c09edbbb408b895123974e54a3fe7c4e5c58d2eacd233271aa685837d7893eec6a46fffc3ad509c2902f65c2ca4143bd6133445546e5a99eb53f
+  metadata.gz: 34fde5200edf29f2b18e739aa567904f9bea453df5c5b6ce482e4cf11c17c1615b1fee9e7c45e3a6b89efa23371d2809ddeba29aa2129bf5c2aa3f6b562399fe
+  data.tar.gz: d8de9312a5ebb997a8115b75671dd85a4ee952efcd018133297c6335fe4297eca72ef1bca0d0d306d77b4cbe6b6ecf9a747c15d12e7e4250ab06586bfa027832

data/lib/omah.rb

@@ -3,6 +3,8 @@
 # file: omah.rb
 # title: Offline Mail Helper
 
+require 'zip'
+require 'nokorexi'
 require 'dynarex-daily'
 
 class Omah
@@ -18,7 +20,8 @@ class Omah
     
     x = if File.exists? dailyfile then dailyfile
     else
-      'messages[date]/message(id, tags, from, to, subject, date, txt_filepath, html_filepath)'
+      'messages[date]/message(id, tags, from, to, subject, date, ' \
+        + 'txt_filepath, html_filepath, attachment1, attachment2, attachment3)'
     end
     
     @dd = DynarexDaily.new x, {dir_archive: :yearly}
@@ -31,7 +34,8 @@ class Omah
 
       subject = msg[:subject]
       title = subject.gsub(/\W+/,'-')[0,30].sub(/-$/,'')
-      a = @dd.find_all_by_subject subject
+
+      a = @dd.all.select {|x| x.subject == subject}
       
       ordinal = a.any? ? '.' + a.length.to_s : ''
       txt_file = title + ordinal + '.txt'
@@ -44,12 +48,55 @@ class Omah
       txt_filepath = File.join(path, txt_file)
       html_filepath = File.join(path, html_file)
       
-      @dd.create msg.merge(txt_filepath: txt_filepath, \
-                                                html_filepath: html_filepath)
 
       FileUtils.mkdir_p path
-      File.write txt_filepath, msg[:body_text]
-      File.write html_filepath, msg[:body_html]
+
+      File.write txt_filepath, text_sanitiser(msg[:body_text].to_s)
+      File.write 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)
+        FileUtils.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)
+            File.write parts_path[i], buffer
+            
+          end
+          
+        else
+          
+          # make a zip file and add the attachments to it
+          
+          zipfile = File.join(attachment_path, title[0,12].downcase + '.zip')
+          parts_path[0] = zipfile
+
+          Zip::File.open(zipfile, Zip::File::CREATE) do |x|
+
+            msg[:attachments].each do |filename, buffer| 
+              x.get_output_stream(filename) {|os| os.write buffer }
+            end
+
+          end          
+          
+        end        
+
+      end
+      
+      msg.delete :attachments
+
+      @dd.create msg.merge(txt_filepath: txt_filepath, \
+            html_filepath: html_filepath, attachment1: parts_path[0], \
+                        attachment2: parts_path[1], attachment3: parts_path[2])
+      
       
     end
 
@@ -65,5 +112,31 @@ class Omah
                           Date::MONTHNAMES[t.month].downcase[0..2], t.day.to_s]
 
   end
+  
+
+  def html_sanitiser(s)
+
+    begin
+      Rexle.new s
+      s2 = s
+    rescue
+      doc = Nokorexi.new(s).to_doc
+      s2 = doc.xml
+    end
+
+  end
+
+  def text_sanitiser(s)
+
+    begin
+      Rexle.new "<root>#{s}</root>"
+      s2 = s
+    rescue
+      doc = Nokorexi.new(s).to_doc
+      s2 = doc.xml
+    end
+
+  end
+    
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omah
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   3LosTxP//qasvjSWNDjmKeTI4/c/fvSDtS5mLXCsxnJ/1Jp4zlO0rZWz0/BgcPFj
   GUN8SqUlRq5unw==
   -----END CERTIFICATE-----
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-daily
@@ -39,20 +39,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: nokorexi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: 
 email: james@r0bertson.co.uk
 executables: []