mail_address 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c3df155a843a41e44b3cd71ead006d7b8eec109
-  data.tar.gz: e4c5a5226870fe2a2c6c711f4702d036e18077b3
+  metadata.gz: ccb2c082070db454ef985f2a87325823c351097d
+  data.tar.gz: 4b6a338e58922edfba00921031ca331293f0b6fa
 SHA512:
-  metadata.gz: 25b66af8271b90ac1bf4bb5578c1829639d8bc840b210223b50bb2f63d6981b92ff6ac0cc6bdf12fac0a03de22284551b917266e48475e02107f06587db0967f
-  data.tar.gz: 2f3a9775c6621af6a87e15f8c0c10ffee43843cec22d57418bca53304241c6ca9e4d6e8fa5195e8a13555727300958547277d2f8495e20955a70750904c15b78
+  metadata.gz: fda758c1ac169360f0a18b9c8390ebf82022e471f70c19939b715b553f8b1ba8eb5a3ae68b2dd9405cef8b84bfff751e3a9c509a57e86e3f1e0e9fff57f69436
+  data.tar.gz: 47a765205ea2ae07b07cb8029245c14bdb96e9baa4c415395eb441ed5e5713b99c9a9b47078c9caf14fd88c7449b303fc066cce4547991aa119993e0c93efadb

data/lib/mail_address/address.rb

@@ -5,7 +5,6 @@ module MailAddress
     attr_accessor :phrase, :address, :original
 
     def initialize(phrase, address, original)
-
       @address = address
       @phrase = phrase
       @original = original
@@ -17,9 +16,7 @@ module MailAddress
       end
 
       # invalid address
-      if @address.nil? && (phrase.nil? || phrase == "")
-        @phrase = original
-      end
+      @phrase = original if @address.nil?
     end
 
     ATEXT = '[\-\w !#$%&\'*+/=?^`{|}~]'

data/lib/mail_address/mail_address.rb

@@ -5,13 +5,13 @@ module MailAddress
     lines = addresses.grep(String)
     line = lines.join('')
 
-    # undisclosed-recipient
-    if line.match(/undisclosed[ \-]recipients?: ?;?/i)
+    # empty
+    if line.strip.empty?
       return [ MailAddress::Address.new(line, nil, line) ]
     end
 
-    # obviously all email address(es) are invalid
-    unless line.match(/[a-z0-9\.\-"_\+]@/i)
+    # undisclosed-recipient
+    if line.match(/undisclosed[ \-]recipients?: ?;?/i)
       return [ MailAddress::Address.new(line, nil, line) ]
     end
 

data/lib/mail_address/version.rb

@@ -1,3 +1,3 @@
 module MailAddress
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/mail_address_spec.rb

@@ -250,7 +250,7 @@ describe MailAddress do
     expect(results[0].original).to eq(line)
   end
 
-  it "local part only" do
+  it "local part only(treated as invalid)" do
     # if local part only, do not treat as an email address
     line = "localpartonly"
     results = MailAddress.parse(line)
@@ -263,6 +263,32 @@ describe MailAddress do
     expect(results[0].original).to eq(line)
   end
 
+  it "includes invalid addresses only among valid addresses " do
+    line = "aaaa, xyz@example.com, bbbb"
+    results = MailAddress.parse(line)
+    expect(results[0].format).to  eq("aaaa")
+    expect(results[0].address).to be_nil
+    expect(results[0].name).to    eq("aaaa")
+    expect(results[0].phrase).to  eq("aaaa")
+    expect(results[0].host).to    be_nil
+    expect(results[0].user).to    eq("")
+    expect(results[0].original).to eq("aaaa")
+    expect(results[1].format).to  eq("xyz@example.com")
+    expect(results[1].address).to eq("xyz@example.com")
+    expect(results[1].name).to    be_nil
+    expect(results[1].phrase).to  eq("")
+    expect(results[1].host).to    eq("example.com")
+    expect(results[1].user).to    eq("xyz")
+    expect(results[1].original).to eq("xyz@example.com")
+    expect(results[2].format).to  eq("bbbb")
+    expect(results[2].address).to be_nil
+    expect(results[2].name).to    eq("bbbb")
+    expect(results[2].phrase).to  eq("bbbb")
+    expect(results[2].host).to    be_nil
+    expect(results[2].user).to    eq("")
+    expect(results[2].original).to eq("bbbb")
+  end
+
   it "a lot of types of undisclosed recipients" do
     array = [
       'undisclosed-recipients: ;',
@@ -276,7 +302,6 @@ describe MailAddress do
 
     array.each do |line|
       results = MailAddress.parse(line)
-#      expect(results[0].format).to  eq(%Q("#{line}"))
       expect(results[0].format).to eq(line)
       expect(results[0].address).to be_nil
       expect(results[0].name).to    eq(line)
@@ -334,9 +359,10 @@ describe MailAddress do
 
     array.each do |line|
       results = MailAddress.parse(line)
+      line.gsub!(';', '')
       expect(results[0].format).to  eq(line)
       expect(results[0].address).to be_nil
-      expect(results[0].name).to    eq(line)
+      expect(results[0].name).to    eq(line.strip)
       expect(results[0].phrase).to  eq(line)
       expect(results[0].host).to    be_nil
       expect(results[0].user).to    eq("")
@@ -344,6 +370,32 @@ describe MailAddress do
     end
   end
 
+  it "all are invalid" do
+    line = 'aa aa, bb (bb), cccc'
+    results = MailAddress.parse(line)
+    expect(results[0].format).to eq('aa aa')
+    expect(results[0].address).to be_nil
+    expect(results[0].name).to eq('aa aa')
+    expect(results[0].phrase).to eq('aa aa')
+    expect(results[0].host).to be_nil
+    expect(results[0].user).to eq('')
+    expect(results[0].original).to eq('aa aa')
+    expect(results[1].format).to eq('bb (bb)')
+    expect(results[1].address).to be_nil
+    expect(results[1].name).to eq('bb (bb)')
+    expect(results[1].phrase).to eq('bb (bb)')
+    expect(results[1].host).to be_nil
+    expect(results[1].user).to eq('')
+    expect(results[1].original).to eq('bb (bb)')
+    expect(results[2].format).to eq('cccc')
+    expect(results[2].address).to be_nil
+    expect(results[2].name).to eq('cccc')
+    expect(results[2].phrase).to eq('cccc')
+    expect(results[2].host).to be_nil
+    expect(results[2].user).to eq('')
+    expect(results[2].original).to eq('cccc')
+  end
+
   it "empty string or nil" do
     # empty string
     line = ''
@@ -407,8 +459,8 @@ describe MailAddress do
     expect(results[0].format).to eq('Sf 山田 太郎@example.com')
     expect(results[0].address).not_to eq("Sf@example.com") ## important!
     expect(results[0].address).to be_nil                   ## important!
-    expect(results[0].name).to eq('山田 太郎')             ## I don't care whatever returns
-    expect(results[0].phrase).to eq('山田 太郎')           ## I don't care whatever returns
+    expect(results[0].name).to eq('Sf 山田 太郎@example.com')    ## I don't care whatever returns
+    expect(results[0].phrase).to eq('Sf 山田 太郎@example.com')  ## I don't care whatever returns
     expect(results[0].host).to be_nil
     expect(results[0].user).to eq('')
     expect(results[0].original).to eq('Sf 山田 太郎@example.com')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_address
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kizashi Nagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler