valid_email2 2.3.1 → 3.0.0

data/gemfiles/activemodel3.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'activemodel', '~> 3.2.22'
+gem 'activemodel', '~> 3.2.22.5'
 
 gemspec path: '../'

data/gemfiles/activemodel4.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'activemodel', '~> 4.2.9'
+gem 'activemodel', '~> 4.2.10'
 
 gemspec path: '../'

data/gemfiles/activemodel5.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'activemodel', '~> 5.1.2'
+gem 'activemodel', '~> 5.2.1'
 
 gemspec path: '../'

data/lib/valid_email2.rb

@@ -1,17 +1,30 @@
+# frozen_string_literal: true
+
 require "valid_email2/email_validator"
 
 module ValidEmail2
+  BLACKLIST_FILE = "config/blacklisted_email_domains.yml"
+  WHITELIST_FILE = "config/whitelisted_email_domains.yml"
+
   def self.disposable_emails
-    @@disposable_emails ||= YAML.load_file(File.expand_path("../../vendor/disposable_emails.yml",__FILE__))
+    @disposable_emails ||= YAML.load_file(
+      File.expand_path('../config/disposable_email_domains.yml', __dir__)
+    )
   end
 
   def self.blacklist
-    blacklist_file = "vendor/blacklist.yml"
-    @@blacklist ||= File.exists?(blacklist_file) ? YAML.load_file(File.expand_path(blacklist_file)) : []
+    @blacklist ||= if File.exist?(BLACKLIST_FILE)
+                     YAML.load_file(File.expand_path(BLACKLIST_FILE))
+                   else
+                     []
+                   end
   end
 
   def self.whitelist
-    whitelist_file = "vendor/whitelist.yml"
-    @@whitelist ||= File.exists?(whitelist_file) ? YAML.load_file(File.expand_path(whitelist_file)) : []
+    @whitelist ||= if File.exist?(WHITELIST_FILE)
+                     YAML.load_file(File.expand_path(WHITELIST_FILE))
+                   else
+                     []
+                   end
   end
 end

data/lib/valid_email2/address.rb

@@ -45,7 +45,11 @@ module ValidEmail2
     end
 
     def disposable?
-      valid? && domain_is_in?(ValidEmail2.disposable_emails)
+      valid? &&
+        (
+          domain_is_in?(ValidEmail2.disposable_emails) ||
+          mx_server_is_in?(ValidEmail2.disposable_emails)
+        )
     end
 
     def whitelisted?
@@ -59,10 +63,7 @@ module ValidEmail2
     def valid_mx?
       return false unless valid?
 
-      Resolv::DNS.open do |dns|
-        return dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX).size > 0 ||
-               dns.getresources(address.domain, Resolv::DNS::Resource::IN::A).size > 0
-      end
+      mx_servers.any?
     end
 
     private
@@ -74,10 +75,29 @@ module ValidEmail2
       }
     end
 
-    def address_contain_emoticons? email_str
-      return false if email_str.nil?
+    def mx_server_is_in?(domain_list)
+      mx_servers.any? { |mx_server|
+        return false unless mx_server.respond_to?(:exchange)
+        mx_server = mx_server.exchange.to_s
+
+        domain_list.any? { |domain|
+          mx_server.end_with?(domain) && mx_server =~ /\A(?:.+\.)*?#{domain}\z/
+        }
+      }
+    end
+
+    def address_contain_emoticons?(email)
+      return false if email.nil?
+
+      email.each_char.any? { |char| char.bytesize > 1 }
+    end
 
-      email_str.each_char.any? { |char| char.bytesize > 1 }
+    def mx_servers
+      @mx_servers ||= Resolv::DNS.open do |dns|
+        mx_servers = dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX)
+        (mx_servers.any? && mx_servers) ||
+          dns.getresources(address.domain, Resolv::DNS::Resource::IN::A)
+      end
     end
   end
 end

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "2.3.1"
+  VERSION = "3.0.0"
 end

data/pull_mailchecker_emails.rb

@@ -10,7 +10,7 @@ whitelisted_emails = %w(
   hush.ai hush.com hushmail.me naver.com qq.com example.com
 )
 
-existing_emails = YAML.load_file("vendor/disposable_emails.yml")
+existing_emails = YAML.load_file("config/disposable_email_domains.yml")
 
 url = "https://raw.githubusercontent.com/FGRibreau/mailchecker/master/list.json"
 resp = Net::HTTP.get_response(URI.parse(url))
@@ -19,4 +19,4 @@ remote_emails = JSON.parse(resp.body).flatten - whitelisted_emails
 
 result_emails = (existing_emails + remote_emails).map(&:strip).uniq.sort
 
-File.open("vendor/disposable_emails.yml", "w") {|f| f.write result_emails.to_yaml }
+File.open("config/disposable_email_domains.yml", "w") {|f| f.write result_emails.to_yaml }

data/spec/valid_email2_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 class TestUser < TestModel
@@ -5,7 +7,7 @@ class TestUser < TestModel
 end
 
 class TestUserSubaddressing < TestModel
-  validates :email, 'valid_email_2/email': {disallow_subaddressing: true}
+  validates :email, 'valid_email_2/email': { disallow_subaddressing: true }
 end
 
 class TestUserMX < TestModel
@@ -24,99 +26,127 @@ class TestUserDisallowBlacklisted < TestModel
   validates :email, 'valid_email_2/email': { blacklist: true }
 end
 
+class TestUserMessage < TestModel
+  validates :email, 'valid_email_2/email': { message: "custom message" }
+end
+
 describe ValidEmail2 do
   describe "basic validation" do
     subject(:user) { TestUser.new(email: "") }
 
-    it "should not be valid email is valid" do
+    it "is valid" do
       user = TestUser.new(email: "foo@bar123.com")
       expect(user.valid?).to be_truthy
     end
 
-    it "should be valid when email is empty" do
+    it "is invalid if email is empty" do
       expect(user.valid?).to be_truthy
     end
 
-    it "should not be valid when domain is missing" do
+    it "is invalid if domain is missing" do
       user = TestUser.new(email: "foo@.com")
       expect(user.valid?).to be_falsey
     end
 
-    it "should be invalid when domain includes invalid characters" do
-      %w(+ _ !).each do |invalid_character|
+    it "is invalid if email contains invalid characters" do
+      %w[+ _ !].each do |invalid_character|
         user = TestUser.new(email: "foo@google#{invalid_character}yahoo.com")
         expect(user.valid?).to be_falsey
       end
     end
 
-    it "should be invalid when email is malformed" do
+    it "is invalid if address is malformed" do
       user = TestUser.new(email: "foo@bar")
       expect(user.valid?).to be_falsey
     end
 
-    it "should be invalid if Mail::AddressListsParser raises exception" do
+    it "is invalid if Mail::AddressListsParser raises exception" do
       user = TestUser.new(email: "foo@gmail.com")
       expect(Mail::Address).to receive(:new).and_raise(Mail::Field::ParseError.new(nil, nil, nil))
       expect(user.valid?).to be_falsey
     end
 
-    it "shouldn't be valid if the domain constains consecutives dots" do
+    it "is invalid if the domain contains consecutive dots" do
       user = TestUser.new(email: "foo@bar..com")
       expect(user.valid?).to be_falsey
     end
+
+    it "is invalid if the domain contains emoticons" do
+      user = TestUser.new(email: "foo🙈@gmail.com")
+      expect(user.valid?).to be_falsy
+    end
   end
 
-  describe "disposable emails" do
-    it "should be valid when the domain is not in the list of disposable email providers" do
+  describe "with disposable validation" do
+    it "is valid if it's not a disposable email" do
       user = TestUserDisallowDisposable.new(email: "foo@gmail.com")
       expect(user.valid?).to be_truthy
     end
 
-    it "should be invalid when domain is in the list of disposable email providers" do
+    it "is invalid if it's a disposable email" do
       user = TestUserDisallowDisposable.new(email: "foo@#{ValidEmail2.disposable_emails.first}")
       expect(user.valid?).to be_falsey
     end
 
-    it "should be invalid when domain is a subdomain of a disposable domain" do
+    it "is invalid if the domain is a subdomain of a disposable domain" do
       user = TestUserDisallowDisposable.new(email: "foo@bar.#{ValidEmail2.disposable_emails.first}")
       expect(user.valid?).to be_falsey
     end
 
-    it "should allow example.com that is common in lists of disposable email providers" do
+    it "allows example.com" do
       user = TestUserDisallowDisposable.new(email: "foo@example.com")
       expect(user.valid?).to be_truthy
     end
 
+    context "with domain that is not disposable but it's mx server is disposable" do
+      let(:domain) { "sogetthis.com" }
+
+      around do |example|
+        ValidEmail2.disposable_emails.delete(domain)
+        example.run
+        ValidEmail2.disposable_emails << domain
+      end
+
+      it "is invalid" do
+        user = TestUserDisallowDisposable.new(email: "foo@sogetthis.com")
+        expect(user.valid?).to be_falsey
+      end
+    end
+
     describe "with whitelisted emails" do
-      it "should be invalid when the domain is in the list of disposable and there is no whitelist" do
-        user = TestUserDisallowDisposableWithWhitelist.new(email: "foo@#{ValidEmail2.disposable_emails.first}")
+      let(:whitelist_domain) { ValidEmail2.disposable_emails.first }
+      let(:whitelist_file_path) { "config/whitelisted_email_domains.yml" }
+
+      after do
+        FileUtils.rm(whitelist_file_path, force: true)
+      end
+
+      it "is invalid if the domain is disposable and not in the whitelist" do
+        user = TestUserDisallowDisposableWithWhitelist.new(email: "foo@#{whitelist_domain}")
         expect(user.valid?).to be_falsey
       end
 
-      it "should be valid when the domain is in the list of disposable but it is in the whitelist" do
-        whitelist_domain = ValidEmail2.disposable_emails.first
-        whitelist_file_path = "vendor/whitelist.yml"
-        File.open(whitelist_file_path, "w") {|f| f.write whitelist_domain.to_yaml }
+      it "is valid if the domain is disposable but in the whitelist" do
+        File.open(whitelist_file_path, "w") { |f| f.write [whitelist_domain].to_yaml }
         user = TestUserDisallowDisposableWithWhitelist.new(email: "foo@#{whitelist_domain}")
         expect(user.valid?).to be_falsey
-        File.delete(whitelist_file_path)
       end
     end
   end
 
-  describe "blacklisted emails" do
-    it "should be valid when email is not in the blacklist" do
+  describe "with blacklist validation" do
+    it "is valid if the domain is not blacklisted" do
       user = TestUserDisallowBlacklisted.new(email: "foo@gmail.com")
       expect(user.valid?).to be_truthy
     end
 
-    it "should be invalid when email is in the blacklist" do
+    it "is invalid if the domain is blacklisted" do
       user = TestUserDisallowBlacklisted.new(email: "foo@#{ValidEmail2.blacklist.first}")
       expect(user.valid?).to be_falsey
     end
   end
 
-  describe "mx lookup" do
+  describe "with mx validation" do
     it "should be valid if mx records are found" do
       user = TestUserMX.new(email: "foo@gmail.com")
       expect(user.valid?).to be_truthy
@@ -133,58 +163,35 @@ describe ValidEmail2 do
     end
   end
 
-  describe "emoticons emails" do
-    it "should be invalid if email contains emoticon" do
-      email = ValidEmail2::Address.new("foo🙈@gmail.com")
-      expect(email.valid?).to be_falsy
+  describe "with subaddress validation" do
+    it "is valid when address does not contain subaddress" do
+      user = TestUserSubaddressing.new(email: "foo@gmail.com")
+      expect(user.valid?).to be_truthy
     end
-  end
 
-  describe "subaddressed emails" do
-
-    describe "::Address::DEFAULT_RECIPIENT_DELIMITER" do
-      it "should be recipient delimiter ('+')" do
-        expect(ValidEmail2::Address::DEFAULT_RECIPIENT_DELIMITER).to eq('+')
-      end
+    it "is invalid when address cotains subaddress" do
+      user = TestUserSubaddressing.new(email: "foo+1@gmail.com")
+      expect(user.valid?).to be_falsey
     end
+  end
 
-    describe "::Address#subaddressed?" do
-      it "should be true when address local part contains a recipient delimiter ('+')" do
-        email = ValidEmail2::Address.new("foo+1@gmail.com")
-        expect(email.subaddressed?).to be_truthy
-      end
-
-      it "should be false when address local part contains a recipient delimiter ('+')" do
-        email = ValidEmail2::Address.new("foo@gmail.com")
-        expect(email.subaddressed?).to be_falsey
-      end
+  describe "with custom error message" do
+    it "supports settings a custom error message" do
+      user = TestUserMessage.new(email: "fakeemail")
+      user.valid?
+      expect(user.errors.full_messages).to include("Email custom message")
     end
+  end
 
-    describe "user validation" do
-      context "subaddressing is allowed (default)" do
-        it "should be valid when address local part does not contain a recipient delimiter ('+')" do
-          user = TestUser.new(email: "foo@gmail.com")
-          expect(user.valid?).to be_truthy
-        end
-
-        it "should be valid when address local part contains a recipient delimiter ('+')" do
-          user = TestUser.new(email: "foo+1@gmail.com")
-          expect(user.valid?).to be_truthy
-        end
-      end
-
-      context "subaddressing is forbidden" do
-        it "should be valid when address local part does not contain a recipient delimiter ('+')" do
-          user = TestUserSubaddressing.new(email: "foo@gmail.com")
-          expect(user.valid?).to be_truthy
-        end
-
-        it "should be invalid when address local part contains a recipient delimiter ('+')" do
-          user = TestUserSubaddressing.new(email: "foo+1@gmail.com")
-          expect(user.valid?).to be_falsey
-        end
-      end
+  describe "#subaddressed?" do
+    it "should be true when address local part contains a recipient delimiter ('+')" do
+      email = ValidEmail2::Address.new("foo+1@gmail.com")
+      expect(email.subaddressed?).to be_truthy
     end
 
+    it "should be false when address local part contains a recipient delimiter ('+')" do
+      email = ValidEmail2::Address.new("foo@gmail.com")
+      expect(email.subaddressed?).to be_falsey
+    end
   end
 end

data/valid_email2.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 11.3.0"
   spec.add_development_dependency "rspec", "~> 3.5.0"
   spec.add_runtime_dependency "mail", "~> 2.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- config/blacklisted_email_domains.yml
+- config/disposable_email_domains.yml
 - gemfiles/activemodel3.gemfile
 - gemfiles/activemodel4.gemfile
 - gemfiles/activemodel5.gemfile
@@ -106,8 +108,6 @@ files:
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb
 - valid_email2.gemspec
-- vendor/blacklist.yml
-- vendor/disposable_emails.yml
 homepage: https://github.com/micke/valid_email2
 licenses:
 - MIT

data/vendor/blacklist.yml

@@ -1 +0,0 @@
-- blacklisted-test.com