email_address 0.1.13 → 0.1.18

data/lib/email_address/local.rb

@@ -107,7 +107,7 @@ module EmailAddress
       %r/^([\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+)$/i.freeze
 
     def initialize(local, config={}, host=nil)
-      self.config   = config.empty? ? EmailAddress::Config.all_settings : config
+      @config = config.is_a?(Hash) ? Config.new(config) : config
       self.local    = local
       @host         = host
       @error        = @error_message = nil
@@ -130,10 +130,10 @@ module EmailAddress
     def parse(raw)
       if raw =~ /\A\"(.*)\"\z/ # Quoted
         raw = $1
-        raw.gsub!(/\\(.)/, '\1') # Unescape
+        raw = raw.gsub(/\\(.)/, '\1') # Unescape
       elsif @config[:local_fix] && @config[:local_format] != :standard
-        raw.gsub!(' ','')
-        raw.gsub!(',','.')
+        raw = raw.gsub(' ','')
+        raw = raw.gsub(',','.')
         #raw.gsub!(/([^\p{L}\p{N}]{2,10})/) {|s| s[0] } # Stutter punctuation typo
       end
       raw, comment = self.parse_comment(raw)
@@ -226,7 +226,7 @@ module EmailAddress
     def relax
       form = self.mailbox
       form += @config[:tag_separator] + self.tag if self.tag
-      form.gsub!(/[ \"\(\),:<>@\[\]\\]/,'')
+      form = form.gsub(/[ \"\(\),:<>@\[\]\\]/,'')
       form
     end
 
@@ -235,7 +235,7 @@ module EmailAddress
       form = self.mailbox
       form += @config[:tag_separator] + self.tag if self.tag
       form += "(" + self.comment + ")" if self.comment
-      form.gsub!(/([\\\"])/, '\\\1') # Escape \ and "
+      form = form.gsub(/([\\\"])/, '\\\1') # Escape \ and "
       if form =~ /[ \"\(\),:<>@\[\\\]]/ # Space and "(),:;<>@[\]
         form = %Q("#{form}")
       end
@@ -388,7 +388,7 @@ module EmailAddress
     def set_error(err, reason=nil)
       @error = err
       @reason= reason
-      @error_message = EmailAddress::Config.error_message(err)
+      @error_message = Config.error_message(err)
       false
     end
 

data/lib/email_address/version.rb

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

data/test/email_address/test_address.rb

@@ -37,6 +37,11 @@ class TestAddress < Minitest::Test
     assert_equal "6bdd00c53645790ad9bbcb50caa93880",  EmailAddress.reference("Gmail.User+tag@gmail.com")
   end
 
+  def test_google_hosted
+    a = EmailAddress.new("Ex.am.ple+tag@boomer.com")
+    assert_equal a.canonical, "ex.am.ple@boomer.com"
+  end
+
   # COMPARISON & MATCHING
   def test_compare
     a = ("User+tag@example.com")

data/test/email_address/test_host.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-require_relative '../test_helper'
-
+require_relative "../test_helper"
 
 class TestHost < MiniTest::Test
   def test_host
@@ -10,16 +8,16 @@ class TestHost < MiniTest::Test
     assert_equal "example", a.registration_name
     assert_equal "com", a.tld
     assert_equal "ex*****", a.munge
-    assert_nil   a.subdomains
+    assert_nil a.subdomains
   end
 
   def test_dns_enabled
     a = EmailAddress::Host.new("example.com")
     assert_instance_of TrueClass, a.dns_enabled?
-    old_setting = EmailAddress::Config.setting(:host_validation)
-    EmailAddress::Config.configure(host_validation: :off)
+    a = EmailAddress::Host.new("example.com", host_validation: :syntax)
+    assert_instance_of FalseClass, a.dns_enabled?
+    a = EmailAddress::Host.new("example.com", dns_lookup: :off)
     assert_instance_of FalseClass, a.dns_enabled?
-    EmailAddress::Config.configure(host_validation: old_setting)
   end
 
   def test_foreign_host
@@ -53,54 +51,54 @@ class TestHost < MiniTest::Test
 
   def test_dmarc
     d = EmailAddress::Host.new("yahoo.com").dmarc
-    assert_equal 'reject', d[:p]
+    assert_equal "reject", d[:p]
     d = EmailAddress::Host.new("example.com").dmarc
     assert_equal true, d.empty?
   end
 
   def test_ipv4
-    h = EmailAddress::Host.new("[127.0.0.1]", host_allow_ip:true, host_local:true)
+    h = EmailAddress::Host.new("[127.0.0.1]", host_allow_ip: true, host_local: true)
     assert_equal "127.0.0.1", h.ip_address
     assert_equal true, h.valid?
   end
 
   def test_ipv6
-    h = EmailAddress::Host.new("[IPv6:::1]", host_allow_ip:true, host_local:true)
+    h = EmailAddress::Host.new("[IPv6:::1]", host_allow_ip: true, host_local: true)
     assert_equal "::1", h.ip_address
     assert_equal true, h.valid?
   end
 
   def test_comment
     h = EmailAddress::Host.new("(oops)gmail.com")
-    assert_equal 'gmail.com', h.to_s
-    assert_equal 'oops', h.comment
+    assert_equal "gmail.com", h.to_s
+    assert_equal "oops", h.comment
     h = EmailAddress::Host.new("gmail.com(oops)")
-    assert_equal 'gmail.com', h.to_s
-    assert_equal 'oops', h.comment
+    assert_equal "gmail.com", h.to_s
+    assert_equal "oops", h.comment
   end
 
   def test_matches
     h = EmailAddress::Host.new("yahoo.co.jp")
     assert_equal false, h.matches?("gmail.com")
-    assert_equal 'yahoo.co.jp', h.matches?("yahoo.co.jp")
-    assert_equal '.co.jp', h.matches?(".co.jp")
-    assert_equal '.jp', h.matches?(".jp")
-    assert_equal 'yahoo.', h.matches?("yahoo.")
-    assert_equal 'yah*.jp', h.matches?("yah*.jp")
+    assert_equal "yahoo.co.jp", h.matches?("yahoo.co.jp")
+    assert_equal ".co.jp", h.matches?(".co.jp")
+    assert_equal ".jp", h.matches?(".jp")
+    assert_equal "yahoo.", h.matches?("yahoo.")
+    assert_equal "yah*.jp", h.matches?("yah*.jp")
   end
 
   def test_ipv4_matches
-    h = EmailAddress::Host.new("[123.123.123.8]", host_allow_ip:true)
+    h = EmailAddress::Host.new("[123.123.123.8]", host_allow_ip: true)
     assert_equal "123.123.123.8", h.ip_address
     assert_equal false, h.matches?("127.0.0.0/8")
-    assert_equal '123.123.123.0/24', h.matches?("123.123.123.0/24")
+    assert_equal "123.123.123.0/24", h.matches?("123.123.123.0/24")
   end
 
   def test_ipv6_matches
-    h = EmailAddress::Host.new("[IPV6:2001:db8::1]", host_allow_ip:true)
+    h = EmailAddress::Host.new("[IPV6:2001:db8::1]", host_allow_ip: true)
     assert_equal "2001:db8::1", h.ip_address
     assert_equal false, h.matches?("2002:db8::/118")
-    assert_equal '2001:db8::/118', h.matches?("2001:db8::/118")
+    assert_equal "2001:db8::/118", h.matches?("2001:db8::/118")
   end
 
   def test_regexen
@@ -112,18 +110,18 @@ class TestHost < MiniTest::Test
   end
 
   def test_hosted_service
-    assert EmailAddress.valid?('test@jiff.com', dns_lookup: :mx)
-    assert ! EmailAddress.valid?('test@gmail.com', dns_lookup: :mx)
+    assert EmailAddress.valid?("test@jiff.com", dns_lookup: :mx)
+    assert !EmailAddress.valid?("test@gmail.com", dns_lookup: :mx)
   end
 
   def test_yahoo_bad_tld
-    assert ! EmailAddress.valid?('test@yahoo.badtld')
-    assert ! EmailAddress.valid?('test@yahoo.wtf') # Registered, but MX IP = 0.0.0.0
+    assert !EmailAddress.valid?("test@yahoo.badtld")
+    assert !EmailAddress.valid?("test@yahoo.wtf") # Registered, but MX IP = 0.0.0.0
   end
 
   def test_bad_formats
-    assert ! EmailAddress::Host.new('ya  hoo.com').valid?
-    assert EmailAddress::Host.new('ya  hoo.com', host_remove_spaces:true).valid?
+    assert !EmailAddress::Host.new("ya  hoo.com").valid?
+    assert EmailAddress::Host.new("ya  hoo.com", host_remove_spaces: true).valid?
   end
 
   def test_errors
@@ -133,7 +131,7 @@ class TestHost < MiniTest::Test
     assert_nil EmailAddress::Host.new("ajsdfhajshdfklasjhd.wtf", host_validation: :syntax).error
     assert_equal EmailAddress::Host.new("ya  hoo.com", host_validation: :syntax).error, "Invalid Domain Name"
     assert_equal EmailAddress::Host.new("[127.0.0.1]").error, "IP Addresses are not allowed"
-    assert_equal EmailAddress::Host.new("[127.0.0.666]", host_allow_ip:true).error, "This is not a valid IPv4 address"
-    assert_equal EmailAddress::Host.new("[IPv6::12t]", host_allow_ip:true).error, "This is not a valid IPv6 address"
+    assert_equal EmailAddress::Host.new("[127.0.0.666]", host_allow_ip: true).error, "This is not a valid IPv4 address"
+    assert_equal EmailAddress::Host.new("[IPv6::12t]", host_allow_ip: true).error, "This is not a valid IPv6 address"
   end
 end

data/test/test_aliasing.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+require_relative 'test_helper'
+
+class TestAliasing < MiniTest::Test
+  def setup
+    Object.send(:const_set, :EmailAddressValidator, EmailAddress)
+    Object.send(:remove_const, :EmailAddress)
+  end
+
+  def test_email_address_not_defined
+    assert_nil defined?(EmailAddress)
+    assert_nil defined?(EmailAddress::Address)
+    assert_nil defined?(EmailAddress::Config)
+    assert_nil defined?(EmailAddress::Exchanger)
+    assert_nil defined?(EmailAddress::Host)
+    assert_nil defined?(EmailAddress::Local)
+    assert_nil defined?(EmailAddress::Rewriter)
+  end
+
+  def test_alias_defined
+    assert_equal defined?(EmailAddressValidator), "constant"
+    assert_equal defined?(EmailAddressValidator::Address), "constant"
+    assert_equal defined?(EmailAddressValidator::Config), "constant"
+    assert_equal defined?(EmailAddressValidator::Exchanger), "constant"
+    assert_equal defined?(EmailAddressValidator::Host), "constant"
+    assert_equal defined?(EmailAddressValidator::Local), "constant"
+    assert_equal defined?(EmailAddressValidator::Rewriter), "constant"
+  end
+
+  def test_alias_class_methods
+    assert_equal true, EmailAddressValidator.valid?("user@yahoo.com")
+  end
+
+  def test_alias_host_methods
+    assert_equal true, EmailAddressValidator::Host.new("yahoo.com").valid?
+  end
+
+  def test_alias_address_methods
+    assert_equal true, EmailAddressValidator::Address.new("user@yahoo.com").valid?
+  end
+
+  def test_alias_config_methods
+    assert Hash, EmailAddressValidator::Config.new.to_h
+  end
+
+  def test_alias_local_methods
+    assert_equal true, EmailAddressValidator::Local.new("user").valid?
+  end
+
+  def teardown
+    Object.send(:const_set, :EmailAddress, EmailAddressValidator)
+    Object.send(:remove_const, :EmailAddressValidator)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.18
 platform: ruby
 authors:
 - Allen Fair
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,13 +162,14 @@ files:
 - 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
 homepage: https://github.com/afair/email_address
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,8 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 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
@@ -199,5 +200,6 @@ test_files:
 - 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