email_address 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2dd7c65f4932e46e3a03d92c5c28d23862bb679
-  data.tar.gz: cd81d66ddb341143ac160351d99623823e2d1e20
+  metadata.gz: 865ef9fea556b3de09bffbfc977f751ef806da92
+  data.tar.gz: c647502c488d49962b962090c5b3623bc89c774c
 SHA512:
-  metadata.gz: fcd8720fd24322f9b8a0f9959ef308e8281a5f2a5969d3b4679639dc99e769fa95b90a6d376e03edd6bc8812f5c27bdefb9595a4315bfcd84718a90a2573ec51
-  data.tar.gz: 17aeaf30ccd3ce8ca29b17f129821960e60148b10d91d3d33778e67cb554947f107961610c81c4cb05c0f38d12c67c50eca32a83d09d576da61e175653bac4be
+  metadata.gz: 85c1508f8e3e73960157d00306db1d0d692e7e9f33db00d8a7ebce75bf1ce56626b670e5fb0f322b54fe78154d79815cefa0350d2f2187c049c13ede4341a828
+  data.tar.gz: 6811f8ec8f1ca8e5253df4cbc58e90d4e6e27ff35014ce56ac59bc70d9a4ed1044d3f09ad0ce3a451238e7328c7eb2721d36840d5f6197616e38bda63c53b2ff

data/lib/email_address/address.rb

@@ -217,7 +217,7 @@ module EmailAddress
         return set_error :invalid_mailbox
       end
       unless self.host.valid?
-        return set_error :invalid_host
+        return set_error self.host.error_message
       end
       if @config[:address_size] && !@config[:address_size].include?(self.to_s.size)
         return set_error :exceeds_size
@@ -237,7 +237,7 @@ module EmailAddress
     end
 
     def set_error(err)
-      @error = EmailAddress::Config.error_messages[err] || err
+      @error = EmailAddress::Config.error_messages.fetch(err) { err }
       false
     end
 

data/lib/email_address/config.rb

@@ -93,7 +93,7 @@ module EmailAddress
       munge_string:       "*****",
 
       local_downcase:     true,
-      local_fix:          true,
+      local_fix:          false,
       local_encoding:     :ascii, # :ascii, :unicode,
       local_parse:        nil,   # nil, Proc
       local_format:       :conventional, # :conventional, :relaxed, :redacted, :standard, Proc

data/lib/email_address/host.rb

@@ -33,7 +33,7 @@ module EmailAddress
     attr_reader :host_name
     attr_accessor :dns_name, :domain_name, :registration_name,
                   :tld, :tld2, :subdomains, :ip_address, :config, :provider,
-                  :comment
+                  :comment, :error_message
     MAX_HOST_LENGTH = 255
 
     # Sometimes, you just need a Regexp...
@@ -313,11 +313,6 @@ module EmailAddress
       EmailAddress::Config.setting(:dns_lookup).equal?(:off) ? false : true
     end
 
-    # True if the host name has a DNS A Record
-    def has_dns_a_record?
-      dns_a_record.size > 0 ? true : false
-    end
-
     # Returns: [official_hostname, alias_hostnames, address_family, *address_list]
     def dns_a_record
       @_dns_a_record ||= Socket.gethostbyname(self.dns_name)
@@ -366,16 +361,49 @@ module EmailAddress
 
     # Returns true if the host name is valid according to the current configuration
     def valid?(rule=@config[:dns_lookup]||:mx)
+      self.error_message = nil
       if self.ip_address
-        @config[:host_allow_ip] && self.valid_ip?
+        valid_ip?
+      elsif ! valid_format?
+        false
       elsif rule == :mx
-        self.exchangers.mx_ips.size > 0
+        valid_mx?
       elsif rule == :a
-        self.has_dns_a_record?
+        valid_dns?
       elsif rule == :off
-        self.to_s.size <= MAX_HOST_LENGTH
+        true
       else
-        false
+        set_error(:domain_bad_validation_rule)
+      end
+    end
+
+    # The inverse of valid? -- Returns nil (falsey) if valid, otherwise error message
+    def error
+      valid? ? nil : @error_message
+    end
+
+    # True if the host name has a DNS A Record
+    def valid_dns?
+      dns_a_record.size > 0 || set_error(:domain_unknown)
+    end
+
+    # True if the host name has valid MX servers configured in DNS
+    def valid_mx?
+      if self.exchangers.mx_ips.size > 0
+        true
+      elsif valid_dns?
+        set_error(:domain_does_not_accept_email)
+      else
+        set_error(:domain_unknown)
+      end
+    end
+
+    # True if the host_name passes Regular Expression match and size limits.
+    def valid_format?
+      if self.host_name =~ CANONICAL_HOST_REGEX && self.to_s.size <= MAX_HOST_LENGTH
+        true
+      else
+        set_error(:domain_invalid)
       end
     end
 
@@ -383,14 +411,19 @@ module EmailAddress
     # is a potentially valid IP address. It does not check if the address
     # is reachable.
     def valid_ip?
-      if self.ip_address.nil?
-        false
+      if ! @config[:host_allow_ip]
+        set_error(:ip_address_forbidden)
       elsif self.ip_address.include?(":")
-        self.ip_address =~ Resolv::IPv6::Regex ? true : false
+        self.ip_address =~ Resolv::IPv6::Regex ? true : set_error(:ipv6_address_invalid)
       elsif self.ip_address.include?(".")
-        self.ip_address =~ Resolv::IPv4::Regex ? true : false
+        self.ip_address =~ Resolv::IPv4::Regex ? true : set_error(:ipv4_address_invalid)
       end
     end
 
+    def set_error(err)
+      @error_message = EmailAddress::Config.error_messages.fetch(err) { err }
+      false
+    end
+
   end
 end

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/email_address/test_host.rb

@@ -111,4 +111,15 @@ class TestHost < MiniTest::Test
     assert ! EmailAddress::Host.new('ya  hoo.com').valid?
     assert EmailAddress::Host.new('ya  hoo.com', host_remove_spaces:true).valid?
   end
+
+  def test_errors
+    assert_equal EmailAddress::Host.new("yahoo.com").error, nil
+    assert_equal EmailAddress::Host.new("example.com").error, :domain_does_not_accept_email
+    assert_equal EmailAddress::Host.new("yahoo.wtf").error, :domain_unknown
+    assert_equal EmailAddress::Host.new("ajsdfhajshdfklasjhd.wtf", dns_lookup: :off).error, nil
+    assert_equal EmailAddress::Host.new("ya  hoo.com", dns_lookup: :off).error, :domain_invalid
+    assert_equal EmailAddress::Host.new("[127.0.0.1]").error, :ip_address_forbidden
+    assert_equal EmailAddress::Host.new("[127.0.0.666]", host_allow_ip:true).error, :ipv4_address_invalid
+    assert_equal EmailAddress::Host.new("[IPv6::12t]", host_allow_ip:true).error, :ipv6_address_invalid
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Allen Fair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake