validates_email_format_of 1.6.1 → 1.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWRlNjBlN2VmN2QxNmM4ZWYzODA2YTRmNzNlZjg0MTRlZTlhYjVlNw==
-  data.tar.gz: !binary |-
-    YTg5ZGY1MWEzYWFkYTUzOTVlYzQ0N2FlZGRjNDY0OWY0ZmU2NTA3OA==
+SHA256:
+  metadata.gz: 42557ade4662b6a601647924b0a35b0ef09ad48077368e2296185b765902f6b8
+  data.tar.gz: ec3bdeed382f2f2af17377a529ef02e9d5271c77b4f810467403265f0b273f3d
 SHA512:
-  metadata.gz: !binary |-
-    NDdjMTljZWE2ODRkMTk1MzFmY2FkZDkwMzg4NjUzYmFhMjczMDJlYTcxODI2
-    YjQyNDI0ZmYyZGRhZmYwN2U0MjEyYzVmYzJmZDk1ZDAwMjcwOWZhOGU2YTZl
-    MjdjNmIyNDE3ZjE5YzJmOGI2ZGVjZWRiMWI5ZDFkNjQ1NzRiYjg=
-  data.tar.gz: !binary |-
-    YTI2Zjg0ZjQ3MzRlZTE2MjEzOTI2NjkwZDUzYjk3MjRmYmYzZDJhNmYzOTUz
-    YWM2MDJiZjkxOGQyNmU2ZDVlZTZiNDMwYWY2YzcwMzU3ZWYyNjVmYmQ1Mzc3
-    MzY1YTgxZmJlMDBiODgyYjVmYmZlZDM0NDhlZGQwYmIyOWM0NTU=
+  metadata.gz: dfea65637b8d575356d3309e63c9947e0e434d53a261f520a918f889f2849f1d44249dfeb74f81dec47dd78e1b5d2d8093f1dcd97652c9d3d7507b2c51d9b5e4
+  data.tar.gz: 0e1420665dd0b6ebe42bb6555552ea31bfedac10c62076f65b43112f62c52246bae37d8c857a3d0816c5ddd54f06d20ac124977b02d151bfd81a78ffc065d7af

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,13 @@
+== 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.
 

data/config/locales/de.yml

@@ -0,0 +1,8 @@
+de:
+  activemodel: &errors
+    errors:
+      messages:
+        invalid_email_address: 'ist offensichtlich keine gültige E-Mail-Adresse'
+        email_address_not_routable: 'kann nicht erreicht werden'
+  activerecord:
+    <<: *errors

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

@@ -2,12 +2,11 @@ require "validates_email_format_of"
 
 RSpec::Matchers.define :validate_email_format_of do |attribute|
   match do
-    actual_class_name = subject.is_a?(Class) ? subject : subject.class
-    actual = actual_class_name.new
+    actual = subject.is_a?(Class) ? subject.new : subject
     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, :invalid_email_address)).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.1'
+  VERSION = "1.7.0"
 end