email_address 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6784502377cd86fe2b6bb53c53ef7700673ed0317d2c96850ba0e9faad32c72
-  data.tar.gz: 5a558e95e390bf608225149fa2cb0948dcd9455607592e0c92156f34dced0807
+  metadata.gz: ad468bd4a05991b9a99adbeabd6fdb8c40d965fcdeed1559ddeb95ad6d599d13
+  data.tar.gz: b3b678cf78737eee8ca6a9febb5ff2434edb322b6393383ca7cd50042e66833c
 SHA512:
-  metadata.gz: 65cd1a6acccd37f3580762ba5d97e2956833c979a9fa639369385427bfe0ebf3cca693014d442ab530a005349e6fd36bce3d0b7372f432230bfcc4e0d3d15d79
-  data.tar.gz: 6543b62b3d0650717c81d2b25de2008fe6b898707a82c8779646364cb351654322958d38dfbf6b9420728a1eb7d6047d2d4205f0e11254e9d868930f6db74243
+  metadata.gz: b453716b5ffb47f3cc9a03fd153cb38349d686bfa8830f273c9f9704736ac987c36128c788ab84472c5a3c5d483743f675c1126bf621643fd979f0235bd19f11
+  data.tar.gz: 0e5bdf1545efd28e45da88e600e7e0bf88ddbed11c1e46c516206f5a301b4e7c0a87301daa90141cf91c8403fc1ea8fcb8cd7a725e64b5d9f810428d14115fe8

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,

data/lib/email_address/host.rb

@@ -183,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
@@ -428,6 +428,8 @@ module EmailAddress
         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)

data/lib/email_address/version.rb

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

data/test/email_address/test_address.rb

@@ -103,6 +103,7 @@ 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"

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Allen Fair
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake