vmail 1.3.5 → 1.3.6

data/lib/vmail.vim

@@ -622,7 +622,8 @@ function! CompleteContact(findstart, base)
     " model regex: match at beginning of line, or inside < > wrapping
     " email addr
     "  '\(^ho\|<ho\)'
-    let regex = shellescape('\(^' . a:base . '\|<' . a:base . '\)')
+    " let regex = shellescape('\(^' . a:base . '\|<' . a:base . '\)')
+    let regex = shellescape(a:base)
     let matches = system("grep -i " . regex  . " " . $VMAIL_CONTACTS_FILE)
     return split(matches, "\n")
   endif

data/lib/vmail/address_quoter.rb

@@ -18,7 +18,14 @@ module Vmail
       end
       
       #Quote the names
-      addrs.map { |addr| addr.gsub(/^(.*) (<.*)/, '"\1" \2') }.join(', ')
+      addrs.map { |addr| 
+        # a little hackish
+        if addr =~ /"/
+          addr
+        else
+          addr.gsub(/^(.*) (<.*)/, '"\1" \2') 
+        end
+      }.join(', ')
     end
     
   end

data/lib/vmail/contacts_extractor.rb

@@ -34,7 +34,7 @@ class ContactsExtractor
           name = address_struct.name
           if name 
             name = Mail::Encodings.unquote_and_convert_to(name, 'UTF-8') 
-            yield "#{name} <#{email}>"
+            yield %Q("#{name}" <#{email}>)
           else
             yield email
           end

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end

data/test/address_quoter_test.rb

@@ -24,4 +24,11 @@ class AddressQuoterTest < MiniTest::Unit::TestCase
     expected = %q("Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>, peterbaker@gmail.com)
     assert_equal expected, quote_addresses(string)  
   end
+
+  def test_quoting_already_quoted
+    string = %q(Bob Smith <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>, peterbaker@gmail.com)
+    expected = %q("Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>, peterbaker@gmail.com)
+    assert_equal expected, quote_addresses(string)  
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Daniel Choi