email_address 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a59891931ddfd551f8ead37a376795d22e70eb
-  data.tar.gz: 8b71384418e8b1a4eb505faa5e95e021f0b30b7d
+  metadata.gz: 57afc3d96aad109de1df3904de39a5abe068363f
+  data.tar.gz: 968572e1c29c8c0f71b14a8e449da7314e83c3c6
 SHA512:
-  metadata.gz: 62af3189a51354059a4d05e03c294e12a3e76839bb4cafd0697231fae638cbe5959324034cbdeea4d83f8a10303e6f7e6bad4c7aa0d2bd90bd7ef3bbafc0c930
-  data.tar.gz: 34d7af8021c044f4cc4e1e00c4d2aa0e0066881178f7300c6322ccad52dd7787448b0929efb1148cfc582e6b073d9ae318fe515937bab9085a94e6ddfa98ab3b
+  metadata.gz: 0c0381813f1572a9071db541f353dc135b807359f1dc217d7f6e87096079c61074763697955f849dc6b1cf3d0b279744172a0d41a78c15408123431085921ed8
+  data.tar.gz: ec0f98df2a8b9a177ff3514f752d49bef6f7160c751d75325de58e4429b74062a2205df1a477ac3ef5d37974bf5fe2744138511dbc1f91a64d930ba946cf9d95

data/lib/email_address/address.rb

@@ -29,7 +29,7 @@ module EmailAddress
       end
       @host         = EmailAddress::Host.new(host, config)
       @config       = @host.config
-      @local        = EmailAddress::Local.new(local, @config)
+      @local        = EmailAddress::Local.new(local, @config, @host)
     end
 
     ############################################################################

data/lib/email_address/config.rb

@@ -119,13 +119,14 @@ module EmailAddress
       },
       google: {
         host_match:       %w(gmail.com googlemail.com),
-        exchanger_match:  %w(google.com),
+        exchanger_match:  %w(google.com googlemail.com),
         local_size:       5..64,
+        local_private_size: 1..64, # When hostname not in host_match (private label)
         mailbox_canonical: ->(m) {m.gsub('.','')},
       },
       msn: {
         host_match:       %w(msn. hotmail. outlook. live.),
-        mailbox_validator: ->(m,t) { m =~ /\A[a-z0-9][\.\-a-z0-9]{5,29}\z/i},
+        mailbox_validator: ->(m,t) { m =~ /\A[a-z][\-\w]*(?:\.[\-\w]+)*\z/i},
       },
       yahoo: {
         host_match:       %w(yahoo. ymail. rocketmail.),

data/lib/email_address/host.rb

@@ -169,6 +169,14 @@ module EmailAddress
       end
     end
 
+    # True if host is hosted at the provider, not a public provider host name
+    def hosted_service?
+      return false unless registration_name
+      find_provider
+      return false unless config[:host_match]
+      ! matches?(config[:host_match])
+    end
+
     def find_provider # :nodoc:
       return self.provider if self.provider
 

data/lib/email_address/local.rb

@@ -98,9 +98,10 @@ module EmailAddress
 
     REDACTED_REGEX = /\A \{ [0-9a-f]{40} \} \z/x # {sha1}
 
-    def initialize(local, config={})
+    def initialize(local, config={}, host=nil)
       self.config   = config.empty? ? EmailAddress::Config.all_settings : config
       self.local    = local
+      @host         = host
     end
 
     def local=(raw)
@@ -299,7 +300,13 @@ module EmailAddress
     end
 
     def valid_size?
-      return false if @config[:local_size] && !@config[:local_size].include?(self.local.size)
+      if @host && @host.hosted_service?
+        return false if @config[:local_private_size] &&
+                      !@config[:local_private_size].include?(self.local.size)
+      else
+        return false if @config[:local_size] &&
+                       !@config[:local_size].include?(self.local.size)
+      end
       return false if @config[:mailbox_size] && !@config[:mailbox_size].include?(self.mailbox.size)
       return false if self.local.size > STANDARD_MAX_SIZE
       true

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/email_address/test_address.rb

@@ -85,4 +85,11 @@ class TestAddress < Minitest::Test
     assert "aasdf-34-.z@example.com".match(EmailAddress::Address::RELAXED_REGEX)
   end
 
+  # Quick Regression tests for addresses that should have been valid (but fixed)
+  def test_issues
+    assert true, EmailAddress.valid?('test@jiff.com', dns_lookup: :mx) # #7
+    assert true, EmailAddress.valid?("w.-asdf-_@hotmail.com") # #8
+    assert true, EmailAddress.valid?("first_last@hotmail.com") # #8
+  end
+
 end

data/test/email_address/test_host.rb

@@ -10,9 +10,9 @@ class TestHost < MiniTest::Test
     assert_equal "example", a.registration_name
     assert_equal "com", a.tld
     assert_equal "ex*****", a.munge
-    assert_equal 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?
@@ -94,6 +94,11 @@ class TestHost < MiniTest::Test
     assert "xn--5ca.com".match EmailAddress::Host::CANONICAL_HOST_REGEX
     assert "[127.0.0.1]".match EmailAddress::Host::STANDARD_HOST_REGEX
     assert "[IPv6:2001:dead::1]".match EmailAddress::Host::STANDARD_HOST_REGEX
-    assert_equal nil, "[256.0.0.1]".match(EmailAddress::Host::STANDARD_HOST_REGEX)
+    assert_nil "[256.0.0.1]".match(EmailAddress::Host::STANDARD_HOST_REGEX)
+  end
+
+  def test_hosted_service
+    assert EmailAddress.valid?('test@jiff.com', dns_lookup: :mx)
+    assert ! EmailAddress.valid?('test@gmail.com', dns_lookup: :mx)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Allen Fair
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This gem provides a ruby language library for working with and validating