vmail 1.9.3 → 1.9.4

data/lib/vmail/imap_client.rb

@@ -285,6 +285,9 @@ module Vmail
     def format_headers(hash)
       lines = []
       hash.each_pair do |key, value|
+        if value.nil?
+          next
+        end
         if value.is_a?(Array)
           value = value.join(", ")
         end
@@ -347,9 +350,10 @@ EOF
       mail = Mail.new
       raw_headers, raw_body = *text.split(/\n\s*\n/, 2)
       headers = {}
+
       raw_headers.split("\n").each do |line|
         key, value = *line.split(/:\s*/, 2)
-        if key == 'message-id'
+        if key == 'references'
           mail.references = value
         else
           next if (value.nil? || value.strip == '')

data/lib/vmail/message_formatter.rb

@@ -85,20 +85,14 @@ module Vmail
     end
 
     def extract_headers(mail = @mail)
-      headers = {'from' => utf8(mail['from'].decoded),
+      headers = {
+        'from' => utf8(mail['from'].decoded),
         'date' => (mail.date.strftime('%a, %b %d %I:%M %p %Z %Y') rescue mail.date),
         'to' => mail['to'].nil? ? nil : utf8(mail['to'].decoded),
+        'cc' => (mail.cc && utf8(mail['cc'].decoded.to_s)),
+        'reply_to' => (mail.reply_to && utf8(mail['reply_to'].decoded)),
         'subject' => utf8(mail.subject)
       }
-      if !mail.cc.nil?
-        headers['cc'] = utf8(mail['cc'].decoded.to_s)
-      end
-      if !mail.reply_to.nil?
-        headers['reply_to'] = utf8(mail['reply_to'].decoded)
-      end
-      if mail['message-id'] 
-        headers['references'] = mail['message-id']
-      end
       headers
     rescue
       {'error' => $!}

data/lib/vmail/reply_templating.rb

@@ -25,7 +25,7 @@ module Vmail
       reply_body = reply_quote_header + divider('-') +
         (current_message.plaintext.split(/^-+$/,2)[1])
       {
-        'message-id' => current_message.message_id,
+        'references' => current_message.message_id,
         'from' => "#@name <#@username>", 
         'to' => reply_recipient, 
         'cc' => reply_cc, 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '1.9.3'
+  VERSION = '1.9.4'
 end

metadata

@@ -2,7 +2,7 @@
 name: vmail
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors: 
 - Daniel Choi