Merge pull request #32 from benbalter/nuke-email-veracity

drop email veracity
benbalter · Jan 31, 2014 · a0469cc · a0469cc
2 parents b0298fe + f5b45b5
commit a0469cc
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 33 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     gman (1.0.0)
       addressable
-      email_veracity
       public_suffix
       swot
 
@@ -18,7 +17,6 @@ GEM
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
     atomic (1.1.14)
-    email_veracity (0.6.0)
     i18n (0.6.9)
     json (1.8.1)
     minitest (4.7.5)

diff --git a/README.md b/README.md
@@ -29,14 +29,6 @@ Gman.valid? "[email protected]" #true
 Gman.valid? "[email protected]" #false
 ```
 
-### Really verify an email address
-
-(also verifies that the server returns a valid MX record)
-
-```ruby
-Gman.valid? "[email protected]", true #true
-Gman.valid? "[email protected]", true #false
-```
 ### Verify domain
 
 ```ruby
@@ -53,8 +45,6 @@ Gman.get_domain "http://foo.bar.gov" # foo.bar.gov
 Gman.get_domain "[email protected]" # bar.gov
 Gman.get_domain "foo.bar.gov" # foo.bar.gov
 Gman.get_domain "asdf@asdf" # nil (no domain within the string)
-Gman.get_domain "[email protected]", true #false (no MX record)
-Gman.get_domain "[email protected]", true # true (valid MX record)
 ```
 
 ## Contributing

diff --git a/gman.gemspec b/gman.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency( "public_suffix" )
   s.add_dependency( "swot" )
-  s.add_dependency( "email_veracity" )
   s.add_dependency( "addressable" )
 
   s.add_development_dependency( "rake" )

diff --git a/lib/gman.rb b/lib/gman.rb
@@ -2,10 +2,48 @@
 require 'yaml'
 require 'swot'
 require "addressable/uri"
-require "email_veracity"
 
 module Gman
 
+  # Source: http://bit.ly/1n2X9iv
+  EMAIL_REGEX = %r{
+        ^
+        (
+          [\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+
+          \.
+        )
+        *
+        [\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+
+        @
+        (
+          (
+            (
+              (
+                (
+                  [a-z0-9]{1}
+                  [a-z0-9\-]{0,62}
+                  [a-z0-9]{1}
+                )
+                |
+                [a-z]
+              )
+              \.
+            )+
+            [a-z]{2,6}
+          )
+          |
+          (
+            \d{1,3}
+            \.
+          ){3}
+          \d{1,3}
+          (
+            \:\d{1,5}
+          )?
+        )
+        $
+      }xi
+
   class << self
 
     # Normalizes and checks if a given string represents a governemnt domain
@@ -16,20 +54,12 @@ class << self
     #   "foo.gov.uk"
     #   "http://foo.bar.gov"
     #
-    # check_mx - if an email is passed, check the domain for an mx record
-    #
     # Returns boolean true if a government domain
-    def valid?(text, check_mx=false)
+    def valid?(text)
 
       domain = get_domain text
       return false unless PublicSuffix.valid?(domain)
 
-      # validate mx record
-      if check_mx && email?(text)
-        EmailVeracity::Config[:skip_lookup] = false
-        return false unless EmailVeracity::Address.new(text).valid?
-      end
-
       # Ensure non-edu
       return false if Swot::is_academic?(domain)
 
@@ -44,7 +74,7 @@ def valid?(text, check_mx=false)
     # returns an instance of our custom public suffix list
     # list behaves like PublicSuffix::List but is limited to our whitelisted domains
     def list
-      @list ||= PublicSuffix::List::parse( File.new(File.join(File.dirname(__FILE__), "domains.txt"), "r:utf-8"))
+      @list ||= PublicSuffix::List::parse(File.new(File.join(File.dirname(__FILE__), "domains.txt"), "r:utf-8"))
     end
 
     # Get the FQDN name from a URL or email address.
@@ -60,7 +90,7 @@ def get_domain(text)
       if uri.host # valid https?://* URI
         uri.host
       elsif email?(text)
-        EmailVeracity::Address.new(text).domain.to_s
+        text.match(/@([\w\.\-]+)\Z/i)[1]
       else # url sans http://
         begin
           uri = Addressable::URI.parse("http://#{text}")
@@ -90,8 +120,7 @@ def domain_parts(text)
     #
     # Returns true if email, otherwise false
     def email?(text)
-      EmailVeracity::Config[:skip_lookup] = true
-      EmailVeracity::Address.new(text).valid?
+      text =~ EMAIL_REGEX
     end
   end
 end
diff --git a/test/test_gman.rb b/test/test_gman.rb
@@ -53,12 +53,6 @@ class TestGman < Test::Unit::TestCase
     assert_equal nil, Gman.get_domain("foo")
   end
 
-  should "validate mx records when asked" do
-    assert_equal true, Gman.valid?("[email protected]", true)
-    assert_equal false, Gman.valid?("[email protected]", true)
-    assert_equal true, Gman.valid?("[email protected]", false)
-  end
-
   should "not err out on invalid domains" do
     assert_equal false, Gman.valid?("[email protected]")
     assert_equal "act.gov.au", Gman.get_domain("[email protected]")