vmail 1.0.7 → 1.0.8

data/README.markdown

@@ -44,6 +44,13 @@ installation command again.
 
     gem install vmail
 
+If you ever want to uninstall vmail from your system, just execute this command:
+
+    gem uninstall vmail
+
+... and all traces of vmail will removed, except the few files it creates
+during execution (see below).
+
 ## Configuration file
 
 To run vmail, create a yaml file called `.vmailrc` and save it either in the

data/lib/vmail.rb

@@ -1,6 +1,8 @@
 require 'vmail/version'
 require 'vmail/options'
 require 'vmail/imap_client'
+require 'vmail/message_formatter'
+require 'vmail/reply_template'
 
 module Vmail
   extend self

data/lib/vmail/imap_client.rb

@@ -1,6 +1,4 @@
 require 'drb'
-require 'vmail/message_formatter'
-require 'vmail/reply_template'
 require 'vmail/string_ext'
 require 'yaml'
 require 'mail'

data/lib/vmail/message_formatter.rb

@@ -132,15 +132,17 @@ module Vmail
 
     def utf8(string)
       return '' unless string
-      return string unless encoding
-      if encoding && encoding != 'UTF-8'
-        Iconv.conv('UTF-8//TRANSLIT/IGNORE', encoding, string)
-      else
-        string
-      end
+      out = if encoding && encoding.upcase != 'UTF-8' 
+              Iconv.conv('UTF-8//TRANSLIT/IGNORE', encoding, string)
+            elsif encoding.upcase == 'UTF-8' 
+              string 
+            else
+              # assume UTF-8
+              Iconv.conv('US-ASCII//TRANSLIT/IGNORE', 'UTF-8', string)
+            end
+      out
     rescue
-      puts $!
-      string
+      "[error: #$!]"
     end
   end
 end

data/lib/vmail/reply_template.rb

@@ -1,4 +1,3 @@
-require 'vmail/message_formatter'
 require 'mail'
 require 'time'
 
@@ -12,20 +11,21 @@ module Vmail
 
     def reply_headers(try_again = true)
       formatter = Vmail::MessageFormatter.new(@mail)
-      headers = formatter.extract_headers
-      subject = headers['subject']
+      @orig_headers = formatter.extract_headers
+      subject = @orig_headers['subject']
       if subject !~ /Re: /
         subject = "Re: #{subject}"
       end
-      date = headers['date'].is_a?(String) ? Time.parse(headers['date']) : headers['date']
-      quote_header = "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n"
+      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.process_body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
       {'from' => "#@name <#@username>", 'to' => primary_recipient, 'cc' => cc, 'subject' => subject, :body => body}
     end
 
     def primary_recipient
-      from = @mail.header['from']
-      reply_to = @mail.header['reply-to']
+      reply_headers unless @orig_headers
+      from = @orig_headers['from']
+      reply_to = @orig_headers['reply-to']
       [ reply_to, from ].flatten.compact.map(&:to_s)[0]
     end
 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/test/fixtures/reply-template-encoding-test.eml

@@ -0,0 +1,40 @@
+Return-Path: <bjorn.anon@gmail.com>
+Received: by 10.213.2.204 with SMTP id 12cs17792ebk; Tue, 21 Dec 2010 05:40:30 -0800
+Received: from mr.google.com ([10.229.226.72]) by 10.229.226.72 with SMTP id iv8mr5009442qcb.204.1292938829929 (num_hops = 1); Tue, 21 Dec 2010 05:40:29 -0800
+Received: by 10.229.226.72 with SMTP id iv8mr5009442qcb.204.1292938829911; Tue, 21 Dec 2010 05:40:29 -0800
+Received: by 10.229.49.20 with HTTP; Tue, 21 Dec 2010 05:40:09 -0800
+Date: Tue, 21 Dec 2010 14:40:09 +0100
+From: =?ISO-8859-1?Q?bj=F6rn?= <bjorn.anon@gmail.com>
+To: dhchoi@gmail.com
+Message-ID: <AANLkTim-YQ=ZknU9kTn6E+gFz2fuYwPATH0p8awLeW4+@mail.gmail.com>
+Subject: MacVim and vmail
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: quoted-printable
+Delivered-To: dhchoi@gmail.com
+Received-SPF: pass (google.com: domain of bjorn.anon@gmail.com designates
+ 10.229.226.72 as permitted sender) client-ip=10.229.226.72;
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of
+ bjorn.anon@gmail.com designates 10.229.226.72 as permitted sender)
+ smtp.mail=bjorn.anon@gmail.com; dkim=pass
+ header.i=bjorn.anon@gmail.com
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
+ h=domainkey-signature:received:mime-version:received:from:date
+ :message-id:subject:to:content-type:content-transfer-encoding;
+ bh=tGJ8CJFcQHFOWkIFqkJNeTR7/cdlltnCQhqqvmM0/J0=;
+ b=XT4QNhPsFHy/c+dd6FqJwhCDGmdBCwnvZqXuG9URh1KGlGBtU0DJX41HW9kZyrAvXj
+ aOxp55FueAXyXUZQm15P2A8/9SrYvMOc9hWOS5Se9a4mlnYqXXcp+W2oE5DqEKGb7YlH
+ ap6btHS1XLryXkO8SjZc+scMk50wqjDzQL7hU=
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
+ h=mime-version:from:date:message-id:subject:to:content-type
+ :content-transfer-encoding;
+ b=D73071TdLGB8O2FMAVeQM8P3FCKldlkhJ1x4cZsa3IBg7Kt39PfVl975M/fopHbUHL
+ ctStLGhrRByypG6+elo0PnHPOwMqnRLN7Smt4yY2DgyJ5IIdFF8HVNswMbRaIJ2kAzYj
+ Ni3lTZC0BwwlBcMfL3/hIxAHTMKTf5oWQgZyA=
+
+Hi Daniel,=0D
+=0D
+I saw the following on your vmail page:=0D
+Best wishes,=0D
+Bj=F6rn=

data/test/reply_template_test.rb

@@ -1,32 +1,48 @@
+# encoding: utf-8
 require 'test_helper'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'vmail/reply_template'
+require 'vmail/message_formatter'
 
 describe Vmail::ReplyTemplate do
-  before do
-    @raw = read_fixture('reply_all.eml')
-    @mail = Mail.new(@raw)
-    @rt = Vmail::ReplyTemplate.new(@mail, 'dhchoi@gmail.com', 'Daniel Choi', true)
+  describe 'normal rfc822 message' do
+    before do
+      @raw = read_fixture('reply_all.eml')
+      @mail = Mail.new(@raw)
+      @rt = Vmail::ReplyTemplate.new(@mail, 'dhchoi@gmail.com', 'Daniel Choi', true)
+    end
+
+    def test_detect_primary_recipient
+      assert_equal "Chappy Youn <chappy1@gmail.com>", @rt.primary_recipient
+    end
+
+    def test_detect_cc
+      expected = "Draculette Ko <violinist.ko@gmail.com>, Cookiemonster Youn <cookiemonster@gmail.com>, Racoon <raycoon@gmail.com>"
+      assert_equal expected, @rt.cc
+    end
+    
+    def test_sender
+      assert_equal "Chappy Youn <chappy1@gmail.com>", @rt.sender
+    end
+
+    def test_template
+      expected = {"from"=>"Daniel Choi <dhchoi@gmail.com>", "to"=>"Chappy Youn <chappy1@gmail.com>", "cc"=>"Draculette Ko <violinist.ko@gmail.com>, Cookiemonster Youn <cookiemonster@gmail.com>, Racoon <raycoon@gmail.com>", "subject"=>"Re: Holiday potluck at Ray's", :body=>"On Sun, Dec 12, 2010 at 01:13 PM, Chappy Youn <chappy1@gmail.com> wrote:\n\n> Guys,\n> Tonight we will have a potluck at Ray's at 7. Pls bring food for 1.5  \n> ppl.\n> \n> Ray will provide wine and dessert.\n> \n> Also, we will be having a poor man's Yankee swap. Pls bring something  \n> gift wrapped from home. Nothing fancy, but something halfway decent or  \n> funny.\n> \n> El, make sure it's worth more than 50 cents.\n> \n> Chappy\n> \n> Sent from my iPhone"}
+
+      assert_equal expected,  @rt.reply_headers
+    end
   end
 
-  def test_detect_primary_recipient
-    assert_equal "Chappy Youn <chappy1@gmail.com>", @rt.primary_recipient
-  end
-
-  def test_detect_cc
-    expected = "Draculette Ko <violinist.ko@gmail.com>, Cookiemonster Youn <cookiemonster@gmail.com>, Racoon <raycoon@gmail.com>"
-    assert_equal expected, @rt.cc
-  end
-  
-  def test_sender
-    assert_equal "Chappy Youn <chappy1@gmail.com>", @rt.sender
-  end
-
-  def test_template
-    expected = {"from"=>"Daniel Choi <dhchoi@gmail.com>", "to"=>"Chappy Youn <chappy1@gmail.com>", "cc"=>"Draculette Ko <violinist.ko@gmail.com>, Cookiemonster Youn <cookiemonster@gmail.com>, Racoon <raycoon@gmail.com>", "subject"=>"Re: Holiday potluck at Ray's", :body=>"On Sun, Dec 12, 2010 at 01:13 PM, Chappy Youn <chappy1@gmail.com> wrote:\n\n> Guys,\n> Tonight we will have a potluck at Ray's at 7. Pls bring food for 1.5  \n> ppl.\n> \n> Ray will provide wine and dessert.\n> \n> Also, we will be having a poor man's Yankee swap. Pls bring something  \n> gift wrapped from home. Nothing fancy, but something halfway decent or  \n> funny.\n> \n> El, make sure it's worth more than 50 cents.\n> \n> Chappy\n> \n> Sent from my iPhone"}
+  describe 'encoded rfc822 message' do
+    before do
+      @raw = read_fixture("reply-template-encoding-test.eml")
+      @mail = Mail.new @raw
+      @rt = Vmail::ReplyTemplate.new(@mail, 'dhchoi@gmail.com', 'Daniel Choi', true)
+    end
 
-    assert_equal expected,  @rt.reply_headers
+    def test_encoded_header
+      assert_equal '"björn" <bjorn.anon@gmail.com>', @rt.reply_headers['to']
+    end
   end
 
-
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Daniel Choi
@@ -84,6 +84,7 @@ files:
 - 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
@@ -165,6 +166,7 @@ test_files:
 - 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