ruby_email 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26ff472ba47c45cd8b0edc4e84b38b1391f0b6d8
-  data.tar.gz: 457c89bbfcefc1172696d851372db8c41a67915a
+  metadata.gz: 6ddad11ccb4144bd5bad65ca9bc92e8f790fdfd9
+  data.tar.gz: 3f82921b53c852986b0b1a033531e8beee214791
 SHA512:
-  metadata.gz: 77b1b6a68386a934aea133a161b6d2c4c073f4453467ab6f6f20375b8791f55e9e57c2c7096f14ba4c807e3ff5eed6cda6cf3f33c20f7188b3bf017e2c554cc4
-  data.tar.gz: 86d90bc23842e99a51215d8aa05d7462ee4695435d3535cced0b6fc9e8a9a59b4663b6729e17e1e4245cd04c04ed1d34a5bd99e3cf9a6d5a9640f2211187aa16
+  metadata.gz: cdc8fcd386b82b5c4b4ff997d6b7b8ba36109cf07eebb7fa9f812b71fd867e87ab90d9fa1301219804d264a092325c53f94ddb6d55f394c5dc70d39f3f0d5eed
+  data.tar.gz: a1c16a694d68f27b8955554b681279c7bf4bb9e375a08e7b9e5d4cc957d16bfcf351f43cae31c87ffe82818597ceeb9935b492c960b05c001f594d51e9fed64c

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.2.2
+  * Fix Rfc1123 regexp bug
+
 v0.2.1
   * Add certificates to the .gem archites too
 

data/README.md

@@ -28,14 +28,14 @@ gem 'ruby_email'
 require 'ruby_email'
 
 # Pure Rfc5322
-RubyEmail::Rfc322.validates? "toto@tata" # => true
-RubyEmail::Rfc322.match "toto@tata" # => #<MatchData "toto@tata" local:"toto" domain:"tata">
-RubyEmail::Rfc322.validates? "toto" # => false
-RubyEmail::Rfc322.match "toto" # => nil
+RubyEmail::Rfc5322.validates? "toto@tata" # => true
+RubyEmail::Rfc5322.match "toto@tata" # => #<MatchData "toto@tata" local:"toto" domain:"tata">
+RubyEmail::Rfc5322.validates? "toto" # => false
+RubyEmail::Rfc5322.match "toto" # => nil
 
 # Rfc5322 + Internet basic usage
-RubyEmail::Rfc322::Public.validates? "toto@tata.com" # => true
-RubyEmail::Rfc322::Public.match "toto@tata.com" # => #<MatchData "toto@tata" local:"toto" domain:"tata.com">
+RubyEmail::Rfc5322::Public.validates? "toto@tata.com" # => true
+RubyEmail::Rfc5322::Public.match "toto@tata.com" # => #<MatchData "toto@tata" local:"toto" domain:"tata.com">
 
 # Rfc5322 Strings
 require 'ruby_email/rfc5322/string'
@@ -54,8 +54,8 @@ require 'ruby_email/rfc5322/public/string'
 
 ```ruby
 class Model < ActiveRecord::Base
-  # validates :email, format: RubyEmail::Rfc322::REGEXP # valid on an intranet ...
-  validates :email, format: RubyEmail::Rfc322::Public::REGEXP
+  # validates :email, format: RubyEmail::Rfc5322::REGEXP # valid on an intranet ...
+  validates :email, format: RubyEmail::Rfc5322::Public::REGEXP
 end
 ```
 

data/lib/ruby_email/rfc1123.rb

@@ -19,10 +19,10 @@ module RubyEmail
     # a valid string with subdomains, separated by dots for domain part as IPV4
     IPV4 = '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
     # a valid string with subdomains, separated by dots for domain part as Domain Name
-    DOT_ATOM_TEXT = "(?=.{1,253})((#{ATOM_ALL}\\.)*#{ATOM_FIRST})"
+    DOT_ATOM_TEXT = "((#{ATOM_ALL}\\.)*#{ATOM_FIRST})"
 
     # email grammar
-    VALIDE = "(?<domain>((#{DOT_ATOM_TEXT})|(#{IPV4})))"
+    VALIDE = "(?<domain>(?!.{254,})((#{DOT_ATOM_TEXT})|(#{IPV4})))"
 
     # regexp to validate complete email
     REGEXP = Regexp.new "\\A#{VALIDE}\\Z"
@@ -34,6 +34,7 @@ module RubyEmail
         RubyEmail::Rfc1123.validates? self
       end
     end
+
   end
 
 end

data/lib/ruby_email/rfc5322.rb

@@ -31,6 +31,7 @@ module RubyEmail
         RubyEmail::Rfc5322.validates? self
       end
     end
+
   end
 
 end

data/test/rfc1123.rb

@@ -21,6 +21,10 @@ class TestRubyEmailRfc1123 < Test::Unit::TestCase
     assert RubyEmail::Rfc1123.validates?("1.toto")
     assert RubyEmail::Rfc1123.validates?("127.0.0.1")
     assert RubyEmail::Rfc1123.validates?("255.254.251.0")
+    assert RubyEmail::Rfc1123.validates?("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+    assert RubyEmail::Rfc1123.validates?("a" * 63)
+    assert RubyEmail::Rfc1123.validates?("a" * 63 + ".a")
+    assert RubyEmail::Rfc1123.validates?("aaa" + ".a"*125)
   end
 
   def test_plus_false
@@ -41,6 +45,8 @@ class TestRubyEmailRfc1123 < Test::Unit::TestCase
     assert !RubyEmail::Rfc1123.validates?("111")
     assert !RubyEmail::Rfc1123.validates?("a.1")
     assert !RubyEmail::Rfc1123.validates?("1.1")
+    assert !RubyEmail::Rfc1123.validates?("a" * 64)
+    assert !RubyEmail::Rfc1123.validates?("aaaa" + ".a"*125)
   end
 
   def test_match
@@ -65,20 +71,3 @@ class TestRubyEmailRfc1123 < Test::Unit::TestCase
   end
 
 end
-
-class TestRubyEmailRfc1123Public < Test::Unit::TestCase
-  def test_simpe
-    assert RubyEmail::Rfc1123::Public.validates?("toto.toto")
-    assert RubyEmail::Rfc1123::Public.validates?("toto.toto.toto")
-    assert RubyEmail::Rfc1123::Public.validates?("toto.toto.toto.toto")
-    assert !RubyEmail::Rfc1123::Public.validates?("toto")
-    assert RubyEmail::Rfc1123::Public.match("toto.toto")
-  end
-
-  def test_string
-    assert_raise { "toto.toto".is_public_domain? }
-    require_relative '../lib/ruby_email/rfc1123/public/string'
-    assert "toto.toto".is_public_domain?
-    assert !"toto".is_public_domain?
-  end
-end

data/test/rfc5322.rb

@@ -60,20 +60,3 @@ class TestRubyEmailRfc5322 < Test::Unit::TestCase
   end
 
 end
-
-class TestRubyEmailRfc5322Public < Test::Unit::TestCase
-  def test_simpe
-    assert RubyEmail::Rfc5322::Public.validates?("toto@toto.toto")
-    assert RubyEmail::Rfc5322::Public.validates?("toto@toto.toto.toto")
-    assert RubyEmail::Rfc5322::Public.validates?("toto@toto.toto.toto.toto")
-    assert !RubyEmail::Rfc5322::Public.validates?("toto@toto")
-    assert RubyEmail::Rfc5322::Public.match("toto@toto.toto")
-  end
-
-  def test_string
-    assert_raise { "toto@toto.toto".is_public_email? }
-    require_relative '../lib/ruby_email/rfc5322/public/string'
-    assert "toto@toto.toto".is_public_email?
-    assert !"toto@toto".is_public_email?
-  end
-end

data/test/unit_test.rb

@@ -4,5 +4,7 @@ require "test/unit"
 
 require_relative '../lib/ruby_email'
 
-require_relative 'rfc5322'
 require_relative 'rfc1123'
+require_relative 'rfc1123_public'
+require_relative 'rfc5322'
+require_relative 'rfc5322_public'

data/version

@@ -1 +1 @@
-0.2.1
+0.2.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_email
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nephos (poulet_a)
@@ -31,7 +31,7 @@ cert_chain:
   tcYkgfqUJPitIJx1RvWZpIyH5uJhRUYK3+vU9nMOxez5WbIlC1TtpByKAPMX+sht
   gib3AoIT8jh/2w==
   -----END CERTIFICATE-----
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nomorebeer