mail_address 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f133e4048ada59c77c2146d1cd06d5f2c35e00f2
-  data.tar.gz: 1057019e38ac5979ed952841dbca8e1e48984b62
+  metadata.gz: c273c57e022c03b757c099fd4245d7616aa4beb6
+  data.tar.gz: 0b8b1fd6b193b85790bbecb32965c1d37e2af8b2
 SHA512:
-  metadata.gz: 1a2a0a5e0a064dee47fc7ad06b75c041016dd70cc7134c518b8e14a53eecef14c286fc1482757b98d39c0f0cb31313e56b3e4d02c6da43d981952c2c4e3ac21a
-  data.tar.gz: e1676c7f33cbfab6448beaccaf0e53b54d24c3b2901cf16e0f71d0bd87adf02de38df339d31866ede01c3b3bfac91df701437400c85c37460ffa2987d4eba685
+  metadata.gz: ed4bd05095c5a316a09e3cb73bbf2b303e74e217d2eacec1b2dce0c34496a43b7834e02b8ae42b2e97a2ecf8f2e6c3dc0c20c6e7f940c5de3fc2485856feaaa2
+  data.tar.gz: 49da2ad5e84ace95734f3814e5f077523e2746f61d25b6f5f84b9c9f49ae10ed3893650bad9e4306fef45999b30b581dfb4c22e41a91aec1b37d8acf809c0bcd

data/README.md

@@ -1,4 +1,4 @@
-# MailAddress [![Build Status](https://travis-ci.org/kizashi1122/mail_address.svg)](https://travis-ci.org/kizashi1122/mail_address) [![Coverage Status](https://coveralls.io/repos/kizashi1122/mail_address/badge.png)](https://coveralls.io/r/kizashi1122/mail_address)
+# MailAddress [![Build Status](https://travis-ci.org/kizashi1122/mail_address.svg)](https://travis-ci.org/kizashi1122/mail_address) [![Coverage Status](https://coveralls.io/repos/kizashi1122/mail_address/badge.png)](https://coveralls.io/r/kizashi1122/mail_address) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/kizashi1122/mail_address/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/kizashi1122/mail_address/?branch=master)
 
 MailAddress is a port of Mail::Address from Perl.
 

data/lib/mail_address/mail_address.rb

@@ -82,14 +82,14 @@ module MailAddress
     line = addresses.join(',') # $_
     words = []
 
+    line.gsub!(/\\/, '')
     line.sub!(/\A\s+/, '')
     line.gsub!(/[\r\n]+/,' ')
 
     while (line != '')
       tmp = nil
       if (
-          line.match(/"[^"]+"/) && line.sub!(/\A("(?:[^"\\]+|\\.)*")(\s*)/, '')  || # "..."
-#         line.sub!(/\A(\[(?:[^\\]\]+|\\.)*\])(\s*)/, '')   || # [...]
+          line.match(/"[^"]+"/) && line.sub!(/\A(\\?"(?:[^"\\]+|\\.)*")(\s*)/, '')  || # "..."
           line.sub!(/\A([^\s()<>\@,;:\\".\[\]]+)(\s*)/, '') ||
           line.sub!(/\A([()<>\@,;:\\".\[\]])(\s*)/, '')
           )
@@ -124,7 +124,18 @@ module MailAddress
 
   def self._complete (phrase, address, original)
     phrase.length > 0 || address.length > 0 or return nil
-    new_address = MailAddress::Address.new(phrase.join('').strip, address.join(''), original)
+
+    name = phrase.join('').strip
+
+    name = self.collapse_whitespace(name)
+    name = name[1 .. -2] if name.start_with?('\'') && name.end_with?('\'')
+    name = name[1 .. -2] if name.start_with?('"') && name.end_with?('"')
+
+    # Replace escaped quotes and slashes.
+    name = name.gsub(ESCAPED_DOUBLE_QUOTES_, '"')
+    name = name.gsub(ESCAPED_BACKSLASHES_, '\\')
+
+    new_address = MailAddress::Address.new(name, address.join(''), original)
     phrase.clear; address.clear
     new_address
   end

data/lib/mail_address/simple_parser.rb

@@ -79,6 +79,8 @@ module MailAddress
 
     #address = goog.string.collapseWhitespace(address);
     address.strip!
+
+    addr = addr.strip
     MailAddress::Address.new(name, address, addr)
   end
 

data/lib/mail_address/version.rb

@@ -1,3 +1,3 @@
 module MailAddress
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/spec/mail_address_spec.rb

@@ -76,7 +76,7 @@ describe MailAddress do
     expect(results[0].format).to eq('"ジョン ドゥ" <johndoe@example.com>')
     expect(results[0].address).to eq('johndoe@example.com')
     expect(results[0].name).to eq('ジョン ドゥ')
-    expect(results[0].phrase).to eq('"ジョン ドゥ"')
+    expect(results[0].phrase).to eq('ジョン ドゥ')
     expect(results[0].host).to eq('example.com')
     expect(results[0].user).to eq('johndoe')
     expect(results[0].original).to eq(line)
@@ -163,7 +163,7 @@ describe MailAddress do
     expect(results[0].format).to eq('"michael@example.jp" <johndoe@example.com>')
     expect(results[0].address).to eq('johndoe@example.com')
     expect(results[0].name).to eq('michael@example.jp')
-    expect(results[0].phrase).to eq('"michael@example.jp"')
+    expect(results[0].phrase).to eq('michael@example.jp')
     expect(results[0].host).to eq('example.com')
     expect(results[0].user).to eq('johndoe')
     expect(results[0].original).to eq(line)
@@ -531,6 +531,38 @@ describe MailAddress do
     expect(results[0].original).to eq('') # Note that it returns empty string NOT nil
   end
 
+  it "includes backslash" do
+    line = '\"jjjjjjjjjjjj\" <john_doe@example.com>'
+    results = MailAddress.parse(line)
+    expect(results[0].format).to eq('jjjjjjjjjjjj <john_doe@example.com>')
+    expect(results[0].address).to eq('john_doe@example.com')
+    expect(results[0].name).to eq("jjjjjjjjjjjj")
+    expect(results[0].phrase).to eq('jjjjjjjjjjjj')
+    expect(results[0].host).to eq('example.com')
+    expect(results[0].user).to eq('john_doe')
+    expect(results[0].original).to eq('"jjjjjjjjjjjj" <john_doe@example.com>') # TO BE EXACT, NOT ORIGINAL.
+
+    line = '\"jjjjjjjjjjjj" <john_doe@example.com>'
+    results = MailAddress.parse(line)
+    expect(results[0].format).to eq('jjjjjjjjjjjj <john_doe@example.com>')
+    expect(results[0].address).to eq('john_doe@example.com')
+    expect(results[0].name).to eq("jjjjjjjjjjjj")
+    expect(results[0].phrase).to eq('jjjjjjjjjjjj')
+    expect(results[0].host).to eq('example.com')
+    expect(results[0].user).to eq('john_doe')
+    expect(results[0].original).to eq('"jjjjjjjjjjjj" <john_doe@example.com>') # TO BE EXACT, NOT ORIGINAL.
+
+    line = '"jjjjjjjjjjjj\" <john_doe@example.com>'
+    results = MailAddress.parse(line)
+    expect(results[0].format).to eq('jjjjjjjjjjjj <john_doe@example.com>')
+    expect(results[0].address).to eq('john_doe@example.com')
+    expect(results[0].name).to eq("jjjjjjjjjjjj")
+    expect(results[0].phrase).to eq('jjjjjjjjjjjj')
+    expect(results[0].host).to eq('example.com')
+    expect(results[0].user).to eq('john_doe')
+    expect(results[0].original).to eq('"jjjjjjjjjjjj" <john_doe@example.com>') # TO BE EXACT, NOT ORIGINAL.
+  end
+
   it "suppress too much extraction" do
     line = 'john_doe@example.com'
     results = MailAddress.parse(line)

data/spec/simple_parser_spec.rb

@@ -63,17 +63,25 @@ describe MailAddress do
 
   it "testparseListWithCommaInLocalPart" do
     res = assert_parsed_list(
-      '"Doe, John" <doe.john@gmail.com>, <someone@gmail.com>',
-      ['doe.john@gmail.com', 'someone@gmail.com'])
-    expect(res[0].phrase).to eq('Doe, John')
-    expect(res[1].phrase).to eq('')
+      '"Doe, John" <doe.john@gmail.com>, <someone@gmail.com>, "あいうえお" <abc@example.com>, かき くけこ <xyz@example.com>',
+      ['doe.john@gmail.com', 'someone@gmail.com', 'abc@example.com', 'xyz@example.com'])
+    expect(res[0].name).to eq('Doe, John')
+    expect(res[1].name).to be_nil
+    expect(res[2].name).to eq('あいうえお')
+    expect(res[3].name).to eq('かき くけこ')
+    expect(res[2].format).to eq('"あいうえお" <abc@example.com>')
+    expect(res[2].original).to eq('"あいうえお" <abc@example.com>')
   end
 
   it "testparseListWithWhitespaceSeparatedEmails" do
     res = assert_parsed_list(
-      'a@b.com <c@d.com> e@f.com "G H" <g@h.com> i@j.com',
+      'a@b.com abc <c@d.com> e@f.com "G H" <g@h.com> i@j.com',
       ['a@b.com', 'c@d.com', 'e@f.com', 'g@h.com', 'i@j.com']);
-    expect(res[3].phrase).to eq('G H')
+    expect(res[3].name).to eq('G H')
+    expect(res[1].original).to eq('abc <c@d.com>')
+    expect(res[1].format).to eq('abc <c@d.com>')
+    expect(res[3].original).to eq('"G H" <g@h.com>')
+    expect(res[3].format).to eq('G H <g@h.com>')
   end
 
   it "testparseListSystemNewlines" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_address
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Kizashi Nagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,7 @@ files:
 - lib/mail_address/simple_parser.rb
 - lib/mail_address/version.rb
 - mail_address.gemspec
+- spec/address_spec.rb
 - spec/mail_address_spec.rb
 - spec/simple_parser_spec.rb
 - spec/spec_helper.rb
@@ -121,6 +122,7 @@ signing_key:
 specification_version: 4
 summary: Simple Mail Address Parser
 test_files:
+- spec/address_spec.rb
 - spec/mail_address_spec.rb
 - spec/simple_parser_spec.rb
 - spec/spec_helper.rb