vmail 1.3.4 → 1.3.5

data/lib/vmail/address_quoter.rb

@@ -1,17 +1,25 @@
 module Vmail
   module AddressQuoter
 
-    def quote_addresses(string)
-      return string
-      email_addrs = []
-      string.scan(/\s*(.*?)\s*<(.+?)>(?:,|\Z)/) do |match|
-        # yields ["Bob Smith", "bobsmith@gmail.com"]
-        # then   ["Jones, Rich A.", "richjones@gmail.com"]
-        email_addrs << "\"#{match.first}\" <#{match.last}>"
+    def quote_addresses(input)
+      parts = input.split /\s*,\s*/
+
+      addrs = []
+      savebin = ""
+
+      #Group the parts together
+      parts.each do |part|
+        if part.include? "@"
+          addrs << savebin + part
+          savebin = ""
+        else
+          savebin = part + ", "
+        end
       end
-      res = email_addrs.join(", ") 
-      res
+      
+      #Quote the names
+      addrs.map { |addr| addr.gsub(/^(.*) (<.*)/, '"\1" \2') }.join(', ')
     end
-
+    
   end
 end

data/lib/vmail/version.rb

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

data/test/address_quoter_test.rb

@@ -15,5 +15,13 @@ class AddressQuoterTest < MiniTest::Unit::TestCase
     assert_equal @expected, quote_addresses(@string)  #=> "Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>
     assert_equal @expected2, quote_addresses(@string2)  #=> "Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>
   end
+  
+  def test_quoting_with_bare_email_address
+    string = "richjones@gmail.com"
+    assert_equal string, quote_addresses(string)  
 
+    string = "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
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: ruby
 authors: 
 - Daniel Choi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -05:00
+date: 2011-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,5 +162,20 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Vim interface to Gmail
-test_files: []
-
+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