email_address 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5129f7fbc9c34749550a07cf447c0ae0ec1fadf711af9aa2f1dc193c0e1c5322
-  data.tar.gz: 5fb49593e6ad95576d400d9f4d3918fa2949b52a44540454c5016ccce00ca695
+  metadata.gz: 24b689ac0a16f073c42a43b3f6e49c42e472c1fbef31290fa4c41f26389f3f51
+  data.tar.gz: 7ba8fb68fa0e71a9821d08c8bb5e40ecd5acc625acebc707b4beb4f25240d628
 SHA512:
-  metadata.gz: cd741fa47ed63923c1cb83bce7139efe5469282d24c57bc987eda9e4686d89ac8aaa650b815324005cb792342395002c29648c0439ad5d4341bb0ae80fb58352
-  data.tar.gz: '0194608171e7fd2dcc68c1fb827ce12051a7cfc9e42d47cef6935503b0a6ae5f257b36e30bd977201b60193bfffa0a55bf7a11a039c8c9c5f90395cb9225cc59'
+  metadata.gz: 4514eb116e370d6e3b4bf9ae006178dae86884228ff66053a0ecd8834943d6ab4a3dc8d6ef658c2c080090a1cb28343e3c3eeb1531bc4a3cedb532ac09dee470
+  data.tar.gz: 146e6a106d2f3c3f6c73661b28b4371078d2a529b05fc09d2078aea64f3ce25ff036b91364f244c12fe037ac62ad02f1dbbbeed1d378dfd87a74624714d91d5b

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - ruby-head
   - 2.3.7
-  - jruby-9.0.4.0
+  - jruby-9.2.9.0
   #- rbx
 
 addons:

data/README.md

@@ -429,11 +429,14 @@ matches against the Mail Exchanger (SMTP receivers) hosts defined in
 DNS. If you specify an exchanger pattern, but requires a DNS MX lookup.
 
 For Rails application, create an initializer file with your default
-configuration options:
+configuration options.
+EmailAddress::Config.setting takes a single setting name and value,
+while EmailAddress::Config.configure takes a hash of multiple settings.
 
 ```ruby
 # ./config/initializers/email_address.rb
-EmailAddress::Config.setting( local_format: :relaxed )
+EmailAddress::Config.setting( :local_format, :relaxed )
+EmailAddress::Config.configure( local_format: :relaxed, ... )
 EmailAddress::Config.provider(:github,
        host_match: %w(github.com), local_format: :standard)
 ```

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 
-require "bundler/gem_tasks"
 require "bundler/setup"
 require 'rake/testtask'
 

data/email_address.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest",     "~> 5.11"
-  spec.add_development_dependency "bundler",      "~> 1.16.0"
+  spec.add_development_dependency "bundler" #,      "~> 1.16.0"
   if RUBY_PLATFORM == 'java'
     spec.add_development_dependency "activerecord", "=  4.2.10"
     spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", '~> 1.3.24'
@@ -28,8 +28,9 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "activerecord", "~> 5.2.0"
     spec.add_development_dependency "sqlite3"
   end
-  spec.add_development_dependency "codeclimate-test-reporter"
+  #spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "simplecov"
 
   spec.add_dependency "simpleidn"
-  spec.add_dependency "netaddr", "~> 2.0"
+  spec.add_dependency "netaddr", '>= 2.0.4', '< 3'
 end

data/lib/email_address/host.rb

@@ -288,7 +288,7 @@ module EmailAddress
 
     # Does "example." match any tld?
     def registration_name_matches?(rule)
-      self.registration_name + '.' == rule ? true : false
+      "#{self.registration_name}." == rule ? true : false
     end
 
     # Does "sub.example.com" match ".com" and ".example.com" top level names?
@@ -305,8 +305,8 @@ module EmailAddress
     # Requires optionally starts with a "@".
     def domain_matches?(rule)
       rule = $1 if rule =~ /\A@(.+)/
-      return rule if File.fnmatch?(rule, self.domain_name)
-      return rule if File.fnmatch?(rule, self.dns_name)
+      return rule if File.fnmatch?(rule, self.domain_name) if self.domain_name
+      return rule if File.fnmatch?(rule, self.dns_name) if self.dns_name
       false
     end
 
@@ -315,12 +315,10 @@ module EmailAddress
     def ip_matches?(cidr)
       return false unless self.ip_address
       return cidr if !cidr.include?("/") && cidr == self.ip_address
-
-      c = NetAddr::CIDR.create(cidr)
       if cidr.include?(":") && self.ip_address.include?(":")
-        return cidr if c.matches?(self.ip_address)
+        return cidr if NetAddr::IPv6Net.parse(cidr).contains(NetAddr::IPv6.parse(self.ip_address))
       elsif cidr.include?(".") && self.ip_address.include?(".")
-        return cidr if c.matches?(self.ip_address)
+        return cidr if NetAddr::IPv4Net.parse(cidr).contains(NetAddr::IPv4.parse(self.ip_address))
       end
       false
     end

data/lib/email_address/local.rb

@@ -82,12 +82,12 @@ module EmailAddress
     STANDARD_MAX_SIZE  = 64
 
     # Conventional : word([.-+'_]word)*
-    CONVENTIONAL_MAILBOX_REGEX  = /\A [\p{L}\p{N}]+ (?: [\.\-\+\'_] [\p{L}\p{N}]+ )* \z/x
-    CONVENTIONAL_MAILBOX_WITHIN = /[\p{L}\p{N}]+ (?: [\.\-\+\'_] [\p{L}\p{N}]+ )*/x
+    CONVENTIONAL_MAILBOX_REGEX  = /\A [\p{L}\p{N}_]+ (?: [\.\-\+\'_] [\p{L}\p{N}_]+ )* \z/x
+    CONVENTIONAL_MAILBOX_WITHIN = /[\p{L}\p{N}_]+ (?: [\.\-\+\'_] [\p{L}\p{N}_]+ )*/x
 
     # Relaxed: same characters, relaxed order
-    RELAXED_MAILBOX_WITHIN = /[\p{L}\p{N}]+ (?: [\.\-\+\'_]+ [\p{L}\p{N}]+ )*/x
-    RELAXED_MAILBOX_REGEX = /\A [\p{L}\p{N}]+ (?: [\.\-\+\'_]+ [\p{L}\p{N}]+ )* \z/x
+    RELAXED_MAILBOX_WITHIN = /[\p{L}\p{N}_]+ (?: [\.\-\+\'_]+ [\p{L}\p{N}_]+ )*/x
+    RELAXED_MAILBOX_REGEX = /\A [\p{L}\p{N}_]+ (?: [\.\-\+\'_]+ [\p{L}\p{N}_]+ )* \z/x
 
     # RFC5322 Token: token."token".token (dot-separated tokens)
     #   Quoted Token can also have: SPACE \" \\ ( ) , : ; < > @ [ \ ] .

data/lib/email_address/version.rb

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

data/test/email_address/test_host.rb

@@ -89,6 +89,20 @@ class TestHost < MiniTest::Test
     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)
+    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")
+  end
+
+  def test_ipv6_matches
+    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")
+  end
+
   def test_regexen
     assert "asdf.com".match EmailAddress::Host::CANONICAL_HOST_REGEX
     assert "xn--5ca.com".match EmailAddress::Host::CANONICAL_HOST_REGEX

data/test/email_address/test_local.rb

@@ -42,7 +42,7 @@ class TestLocal < MiniTest::Test
     assert EmailAddress::Local.new("first..last", local_format: :relaxed).valid?, "relax.."
     assert EmailAddress::Local.new("first.-last", local_format: :relaxed).valid?, "relax.-"
     assert EmailAddress::Local.new("a", local_format: :relaxed).valid?, "relax single"
-    assert ! EmailAddress::Local.new("firstlast_", local_format: :relaxed).valid?, "last_"
+    assert EmailAddress::Local.new("firstlast_", local_format: :relaxed).valid?, "last_"
   end
 
   def test_unicode
@@ -99,4 +99,10 @@ class TestLocal < MiniTest::Test
     assert EmailAddress.valid?("xxxxx+subscriber@gmail.com")
   end
 
+  def test_ending_underscore
+    assert EmailAddress.valid?("name_@icloud.com")
+    assert EmailAddress.valid?("username_@gmail.com")
+    assert EmailAddress.valid?("username_____@gmail.com")
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Allen Fair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,16 +112,22 @@ dependencies:
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
 description: The EmailAddress Gem to work with and validate email addresses.
 email:
 - allen.fair@gmail.com
@@ -177,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: This gem provides a ruby language library for working with and validating