validates_email_format_of 1.6.3 → 1.7.0

data/spec/rspec_matcher_spec.rb

@@ -1,14 +1,12 @@
-require "#{File.expand_path(File.dirname(__FILE__))}/spec_helper"
-if defined?(ActiveModel)
-  require "validates_email_format_of/rspec_matcher"
+require "#{__dir__}/spec_helper"
+require "validates_email_format_of/rspec_matcher"
 
-  class Person
-    attr_accessor :email_address
-    include ::ActiveModel::Validations
-    validates_email_format_of :email_address
-  end
+class Person
+  attr_accessor :email_address
+  include ::ActiveModel::Validations
+  validates_email_format_of :email_address
+end
 
-  describe Person do
-    it { should validate_email_format_of(:email_address) }
-  end
+describe Person do
+  it { should validate_email_format_of(:email_address) }
 end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
-require 'active_model' if Gem.loaded_specs.keys.include?('activemodel')
+require "active_model"
+require "active_support"
+require "pry"
+require "byebug"
 
 RSpec::Matchers.define :have_errors_on_email do
   match do |actual|
@@ -6,7 +9,7 @@ RSpec::Matchers.define :have_errors_on_email do
     expect(actual).not_to be_empty, "#{actual} should not be empty"
     expect(actual.size).to eq(@reasons.size), "#{actual} should have #{@reasons.size} elements"
     @reasons.each do |reason|
-      reason = "#{"Email " if defined?(ActiveModel)}#{reason}"
+      reason = "Email #{reason}"
       expect(actual).to include(reason), "#{actual} should contain #{reason}"
     end
   end
@@ -17,6 +20,6 @@ RSpec::Matchers.define :have_errors_on_email do
     (@reasons ||= []) << reason
   end
   match_when_negated do |actual|
-    expect(actual).to (defined?(ActiveModel) ? be_empty : be_nil)
+    expect(actual).to(be_empty)
   end
 end

data/spec/validates_email_format_of_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require "#{File.expand_path(File.dirname(__FILE__))}/spec_helper"
+require "#{__dir__}/spec_helper"
 require "validates_email_format_of"
 
 RSpec.configure do |config|
@@ -11,65 +10,68 @@ end
 
 describe ValidatesEmailFormatOf do
   subject do |example|
-    if defined?(ActiveModel)
-      user = Class.new do
-        def initialize(email)
-          @email = email.freeze
-        end
-        attr_reader :email
-        include ActiveModel::Validations
-        validates_email_format_of :email, example.example_group_instance.options
+    user = Class.new do
+      def initialize(email)
+        @email = email.freeze
+      end
+      attr_reader :email
+      include ActiveModel::Validations
+      validates_email_format_of :email, example.example_group_instance.options
+
+      def self.model_name
+        ActiveModel::Name.new(self, nil, "User")
       end
-      example.example_group_instance.class::User = user
-      user.new(example.example_group_instance.email).tap(&:valid?).errors.full_messages
-    else
-      ValidatesEmailFormatOf::validate_email_format(email.freeze, options)
     end
+    user.new(example.example_group_instance.email).tap(&:valid?).errors.full_messages
   end
   let(:options) { {} }
   let(:email) { |example| example.example_group.description }
 
   shared_examples_for :all_specs do
     [
-      'valid@example.com',
-      'Valid@test.example.com',
-      'valid+valid123@test.example.com',
-      'valid_valid123@test.example.com',
-      'valid-valid+123@test.example.co.uk',
-      'valid-valid+1.23@test.example.com.au',
-      'valid@example.co.uk',
-      'v@example.com',
-      'valid@example.ca',
-      'valid_@example.com',
-      'valid123.456@example.org',
-      'valid123.456@example.travel',
-      'valid123.456@example.museum',
-      'valid@example.mobi',
-      'valid@example.info',
-      'valid-@example.com',
-      'fake@p-t.k12.ok.us',
+      "valid@example.com",
+      "Valid@test.example.com",
+      "valid+valid123@test.example.com",
+      "valid_valid123@test.example.com",
+      "valid-valid+123@test.example.co.uk",
+      "valid-valid+1.23@test.example.com.au",
+      "valid@example.co.uk",
+      "v@example.com",
+      "valid@example.ca",
+      "valid_@example.com",
+      "valid123.456@example.org",
+      "valid123.456@example.travel",
+      "valid123.456@example.museum",
+      "valid@example.mobi",
+      "valid@example.info",
+      "valid-@example.com",
+      "fake@p-t.k12.ok.us",
       # allow single character domain parts
-      'valid@mail.x.example.com',
-      'valid@x.com',
-      'valid@example.w-dash.sch.uk',
+      "valid@mail.x.example.com",
+      "valid@x.com",
+      "valid@example.w-dash.sch.uk",
       # from RFC 3696, page 6
-      'customer/department=shipping@example.com',
-      '$A12345@example.com',
-      '!def!xyz%abc@example.com',
-      '_somename@example.com',
+      "customer/department=shipping@example.com",
+      "$A12345@example.com",
+      "!def!xyz%abc@example.com",
+      "_somename@example.com",
       # apostrophes
       "test'test@example.com",
       # international domain names
-      'test@xn--bcher-kva.ch',
-      'test@example.xn--0zwm56d',
-      'test@192.192.192.1',
+      "test@xn--bcher-kva.ch",
+      "test@example.xn--0zwm56d",
+      "test@192.192.192.1",
       # Allow quoted characters.  Valid according to http://www.rfc-editor.org/errata_search.php?rfc=3696
       '"Abc\@def"@example.com',
+      '"Quote(Only".Chars@wier.de',
       '"Fred\ Bloggs"@example.com',
       '"Joe.\\Blow"@example.com',
       # Balanced quoted characters
-      %!"example\\\\\\""@example.com!,
-      %!"example\\\\"@example.com!
+      %("example\\\\\\""@example.com),
+      %("example\\\\"@example.com),
+      "(leading comment)email@example.com",
+      "(nested (comment))email@example.com",
+      "email(trailing comment)@example.com"
     ].each do |address|
       describe address do
         it { should_not have_errors_on_email }
@@ -77,50 +79,54 @@ describe ValidatesEmailFormatOf do
     end
 
     [
-      'no_at_symbol',
-      'invalid@example-com',
+      "no_at_symbol",
+      "invalid@example-com",
       # period can not start local part
-        '.invalid@example.com',
+      ".invalid@example.com",
       # period can not end local part
-        'invalid.@example.com',
+      "invalid.@example.com",
       # period can not appear twice consecutively in local part
-        'invali..d@example.com',
+      "invali..d@example.com",
       # should not allow underscores in domain names
-      'invalid@ex_mple.com',
-      'invalid@e..example.com',
-      'invalid@p-t..example.com',
-      'invalid@example.com.',
-      'invalid@example.com_',
-      'invalid@example.com-',
-      'invalid-example.com',
-      'invalid@example.b#r.com',
-      'invalid@example.c',
-      'invali d@example.com',
+      "invalid@ex_mple.com",
+      "invalid@e..example.com",
+      "invalid@p-t..example.com",
+      "invalid@example.com.",
+      "invalid@example.com_",
+      "invalid@example.com-",
+      "invalid-example.com",
+      "invalid@example.b#r.com",
+      "invalid@example.c",
+      "invali d@example.com",
       # TLD can not be only numeric
-      'invalid@example.123',
+      "invalid@example.123",
       # unclosed quote
       "\"a-17180061943-10618354-1993365053@example.com",
       # too many special chars used to cause the regexp to hang
       "-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++@foo",
-      'invalidexample.com',
+      "invalidexample.com",
       # should not allow special chars after a period in the domain
-      'local@sub.)domain.com',
-      'local@sub.#domain.com',
+      "local@sub.)domain.com",
+      "local@sub.#domain.com",
       # one at a time
       "foo@example.com\nexample@gmail.com",
-      'invalid@example.',
+      "invalid@example.",
       "\"foo\\\\\"\"@bar.com",
       "foo@mail.com\r\nfoo@mail.com",
-      '@example.com',
-      'foo@',
-      'foo',
-      'Iñtërnâtiônàlizætiøn@hasnt.happened.to.email',
+      "@example.com",
+      "foo@",
+      "foo",
+      "Iñtërnâtiônàlizætiøn@hasnt.happened.to.email",
       # Escaped characters with quotes.  From http://tools.ietf.org/html/rfc3696, page 5.  Corrected in http://www.rfc-editor.org/errata_search.php?rfc=3696
       'Fred\ Bloggs_@example.com',
       'Abc\@def+@example.com',
       'Joe.\\Blow@example.com',
       # Unbalanced quoted characters
-      %!"example\\\\""example.com!
+      %("example\\\\""example.com),
+      "\nnewline@example.com",
+      " spacesbefore@example.com",
+      "spacesafter@example.com ",
+      "(unbalancedcomment@example.com"
     ].each do |address|
       describe address do
         it { should have_errors_on_email.because("does not appear to be a valid e-mail address") }
@@ -129,10 +135,10 @@ describe ValidatesEmailFormatOf do
 
     describe do
       shared_examples_for :local_length_limit do |limit|
-        describe "#{'a' * limit}@example.com" do
+        describe "#{"a" * limit}@example.com" do
           it { should_not have_errors_on_email }
         end
-        describe "#{'a' * (limit + 1)}@example.com" do
+        describe "#{"a" * (limit + 1)}@example.com" do
           it { should have_errors_on_email.because("does not appear to be a valid e-mail address") }
         end
       end
@@ -140,16 +146,16 @@ describe ValidatesEmailFormatOf do
         it_should_behave_like :local_length_limit, 64
       end
       describe "when overriding defaults" do
-        let(:options) { { :local_length => 20 } }
+        let(:options) { {local_length: 20} }
         it_should_behave_like :local_length_limit, 20
       end
     end
     describe do
       shared_examples_for :domain_length_limit do |limit|
-        describe "user@#{'a' * (limit - 4)}.com" do
+        describe "user@#{"a." * (limit / 2 - 3)}com" do
           it { should_not have_errors_on_email }
         end
-        describe "user@#{'a' * (limit - 3)}.com" do
+        describe "user@#{"a." * (limit / 2 + 1)}com" do
           it { should have_errors_on_email.because("does not appear to be a valid e-mail address") }
         end
       end
@@ -157,31 +163,35 @@ describe ValidatesEmailFormatOf do
         it_should_behave_like :domain_length_limit, 255
       end
       describe "when overriding defaults" do
-        let(:options) { { :domain_length => 100 } }
+        let(:options) { {domain_length: 100} }
         it_should_behave_like :domain_length_limit, 100
       end
     end
 
     describe "custom error messages" do
-      describe 'invalid@example.' do
-        let(:options) { { :message => "just because I don't like you" } }
-        it { should have_errors_on_email.because("just because I don't like you") }
+      describe "invalid@example." do
+        let(:options) { {message: "just because I don't like you"} }
+        it {
+          should have_errors_on_email.because("just because I don't like you")
+        }
       end
     end
 
     describe "mx record" do
-      domain = "stubbed.com"
+      domain = "example.com"
       email = "valid@#{domain}"
+
       describe "when testing" do
         let(:dns) { double(Resolv::DNS) }
         let(:mx_record) { [double] }
         let(:a_record) { [double] }
         before(:each) do
           allow(Resolv::DNS).to receive(:open).and_yield(dns)
+          allow(dns).to receive(:"timeouts=").with(3).once
           allow(dns).to receive(:getresources).with(domain, Resolv::DNS::Resource::IN::MX).once.and_return(mx_record)
           allow(dns).to receive(:getresources).with(domain, Resolv::DNS::Resource::IN::A).once.and_return(a_record)
         end
-        let(:options) { { :check_mx => true } }
+        let(:options) { {check_mx: true, check_mx_timeout: 3} }
         describe "and only an mx record is found" do
           let(:a_record) { [] }
           describe email do
@@ -206,7 +216,7 @@ describe ValidatesEmailFormatOf do
             it { should have_errors_on_email.because("is not routable") }
           end
           describe "with a custom error message" do
-            let(:options) { { :check_mx => true, :mx_message => "There ain't no such domain!" } }
+            let(:options) { {check_mx: true, mx_message: "There ain't no such domain!"} }
             describe email do
               it { should have_errors_on_email.because("There ain't no such domain!") }
             end
@@ -221,22 +231,6 @@ describe ValidatesEmailFormatOf do
                 it { should have_errors_on_email.because("jest nieosiągalny") }
               end
             end
-            unless defined?(ActiveModel)
-              describe email do
-                let(:locale) { :ir }
-                describe email do
-                  it { should have_errors_on_email.because("is not routable") }
-                end
-              end
-            end
-          end
-          unless defined?(ActiveModel)
-            describe "without i18n" do
-              before(:each) { hide_const("I18n") }
-              describe email do
-                it { should have_errors_on_email.because("is not routable") }
-              end
-            end
           end
         end
       end
@@ -249,25 +243,25 @@ describe ValidatesEmailFormatOf do
         end
         describe "explicitly" do
           describe email do
-            let(:options) { { :check_mx => false } }
+            let(:options) { {check_mx: false} }
             it { should_not have_errors_on_email }
           end
         end
       end
       describe "without mocks" do
         describe email do
-          let(:options) { { :check_mx => true } }
+          let(:options) { {check_mx: true} }
           it { should_not have_errors_on_email }
         end
       end
     end
 
     describe "custom regex" do
-      let(:options) { { :with => /[0-9]+\@[0-9]+/ } }
-      describe '012345@789' do
+      let(:options) { {with: /[0-9]+@[0-9]+/} }
+      describe "012345@789" do
         it { should_not have_errors_on_email }
       end
-      describe 'valid@example.com' do
+      describe "valid@example.com" do
         it { should have_errors_on_email.because("does not appear to be a valid e-mail address") }
       end
     end
@@ -282,42 +276,51 @@ describe ValidatesEmailFormatOf do
           it { should have_errors_on_email.because("nieprawidłowy adres e-mail") }
         end
       end
-      unless defined?(ActiveModel)
-        describe "missing locale" do
-          let(:locale) { :ir }
-          describe "invalid@exmaple." do
-            it { should have_errors_on_email.because("does not appear to be valid") }
-          end
-        end
+    end
+  end
+  it_should_behave_like :all_specs
+
+  describe "validation without ActiveModel" do
+    subject do
+      ValidatesEmailFormatOf.validate_email_format(email.freeze, options)
+    end
+
+    describe "valid@example.com" do
+      it { should be_nil }
+    end
+
+    describe "custom error messages" do
+      describe "invalid@example." do
+        let(:options) { {message: "just because I don't like you"} }
+        it { should match_array(["just because I don't like you"]) }
       end
     end
-    unless defined?(ActiveModel)
-      describe "without i18n" do
-        before(:each) { hide_const("I18n") }
-        describe "invalid@exmaple." do
-          it { should have_errors_on_email.because("does not appear to be valid") }
-        end
+
+    describe "without i18n" do
+      before(:each) { hide_const("I18n") }
+      describe "invalid@exmaple." do
+        it { should match_array(["does not appear to be valid"]) }
       end
     end
   end
-  it_should_behave_like :all_specs
 
-  if defined?(ActiveModel)
-    describe "shorthand ActiveModel validation" do
-      subject do |example|
-        user = Class.new do
-          def initialize(email)
-            @email = email.freeze
-          end
-          attr_reader :email
-          include ActiveModel::Validations
-          validates :email, :email_format => example.example_group_instance.options
+  describe "shorthand ActiveModel validation" do
+    subject do |example|
+      user = Class.new do
+        def initialize(email)
+          @email = email.freeze
         end
-        example.example_group_instance.class::User = user
-        user.new(example.example_group_instance.email).tap(&:valid?).errors.full_messages
-      end
+        attr_reader :email
+        include ActiveModel::Validations
+        validates :email, email_format: example.example_group_instance.options
 
-      it_should_behave_like :all_specs
+        def self.model_name
+          ActiveModel::Name.new(self, nil, "User")
+        end
+      end
+      user.new(example.example_group_instance.email).tap(&:valid?).errors.full_messages
     end
+
+    it_should_behave_like :all_specs
   end
 end

data/validates_email_format_of.gemspec

@@ -1,26 +1,28 @@
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'validates_email_format_of/version'
+$:.unshift File.expand_path("../lib", __FILE__)
+require "validates_email_format_of/version"
 
-spec = Gem::Specification.new do |s|
-  s.name          = 'validates_email_format_of'
-  s.version       = ValidatesEmailFormatOf::VERSION
-  s.summary       = 'Validate e-mail addresses against RFC 2822 and RFC 3696.'
-  s.description   = s.summary
-  s.authors       = ['Alex Dunae', 'Isaac Betesh']
-  s.email         = ['code@dunae.ca', 'iybetesh@gmail.com']
-  s.homepage      = 'https://github.com/validates-email-format-of/validates_email_format_of'
-  s.license       = 'MIT'
-  s.test_files    = s.files.grep(%r{^test/})
-  s.files         = `git ls-files`.split($/)
-  s.require_paths = ['lib']
+Gem::Specification.new do |s|
+  s.name = "validates_email_format_of"
+  s.version = ValidatesEmailFormatOf::VERSION
+  s.summary = "Validate e-mail addresses against RFC 2822 and RFC 3696."
+  s.description = s.summary
+  s.authors = ["Alex Dunae", "Isaac Betesh"]
+  s.email = ["code@dunae.ca", "iybetesh@gmail.com"]
+  s.homepage = "https://github.com/validates-email-format-of/validates_email_format_of"
+  s.license = "MIT"
+  s.files = `git ls-files`.split($/)
+  s.require_paths = ["lib"]
 
   if RUBY_VERSION < "1.9.3"
-    s.add_dependency 'i18n', '< 0.7.0'
+    s.add_dependency "i18n", "< 0.7.0"
   else
-    s.add_dependency 'i18n'
+    s.add_dependency "i18n"
   end
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency "activemodel"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "standard"
+  s.add_development_dependency "appraisal"
+  s.add_development_dependency "pry-byebug"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: validates_email_format_of
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Alex Dunae
 - Isaac Betesh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +67,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Validate e-mail addresses against RFC 2822 and RFC 3696.
 email:
 - code@dunae.ca
@@ -61,23 +117,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/fr.yml
+- config/locales/it.yml
+- config/locales/ja.yml
 - config/locales/pl.yml
-- gemfiles/Gemfile.active_model_2_1
-- gemfiles/Gemfile.active_model_3_0
-- gemfiles/Gemfile.active_model_3_1
-- gemfiles/Gemfile.active_model_3_2
-- gemfiles/Gemfile.active_model_3_3
-- gemfiles/Gemfile.active_model_4_0
-- gemfiles/Gemfile.active_model_4_1
+- config/locales/pt-BR.yml
+- config/locales/pt.yml
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/validates_email_format_of.rb
 - lib/validates_email_format_of/active_model.rb
 - lib/validates_email_format_of/railtie.rb
@@ -92,7 +154,7 @@ homepage: https://github.com/validates-email-format-of/validates_email_format_of
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,9 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Validate e-mail addresses against RFC 2822 and RFC 3696.
 test_files: []