valid_email2 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81f002d3f49ad0c6c47542c4551e19d4f3c4eee5e7ac8a880843c72afca63580
-  data.tar.gz: 83048195af9517187e998511ef33ba58813802110557305e5b0e195f5085833b
+  metadata.gz: 8cc608e090f5de38c7126888581eaad8610393e05e5d93a42494a6b35f44db4e
+  data.tar.gz: b95740599e8cad05d701563f613561e17a420fcc69e98afa7edcfcced19afdd8
 SHA512:
-  metadata.gz: e1404b591d8639273063daeeaecdd8c53012d58c18e33286418f651372f8dd06513560ce2e0c2aac55db53ac081a8b11b9cb450520a66cf7b4506d86bce5f4b0
-  data.tar.gz: 6c739f6f71eacb00db48cf0ed72ae6dbd564275e54943a5bb88f10d64878d96cf32600f60ff6ee4dd525e7e47968e0809306f9d88fc13aef1d2af5a91a2bc6cf
+  metadata.gz: 35e355481ab31a6733e037a0c053e894634895d67e1aa078480e74da6304a644eb668f8415da71815cf2f58d35d4279383bb9622d510898cde3c48efc51771eb
+  data.tar.gz: e957769daec7de10bc8cd64c998a7bd678cc3e086446b280a4013e0a43ddf247692e78fc26f14e2a5eb1044082b44445d71f36cd722a7ff487b34c8af0b9235a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 3.1.3
+* Disallow `/` in addresses https://github.com/micke/valid_email2/pull/142
+* Add option to only validate that domain is not in list of disposable emails https://github.com/micke/valid_email2/pull/141
+
 ## Version 3.1.2
 * Disallow ` ` in addresses https://github.com/micke/valid_email2/pull/139
 

data/README.md

@@ -48,11 +48,16 @@ To validate that the domain has a MX record:
 validates :email, 'valid_email_2/email': { mx: true }
 ```
 
-To validate that the domain is not a disposable email:
+To validate that the domain is not a disposable email (checks domain and MX server):
 ```ruby
 validates :email, 'valid_email_2/email': { disposable: true }
 ```
 
+To validate that the domain is not a disposable email (checks domain only, does not check MX server):
+```ruby
+validates :email, 'valid_email_2/email': { disposable_domain: true }
+```
+
 To validate that the domain is not a disposable email or a disposable email but whitelisted (under config/whitelisted_email_domains.yml):
 ```ruby
 validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }

data/lib/valid_email2/address.rb

@@ -6,7 +6,7 @@ module ValidEmail2
   class Address
     attr_accessor :address
 
-    PROHIBITED_DOMAIN_CHARACTERS_REGEX = /[+!_\s]/
+    PROHIBITED_DOMAIN_CHARACTERS_REGEX = /[+!_\/\s]/
     DEFAULT_RECIPIENT_DELIMITER = '+'.freeze
 
     def initialize(address)
@@ -23,26 +23,28 @@ module ValidEmail2
     end
 
     def valid?
-      return false if @parse_error
-
-      if address.domain && address.address == @raw_address
-        domain = address.domain
-
-        domain !~ PROHIBITED_DOMAIN_CHARACTERS_REGEX &&
-          # Domain needs to have at least one dot
-          domain =~ /\./ &&
-          # Domain may not have two consecutive dots
-          domain !~ /\.{2,}/ &&
-          # Domain may not start with a dot
-          domain !~ /^\./ &&
-          # Domain may not start with a dash
-          domain !~ /^-/ &&
-          # Domain name may not end with a dash
-          domain !~ /-\./ &&
-          # Address may not contain a dot directly before @
-          address.address !~ /\.@/
-      else
-        false
+      @valid ||= begin
+        return false if @parse_error
+
+        if address.domain && address.address == @raw_address
+          domain = address.domain
+
+          domain !~ PROHIBITED_DOMAIN_CHARACTERS_REGEX &&
+            # Domain needs to have at least one dot
+            domain =~ /\./ &&
+            # Domain may not have two consecutive dots
+            domain !~ /\.{2,}/ &&
+            # Domain may not start with a dot
+            domain !~ /^\./ &&
+            # Domain may not start with a dash
+            domain !~ /^-/ &&
+            # Domain name may not end with a dash
+            domain !~ /-\./ &&
+            # Address may not contain a dot directly before @
+            address.address !~ /\.@/
+        else
+          false
+        end
       end
     end
 
@@ -51,11 +53,15 @@ module ValidEmail2
     end
 
     def disposable?
-      valid? &&
-        (
-          domain_is_in?(ValidEmail2.disposable_emails) ||
-          mx_server_is_in?(ValidEmail2.disposable_emails)
-        )
+      disposable_domain? || disposable_mx_server?
+    end
+
+    def disposable_domain?
+      valid? && domain_is_in?(ValidEmail2.disposable_emails)
+    end
+
+    def disposable_mx_server?
+      valid? && mx_server_is_in?(ValidEmail2.disposable_emails)
     end
 
     def whitelisted?

data/lib/valid_email2/email_validator.rb

@@ -24,6 +24,10 @@ module ValidEmail2
         error(record, attribute) && return if address.disposable?
       end
 
+      if options[:disposable_domain]
+        error(record, attribute) && return if address.disposable_domain?
+      end
+
       if options[:disposable_with_whitelist]
         error(record, attribute) && return if address.disposable? && !address.whitelisted?
       end

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "3.1.2"
+  VERSION = "3.1.3"
 end

data/spec/valid_email2_spec.rb

@@ -18,6 +18,10 @@ class TestUserDisallowDisposable < TestModel
   validates :email, 'valid_email_2/email': { disposable: true }
 end
 
+class TestUserDisallowDisposableDomain < TestModel
+  validates :email, 'valid_email_2/email': { disposable_domain: true }
+end
+
 class TestUserDisallowDisposableWithWhitelist < TestModel
   validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }
 end
@@ -89,6 +93,11 @@ describe ValidEmail2 do
       expect(user.valid?).to be_falsy
     end
 
+    it "is invalid if the domain contains a forward slash" do
+      user = TestUser.new(email: "user@gm/ail.com")
+      expect(user.valid?).to be_falsy
+    end
+
     it "is invalid if the domain begins with a dash" do
       user = TestUser.new(email: "foo@-gmail.com")
       expect(user.valid?).to be_falsy
@@ -111,19 +120,26 @@ describe ValidEmail2 do
       expect(user.valid?).to be_truthy
     end
 
-    it "is invalid if it's a disposable email" do
-      user = TestUserDisallowDisposable.new(email: "foo@#{disposable_domain}")
-      expect(user.valid?).to be_falsey
-    end
+    context "with disposable domain" do
+      it "is invalid with disposable domain" do
+        user = TestUserDisallowDisposable.new(email: "foo@#{disposable_domain}")
+        expect(user.valid?).to be_falsey
+      end
 
-    it "is invalid if the domain is a subdomain of a disposable domain" do
-      user = TestUserDisallowDisposable.new(email: "foo@bar.#{disposable_domain}")
-      expect(user.valid?).to be_falsey
-    end
+      it "is invalid with disposable domain even without mx server check" do
+        user = TestUserDisallowDisposableDomain.new(email: "foo@#{disposable_domain}")
+        expect(user.valid?).to be_falsey
+      end
 
-    it "allows example.com" do
-      user = TestUserDisallowDisposable.new(email: "foo@example.com")
-      expect(user.valid?).to be_truthy
+      it "is invalid if the domain is a subdomain of a disposable domain" do
+        user = TestUserDisallowDisposable.new(email: "foo@bar.#{disposable_domain}")
+        expect(user.valid?).to be_falsey
+      end
+
+      it "allows example.com" do
+        user = TestUserDisallowDisposable.new(email: "foo@example.com")
+        expect(user.valid?).to be_truthy
+      end
     end
 
     context "with domain that is not disposable but it's mx server is disposable" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler