valid_email2 3.7.0 → 4.0.6

data/gemfiles/activemodel7.gemfile

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

data/lib/valid_email2/address.rb

@@ -20,9 +20,10 @@ module ValidEmail2
       @prohibited_domain_characters_regex = val
     end
 
-    def initialize(address)
+    def initialize(address, dns_timeout = 5)
       @parse_error = false
       @raw_address = address
+      @dns_timeout = dns_timeout
 
       begin
         @address = Mail::Address.new(address)
@@ -37,14 +38,12 @@ module ValidEmail2
       return @valid unless @valid.nil?
       return false  if @parse_error
 
-      @valid = address.domain &&
-               address.address == @raw_address &&
-               valid_domain? &&
-               valid_address?
+      @valid = valid_domain? && valid_address?
     end
 
     def valid_domain?
       domain = address.domain
+      return false if domain.nil?
 
       domain !~ self.class.prohibited_domain_characters_regex &&
         domain.include?('.') &&
@@ -55,6 +54,8 @@ module ValidEmail2
     end
 
     def valid_address?
+      return false if address.address != @raw_address
+
       !address.local.include?('..') &&
         !address.local.end_with?('.') &&
         !address.local.start_with?('.')
@@ -132,12 +133,14 @@ module ValidEmail2
 
     def mx_servers
       @mx_servers ||= Resolv::DNS.open do |dns|
+        dns.timeouts = @dns_timeout
         dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX)
       end
     end
 
     def mx_or_a_servers
       @mx_or_a_servers ||= Resolv::DNS.open do |dns|
+        dns.timeouts = @dns_timeout
         (mx_servers.any? && mx_servers) ||
           dns.getresources(address.domain, Resolv::DNS::Resource::IN::A)
       end

data/lib/valid_email2/email_validator.rb

@@ -5,14 +5,14 @@ require "active_model/validations"
 module ValidEmail2
   class EmailValidator < ActiveModel::EachValidator
     def default_options
-      { regex: true, disposable: false, mx: false, strict_mx: false, disallow_subaddressing: false, multiple: false }
+      { disposable: false, mx: false, strict_mx: false, disallow_subaddressing: false, multiple: false, dns_timeout: 5 }
     end
 
     def validate_each(record, attribute, value)
       return unless value.present?
       options = default_options.merge(self.options)
 
-      addresses = sanitized_values(value).map { |v| ValidEmail2::Address.new(v) }
+      addresses = sanitized_values(value).map { |v| ValidEmail2::Address.new(v, options[:dns_timeout]) }
 
       error(record, attribute) && return unless addresses.all?(&:valid?)
 

data/lib/valid_email2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal:true
 
 module ValidEmail2
-  VERSION = "3.7.0"
+  VERSION = "4.0.6"
 end

data/pull_mailchecker_emails.rb

@@ -9,15 +9,20 @@ whitelisted_emails = %w(
   onet.pl poczta.onet.pl fastmail.fm hushmail.com
   hush.ai hush.com hushmail.me naver.com qq.com example.com
   yandex.net gmx.com gmx.es webdesignspecialist.com.au vp.com
+  onit.com asics.com freemail.hu 139.com mail2world.com slmail.me
 )
 
 existing_emails = File.open("config/disposable_email_domains.txt") { |f| f.read.split("\n") }
 
-url = "https://raw.githubusercontent.com/FGRibreau/mailchecker/master/list.txt"
-resp = Net::HTTP.get_response(URI.parse(url))
+remote_emails = [
+  "https://raw.githubusercontent.com/FGRibreau/mailchecker/master/list.txt",
+  "https://raw.githubusercontent.com/disposable/disposable-email-domains/master/domains.txt",
+].flat_map do |url|
+  resp = Net::HTTP.get_response(URI.parse(url))
 
-remote_emails = resp.body.split("\n").flatten - whitelisted_emails
+  resp.body.split("\n").flatten
+end
 
-result_emails = (existing_emails + remote_emails).map(&:strip).uniq.sort
+result_emails = (existing_emails + remote_emails).map(&:strip).uniq.sort - whitelisted_emails
 
-File.open("config/disposable_email_domains.txt", "w") {|f| f.write result_emails.join("\n") }
+File.open("config/disposable_email_domains.txt", "w") { |f| f.write result_emails.join("\n") }

data/spec/address_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe ValidEmail2::Address do
+  describe "#valid?" do
+    it "is valid" do
+      address = described_class.new("foo@bar123.com")
+      expect(address.valid?).to be true
+    end
+
+    it "is invalid if email is nil" do
+      address = described_class.new(nil)
+      expect(address.valid?).to be false
+    end
+
+    it "is invalid if email is empty" do
+      address = described_class.new(" ")
+      expect(address.valid?).to be false
+    end
+
+    it "is invalid if domain is missing" do
+      address = described_class.new("foo")
+      expect(address.valid?).to be false
+    end
+
+    it "is invalid if email cannot be parsed" do
+      address = described_class.new("<>")
+      expect(address.valid?).to be false
+    end
+
+    it "is invalid if email contains emoticons" do
+      address = described_class.new("foo🙈@gmail.com")
+      expect(address.valid?).to be false
+    end
+  end
+end

data/valid_email2.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 1.9.3"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.5.0"
+  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "rspec-benchmark", "~> 0.6"
+  spec.add_development_dependency "net-smtp"
   spec.add_development_dependency "pry"
   spec.add_runtime_dependency "mail", "~> 2.5"
   spec.add_runtime_dependency "activemodel", ">= 3.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 4.0.6
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-26 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +130,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -129,11 +143,13 @@ files:
 - gemfiles/activemodel4.gemfile
 - gemfiles/activemodel5.gemfile
 - gemfiles/activemodel6.gemfile
+- gemfiles/activemodel7.gemfile
 - lib/valid_email2.rb
 - lib/valid_email2/address.rb
 - lib/valid_email2/email_validator.rb
 - lib/valid_email2/version.rb
 - pull_mailchecker_emails.rb
+- spec/address_spec.rb
 - spec/benchmark_spec.rb
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb
@@ -157,12 +173,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: ActiveModel validation for email. Including MX lookup and disposable email
   blacklist
 test_files:
+- spec/address_spec.rb
 - spec/benchmark_spec.rb
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-
-sudo: false
-
-rvm:
-  - 3.0
-  - 2.7
-  - 2.6
-  - 2.5
-
-gemfile:
-  - gemfiles/activemodel5.gemfile
-  - gemfiles/activemodel6.gemfile
-
-jobs:
-  exclude:
-    - rvm: 3.0
-      gemfile: gemfiles/activemodel5.gemfile
-
-before_install:
-  - gem install bundler