email_address 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b689ac0a16f073c42a43b3f6e49c42e472c1fbef31290fa4c41f26389f3f51
-  data.tar.gz: 7ba8fb68fa0e71a9821d08c8bb5e40ecd5acc625acebc707b4beb4f25240d628
+  metadata.gz: 67dd5ab4cf92d131f566e7cf275073dfd80f92f1024adb0a276e08bc81640878
+  data.tar.gz: fcccbc2f24aa40ee835c3a4cd5ec1a233823c7ab7d08afdb20f94f029b208493
 SHA512:
-  metadata.gz: 4514eb116e370d6e3b4bf9ae006178dae86884228ff66053a0ecd8834943d6ab4a3dc8d6ef658c2c080090a1cb28343e3c3eeb1531bc4a3cedb532ac09dee470
-  data.tar.gz: 146e6a106d2f3c3f6c73661b28b4371078d2a529b05fc09d2078aea64f3ce25ff036b91364f244c12fe037ac62ad02f1dbbbeed1d378dfd87a74624714d91d5b
+  metadata.gz: 7b28dfd2876f0a01cac862905bdd9b1c30d88505d0457a319469ec4ae35cb87d0b592ac6b028a531c2a115249eb3a6abb527896a63a1e2155ed6712618d2cff4
+  data.tar.gz: 4734fe3a428b07023963e7a01bf3a2853295a52ea4b308ddda8b82f8a0d09614ffabbc8d63c188b477b4a2f0f464ec76c70f6681b7423f7774b8205cbcefa4ad

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - ruby-head
+  - 2.7.0
   - 2.3.7
   - jruby-9.2.9.0
   #- rbx

data/email_address.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "activerecord", "=  4.2.10"
     spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", '~> 1.3.24'
   else
-    spec.add_development_dependency "activerecord", "~> 5.2.0"
+    spec.add_development_dependency "activerecord", "~> 5.2.4"
     spec.add_development_dependency "sqlite3"
   end
   #spec.add_development_dependency "codeclimate-test-reporter"

data/lib/email_address/address.rb

@@ -24,8 +24,8 @@ module EmailAddress
     # address. The original string is available in the #original method.
     def initialize(email_address, config={})
       @config        = config # This needs refactoring!
-      email_address  = (email_address || "").strip
       @original      = email_address
+      email_address  = (email_address || "").strip
       email_address  = parse_rewritten(email_address) unless config[:skip_rewrite]
       local, host    = EmailAddress::Address.split_local_host(email_address)
 
@@ -246,9 +246,6 @@ module EmailAddress
       else
         return false unless self.local.valid?
         return false unless self.host.valid?
-      end
-      if @config[:address_validation] == :smtp
-
       end
       true
     end

data/lib/email_address/config.rb

@@ -9,6 +9,9 @@ module EmailAddress
   #   :a        - DNS A Record lookup (as some domains don't specify an MX incorrectly)
   #   :off      - Do not perform DNS lookup (Test mode, network unavailable)
   #
+  # * dns_timeout:        nil
+  #   False, or a timeout in seconds. Timeout on the DNS lookup, after which it will fail.
+  #
   # * sha1_secret         ""
   #   This application-level secret is appended to the email_address to compute
   #   the SHA1 Digest, making it unique to your application so it can't easily be
@@ -99,6 +102,7 @@ module EmailAddress
   class Config
     @config = {
       dns_lookup:         :mx,  # :mx, :a, :off
+      dns_timeout:        nil,
       sha1_secret:        "",
       munge_string:       "*****",
 
@@ -139,7 +143,7 @@ module EmailAddress
       },
       msn: {
         host_match:       %w(msn. hotmail. outlook. live.),
-        mailbox_validator: ->(m,t) { m =~ /\A[a-z][\-\w]*(?:\.[\-\w]+)*\z/i},
+        mailbox_validator: ->(m,t) { m =~ /\A\w[\-\w]*(?:\.[\-\w]+)*\z/i},
       },
       yahoo: {
         host_match:       %w(yahoo. ymail. rocketmail.),

data/lib/email_address/exchanger.rb

@@ -52,7 +52,14 @@ module EmailAddress
     def mxers
       return [["example.com", "0.0.0.0", 1]] if @config[:dns_lookup] == :off
       @mxers ||= Resolv::DNS.open do |dns|
-        ress = dns.getresources(@host, Resolv::DNS::Resource::IN::MX)
+        dns.timeouts = @config[:dns_timeout] if @config[:dns_timeout]
+
+        ress = begin
+          dns.getresources(@host, Resolv::DNS::Resource::IN::MX)
+        rescue Resolv::ResolvTimeout
+          []
+        end
+
         records = ress.map do |r|
           begin
             if r.exchange.to_s > " "

data/lib/email_address/host.rb

@@ -350,8 +350,14 @@ module EmailAddress
     # Returns a DNS TXT Record
     def txt(alternate_host=nil)
       Resolv::DNS.open do |dns|
-        records = dns.getresources(alternate_host || self.dns_name,
+        dns.timeouts = @config[:dns_timeout] if @config[:dns_timeout]
+        records = begin
+          dns.getresources(alternate_host || self.dns_name,
                          Resolv::DNS::Resource::IN::TXT)
+        rescue Resolv::ResolvTimeout
+          []
+        end
+
         records.empty? ? nil : records.map(&:data).join(" ")
       end
     end
@@ -418,7 +424,7 @@ module EmailAddress
         else
           true
         end
-      elsif valid_dns?
+      elsif @config[:dns_timeout].nil? && valid_dns?
         set_error(:domain_does_not_accept_email)
       else
         set_error(:domain_unknown)

data/lib/email_address/local.rb

@@ -101,6 +101,11 @@ module EmailAddress
 
     REDACTED_REGEX = /\A \{ [0-9a-f]{40} \} \z/x # {sha1}
 
+    CONVENTIONAL_TAG_REGEX  = #  AZaz09_!'+-/=
+      %r/^([\w\!\'\+\-\/\=]+)$/i.freeze
+    RELAXED_TAG_REGEX  = #  AZaz09_!#$%&'*+-/=?^`{|}~
+      %r/^([\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+)$/i.freeze
+
     def initialize(local, config={}, host=nil)
       self.config   = config.empty? ? EmailAddress::Config.all_settings : config
       self.local    = local
@@ -328,7 +333,12 @@ module EmailAddress
     # True if the part matches the conventional format
     def conventional?
       self.syntax = :invalid
-      self.local =~ CONVENTIONAL_MAILBOX_REGEX or return false
+      if self.tag
+        return false unless self.mailbox =~ CONVENTIONAL_MAILBOX_REGEX &&
+          self.tag =~ CONVENTIONAL_TAG_REGEX
+      else
+        return false unless self.local =~ CONVENTIONAL_MAILBOX_REGEX
+      end
       self.valid_size? or return false
       self.valid_encoding? or return false
       self.syntax = :conventional
@@ -340,7 +350,10 @@ module EmailAddress
       self.syntax = :invalid
       self.valid_size? or return false
       self.valid_encoding? or return false
-      if self.local =~ RELAXED_MAILBOX_REGEX
+      if self.tag
+        return false unless self.mailbox =~ RELAXED_MAILBOX_REGEX &&
+          self.tag =~ RELAXED_TAG_REGEX
+      elsif self.local =~ RELAXED_MAILBOX_REGEX
         self.syntax = :relaxed
         true
       else
@@ -384,7 +397,7 @@ module EmailAddress
     end
 
     def error
-      self.valid? ? nil : @error
+      self.valid? ? nil : ( @error || :local_invalid)
     end
 
   end

data/lib/email_address/messages.yaml

@@ -16,5 +16,6 @@ en:
     ipv6_address_invalid: "This is not a valid IPv6 address"
     local_size_long: "Mailbox name too long"
     local_size_short: "Mailbox name too short"
+    local_invalid: "Recipient is not valid"
     not_allowed: "Address is not allowed"
     server_not_available: "The remote email server is not available"

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

data/test/email_address/test_address.rb

@@ -116,4 +116,12 @@ class TestAddress < Minitest::Test
     assert ! EmailAddress.new('a.c.m.e.-industries@foo.com').valid?
     assert true, EmailAddress.new('a.c.m.e.-industries@foo.com', local_format: :relaxed).valid?
   end
+
+  def test_nil_address
+    assert_nil EmailAddress.new(nil).normal, "Expected a nil input to make nil output"
+  end
+
+  def test_nonstandard_tag
+    assert EmailAddress.valid?("asdfas+-@icloud.com")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Allen Fair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: This gem provides a ruby language library for working with and validating