valid_email2 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f186139759bb0a218e4d8d6ba873e21fcdea8d
-  data.tar.gz: 7c539775adb2b0c862f0a461ca800821fa573818
+  metadata.gz: 62bcd688e250d8f777cde7f86dd504db4a3d9d7c
+  data.tar.gz: 4f9b4dd2624670e9dd1c41ca961f9a3ea3f2a450
 SHA512:
-  metadata.gz: 2c2e65fe8a09913c82e2412af71e80f6a8c18bcfb89fbb00722b2c3eccc223048bb3d2cf3928dc18eff057e0783f366051c2b0e036737e5f66db90923f8d8121
-  data.tar.gz: 3552ed32f9e8410277abdd5cf90049b2f56126904cfb53027c65c1f14aebbf209dec3e8d63bd4851c982db152cf106a31198eb52d6efd87acac4a13b19d3cf49
+  metadata.gz: 8def84bad60dd1219989ab1885d0a9dbed6cd3ed0e8f3e271cabcdc4094f412e5d350b812a61f6425983d5e8d0cd83b8c50bb6edb05309d6303b00fcbc6197d5
+  data.tar.gz: c2742f6863b22c76f60643136c342da3414452e09e4d0164ba3fcfa3bda068dd45ec6eece46ae72bddb94b4f2ddfab0abd809678fe762e615382da35717874c8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.10
+Improve performance in domain matching (https://github.com/lisinge/valid_email2/pull/62)
+Add clipmail.eu (https://github.com/lisinge/valid_email2/pull/61)
+
 ## Version 1.2.9
 Remove example.com (https://github.com/lisinge/valid_email2/issues/59)
 

data/lib/valid_email2/address.rb

@@ -52,9 +52,10 @@ module ValidEmail2
     private
 
     def domain_is_in?(domain_list)
-      domain_list.select { |domain|
-        address.domain =~ (/^(.*\.)*#{domain}$/i)
-      }.any?
+      address_domain = address.domain.downcase
+      domain_list.any? { |domain|
+        address_domain.end_with?(domain) && address_domain =~ /\A(?:.+\.)*?#{domain}\z/
+      }
     end
   end
 end

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

data/spec/valid_email2_spec.rb

@@ -21,69 +21,69 @@ describe ValidEmail2 do
     subject(:user) { TestUser.new(email: "") }
 
     it "should be valid when email is empty" do
-      user.valid?.should be_true
+      expect(user.valid?).to be_truthy
     end
 
     it "should not be valid when domain is missing" do
       user = TestUser.new(email: "foo")
-      user.valid?.should be_false
+      expect(user.valid?).to be_falsey
     end
 
     it "should be invalid when email is malformed" do
       user = TestUser.new(email: "foo@bar")
-      user.valid?.should be_false
+      expect(user.valid?).to be_falsey
     end
 
     it "should be invalid if Mail::AddressListsParser raises exception" do
       user = TestUser.new(email: "foo@gmail.com")
-      Mail::Address.stub(:new).and_raise(Mail::Field::ParseError.new(nil, nil, nil))
-      user.valid?.should be_false
+      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
       user = TestUser.new(email: "foo@bar..com")
-      user.valid?.should be_false
+      expect(user.valid?).to be_falsey
     end
   end
 
   describe "disposable emails" do
     it "should be valid when the domain is not in the list of disposable email providers" do
       user = TestUserDisallowDisposable.new(email: "foo@gmail.com")
-      user.valid?.should be_true
+      expect(user.valid?).to be_truthy
     end
 
     it "should be invalid when domain is in the list of disposable email providers" do
       user = TestUserDisallowDisposable.new(email: "foo@#{ValidEmail2.disposable_emails.first}")
-      user.valid?.should be_false
+      expect(user.valid?).to be_falsey
     end
 
     it "should be invalid when domain is a subdomain of a disposable domain" do
       user = TestUserDisallowDisposable.new(email: "foo@bar.#{ValidEmail2.disposable_emails.first}")
-      user.valid?.should be_false
+      expect(user.valid?).to be_falsey
     end
   end
 
   describe "blacklisted emails" do
     it "should be valid when email is not in the blacklist" do
       user = TestUserDisallowBlacklisted.new(email: "foo@gmail.com")
-      user.valid?.should be_true
+      expect(user.valid?).to be_truthy
     end
 
     it "should be invalid when email is in the blacklist" do
       user = TestUserDisallowBlacklisted.new(email: "foo@#{ValidEmail2.blacklist.first}")
-      user.valid?.should be_false
+      expect(user.valid?).to be_falsey
     end
   end
 
   describe "mx lookup" do
     it "should be valid if mx records are found" do
       user = TestUserMX.new(email: "foo@gmail.com")
-      user.valid?.should be_true
+      expect(user.valid?).to be_truthy
     end
 
     it "should be invalid if no mx records are found" do
       user = TestUserMX.new(email: "foo@subdomain.gmail.com")
-      user.valid?.should be_false
+      expect(user.valid?).to be_falsey
     end
   end
 end

data/valid_email2.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 11.3.0"
-  spec.add_development_dependency "rspec", "~> 2.14.1"
+  spec.add_development_dependency "rspec", "~> 3.5.0"
   spec.add_runtime_dependency "mail", "~> 2.5"
   spec.add_runtime_dependency "activemodel", ">= 3.2"
 end

data/vendor/disposable_emails.yml

@@ -335,6 +335,7 @@
 - cl-cl.org
 - cl0ne.net
 - clandest.in
+- clipmail.eu
 - clixser.com
 - clrmail.com
 - cmail.com

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement