1 files changed, 42 insertions, 22 deletions
diff --git a/lib/nickserver/email_address.rb b/lib/nickserver/email_address.rb
index 26053a2..2b3f2c2 100644
--- a/lib/nickserver/email_address.rb
+++ b/lib/nickserver/email_address.rb
@@ -1,25 +1,45 @@
-#
-# This rather crazy regexp is from here: http://code.iamcal.com/php/rfc822/
-# Licensed GPLv3
-#
-# It is too liberal, allowing "!@x" as a valid address, for example, but it does
-# follow the specification rather closely.
-#
-
 module Nickserver
-  EmailAddress = begin
-    qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'
-    dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]'
-    atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+'
-    quoted_pair = '\\x5c[\\x00-\\x7f]'
-    domain_literal = "\\x5b(?:#{dtext}|#{quoted_pair})*\\x5d"
-    quoted_string = "\\x22(?:#{qtext}|#{quoted_pair})*\\x22"
-    domain_ref = atom
-    sub_domain = "(?:#{domain_ref}|#{domain_literal})"
-    word = "(?:#{atom}|#{quoted_string})"
-    domain = "#{sub_domain}(?:\\x2e#{sub_domain})*"
-    local_part = "#{word}(?:\\x2e#{word})*"
-    addr_spec = "#{local_part}\\x40#{domain}"
-    /\A#{addr_spec}\z/n
+  class EmailAddress
+
+    REGEXP = begin
+               qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'
+               dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]'
+               atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+'
+               quoted_pair = '\\x5c[\\x00-\\x7f]'
+               domain_literal = "\\x5b(?:#{dtext}|#{quoted_pair})*\\x5d"
+               quoted_string = "\\x22(?:#{qtext}|#{quoted_pair})*\\x22"
+               domain_ref = atom
+               sub_domain = "(?:#{domain_ref}|#{domain_literal})"
+               word = "(?:#{atom}|#{quoted_string})"
+               domain = "#{sub_domain}(?:\\x2e#{sub_domain})*"
+               local_part = "#{word}(?:\\x2e#{word})*"
+               addr_spec = "#{local_part}\\x40#{domain}"
+               /\A#{addr_spec}\z/n
+             end
+
+    def initialize(address)
+      @address = address.to_s
+    end
+
+    def valid?
+      address =~ REGEXP
+    end
+
+    def invalid?
+      !valid?
+    end
+
+    def domain?(domain)
+      address.end_with? "@#{domain}"
+    end
+
+    def to_s
+      address
+    end
+
+    protected
+
+    attr_reader :address
+
   end
 end