email_validator 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bd723714c6aa3a844e584e986e5989920b6d3f212a44d800183d118c561cb7
-  data.tar.gz: bb58e5bf862c4be796e3ce59727dcf3fd2e28267e7c6077014f01d25dc841580
+  metadata.gz: c6952edf85fc0eafbe159b4a3b812731c81361ee0a15f22927e270a3eb885c9d
+  data.tar.gz: 8b5a56e059f652f1822c93cbcec0be9da23842433e9c7e5f97478496ba888ff9
 SHA512:
-  metadata.gz: 2ece91a44bd82bd79c5484a17729996731787148b6813af0c4e41804715242a9cbfb4c0d661b08e0c904753dd59f23560d11aed7bf9044986802445e36f69438
-  data.tar.gz: 1b91bf21ce112f86f9b97138573d20fe14b67f075935136c3b19a620f155d50c5d5cf5ff9566e4c101429b8d7ce80ccb80709a2a15eeb07f4caeaac34f2b86b0
+  metadata.gz: 158307d4196989b8d73872fa91c302ee9eab174b25f0686f3d61fe395796fa0b8e6c1c08185a4accf6c9581e23ba66bbebb8e3e8dc46b7ded935ed80a2484b53
+  data.tar.gz: 7f9ccf405a9bcf08d809fa58819d9e6d8489871a52020115802f3c755eddc3962b3533928f8f7c40e8122b055ad185c6f72cf1878ad6c920ba1b86872c0362a8

data/CHANGELOG.md

@@ -5,6 +5,31 @@ This file is used to list changes made in `email_validator`.
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.2.4 (2022-11-09)
+
+* [karlwilbur] - Remove Ruby 2.4 from tested versions; add Ruby 3.0 and 3.1 to tested versions
+* [karlwilbur] - Fix issue where `domain: ''` wasn't requiring empty domain
+* [karlwilbur] - Remove checks for double hyphens (fixes [#87](https://github.com/K-and-R/email_validator/issues/87))
+* [dependabot] - Security updates
+    - [#89](https://github.com/K-and-R/email_validator/pull/89)
+        + Bump `minimist` from `1.2.5` to `1.2.7`
+    - [#86](https://github.com/K-and-R/email_validator/pull/86)
+        + Bump `node-fetch` from `2.6.1` to `2.6.7`
+        + Add `whatwg-url` at `5.0.0`
+        + Add `tr46` at `0.0.3`
+        + Add `webidl-conversions` at `3.0.0`
+    - [#80](https://github.com/K-and-R/email_validator/pull/80)
+        + Bump `tar` from `6.0.5` to `6.1.11`
+        + Bump `minipass` from `3.1.3` to `3.1.5`
+    - [#79](https://github.com/K-and-R/email_validator/pull/79)
+        + Bump `path-parse` from `1.0.6` to `1.0.7`
+    - [#76](https://github.com/K-and-R/email_validator/pull/76)
+        + Bump `lodash` from `4.17.20` to `4.17.21`
+    - [#75](https://github.com/K-and-R/email_validator/pull/75)
+        + Bump `hosted-git-info` from `2.8.8` to `2.8.9`
+* [msands] - Fix URL in `README.md` [#81](https://github.com/K-and-R/email_validator/pull/81)
+* [kerolloz] - Fix typo in `README.md` [#73](https://github.com/K-and-R/email_validator/pull/73)
+
 ## 2.2.3 (2021-04-05)
 
 * [karlwilbur] - Fix regexp for numeric domains (fixes [#72](https://github.com/K-and-R/email_validator/issues/72))
@@ -12,8 +37,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - [karlwilbur] - Fix specs for numeric-only domains labels (should be considered valid)
     - [karlwilbur] - Add checks for numeric-only TLDs in tests (should be considered invalid)
     - [karlwilbur] - Add tests to ensure that `regexp` returns expected value
-    - [karlwilbur] - Add checks for double dash in domain (should be considered invalid)
-    - [karlwilbur] - Add `EmailValidator::Error` class, raise `EmailValidator::Error` when invalid `mode`
+* [karlwilbur] - Add checks for double dash in domain (should be considered invalid)
+* [karlwilbur] - Add `EmailValidator::Error` class, raise `EmailValidator::Error` when invalid `mode`
 
 ## 2.2.2 (2020-12-10)
 

data/README.md

@@ -14,7 +14,7 @@ Formerly found at: <https://github.com/balexand/email_validator>
 
 The default validation provided by this gem (the `:loose` configuration option)
 is extremely loose. It just checks that there's an `@` with something before and
-after it without any whitespace. See [this article by David Gilbertson](https://hackernoon.com/the-100-correct-way-to-validate-email-addresses-7c4818f24643)
+after it without any whitespace. See [this article by David Gilbertson](https://medium.com/hackernoon/the-100-correct-way-to-validate-email-addresses-7c4818f24643)
 for an explanation of why.
 
 We understand that many use cases require an increased level of validation. This
@@ -68,7 +68,7 @@ Default configuration can be overridden by setting options in `config/initialize
 
 ```ruby
 if defined?(EmailValidator)
-  # To completly override the defaults
+  # To completely override the defaults
   EmailValidator.default_options = {
     allow_nil: false,
     domain: nil,

data/lib/email_validator.rb

@@ -27,6 +27,8 @@ class EmailValidator < ActiveModel::EachValidator
       options = parse_options(options)
       return true if value.nil? && options[:allow_nil] == true
       return false if value.nil?
+      # quickly fail if domain is required but doesn't match
+      return false unless options[:domain].nil? || value[/^.*@#{regexp_safe_domain(options)}$/]
       !!(value =~ regexp(options))
     end
 
@@ -94,7 +96,6 @@ class EmailValidator < ActiveModel::EachValidator
 
     def host_label_pattern
       "#{label_is_correct_length}" \
-      "#{label_contains_no_more_than_one_consecutive_hyphen}" \
       "#{alnum}(?:#{alnumhy}{,61}#{alnum})?"
     end
 
@@ -123,10 +124,6 @@ class EmailValidator < ActiveModel::EachValidator
       '(?=.{1,255}$)'
     end
 
-    def label_contains_no_more_than_one_consecutive_hyphen
-      '(?!.*?--.*$)'
-    end
-
     def atom_char
       # The `atext` spec
       # We are looking at this without whitespace; no whitespace support here
@@ -139,7 +136,7 @@ class EmailValidator < ActiveModel::EachValidator
     end
 
     def domain_part_pattern(options)
-      return options[:domain].sub(/\./, '\.') if options[:domain].present?
+      return regexp_safe_domain(options) unless options[:domain].nil?
       return fqdn_pattern if options[:require_fqdn]
       "#{domain_part_is_correct_length}(?:#{address_literal}|(?:#{host_label_pattern}\\.)*#{tld_label_pattern})"
     end
@@ -155,6 +152,10 @@ class EmailValidator < ActiveModel::EachValidator
       options[:require_fqdn] = true if options[:require_fqdn].nil? && options[:mode] == :strict
       default_options.merge(options)
     end
+
+    def regexp_safe_domain(options)
+      options[:domain].sub(/\./, '\.')
+    end
   end
 
   def validate_each(record, attribute, value)

data/spec/email_validator_spec.rb

@@ -52,6 +52,18 @@ class NonFqdnRfcUser < TestModel
   validates :email, :email => { :require_fqdn => false, :mode => :rfc }
 end
 
+class RequireFqdnWithEmptyDomainUser < TestModel
+  validates :email_address, :email => { :require_fqdn => true, :domain => '' }
+end
+
+class RequireEmptyDomainStrictUser < TestModel
+  validates :email_address, :email => { :require_fqdn => true, :domain => '', :mode => :strict }
+end
+
+class RequireEmptyDomainRfcUser < TestModel
+  validates :email_address, :email => { :require_fqdn => true, :domain => '', :mode => :rfc }
+end
+
 class DefaultUserWithMessage < TestModel
   validates :email_address, :email => { :message => 'is not looking very good!' }
 end
@@ -147,7 +159,9 @@ RSpec.describe EmailValidator do
         'john.doe@2020.a-z.com',
         'john.doe@2020.a2z.com',
         'john.doe@2020.12345a6789.com',
-        'jonh.doe@163.com'
+        'jonh.doe@163.com',
+        'test@umläut.com', # non-ASCII
+        'test@xn--umlut-ira.com' # ASCII-compatibale encoding of non-ASCII
       ]).flatten.each do |email|
         context 'when using defaults' do
           it "'#{email}' should be valid" do
@@ -477,7 +491,6 @@ RSpec.describe EmailValidator do
         'host-beginning-with-dot@.example.com',
         'domain-beginning-with-dash@-example.com',
         'domain-ending-with-dash@example-.com',
-        'domain-contains-double-dash@foo--example.com',
         'the-local-part-is-invalid-if-it-is-longer-than-sixty-four-characters@sld.dev',
         "domain-too-long@t#{".#{'o' * 63}" * 5}.long",
         "user@example.com<script>alert('hello')</script>"
@@ -727,7 +740,7 @@ RSpec.describe EmailValidator do
         end
 
         context 'when in `:strict` mode' do
-          it "#{email.strip} in a model should be valid" do
+          it "#{email.strip} in a model should not be valid" do
             expect(StrictUser.new(:email => email)).not_to be_valid
           end
 
@@ -764,6 +777,68 @@ RSpec.describe EmailValidator do
       end
     end
 
+    context 'when `require_fqdn` is explicitly enabled with a blank domain' do
+      let(:opts) { { :require_fqdn => true, :domain => '' } }
+
+      context 'when given a email containing any domain' do
+        let(:email) { 'someuser@somehost' }
+
+        context 'when using defaults' do
+          it 'is not valid in a model' do
+            expect(RequireFqdnWithEmptyDomainUser.new(:email => email)).not_to be_valid
+          end
+
+          it 'is not using EmailValidator.valid?' do
+            expect(described_class).not_to be_valid(email, opts)
+          end
+
+          it 'is invalid using EmailValidator.invalid?' do
+            expect(described_class).to be_invalid(email, opts)
+          end
+
+          it 'does not match the regexp' do
+            expect(!!(email =~ described_class.regexp(opts))).to be(false)
+          end
+        end
+
+        context 'when in `:strict` mode' do
+          it 'is not valid in a model' do
+            expect(RequireEmptyDomainStrictUser.new(:email => email)).not_to be_valid
+          end
+
+          it 'is not using EmailValidator.valid?' do
+            expect(described_class).not_to be_valid(email, opts.merge({ :mode => :strict }))
+          end
+
+          it 'is invalid using EmailValidator.invalid?' do
+            expect(described_class).to be_invalid(email, opts.merge({ :mode => :strict }))
+          end
+
+          it 'does not match the regexp' do
+            expect(!!(email =~ described_class.regexp(opts.merge({ :mode => :strict })))).to be(false)
+          end
+        end
+
+        context 'when in `:rfc` mode' do
+          it 'is not valid in a model' do
+            expect(RequireEmptyDomainRfcUser.new(:email => email)).not_to be_valid
+          end
+
+          it 'is not using EmailValidator.valid?' do
+            expect(described_class).not_to be_valid(email, opts.merge({ :mode => :rfc }))
+          end
+
+          it 'is invalid using EmailValidator.invalid?' do
+            expect(described_class).to be_invalid(email, opts.merge({ :mode => :rfc }))
+          end
+
+          it 'does not match the regexp' do
+            expect(!!(email =~ described_class.regexp(opts.merge({ :mode => :rfc })))).to be(false)
+          end
+        end
+      end
+    end
+
     context 'when `require_fqdn` is explicitly disabled' do
       let(:opts) { { :require_fqdn => false } }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_validator
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Brian Alexander
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: An email validator for Rails 3+.