valid_email2 4.0.3 → 4.0.4

data/gemfiles/activemodel7.gemfile

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

data/lib/valid_email2/address.rb

@@ -38,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?('.') &&
@@ -56,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?('.')

data/lib/valid_email2/version.rb

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

data/pull_mailchecker_emails.rb

@@ -14,11 +14,15 @@ whitelisted_emails = %w(
 
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,8 +130,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -143,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
@@ -177,6 +179,7 @@ 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