mail_address 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e966fc9f6878a8d0954ca5e658db596e581d15
-  data.tar.gz: 108c96f94e4b19c9aee8c61ec52c4fe6cf896d5f
+  metadata.gz: 6c3df155a843a41e44b3cd71ead006d7b8eec109
+  data.tar.gz: e4c5a5226870fe2a2c6c711f4702d036e18077b3
 SHA512:
-  metadata.gz: 477bdb94a6eba5ac3a302ae590bf4b926e0dd8f236c0d5cedf57112a5ccea8f058d6e391eff50000a317baba7f5c332eabe0606defab8d4cb333c9ff85268eed
-  data.tar.gz: ca4c41bed4759fc726fe72bae286c897d5fd97f52fd6fe71abde8843864121ea047f82d13609b2527de9d8a359b190c2948f71c88f6f957c5f6fd79ed06e7cef
+  metadata.gz: 25b66af8271b90ac1bf4bb5578c1829639d8bc840b210223b50bb2f63d6981b92ff6ac0cc6bdf12fac0a03de22284551b917266e48475e02107f06587db0967f
+  data.tar.gz: 2f3a9775c6621af6a87e15f8c0c10ffee43843cec22d57418bca53304241c6ca9e4d6e8fa5195e8a13555727300958547277d2f8495e20955a70750904c15b78

data/lib/mail_address/address.rb

@@ -2,18 +2,31 @@ module MailAddress
 
   class Address
 
-    def initialize(phrase, address_, original)
+    attr_accessor :phrase, :address, :original
+
+    def initialize(phrase, address, original)
+
+      @address = address
       @phrase = phrase
-      @address = address_
       @original = original
+
+      ###  validate afterwords
+      # parse failed or invalid address
+      unless (@address && @original.include?(@address)) && Address._check_address_with_regex(@address)
+        @address = nil
+      end
+
+      # invalid address
+      if @address.nil? && (phrase.nil? || phrase == "")
+        @phrase = original
+      end
     end
-    attr_accessor :phrase, :original
 
     ATEXT = '[\-\w !#$%&\'*+/=?^`{|}~]'
 
     def format
       addr = []
-      return @original if address.nil?
+      return @original if @address.nil?
 
       if !@phrase.nil? && @phrase.length > 0 then
         if @phrase.match(/\A\(/) && @phrase.match(/\)\z/)
@@ -35,43 +48,18 @@ module MailAddress
 
     def name
       phrase = @phrase.dup
-      addr   = @address ? @address.dup : ""
-
       name   = Address._extract_name(phrase)
-
-      # first.last@domain address
-      if (name == '') && (md = addr.match(/([^\%\.\@_]+([\._][^\%\.\@_]+)+)[\@\%]/)) then
-        name = md[1]
-        name.gsub!(/[\._]+/, ' ')
-        name = Address._extract_name name
-      end
-      
-      if (name == '' && addr.match(%r{/g=}i)) then   # X400 style address
-        f = addr.match(%r{g=([^/]*)}i)
-        l = addr.match(%r{s=([^/]*)}i)
-        name = Address._extract_name "#{f[1]} #{l[1]}"
-      end
-
       name.length > 0 ? name : nil
     end
 
-    def address
-      # double check
-      if @address.nil? || @original.include?(@address)
-        @address
-      else
-        nil # wrongly constructed address
-      end
-    end
-
     def host
-      addr = address || '';
+      addr = @address || '';
       i = addr.rindex('@')
       i.nil? ? nil : addr[i + 1 .. -1]
     end
 
     def user
-      addr = address || '';
+      addr = @address || '';
       i = addr.rindex('@')
       i.nil? ? addr : addr[0 ... i]
     end
@@ -106,6 +94,13 @@ module MailAddress
       name
     end
 
+    # check if the address is compliant with RFC2822
+    def self._check_address_with_regex(email_address)
+      return nil unless email_address
+      # regex check (see  http://blog.livedoor.jp/dankogai/archives/51189905.html)
+      email_address.match(/^(?:(?:(?:(?:[a-zA-Z0-9_!#\$\%&'*+\/=?\^`{}~|\-]+)(?:\.(?:[a-zA-Z0-9_!#\$\%&'*+\/=?\^`{}~|\-]+))*)|(?:"(?:\\[^\r\n]|[^\\"])*")))\@(?:(?:(?:(?:[a-zA-Z0-9_!#\$\%&'*+\/=?\^`{}~|\-]+)(?:\.(?:[a-zA-Z0-9_!#\$\%&'*+\/=?\^`{}~|\-]+))*)|(?:\[(?:\\\S|[\x21-\x5a\x5e-\x7e])*\])))$/)
+    end
+
   end
 
 end

data/lib/mail_address/mail_address.rb

@@ -10,7 +10,7 @@ module MailAddress
       return [ MailAddress::Address.new(line, nil, line) ]
     end
 
-    # obviously invalid email address
+    # obviously all email address(es) are invalid
     unless line.match(/[a-z0-9\.\-"_\+]@/i)
       return [ MailAddress::Address.new(line, nil, line) ]
     end

data/lib/mail_address/version.rb

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

data/spec/mail_address_spec.rb

@@ -170,7 +170,7 @@ describe MailAddress do
   end
 
   it "normal case (multiple address)" do
-    line = "John 'M' Doe <john@example.com>, 大阪 太郎 <osaka@example.jp>"
+    line = "John 'M' Doe <john@example.com>, 大阪 太郎 <osaka@example.jp>, localpartonly"
     results = MailAddress.parse(line)
 
     expect(results[0].format).to eq("John 'M' Doe <john@example.com>")
@@ -190,6 +190,14 @@ describe MailAddress do
     expect(results[1].host).to eq("example.jp")
     expect(results[1].user).to eq("osaka")
     expect(results[1].original).to eq('大阪 太郎 <osaka@example.jp>')
+
+    expect(results[2].format).to  eq("localpartonly")
+    expect(results[2].address).to be_nil
+    expect(results[2].name).to    eq("localpartonly")
+    expect(results[2].phrase).to  eq("localpartonly")
+    expect(results[2].host).to    be_nil
+    expect(results[2].user).to    eq("")
+    expect(results[2].original).to eq("localpartonly")
   end
 
   it "normal case (rfc-violated(RFC822) but commonly used in AU/DoCoMo)" do
@@ -359,6 +367,28 @@ describe MailAddress do
     expect(results[0].original).to eq('') # Note that it returns empty string NOT nil
   end
 
+  it "suppress too much extraction" do
+    line = 'john_doe@example.com'
+    results = MailAddress.parse(line)
+    expect(results[0].format).to eq('john_doe@example.com')
+    expect(results[0].address).to eq('john_doe@example.com')
+    expect(results[0].name).to be_nil
+    expect(results[0].phrase).to eq('')
+    expect(results[0].host).to eq("example.com")
+    expect(results[0].user).to eq('john_doe')
+    expect(results[0].original).to eq(line)
+
+    line = 'john.doe@example.com'
+    results = MailAddress.parse(line)
+    expect(results[0].format).to eq('john.doe@example.com')
+    expect(results[0].address).to eq('john.doe@example.com')
+    expect(results[0].name).to be_nil
+    expect(results[0].phrase).to eq('')
+    expect(results[0].host).to eq("example.com")
+    expect(results[0].user).to eq('john.doe')
+    expect(results[0].original).to eq(line)
+  end
+
   it "corrupted address" do
     line = 'john <john@example.com' # lack of right angle bracket
     expect {
@@ -466,9 +496,9 @@ describe MailAddress do
       ['Clive Bittlestone <clyvb@asic.sc.ti.com>',
         'Clive Bittlestone <clyvb@asic.sc.ti.com>',
         'Clive Bittlestone'],
-      ['Graham.Barr@tiuk.ti.com',
-        'Graham.Barr@tiuk.ti.com',
-        'Graham Barr'],
+      # ['Graham.Barr@tiuk.ti.com',
+      #   'Graham.Barr@tiuk.ti.com',
+      #   'Graham Barr'],
       # ['"Graham Bisset, UK Net Support, +44 224 728109"  <GRAHAM@dyce.wireline.slb.com.ti.com.>',
       #   '"Graham Bisset, UK Net Support, +44 224 728109" <GRAHAM@dyce.wireline.slb.com.ti.com.>',
       #   'Graham Bisset'],
@@ -481,9 +511,9 @@ describe MailAddress do
       # ['a909062@node_cb83.node_cb83 (Colin Maytum         (0013 bro5))',
       #   'a909062@node_cb83.node_cb83 (Colin Maytum         (0013 bro5))',
       #   'Colin Maytum'],
-      ['Derek.Roskell%dero@msg.ti.com',
-        'Derek.Roskell%dero@msg.ti.com',
-        'Derek Roskell'],
+      # ['Derek.Roskell%dero@msg.ti.com',
+      #   'Derek.Roskell%dero@msg.ti.com',
+      #   'Derek Roskell'],
       # ['":sysmail"@ Some-Group. Some-Org, Muhammed.(I am the greatest) Ali @(the)Vegas.WBA',
       #   '":sysmail"@Some-Group.Some-Org',
       #   ''],

metadata

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