email_address 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc99a156cbc12320e084571723e8633c5c1f8a3e92a9e47258d9521c0f27fcc6
-  data.tar.gz: '05302795638cad6027f50b778253484f390ef2cd697c665150d1e5a2d214172d'
+  metadata.gz: f6fb959ca75da2d73ed378a3b2f97b4dceead14d634cf24ff5ce18c5a52f0e4a
+  data.tar.gz: 47dd7dcb50a3e11b99d2be141dc1e3737b41b7a2b0f13ec80fb83ef59bc68d15
 SHA512:
-  metadata.gz: 58c0ec4c8260854d9f7bacaf6c7891e661c9953f57c678d9bd03ab7e14e69b5a48902ca651ec29105a1fd13b08942187473340dace11cf81533af5ef1093dadc
-  data.tar.gz: 4d6ff21b55ed86a0d04ca8011d85a4f0c0f69637c80e9d2b6dc393717051fb15e703630bd531531c5453b3e8c0e301e34917fa48b3be1123f1c6ff3cd105e957
+  metadata.gz: '097d2fa911cef5a006f7280e569107fcba3c18a025597fc89a18fb542e49bb4603efd1bae6ad39d68f9514ed26b27ea4e7890f018a32fa7e6d80ee608ebb6f4e'
+  data.tar.gz: 1c688907c73eb2dad9d64793fda1f2a8baece32f694710f9384a50cb92584c59b169f425d776e7d85a918d17cdcd5995f063fe8143f559d27241103f8e6114d5

data/.github/workflows/ci.yml

@@ -5,9 +5,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.6, 2.7, 3.0, 3.1, jruby]
+        ruby-version: [3.2, 3.3, 3.4]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-lsp

data/README.md

@@ -241,7 +241,7 @@ email.provider      #=> :google
 email.mailbox       #=> "clark.kent"
 email.tag           #=> "scoops"
 
-email.host.exchanger.first[:ip] #=> "2a00:1450:400b:c02::1a"
+email.host.exchangers.first[:ip] #=> "2a00:1450:400b:c02::1a"
 email.host.txt_hash #=> {:v=>"spf1", :redirect=>"\_spf.google.com"}
 
 EmailAddress.normal("HIRO@こんにちは世界.com")

data/email_address.gemspec

@@ -15,23 +15,26 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5", "< 4"
   spec.files = `git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.11"
   spec.add_development_dependency "bundler" # ,      "~> 1.16.0"
   if RUBY_PLATFORM == "java"
-    spec.add_development_dependency "activerecord", "~> 5.2.6"
-    spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", "~> 52.7"
+    spec.add_development_dependency "activerecord", "~> 7.2.0"
+    spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", "~> 70.2"
   else
-    spec.add_development_dependency "activerecord", "~> 6.1.4"
-    spec.add_development_dependency "sqlite3"
-    spec.add_development_dependency "standard", "~> 1.5.0"
+    spec.add_development_dependency "activerecord", "~> 8.0.0"
+    spec.add_development_dependency "sqlite3", "~> 2.1"
+    spec.add_development_dependency "standard"
   end
   spec.add_development_dependency "net-smtp"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "bigdecimal"
+  spec.add_development_dependency "mutex_m"
+  spec.add_development_dependency "irb"
 
+  spec.add_dependency "base64"
   spec.add_dependency "simpleidn"
 end

data/lib/email_address/active_record_validator.rb

@@ -12,8 +12,12 @@ module EmailAddress
   # * field: email,
   # * fields: [:email1, :email2]
   #
+  # * code: custom error code (default: :invalid_address)
+  # * message: custom error message (default: "Invalid Email Address")
+  #
   # Default field: :email or :email_address (first found)
   #
+  #
   class ActiveRecordValidator < ActiveModel::Validator
     def initialize(options = {})
       @opt = options
@@ -24,22 +28,35 @@ module EmailAddress
         @opt[:fields].each { |f| validate_email(r, f) }
       elsif @opt[:field]
         validate_email(r, @opt[:field])
-      elsif r.respond_to? :email
-        validate_email(r, :email)
-      elsif r.respond_to? :email_address
-        validate_email(r, :email_address)
+      else
+        validate_email(r, :email) || validate_email(r, :email_address)
       end
     end
 
     def validate_email(r, f)
-      return if r[f].nil?
-      e = Address.new(r[f])
+      v = field_value(r, f)
+      return if v.nil?
+
+      e = Address.new(v)
       unless e.valid?
+        error_code = @opt[:code] || :invalid_address
         error_message = @opt[:message] ||
           Config.error_message(:invalid_address, I18n.locale.to_s) ||
           "Invalid Email Address"
-        r.errors.add(f, error_message)
+        r.errors.add(f, error_code, message: error_message)
+      end
+    end
+
+    def field_value(r, f)
+      if r.respond_to?(f)
+        r.send(f)
+      elsif r[f]
+        r[f]
+      else
+        nil
       end
+    rescue NoMethodError
+      nil
     end
   end
 end

data/lib/email_address/host.rb

@@ -36,7 +36,7 @@ module EmailAddress
     MAX_HOST_LENGTH = 255
 
     # Sometimes, you just need a Regexp...
-    DNS_HOST_REGEX = / [\p{L}\p{N}]+ (?: (?: -{1,2} | \.) [\p{L}\p{N}]+ )*/x
+    DNS_HOST_REGEX = / [\p{L}\p{N}]+ (?: (?: -{1,3} | \.) [\p{L}\p{N}]+ )*/x
 
     # The IPv4 and IPv6 were lifted from Resolv::IPv?::Regex and tweaked to not
     # \A...\z anchor at the edges.
@@ -381,7 +381,7 @@ module EmailAddress
     # Returns true if the host name is valid according to the current configuration
     def valid?(rules = {})
       host_validation = rules[:host_validation] || @config[:host_validation] || :mx
-      dns_lookup = rules[:dns_lookup] || host_validation
+      dns_lookup = rules[:dns_lookup] || @config[:dns_lookup] || host_validation
       self.error_message = nil
       if host_name && !host_name.empty? && !@config[:host_size].include?(host_name.size)
         return set_error(:invalid_host)
@@ -392,10 +392,10 @@ module EmailAddress
         false
       elsif dns_lookup == :connect
         valid_mx? && connect
+      elsif dns_lookup == :a || host_validation == :a
+        valid_dns?
       elsif dns_lookup == :mx
         valid_mx?
-      elsif dns_lookup == :a
-        valid_dns?
       else
         true
       end

data/lib/email_address/local.rb

@@ -116,7 +116,7 @@ module EmailAddress
 
     def local=(raw)
       self.original = raw
-      raw.downcase! if @config[:local_downcase].nil? || @config[:local_downcase]
+      raw = raw.downcase if @config[:local_downcase].nil? || @config[:local_downcase]
       @local = raw
 
       if @config[:local_parse].is_a?(Proc)

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

data/test/activerecord/test_ar.rb

@@ -9,11 +9,21 @@ class TestAR < MiniTest::Test
       user = User.new(email: "Pat.Jones+ASDF#GMAIL.com")
       assert_equal false, user.valid?
       assert user.errors.messages[:email].first
+
       user = User.new(email: "Pat.Jones+ASDF@GMAIL.com")
       assert_equal true, user.valid?
     end
   end
 
+  def test_validation_error_message
+    if RUBY_PLATFORM != "java" # jruby
+      user = User.new(alternate_email: "Pat.Jones+ASDF#GMAIL.com")
+      assert_equal false, user.valid?
+      assert user.errors.messages[:alternate_email].first.include?("Check your email")
+      assert_equal :some_error_code, user.errors.details[:alternate_email].first[:error]
+    end
+  end
+
   def test_datatype
     # Disabled JRuby checks... weird CI failures. Hopefully someone can help?
     if RUBY_PLATFORM != "java" # jruby
@@ -24,4 +34,14 @@ class TestAR < MiniTest::Test
       end
     end
   end
+
+  def test_store_accessor_valid_email
+    user = User.new(support_email: "test@gmail.com")
+    assert user.valid?
+  end
+
+  def test_store_accessor_invalid_email
+    user = User.new(support_email: "this_is_not_an_email")
+    assert_equal false, user.valid?
+  end
 end

data/test/activerecord/user.rb

@@ -45,13 +45,18 @@ end
 ################################################################################
 
 class User < ApplicationRecord
+  store :settings, accessors: [ :support_email ], coder: JSON
+
   if defined?(ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 5
     attribute :email, :email_address
     attribute :canonical_email, :canonical_email_address
+    attribute :alternate_email, :email_address
   end
 
   validates_with EmailAddress::ActiveRecordValidator,
-    fields: %i[email canonical_email]
+    fields: %i[email canonical_email support_email]
+  validates_with EmailAddress::ActiveRecordValidator,
+    field: :alternate_email, code: :some_error_code, message: "Check your email"
 
   def email=(email_address)
     self[:canonical_email] = email_address

data/test/email_address/test_host.rb

@@ -52,7 +52,7 @@ class TestHost < MiniTest::Test
   def test_dmarc
     d = EmailAddress::Host.new("yahoo.com").dmarc
     assert_equal "reject", d[:p]
-    d = EmailAddress::Host.new("example.com").dmarc
+    d = EmailAddress::Host.new("calculator.net").dmarc
     assert_equal true, d.empty?
   end
 
@@ -127,7 +127,7 @@ class TestHost < MiniTest::Test
   def test_hosted_service
     # Is there a gmail-hosted domain that will continue to exist? Removing until then
     # assert EmailAddress.valid?("test@jiff.com", dns_lookup: :mx)
-    assert !EmailAddress.valid?("test@gmail.com", dns_lookup: :mx)
+    assert !EmailAddress.valid?("t@gmail.com", dns_lookup: :mx)
   end
 
   def test_yahoo_bad_tld
@@ -154,4 +154,16 @@ class TestHost < MiniTest::Test
   def test_host_size
     assert !EmailAddress::Host.new("stackoverflow.com", {host_size: 1..3}).valid?
   end
+
+  # When a domain is not configured to receive email (missing MX record),
+  # Though some MTA's will fallback to the A/AAAA host record
+  def test_no_mx
+    assert !EmailAddress::Host.new("zaboz.com").valid?
+    assert EmailAddress::Host.new("zaboz.com", dns_lookup: :a).valid?
+  end
+
+  # Issue #102 off---white.com should be valid 
+  def test_triple_dash_domain 
+    assert EmailAddress::Host.new("off---white.com").valid?
+  end
 end

data/test/email_address/test_local.rb

@@ -92,7 +92,7 @@ class TestLocal < MiniTest::Test
 
   def test_hosted
     assert EmailAddress.valid?("x@exposure.co")
-    assert EmailAddress.error("xxxx+subscriber@gmail.com")
+    assert EmailAddress.error("xx+subscriber@gmail.com")
     assert EmailAddress.valid?("xxxxx+subscriber@gmail.com")
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Allen Fair
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,42 +57,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 8.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-smtp
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +135,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  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: mutex_m
+  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: irb
+  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: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +246,6 @@ homepage: https://github.com/afair/email_address
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,22 +263,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: This gem provides a ruby language library for working with and validating
   email addresses. By default, it validates against conventional usage, the format
   preferred for user email addresses. It can be configured to validate against RFC
   “Standard” formats, common email service provider formats, and perform DNS validation.
-test_files:
-- test/activerecord/test_ar.rb
-- test/activerecord/user.rb
-- test/email_address/test_address.rb
-- test/email_address/test_config.rb
-- test/email_address/test_exchanger.rb
-- test/email_address/test_host.rb
-- test/email_address/test_local.rb
-- test/email_address/test_rewriter.rb
-- test/test_aliasing.rb
-- test/test_email_address.rb
-- test/test_helper.rb
+test_files: []