validates_email_format_of 1.6.2 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6b623e89d67bbb88c3d6e9d2618b425b4eb1a35d
-  data.tar.gz: 79b812468bd56f993fc9b27fede13adf4e7433cc
+SHA256:
+  metadata.gz: 2b11027884cda429ba190024f4564c69f88bfdf8dc24ac471fb3ed805050b8f9
+  data.tar.gz: c7a676365614b908a6206fcabfb2f9eda65c5995eae2e4f15fdbe18f4e182aa8
 SHA512:
-  metadata.gz: 7badf4df9d02ca2171f6aad33c588ee0d9710643799dd258bfe02edcb4abf9a2d57ce46016ed22fa59c003a2299f043ca519a8d2449a587af8d9686ac8b86bca
-  data.tar.gz: f1df6f726de58e051cb532d7c65a0a0ed77e36ccd02bd83da250cf89a9a6a19e453a3ce6f44bfaaf8c54386ab277a702cc07169e16a6776c49c3b2b484b89e88
+  metadata.gz: 9b21600741d0f3e46ed27548db8ab52165e5ee7a284633be31ea1eb127e4156f418f93c6ceea29fe8b9ec305bf52fe4d74166a0de24f1c12b1d0eb0b88e472c8
+  data.tar.gz: c867bb8f4e29b7f3ea21c343a2a5668c68f8bf0c02fafdea979c5fcd9a2588cabe84c29cf3c62c5ebd426ad55625897a7a0b156067021d69ae9ae2f2bf8ce63c

data/.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: "Ruby ${{ matrix.ruby }}, Rails ${{ matrix.gemfile }}"
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        gemfile: ["4.2", "5.0", "5.1", "5.2", "6.0", "6.1", "7.0"]
+        exclude:
+          - gemfile: "4.2"
+            ruby: "3.0"
+          - gemfile: "4.2"
+            ruby: "3.1"
+          - gemfile: "5.0"
+            ruby: "3.0"
+          - gemfile: "5.0"
+            ruby: "3.1"
+          - gemfile: "5.1"
+            ruby: "3.0"
+          - gemfile: "5.1"
+            ruby: "3.1"
+          - gemfile: "5.2"
+            ruby: "3.0"
+          - gemfile: "5.2"
+            ruby: "3.1"
+          - gemfile: "7.0"
+            ruby: "2.5"
+          - gemfile: "7.0"
+            ruby: "2.6"
+          - gemfile: "7.0"
+            ruby: "2.7"
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.gemfile }}.gemfile
+      RAILS_ENV: test
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: "Install Ruby ${{ matrix.ruby  }}"
+        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+        # change this to (see https://github.com/ruby/setup-ruby#versioning):
+        # uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler: 1
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Run specs
+        run: bundle exec rspec
+
+      - name: Run standard.rb
+        run: bundle exec rake standard

data/.gitignore

@@ -6,3 +6,5 @@ Gemfile.lock
 *.sqlite3
 *.swp
 .ruby-version
+gemfiles/.bundle
+gemfiles/*.gemfile.lock

data/Appraisals

@@ -0,0 +1,32 @@
+# run `bundle exec appraisal install` after making changes here
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0"
+end
+
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1.0"
+end
+
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0.3", ">= 6.0.3.2"
+end
+
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2.4", ">= 5.2.4.3"
+  gem "i18n", "< 1"
+end
+
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.7"
+  gem "i18n", "< 1"
+end
+
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.7", ">= 5.0.7.2"
+  gem "i18n", "< 1"
+end
+
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2.0"
+  gem "i18n", "< 1"
+end

data/CHANGELOG

@@ -1,3 +1,18 @@
+== 1.7.1 (3 Aug 2022)
+
+* Fix invalid symbols being allowed in the local part - https://github.com/validates-email-format-of/validates_email_format_of/issues/86
+* Fix rspec_matcher when using a custom error message - https://github.com/validates-email-format-of/validates_email_format_of/pull/85 - thanks https://github.com/luuqnhu !
+
+== 1.7.0 (29 July 2022)
+
+* Use Standard.rb for internal code formatting - https://github.com/validates-email-format-of/validates_email_format_of/commit/db1b0a86af58e478b7f9f2f269bf93bf48dc13c1
+* Add support for comments in the local part and improve quoted character handling - https://github.com/validates-email-format-of/validates_email_format_of/issues/69
+* Improve grammar for parsing domain part and validate domain part lengths - https://github.com/validates-email-format-of/validates_email_format_of/commit/2554b55e547c1fae6599d13b0c99296752888c91
+* Do not strip spaces before validating - https://github.com/validates-email-format-of/validates_email_format_of/issues/61 and https://github.com/validates-email-format-of/validates_email_format_of/issues/72
+* Allow setting check_mx_timeout and reduce the default timeout to 3 seconds - https://github.com/validates-email-format-of/validates_email_format_of/issues/66
+* Fix regex duplicate character warning - https://github.com/validates-email-format-of/validates_email_format_of/pull/71
+* Update CI to include Ruby 2.6 to 3.1 and Rails 4.2 to 7.0
+
 == 1.6.1 (8 Sept 2014)
 
 * In a Rails context, this gem now uses ActiveModel's default logic for constructing I18n keys, to make it easier to override them on a model/attribute basis.

data/README.rdoc

@@ -40,6 +40,8 @@ Or in your Gemfile:
      String. A custom error message when the email format is invalid (default is: "does not appear to be a valid e-mail address")
   :check_mx
      Boolean. Check domain for a valid MX record (default is false)
+  :check_mx_timeout
+     Integer. Timeout in seconds for checking MX records before a `ResolvTimeout` is raised (default is 3).
   :mx_message
      String. A custom error message when the domain does not match a valid MX record (default is: "is not routable").  Ignored unless :check_mx option is true.
   :local_length
@@ -56,7 +58,7 @@ Or in your Gemfile:
 
 == Testing
 
-To execute the unit tests run <tt>rspec</tt>.
+To execute the unit tests against [all the Rails versions we support run](gemfiles/) <tt>bundle exec appraisal rspec</tt> or run against an individual version with <tt>bundle exec appraisal rails-6.0 rspec</tt>.
 
 Tested in Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.2, JRuby and REE 1.8.7.
 
@@ -83,7 +85,7 @@ Yes, our Rspec syntax is that simple!
 
 == Credits
 
-Written by Alex Dunae (dunae.ca), 2006-11.
+Written by Alex Dunae (dunae.ca), 2006-22.
 
 Many thanks to the plugin's recent contributors: https://github.com/alexdunae/validates_email_format_of/contributors
 

data/config/locales/fr.yml

@@ -0,0 +1,8 @@
+fr:
+  activemodel: &errors
+    errors:
+      messages:
+        invalid_email_address: "ne semble pas être une adresse email valide"
+        email_address_not_routable: "n'est pas routable"
+  activerecord:
+    <<: *errors

data/config/locales/it.yml

@@ -0,0 +1,8 @@
+it:
+  activemodel: &errors
+    errors:
+      messages:
+        invalid_email_address: 'non sembra un indirizzo e-mail valido'
+        email_address_not_routable: 'dominio non raggiungibile'
+  activerecord:
+    <<: *errors

data/config/locales/ja.yml

@@ -0,0 +1,8 @@
+ja:
+  activemodel: &errors
+    errors:
+      messages:
+        invalid_email_address: 'は妥当なメールアドレスでは無いようです。'
+        email_address_not_routable: 'は到達不能です。'
+  activerecord:
+    <<: *errors

data/config/locales/pt-BR.yml

@@ -0,0 +1,8 @@
+pt-BR:
+  activemodel: &errors
+    errors:
+      messages:
+        invalid_email_address: 'não parece ser um endereço de e-mail válido'
+        email_address_not_routable: 'não é acessível'
+  activerecord:
+    <<: *errors

data/config/locales/pt.yml

@@ -0,0 +1,8 @@
+pt:
+  activemodel: &errors
+    errors:
+      messages:
+        invalid_email_address: 'não parece ser um endereço de e-mail válido'
+        email_address_not_routable: 'não é acessível'
+  activerecord:
+    <<: *errors

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "i18n", "< 1"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.0.7", ">= 5.0.7.2"
+gem "i18n", "< 1"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.1.7"
+gem "i18n", "< 1"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.2.4", ">= 5.2.4.3"
+gem "i18n", "< 1"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 6.0.3", ">= 6.0.3.2"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 7.0"
+
+gemspec path: "../"

data/lib/validates_email_format_of/active_model.rb

@@ -1,7 +1,7 @@
-require 'validates_email_format_of'
-require 'active_model'
+require "validates_email_format_of"
+require "active_model"
 
-if ActiveModel::VERSION::MAJOR < 2 || (2 == ActiveModel::VERSION::MAJOR && ActiveModel::VERSION::MINOR < 1)
+if ActiveModel::VERSION::MAJOR < 2 || (ActiveModel::VERSION::MAJOR == 2 && ActiveModel::VERSION::MINOR < 1)
   puts "WARNING: ActiveModel validation helper methods in validates_email_format_of gem are not compatible with ActiveModel < 2.1.0.  Please use ValidatesEmailFormatOf::validate_email_format(email, options) or upgrade ActiveModel"
 end
 
@@ -9,7 +9,7 @@ module ActiveModel
   module Validations
     class EmailFormatValidator < EachValidator
       def validate_each(record, attribute, value)
-        (ValidatesEmailFormatOf::validate_email_format(value, options.merge(:generate_message => true)) || []).each do |error|
+        (ValidatesEmailFormatOf.validate_email_format(value, options.merge(generate_message: true)) || []).each do |error|
           record.errors.add(attribute, error)
         end
       end

data/lib/validates_email_format_of/railtie.rb

@@ -1,7 +1,7 @@
 module ValidatesEmailFormatOf
   class Railtie < Rails::Railtie
-    initializer 'validates_email_format_of.load_i18n_locales' do |app|
-      ValidatesEmailFormatOf::load_i18n_locales
+    initializer "validates_email_format_of.load_i18n_locales" do |app|
+      ValidatesEmailFormatOf.load_i18n_locales
     end
   end
 end

data/lib/validates_email_format_of/rspec_matcher.rb

@@ -6,7 +6,7 @@ RSpec::Matchers.define :validate_email_format_of do |attribute|
     actual.send(:"#{attribute}=", "invalid@example.")
     expect(actual).to be_invalid
     @expected_message ||= ValidatesEmailFormatOf.default_message
-    expect(actual.errors.messages[attribute.to_sym]).to include(@expected_message)
+    expect(actual.errors.added?(attribute, @expected_message)).to be_truthy
   end
   chain :with_message do |message|
     @expected_message = message

data/lib/validates_email_format_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesEmailFormatOf
-  VERSION = '1.6.2'
+  VERSION = "1.7.1"
 end

data/lib/validates_email_format_of.rb

@@ -1,22 +1,99 @@
-# encoding: utf-8
-require 'validates_email_format_of/version'
+require "validates_email_format_of/version"
 
 module ValidatesEmailFormatOf
   def self.load_i18n_locales
-    require 'i18n'
-    I18n.load_path += Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'locales', '*.yml')))
+    require "i18n"
+    I18n.load_path += Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "..", "config", "locales", "*.yml")))
   end
 
-  require 'resolv'
+  require "resolv"
 
-  LocalPartSpecialChars = /[\!\#\$\%\&\'\*\-\/\=\?\+\-\^\_\`\{\|\}\~]/
+  # Characters that are allowed in to appear in the local part unquoted
+  # https://www.rfc-editor.org/rfc/rfc5322#section-3.2.3
+  #
+  # An addr-spec is a specific Internet identifier that contains a
+  # locally interpreted string followed by the at-sign character ("@",
+  # ASCII value 64) followed by an Internet domain.  The locally
+  # interpreted string is either a quoted-string or a dot-atom.  If the
+  # string can be represented as a dot-atom (that is, it contains no
+  # characters other than atext characters or "." surrounded by atext
+  # characters), then the dot-atom form SHOULD be used and the quoted-
+  # string form SHOULD NOT be used.  Comments and folding white space
+  # SHOULD NOT be used around the "@" in the addr-spec.
+  #
+  #   atext           =   ALPHA / DIGIT /
+  #                       "!" / "#" / "$" / "%" / "&" / "'" / "*" /
+  #                       "+" / "-" / "/" / "=" / "?" / "^" / "_" /
+  #                       "`" / "{" / "|" / "}" / "~"
+  #   dot-atom-text   =   1*atext *("." 1*atext)
+  #   dot-atom        =   [CFWS] dot-atom-text [CFWS]
+  ATEXT = /\A[A-Z0-9!\#$%&'*\-\/=?+\^_`{|}~]\z/i
+
+  # Characters that are allowed to appear unquoted in comments
+  # https://www.rfc-editor.org/rfc/rfc5322#section-3.2.2
+  #
+  # ctext           =   %d33-39 / %d42-91 / %d93-126
+  # ccontent        =   ctext / quoted-pair / comment
+  # comment         =   "(" *([FWS] ccontent) [FWS] ")"
+  # CFWS            =   (1*([FWS] comment) [FWS]) / FWS
+  CTEXT = /\A[#{Regexp.escape([33..39, 42..91, 93..126].map { |ascii_range| ascii_range.map(&:chr) }.flatten.join)}\s]/i
+
+  # https://www.rfc-editor.org/rfc/rfc5322#section-3.2.4
+  #
+  # Strings of characters that include characters other than those
+  # allowed in atoms can be represented in a quoted string format, where
+  # the characters are surrounded by quote (DQUOTE, ASCII value 34)
+  # characters.
+  #
+  # qtext           =   %d33 /             ; Printable US-ASCII
+  #                     %d35-91 /          ;  characters not including
+  #                     %d93-126 /         ;  "\" or the quote character
+  #                     obs-qtext
+  #
+  # qcontent        =   qtext / quoted-pair
+  # quoted-string   =   [CFWS]
+  #                     DQUOTE *([FWS] qcontent) [FWS] DQUOTE
+  #                     [CFWS]
+  QTEXT = /\A[#{Regexp.escape([33..33, 35..91, 93..126].map { |ascii_range| ascii_range.map(&:chr) }.flatten.join)}\s]/i
+
+  IP_OCTET = /\A[0-9]+\Z/
 
-  def self.validate_email_domain(email)
-    domain = email.to_s.downcase.match(/\@(.+)/)[1]
+  # From https://datatracker.ietf.org/doc/html/rfc1035#section-2.3.1
+  #
+  # > The labels must follow the rules for ARPANET host names.  They must
+  # > start with a letter, end with a letter or digit, and have as interior
+  # > characters only letters, digits, and hyphen.  There are also some
+  # > restrictions on the length.  Labels must be 63 characters or less.
+  #
+  # <label> | <subdomain> "." <label>
+  # <label> ::= <letter> [ [ <ldh-str> ] <let-dig> ]
+  # <ldh-str> ::= <let-dig-hyp> | <let-dig-hyp> <ldh-str>
+  # <let-dig-hyp> ::= <let-dig> | "-"
+  # <let-dig> ::= <letter> | <digit>
+  DOMAIN_PART_LABEL = /\A[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9]?\Z/
+
+  # From https://tools.ietf.org/id/draft-liman-tld-names-00.html#rfc.section.2
+  #
+  # > A TLD label MUST be at least two characters long and MAY be as long as 63 characters -
+  # > not counting any leading or trailing periods (.). It MUST consist of only ASCII characters
+  # > from the groups "letters" (A-Z), "digits" (0-9) and "hyphen" (-), and it MUST start with an
+  # > ASCII "letter", and it MUST NOT end with a "hyphen". Upper and lower case MAY be mixed at random,
+  # > since DNS lookups are case-insensitive.
+  #
+  # tldlabel = ALPHA *61(ldh) ld
+  # ldh      = ld / "-"
+  # ld       = ALPHA / DIGIT
+  # ALPHA    = %x41-5A / %x61-7A   ; A-Z / a-z
+  # DIGIT    = %x30-39             ; 0-9
+  DOMAIN_PART_TLD = /\A[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9]\Z/
+
+  def self.validate_email_domain(email, check_mx_timeout: 3)
+    domain = email.to_s.downcase.match(/@(.+)/)[1]
     Resolv::DNS.open do |dns|
+      dns.timeouts = check_mx_timeout
       @mx = dns.getresources(domain, Resolv::DNS::Resource::IN::MX) + dns.getresources(domain, Resolv::DNS::Resource::IN::A)
     end
-    @mx.size > 0 ? true : false
+    @mx.size > 0
   end
 
   DEFAULT_MESSAGE = "does not appear to be valid"
@@ -25,7 +102,7 @@ module ValidatesEmailFormatOf
   ERROR_MX_MESSAGE_I18N_KEY = :email_address_not_routable
 
   def self.default_message
-    defined?(I18n) ? I18n.t(ERROR_MESSAGE_I18N_KEY, :scope => [:activemodel, :errors, :messages], :default => DEFAULT_MESSAGE) : DEFAULT_MESSAGE
+    defined?(I18n) ? I18n.t(ERROR_MESSAGE_I18N_KEY, scope: [:activemodel, :errors, :messages], default: DEFAULT_MESSAGE) : DEFAULT_MESSAGE
   end
 
   # Validates whether the specified value is a valid email address.  Returns nil if the value is valid, otherwise returns an array
@@ -34,57 +111,60 @@ module ValidatesEmailFormatOf
   # Configuration options:
   # * <tt>message</tt> - A custom error message (default is: "does not appear to be valid")
   # * <tt>check_mx</tt> - Check for MX records (default is false)
+  # * <tt>check_mx_timeout</tt> - Timeout in seconds for checking MX records before a `ResolvTimeout` is raised (default is 3)
   # * <tt>mx_message</tt> - A custom error message when an MX record validation fails (default is: "is not routable.")
   # * <tt>with</tt> The regex to use for validating the format of the email address (deprecated)
   # * <tt>local_length</tt> Maximum number of characters allowed in the local part (default is 64)
   # * <tt>domain_length</tt> Maximum number of characters allowed in the domain part (default is 255)
   # * <tt>generate_message</tt> Return the I18n key of the error message instead of the error message itself (default is false)
-  def self.validate_email_format(email, options={})
-      default_options = { :message => options[:generate_message] ? ERROR_MESSAGE_I18N_KEY : default_message,
-                          :check_mx => false,
-                          :mx_message => options[:generate_message] ? ERROR_MX_MESSAGE_I18N_KEY : (defined?(I18n) ? I18n.t(ERROR_MX_MESSAGE_I18N_KEY, :scope => [:activemodel, :errors, :messages], :default => DEFAULT_MX_MESSAGE) : DEFAULT_MX_MESSAGE),
-                          :domain_length => 255,
-                          :local_length => 64,
-                          :generate_message => false
-                          }
-      opts = options.merge(default_options) {|key, old, new| old}  # merge the default options into the specified options, retaining all specified options
-
-      email = email.strip if email
-
-      begin
-        domain, local = email.reverse.split('@', 2)
-      rescue
-        return [ opts[:message] ]
-      end
+  def self.validate_email_format(email, options = {})
+    default_options = {message: options[:generate_message] ? ERROR_MESSAGE_I18N_KEY : default_message,
+                       check_mx: false,
+                       check_mx_timeout: 3,
+                       mx_message: if options[:generate_message]
+                                     ERROR_MX_MESSAGE_I18N_KEY
+                                   else
+                                     (defined?(I18n) ? I18n.t(ERROR_MX_MESSAGE_I18N_KEY, scope: [:activemodel, :errors, :messages], default: DEFAULT_MX_MESSAGE) : DEFAULT_MX_MESSAGE)
+                                   end,
+                       domain_length: 255,
+                       local_length: 64,
+                       generate_message: false}
+    opts = options.merge(default_options) { |key, old, new| old } # merge the default options into the specified options, retaining all specified options
+
+    begin
+      domain, local = email.reverse.split("@", 2)
+    rescue
+      return [opts[:message]]
+    end
 
-      # need local and domain parts
-      return [ opts[:message] ] unless local and not local.empty? and domain and not domain.empty?
+    # need local and domain parts
+    return [opts[:message]] unless local && !local.empty? && domain && !domain.empty?
 
-      # check lengths
-      return [ opts[:message] ] unless domain.length <= opts[:domain_length] and local.length <= opts[:local_length]
+    # check lengths
+    return [opts[:message]] unless domain.length <= opts[:domain_length] && local.length <= opts[:local_length]
 
-      local.reverse!
-      domain.reverse!
+    local.reverse!
+    domain.reverse!
 
-      if opts.has_key?(:with) # holdover from versions <= 1.4.7
-        return [ opts[:message] ] unless email =~ opts[:with]
-      else
-        return [ opts[:message] ] unless self.validate_local_part_syntax(local) and self.validate_domain_part_syntax(domain)
-      end
+    if opts.has_key?(:with) # holdover from versions <= 1.4.7
+      return [opts[:message]] unless email&.match?(opts[:with])
+    else
+      return [opts[:message]] unless validate_local_part_syntax(local) && validate_domain_part_syntax(domain)
+    end
 
-      if opts[:check_mx] and !self.validate_email_domain(email)
-        return [ opts[:mx_message] ]
-      end
+    if opts[:check_mx] && !validate_email_domain(email, check_mx_timeout: opts[:check_mx_timeout])
+      return [opts[:mx_message]]
+    end
 
-      return nil    # represents no validation errors
+    nil # represents no validation errors
   end
 
-
   def self.validate_local_part_syntax(local)
     in_quoted_pair = false
     in_quoted_string = false
+    comment_depth = 0
 
-    (0..local.length-1).each do |i|
+    (0..local.length - 1).each do |i|
       ord = local[i].ord
 
       # accept anything if it's got a backslash before it
@@ -93,9 +173,26 @@ module ValidatesEmailFormatOf
         next
       end
 
+      if in_quoted_string
+        next if QTEXT.match?(local[i])
+      end
+
+      # opening paren to show we are going into a comment (CFWS)
+      if ord == 40
+        comment_depth += 1
+        next
+      end
+
+      # closing paren
+      if ord == 41
+        comment_depth -= 1
+        return false if comment_depth < 0
+        next
+      end
+
       # backslash signifies the start of a quoted pair
-      if ord == 92 and i < local.length - 1
-        return false if not in_quoted_string # must be in quoted string per http://www.rfc-editor.org/errata_search.php?rfc=3696
+      if ord == 92 && i < local.length - 1
+        return false if !in_quoted_string # must be in quoted string per http://www.rfc-editor.org/errata_search.php?rfc=3696
         in_quoted_pair = true
         next
       end
@@ -106,45 +203,53 @@ module ValidatesEmailFormatOf
         next
       end
 
-      next if local[i,1] =~ /[a-z0-9]/i
-      next if local[i,1] =~ LocalPartSpecialChars
+      if comment_depth > 0
+        next if CTEXT.match?(local[i])
+      elsif ATEXT.match?(local[i, 1])
+        next
+      end
 
       # period must be followed by something
       if ord == 46
-        return false if i == 0 or i == local.length - 1 # can't be first or last char
-        next unless local[i+1].ord == 46 # can't be followed by a period
+        return false if i == 0 || i == local.length - 1 # can't be first or last char
+        next unless local[i + 1].ord == 46 # can't be followed by a period
       end
 
       return false
     end
 
     return false if in_quoted_string # unbalanced quotes
+    return false unless comment_depth.zero? # unbalanced comment parens
 
-    return true
+    true
   end
 
   def self.validate_domain_part_syntax(domain)
-    parts = domain.downcase.split('.', -1)
+    parts = domain.downcase.split(".", -1)
 
     return false if parts.length <= 1 # Only one domain part
 
-    # Empty parts (double period) or invalid chars
-    return false if parts.any? {
-      |part|
-        part.nil? or
-        part.empty? or
-        not part =~ /\A[[:alnum:]\-]+\Z/ or
-        part[0,1] == '-' or part[-1,1] == '-' # hyphen at beginning or end of part
-    }
-
     # ipv4
-    return true if parts.length == 4 and parts.all? { |part| part =~ /\A[0-9]+\Z/ and part.to_i.between?(0, 255) }
-
-    return false if parts[-1].length < 2 or not parts[-1] =~ /[a-z\-]/ # TLD is too short or does not contain a char or hyphen
+    return true if parts.length == 4 && parts.all? { |part| part =~ IP_OCTET && part.to_i.between?(0, 255) }
+
+    # From https://datatracker.ietf.org/doc/html/rfc3696#section-2 this is the recommended, pragmatic way to validate a domain name:
+    #
+    # > It is likely that the better strategy has now become to make the "at least one period" test,
+    # > to verify LDH conformance (including verification that the apparent TLD name is not all-numeric),
+    # > and then to use the DNS to determine domain name validity, rather than trying to maintain
+    # > a local list of valid TLD names.
+    #
+    # We do a little bit more but not too much and validate the tokens but do not check against a list of valid TLDs.
+    parts.each do |part|
+      return false if part.nil? || part.empty?
+      return false if part.length > 63
+      return false unless DOMAIN_PART_LABEL.match?(part)
+    end
 
-    return true
+    return false unless DOMAIN_PART_TLD.match?(parts[-1])
+    true
   end
 end
 
-require 'validates_email_format_of/active_model' if defined?(::ActiveModel) && !(ActiveModel::VERSION::MAJOR < 2 || (2 == ActiveModel::VERSION::MAJOR && ActiveModel::VERSION::MINOR < 1))
-require 'validates_email_format_of/railtie' if defined?(::Rails)
+require "validates_email_format_of/active_model" if defined?(::ActiveModel) && !(ActiveModel::VERSION::MAJOR < 2 || (ActiveModel::VERSION::MAJOR == 2 && ActiveModel::VERSION::MINOR < 1))
+require "validates_email_format_of/railtie" if defined?(::Rails::Railtie)