email_address 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9667acc31d6ce84fd3acb2e8e2f3ea04e496df5ff9dc5f89815fa148df1113e
-  data.tar.gz: e17aa2b229cb28ca80dcbf37226a5411052758db1e15cee0ddc2038d5244de42
+  metadata.gz: ad468bd4a05991b9a99adbeabd6fdb8c40d965fcdeed1559ddeb95ad6d599d13
+  data.tar.gz: b3b678cf78737eee8ca6a9febb5ff2434edb322b6393383ca7cd50042e66833c
 SHA512:
-  metadata.gz: 908fa1ffaa5692b07fa4e586a66a8fdf6395c1a51013ee389e0437df175d6712ecc57831b6616cfabd28463a87c7a60df9b6ba8382cba0c58d8449e4ada51c6d
-  data.tar.gz: a9f2a9bb8280118af5b21b08e8ca2273b16f3d5f700b91cb7c36b22444a7d5878e54a45292a2080243aff6fa4d31cd2ca3af4bd664f182b49d52ab42b864c711
+  metadata.gz: b453716b5ffb47f3cc9a03fd153cb38349d686bfa8830f273c9f9704736ac987c36128c788ab84472c5a3c5d483743f675c1126bf621643fd979f0235bd19f11
+  data.tar.gz: 0e5bdf1545efd28e45da88e600e7e0bf88ddbed11c1e46c516206f5a301b4e7c0a87301daa90141cf91c8403fc1ea8fcb8cd7a725e64b5d9f810428d14115fe8

data/.github/workflows/ci.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.6, 2.7, 3.0, jruby]
+        ruby-version: [2.6, 2.7, 3.0, 3.1, jruby]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

data/email_address.gemspec

@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
   else
     spec.add_development_dependency "activerecord", "~> 6.1.4"
     spec.add_development_dependency "sqlite3"
+    spec.add_development_dependency "standard", "~> 1.5.0"
   end
+  # spec.add_development_dependency "net-smtp"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "standard", "~> 1.1.1"
 
   spec.add_dependency "simpleidn"
 end

data/lib/email_address/address.rb

@@ -258,6 +258,10 @@ module EmailAddress
     # Connects to host to test if user can receive email. This should NOT be performed
     # as an email address check, but is provided to assist in problem resolution.
     # If you abuse this, you *could* be blocked by the ESP.
+    #
+    # NOTE: As of Ruby 3.1, Net::SMTP was moved from the standard library to the
+    # 'net-smtp' gem. In order to avoid adding that dependency for this experimental
+    # feature, please add the gem to your Gemfile and require it to use this feature.
     def connect
       smtp = Net::SMTP.new(host_name || ip_address)
       smtp.start(@config[:smtp_helo_name] || "localhost")

data/lib/email_address/config.rb

@@ -81,6 +81,12 @@ module EmailAddress
   # * host_local:         false,
   #   Allow localhost, no domain, or local subdomains.
   #
+  # * host_fqdn:          true
+  #   Check if host name is FQDN
+  #
+  # * host_auto_append:   true
+  #   Append localhost if host is missing
+  #
   # * address_validation: :parts, :smtp, ->(address) { true }
   #   Address validation policy
   #   :parts              Validate local and host.
@@ -129,6 +135,8 @@ module EmailAddress
       host_allow_ip: false,
       host_remove_spaces: false,
       host_local: false,
+      host_fqdn: true,
+      host_auto_append: true,
 
       address_validation: :parts, # :parts, :smtp, Proc
       address_size: 3..254,
@@ -188,7 +196,7 @@ module EmailAddress
     end
 
     def self.error_message(name, locale = "en")
-      @errors[locale]["email_address"][name.to_s] || name.to_s
+      @errors.dig(locale, "email_address", name.to_s) || name.to_s
     end
 
     # Customize your own error message text.

data/lib/email_address/host.rb

@@ -1,6 +1,5 @@
 require "simpleidn"
 require "resolv"
-require "net/smtp"
 
 module EmailAddress
   ##############################################################################
@@ -184,7 +183,7 @@ module EmailAddress
     def fully_qualified_domain_name(host_part)
       dn = @config[:address_fqdn_domain]
       if !dn
-        if (host_part.nil? || host_part <= " ") && @config[:host_local]
+        if (host_part.nil? || host_part <= " ") && @config[:host_local] && @config[:host_auto_append]
           "localhost"
         else
           host_part
@@ -402,11 +401,7 @@ module EmailAddress
     # True if the host name has a DNS A Record
     def valid_dns?
       return true unless dns_enabled?
-      bool = dns_a_record.size > 0 || set_error(:domain_unknown)
-      if localhost? && !@config[:host_local]
-        bool = set_error(:domain_no_localhost)
-      end
-      bool
+      dns_a_record.size > 0 || set_error(:domain_unknown)
     end
 
     # True if the host name has valid MX servers configured in DNS
@@ -430,7 +425,11 @@ module EmailAddress
     # True if the host_name passes Regular Expression match and size limits.
     def valid_format?
       if host_name =~ CANONICAL_HOST_REGEX && to_s.size <= MAX_HOST_LENGTH
-        return true if localhost?
+        if localhost?
+          return @config[:host_local] ? true : set_error(:domain_no_localhost)
+        end
+
+        return true if !@config[:host_fqdn]
         return true if host_name.include?(".") # require FQDN
       end
       set_error(:domain_invalid)
@@ -462,6 +461,10 @@ module EmailAddress
     # Connects to host to test it can receive email. This should NOT be performed
     # as an email address check, but is provided to assist in problem resolution.
     # If you abuse this, you *could* be blocked by the ESP.
+    #
+    # NOTE: As of Ruby 3.1, Net::SMTP was moved from the standard library to the
+    # 'net-smtp' gem. In order to avoid adding that dependency for this experimental
+    # feature, please add the gem to your Gemfile and require it to use this feature.
     def connect
       smtp = Net::SMTP.new(host_name || ip_address)
       smtp.start(@config[:helo_name] || "localhost")

data/lib/email_address/local.rb

@@ -351,8 +351,10 @@ module EmailAddress
       valid_size? or return false
       valid_encoding? or return false
       if tag
-        return false unless mailbox =~ RELAXED_MAILBOX_REGEX &&
-          tag =~ RELAXED_TAG_REGEX
+        return false unless RELAXED_MAILBOX_REGEX.match?(mailbox) &&
+          RELAXED_TAG_REGEX.match?(tag)
+        self.syntax = :relaxed
+        true
       elsif RELAXED_MAILBOX_REGEX.match?(local)
         self.syntax = :relaxed
         true

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.2.0"
+  VERSION = "0.2.3"
 end

data/test/email_address/test_address.rb

@@ -103,7 +103,10 @@ class TestAddress < Minitest::Test
     assert_equal false, e.valid? # localhost not allowed by default
     assert_equal EmailAddress.error("user1"), "Invalid Domain Name"
     assert_equal EmailAddress.error("user1", host_local: true), "This domain is not configured to accept email"
+    assert_equal EmailAddress.error("user1", host_local: true, host_auto_append: false), "Invalid Domain Name"
     assert_equal EmailAddress.error("user1@localhost", host_local: true), "This domain is not configured to accept email"
+    assert_equal EmailAddress.error("user1@localhost", host_local: false, host_validation: :syntax), "localhost is not allowed for your domain name"
+    assert_equal EmailAddress.error("user1@localhost", host_local: false, dns_lookup: :off), "localhost is not allowed for your domain name"
     assert_nil EmailAddress.error("user2@localhost", host_local: true, dns_lookup: :off, host_validation: :syntax)
   end
 

data/test/email_address/test_host.rb

@@ -68,6 +68,21 @@ class TestHost < MiniTest::Test
     assert_equal true, h.valid?
   end
 
+  def test_localhost
+    h = EmailAddress::Host.new("localhost", host_local: true, host_validation: :syntax)
+    assert_equal true, h.valid?
+  end
+
+  def test_host_no_dot
+    h = EmailAddress::Host.new("local", host_validation: :syntax)
+    assert_equal false, h.valid?
+  end
+
+  def test_host_no_dot_enable_fqdn
+    h = EmailAddress::Host.new("local", host_fqdn: false, host_validation: :syntax)
+    assert_equal true, h.valid?
+  end
+
   def test_comment
     h = EmailAddress::Host.new("(oops)gmail.com")
     assert_equal "gmail.com", h.to_s
@@ -110,7 +125,8 @@ class TestHost < MiniTest::Test
   end
 
   def test_hosted_service
-    assert EmailAddress.valid?("test@jiff.com", dns_lookup: :mx)
+    # 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)
   end
 

data/test/email_address/test_local.rb

@@ -105,4 +105,8 @@ class TestLocal < MiniTest::Test
   def test_tag_punctuation
     assert EmailAddress.valid?("first.last+foo.bar@gmail.com")
   end
+
+  def test_relaxed_tag
+    assert EmailAddress.valid? "foo+abc@example.com", host_validation: :syntax, local_format: :relaxed
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Allen Fair
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: standard
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: This gem provides a ruby language library for working with and validating