email_address 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f54dab3992bf4e19436dd4771c376b5c4a770b263b6e91704bb8f4b4aa1c33c6
-  data.tar.gz: 64f8de302e904131bcc25be93674d8e976e6f7ee37d6f75b3c4fcaf362054256
+  metadata.gz: 3825a1fafdf4659a5bc444b2bea01e83d4a52a0ae3faf57042c2cf83cae0d364
+  data.tar.gz: e9c2f046f52648f7f7f2e0326457f1aaa11f36e075e87d40818a34de7a84f2f3
 SHA512:
-  metadata.gz: e5f284c688160493c8d30170007b797179ed18c38132e3d9d96d7d1afb390f996ac4f4d68dd3d473706c9a7a8be19cbaa2de2cf64b603032408cc7f3a1d60253
-  data.tar.gz: e78d1280da5668f07bd101f6f83df0e48c8f07a93bfdfe23b8a837632b5c62c57f2e19e309999c3b05c39f9c05a387394efd32bfc6f3ac2cdb28f49d0d4d0cad
+  metadata.gz: 39f199aab0bd33b42a57841df03a033142217aa5a39fe0652b779c4522509d450660178fc51eee23bc3111905a967475ac3625718d020d275ef9d697b672fe79
+  data.tar.gz: e3ee79489ea98a0b6c11a3b438e84087833ce9782f16bf3865d7169514cd9a939f383a17e6ef2b695273351cbd427de2f36332d0d63e693c99c6f3fa7173430b

data/email_address.gemspec

@@ -19,17 +19,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest",     "~> 5.8.3"
+  spec.add_development_dependency "minitest",     "~> 5.11"
   spec.add_development_dependency "bundler",      "~> 1.3"
   if RUBY_PLATFORM == 'java'
     spec.add_development_dependency "activerecord", "=  4.2.5"
     spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", '=1.3.19'
   else
-    spec.add_development_dependency "activerecord", "~> 5.1.3"
+    spec.add_development_dependency "activerecord", "~> 5.2.0.rc2"
     spec.add_development_dependency "sqlite3"
   end
   spec.add_development_dependency "codeclimate-test-reporter"
 
   spec.add_dependency "simpleidn"
-  spec.add_dependency "netaddr", "~> 1.5.1"
+  spec.add_dependency "netaddr", "~> 2.0"
 end

data/lib/email_address/exchanger.rb

@@ -92,14 +92,22 @@ module EmailAddress
 
     # Given a cidr (ip/bits) and ip address, returns true on match. Caches cidr object.
     def in_cidr?(cidr)
-      c = NetAddr::CIDR.create(cidr)
       if cidr.include?(":")
-        mx_ips.find { |ip| ip.include?(":") && c.matches?(ip) } ? true : false
+        c = NetAddr::IPv6Net.parse(cidr)
+        return true if mx_ips.find do |ip|
+          next unless ip.include?(":")
+          rel = c.rel NetAddr::IPv6Net.parse(ip)
+          !rel.nil? && rel >= 0
+        end
       elsif cidr.include?(".")
-        mx_ips.find { |ip| !ip.include?(":") && c.matches?(ip) } ? true : false
-      else
-        false
+        c = NetAddr::IPv4Net.parse(cidr)
+        return true if mx_ips.find do |ip|
+          next if ip.include?(":")
+          rel = c.rel NetAddr::IPv4Net.parse(ip)
+          !rel.nil? && rel >= 0
+        end
       end
+      false
     end
   end
 end

data/lib/email_address/host.rb

@@ -455,11 +455,17 @@ module EmailAddress
 
     def localhost?
       if self.ip_address
-        if self.ip_address.include?(":")
-          return NetAddr::CIDR.create("::1").matches?(self.ip_address)
-        else
-          return NetAddr::CIDR.create("127.0.0.0/8").matches?(self.ip_address)
-        end
+        rel =
+          if self.ip_address.include?(":")
+            NetAddr::IPv6Net.parse("::1").rel(
+              NetAddr::IPv6Net.parse(self.ip_address)
+            )
+          else
+            NetAddr::IPv4Net.parse("127.0.0.0/8").rel(
+              NetAddr::IPv4Net.parse(self.ip_address)
+            )
+          end
+        !rel.nil? && rel >= 0
       else
         self.host_name == 'localhost'
       end

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/test/email_address/test_address.rb

@@ -80,14 +80,14 @@ class TestAddress < Minitest::Test
     assert_equal EmailAddress.error("user1"), :domain_invalid
     assert_equal EmailAddress.error("user1", host_local:true), :domain_does_not_accept_email
     assert_equal EmailAddress.error("user1@localhost", host_local:true), :domain_does_not_accept_email
-    assert_equal EmailAddress.error("user2@localhost", host_local:true, dns_lookup: :off, host_validation: :syntax), nil
+    assert_nil EmailAddress.error("user2@localhost", host_local:true, dns_lookup: :off, host_validation: :syntax)
   end
 
   def test_regexen
     assert "First.Last+TAG@example.com".match(EmailAddress::Address::CONVENTIONAL_REGEX)
     assert "First.Last+TAG@example.com".match(EmailAddress::Address::STANDARD_REGEX)
-    assert_equal nil, "First.Last+TAGexample.com".match(EmailAddress::Address::STANDARD_REGEX)
-    assert_equal nil, "First#Last+TAGexample.com".match(EmailAddress::Address::CONVENTIONAL_REGEX)
+    assert_nil "First.Last+TAGexample.com".match(EmailAddress::Address::STANDARD_REGEX)
+    assert_nil "First#Last+TAGexample.com".match(EmailAddress::Address::CONVENTIONAL_REGEX)
     assert "aasdf-34-.z@example.com".match(EmailAddress::Address::RELAXED_REGEX)
   end
 

data/test/email_address/test_config.rb

@@ -18,11 +18,11 @@ class TestConfig < MiniTest::Test
   end
 
   def test_provider
-    assert_equal nil, EmailAddress::Config.provider(:github)
+    assert_nil EmailAddress::Config.provider(:github)
     EmailAddress::Config.provider(:github, host_match: %w(github.com), local_format: :standard)
     assert_equal :standard, EmailAddress::Config.provider(:github)[:local_format]
     assert_equal :github, EmailAddress::Host.new("github.com").provider
     EmailAddress::Config.providers.delete(:github)
-    assert_equal nil, EmailAddress::Config.provider(:github)
+    assert_nil EmailAddress::Config.provider(:github)
   end
 end

data/test/email_address/test_host.rb

@@ -113,10 +113,10 @@ class TestHost < MiniTest::Test
   end
 
   def test_errors
-    assert_equal EmailAddress::Host.new("yahoo.com").error, nil
+    assert_nil EmailAddress::Host.new("yahoo.com").error
     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", host_validation: :syntax).error, nil
+    assert_nil EmailAddress::Host.new("ajsdfhajshdfklasjhd.wtf", host_validation: :syntax).error
     assert_equal EmailAddress::Host.new("ya  hoo.com", host_validation: :syntax).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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Allen Fair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.3
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.3
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.2.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '2.0'
 description: The EmailAddress Gem to work with and validate email addresses.
 email:
 - allen.fair@gmail.com