activemodel-email_address_validator 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce32d9302e063c235e291b9743acc89088c167adb42ef820d3869c325b827a13
-  data.tar.gz: 910f0ee9ad0d42d408eb0d3b90aac4e1f647c54f627628a096d3b5a246411f30
+  metadata.gz: 35147b0210c36fba2c92ccf367ac7971ec695037335a5992fe6ab4057f91b1d9
+  data.tar.gz: 45b57da9546f802c26fad4928708c5300ec9c82520c4e28e09cda345c1342fcc
 SHA512:
-  metadata.gz: 7da25676700ae7c2003a01ad56cc8a5b2a6c9f81f3a38a6b956cccf244c9f6d26bf0d578ce3b5fe9495d2d5663f29cee6155cd198b5fca775ed64f4f66b1fe93
-  data.tar.gz: 7669cf81432b9ba999283832ca89dfefaff6bcaea22d2e6678ef5d91a2a58577541ee806d6f0c1cc8f7632a820f8bb251f6130a68cf31e5939c5efb625e670e9
+  metadata.gz: 905c27c5b7e6f8fe94112e346a84f956e289bb1c1c66a58c9a9c3f3ac0a5419e2d1ec5f2f957db57d93438da24d0418e1fb03051461d464315215eaab05dd3e9
+  data.tar.gz: ef4792acd3f5b1b118182473c580663f4960d09d2576004c95d54ad2666d2252ac74f18e64a2e7785ead19604416ff36d1577629b6bcb0301fe7f73621889281

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
 
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -9,16 +9,35 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- Support for ActiveModel 7.
+-
 
-- Support for Ruby 3.1 and 3.2.
+### Removed
+
+-
+
+## [3.0.0]
+
+### Added
 
-- Commas are no longer allowed anywhere in an email address. Thanks @prognostikos!
+- Support for ActiveModel 8 (no changes).
+- Support for Ruby 3.3 and 3.4 (no changes).
 
 ### Removed
 
--
+- Support for Rubies before 3.0.
+- Passing a regular expression with :format is no longer supported. Use the
+  :with option instead.
+
+## [2.1.1]
 
+### Added
+
+- Support for ActiveModel 7.
+
+- Support for Ruby 3.1 and 3.2.
+
+- Commas are no longer allowed anywhere in an email address. Thanks
+  @prognostikos!
 
 ## [2.1.0]
 

data/README.md

@@ -22,20 +22,29 @@ Quite frankly, I don't care about the RFC at this point, neither does the user.
 
     validates :email, :email_address => true
 
-### Bring your own regex
-
-If you want to use a specific regular expression:
+### Bring your own logic
 
-    validates :email, :email_address => {:format => /.+@.+\..+/}
+If the default behavior isn't enough for you, you can include a custom rule for email addresses. For example to match the email addresses against a regular expression:
 
-### Bring your own logic
+    validates :email, :email_address => {:with => /.+@.+\..+/}
 
-If a regular expression isn't enough for you, you can include your own rules for email addresses. For example, you could validate that all email adresses belong to the same company:
+Or you could go beyound simple matching and validate that all email adresses belong to the same company:
 
     validates :email, :email_address => {
       :with => proc { |address| address.end_with?("@substancelab.com") }
     }
 
+You can even match against multiple rules, in which case all rules must pass:
+
+    validates :email, :email_address => {
+      :with => [
+        proc { |address| address.match(/.+@.+\..+/) },
+        proc { |address| !address.end_with?("@outlook.com") },
+      ]
+    }
+
+Do note that supplying your own rules means that the default email address validation isn't run - you're on your own, basically.
+
 ### Verify domain (still to be done - pull request, anybody?)
 
 This also checks that the domain actually has an MX record. Note this might take a while because of DNS lookups.

data/activemodel-email_address_validator.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activemodel", ">= 4.0", "< 8.0"
+  spec.add_dependency "activemodel", ">= 4.0", "< 9.0"
 
   spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "rake", ">= 10.0"

data/lib/activemodel_email_address_validator/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelEmailAddressValidator
-  VERSION = "2.1.1"
+  VERSION = "3.0.0"
 end

data/lib/validator/email_address_validator.rb

@@ -3,12 +3,13 @@ require "activemodel_email_address_validator/email_address"
 
 class EmailAddressValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    rules = Array(options[:with] || [])
-    if rules.empty?
-      # We are using the old syntax, assume regular expressions
-      rules = [build_rule_from_format(options[:format])]
+    if options[:format]
+      raise ArgumentError, "Don't use deprecated :format option. Use :with instead"
     end
 
+    rules = Array(options[:with] || [])
+    rules << build_default_rule if rules.empty?
+
     invalidate(record, attribute) unless all_rules_pass?(rules, value)
   end
 
@@ -34,11 +35,11 @@ class EmailAddressValidator < ActiveModel::EachValidator
     end
   end
 
-  def build_rule_from_format(format)
+  def build_default_rule
     proc { |attribute_value|
       address =
         ActiveModelEmailAddressValidator::EmailAddress.new(attribute_value)
-      address.valid?(format)
+      address.valid?
     }
   end
 

data/test/activemodel-email_address_validator/test_email_address.rb

@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class EmailAddressValidTest < MiniTest::Test
+class EmailAddressValidTest < Minitest::Test
   def test_accepts_common_email_address_format
     accept("bob@example.com")
   end
@@ -153,7 +153,7 @@ class EmailAddressValidTest < MiniTest::Test
   end
 end
 
-class EmailAddressTest < MiniTest::Test
+class EmailAddressTest < Minitest::Test
   def test_to_s_uses_address
     email_address = ActiveModelEmailAddressValidator::EmailAddress.new(
       "bob@example.com"

data/test/test_active_model_integration.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 require "active_model"
 
-class EmailAddressValidatorTest < MiniTest::Test
+class EmailAddressValidatorTest < Minitest::Test
   def setup
     @subject = build_model_with_validations
   end
@@ -31,15 +31,14 @@ class EmailAddressValidatorTest < MiniTest::Test
     assert !subject.errors[:work_email].empty?
   end
 
-  def test_validates_with_custom_regular_expression
+  def test_fails_when_using_deprecated_format_option
     subject = build_model_with_validations(
       email: {email_address: {format: /.+@enterprise\..+/}}
     )
-    accept("whatever@enterprise.museum", subject)
-    reject("totally@valid.com", subject)
+    assert_raises(ArgumentError) { subject.valid? }
   end
 
-  def test_validates_with_custom_regular_as_a_rule
+  def test_validates_with_custom_regular_expression_as_a_rule
     subject = build_model_with_validations(
       email: {email_address: {with: /.+@enterprise\..+/}}
     )
@@ -70,6 +69,16 @@ class EmailAddressValidatorTest < MiniTest::Test
     reject("bob", subject)
   end
 
+  def test_rules_overwrite_default_rule
+    subject = build_model_with_validations(
+      email: {email_address: {
+        with: proc { |address| true }
+      }}
+    )
+
+    accept("anything", subject)
+  end
+
   private
 
   def accept(email_address, subject)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-email_address_validator
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Jakob Skjerning
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: ActiveModel-style email address format validator