vmail 1.8.7 → 1.8.8

data/lib/vmail.rb

@@ -3,7 +3,6 @@ require 'vmail/options'
 require 'vmail/imap_client'
 require 'vmail/query'
 require 'vmail/message_formatter'
-require 'vmail/reply_template'
 
 module Vmail
   extend self

data/lib/vmail/imap_client.rb

@@ -13,6 +13,7 @@ require 'vmail/searching'
 require 'vmail/showing_headers'
 require 'vmail/showing_message'
 require 'vmail/flagging_and_moving'
+require 'vmail/reply_templating'
 
 module Vmail
   class ImapClient
@@ -22,6 +23,7 @@ module Vmail
     include Vmail::ShowingHeaders
     include Vmail::ShowingMessage
     include Vmail::FlaggingAndMoving
+    include Vmail::ReplyTemplating
 
     attr_accessor :max_seqno # of current mailbox
 
@@ -34,6 +36,7 @@ module Vmail
       @mailbox = nil
       @logger = Logger.new(config['logfile'] || STDERR)
       @logger.level = Logger::DEBUG
+      $logger = @logger
       @imap_server = config['server'] || 'imap.gmail.com'
       @imap_port = config['port'] || 993
       current_message = nil
@@ -286,12 +289,6 @@ module Vmail
       lines.join("\n")
     end
 
-    def reply_template(replyall=false)
-      log "Sending reply template"
-      reply_headers = Vmail::ReplyTemplate.new(current_message.rfc822, @username, @name, replyall, @always_cc).reply_headers
-      body = reply_headers.delete(:body)
-      format_headers(reply_headers) + "\n\n\n" + body + signature
-    end
 
     def signature
       return '' unless @signature
@@ -348,11 +345,16 @@ EOF
       headers = {}
       raw_headers.split("\n").each do |line|
         key, value = *line.split(/:\s*/, 2)
-        log [key, value].join(':')
-        if %w(from to cc bcc).include?(key)
-          value = quote_addresses(value)
+        if key == 'message-id'
+          mail.references = value
+        else
+          next if (value.nil? || value.strip == '')
+          log [key, value].join(':')
+          if %w(from to cc bcc).include?(key)
+            value = quote_addresses(value)
+          end
+          headers[key] = value
         end
-        headers[key] = value
       end
       log "Delivering message with headers: #{headers.to_yaml}"
       mail.from = headers['from'] || @username
@@ -384,6 +386,9 @@ EOF
         end
       end
       mail
+    rescue
+      $logger.debug $!
+      raise
     end
 
     def save_attachments(dir)
@@ -486,7 +491,8 @@ trap("INT") {
   puts "Closing imap connection"  
   begin
     Timeout::timeout(2) do 
-      $gmail.close
+      # just try to quit
+      # $gmail.close
     end
   rescue Timeout::Error
     puts "Close connection attempt timed out"

data/lib/vmail/message_formatter.rb

@@ -96,6 +96,9 @@ module Vmail
       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' => $!}
@@ -117,6 +120,7 @@ module Vmail
             end
       out
     rescue
+      $logger.debug $!
       "[error: #$!]"
     end
   end

data/lib/vmail/reply_templating.rb

@@ -0,0 +1,59 @@
+# encoding: UTF-8
+require 'mail'
+require 'time'
+
+module Vmail
+  module ReplyTemplating
+
+    def reply_template(replyall=false)
+      @replyall = replyall
+      log "Sending reply template"
+      h = reply_headers
+      body = h.delete('body')
+      format_headers(h) + "\n\n\n" + body + signature
+    end
+
+    def reply_headers
+      reply_subject = current_message.subject
+      if reply_subject !~ /Re: /
+        reply_subject = "Re: #{reply_subject}"
+      end
+      date = DateTime.parse(current_message.date)
+      sender = current_message.sender
+      reply_quote_header = date ? "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n" : "#{sender} wrote:\n"
+
+      reply_body = reply_quote_header + divider('-') +
+        (current_message.plaintext.split(/^-+$/,2)[1])
+      {
+        'message-id' => current_message.message_id,
+        'from' => "#@name <#@username>", 
+        'to' => reply_recipient, 
+        'cc' => reply_cc, 
+        'bcc' => @always_bcc,
+        'subject' => reply_subject, 
+        'body' => reply_body
+      }
+    rescue
+      $logger.debug $!
+      raise
+    end
+
+    def reply_recipient
+      current_mail.header['Reply-To'] || current_message.sender
+    end
+
+    def reply_cc
+      return nil unless (@replyall || @always_cc)
+      xs = if @replyall
+             ((current_mail['cc'] && current_mail['cc'].decoded) || "") .split(/,\s*/)
+           else
+             []
+           end
+      if @always_cc && xs.none? {|x| x =~ %r{#{@always_cc}}}
+        xs << @always_cc
+      end
+      xs.uniq.select {|x| x != reply_recipient }.join(', ')
+    end
+
+  end
+end

data/lib/vmail/showing_headers.rb

@@ -1,3 +1,4 @@
+require 'iconv'
 module Vmail
   module ShowingHeaders
 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '1.8.7'
+  VERSION = '1.8.8'
 end

metadata

@@ -2,7 +2,7 @@
 name: vmail
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors: 
 - Daniel Choi
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 Z
+date: 2011-06-28 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mail
@@ -89,7 +90,7 @@ files:
 - lib/vmail/message_formatter.rb
 - lib/vmail/options.rb
 - lib/vmail/query.rb
-- lib/vmail/reply_template.rb
+- lib/vmail/reply_templating.rb
 - lib/vmail/searching.rb
 - lib/vmail/send_options.rb
 - lib/vmail/sender.rb
@@ -114,6 +115,7 @@ files:
 - test/test_helper.rb
 - test/time_format_test.rb
 - vmail.gemspec
+has_rdoc: true
 homepage: http://danielchoi.com/software/vmail.html
 licenses: []
 
@@ -137,24 +139,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vmail
-rubygems_version: 1.8.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A Vim interface to Gmail
-test_files: 
-- test/address_quoter_test.rb
-- test/base64_test.rb
-- test/fixtures/euc-kr-header.eml
-- test/fixtures/euc-kr-html.eml
-- test/fixtures/google-affiliate.eml
-- test/fixtures/htmlbody.eml
-- test/fixtures/moleskine-html.eml
-- test/fixtures/reply-template-encoding-test.eml
-- test/fixtures/reply_all.eml
-- test/fixtures/rfc_part.eml
-- test/fixtures/textbody-nocontenttype.eml
-- test/fixtures/with-attachments.eml
-- test/message_formatter_test.rb
-- test/reply_template_test.rb
-- test/test_helper.rb
-- test/time_format_test.rb
+test_files: []
+

data/lib/vmail/reply_template.rb

@@ -1,59 +0,0 @@
-# encoding: UTF-8
-require 'mail'
-require 'time'
-
-module Vmail
-  class ReplyTemplate
-
-    def initialize(mail, username, name, replyall, always_cc=nil)
-      @username, @name, @replyall, @always_cc = username, name, replyall, always_cc
-      @mail = Mail.new(mail)
-    end
-
-    def reply_headers(try_again = true)
-      formatter = Vmail::MessageFormatter.new(@mail)
-      @orig_headers = formatter.extract_headers
-      subject = @orig_headers['subject']
-      if subject !~ /Re: /
-        subject = "Re: #{subject}"
-      end
-      date = @orig_headers['date'].is_a?(String) ? Time.parse(@orig_headers['date']) : @orig_headers['date']
-      quote_header = date ? "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n" : "#{sender} wrote:\n\n"
-      body = quote_header + formatter.plaintext_part
-      begin
-        body = body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
-      rescue
-        body = Iconv.conv(body, "US-ASCII//TRANSLIT//IGNORE", "UTF-8").gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
-      end
-      {'from' => "#@name <#@username>", 'to' => primary_recipient, 'cc' => cc, 'subject' => subject, :body => body}
-    end
-
-    def primary_recipient
-      from = @orig_headers['from']
-      reply_to = @mail.header['Reply-To']
-      @primary_recipient = (reply_to || from).to_s 
-    end
-
-    def cc
-      return nil unless (@replyall || @always_cc)
-      cc = @mail.header['to'] ? @mail.header['to'].value.split(/,\s*/) : []
-      if @mail.header['cc']
-        cc += @mail.header['cc'].value.split(/,\s*/) 
-      end
-      cc = cc.flatten.compact.
-        select {|x| x !~ /#{@username}/} 
-      cc << @always_cc
-      cc.select {|x| x !~ /#{@primary_recipient}/}.join(', ')
-    end
-
-    def sender
-      @mail.header['from'].value
-    end
-
-    # deprecated
-    def address_to_string(x)
-      x.name ? "#{x.name} <#{x.mailbox}@#{x.host}>" : "#{x.mailbox}@#{x.host}"
-    end
-
-  end
-end