valid_email 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 380a2215e68ccc58972d59859e42e66ac5192e74
-  data.tar.gz: ca2e75012a59423ff84bc3103d6ca2f3441609f4
+  metadata.gz: 42a2f72cc8d27b8f7bfa7cc975a7b06512f6cbac
+  data.tar.gz: 6e6a23102e9b365aa96da9ce632dc8b890f15753
 SHA512:
-  metadata.gz: 07183982261298da84f84214d363ff420c61c6bac3a8f787d449b3184e2ae4ae31b8b3fb2285ac9e5817112cc8dce7d54aadf26389062b17cbb5d30221189916
-  data.tar.gz: dbd5ffaf12d3fab07b3f936abc8f2e060c4046f32340781af03399580b31d0d2bedb613f6ee95f8a9a9f0020ad4402b1609a0777ca6f2648765762815de48f9d
+  metadata.gz: 3918c4f4a86617449a70451e7f914874972dcb7045beead234ddbfac21b69e84e269e21122ba1e2b433bbadc0d362815f6f0e91dbc34eb1c860af7b53164dc10
+  data.tar.gz: 907854ee62fcc7474d225ab1c87b526b1c688c61f58b40c79023bf84e8b61b13a23dd0b692b03df5886affbe7c82e0d18be0241905ef85148bd58d540afdfa97

data/.travis.yml

@@ -1,9 +1,8 @@
+sudo: false
 language: ruby
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1
   - jruby-19mode
-

data/config/valid_email.yml

@@ -469,6 +469,7 @@ disposable_email_services:
   - trashmailer.com
   - trashymail.com
   - trashymail.net
+  - trbvm.com
   - trillianpro.com
   - turual.com
   - twinmail.de
@@ -515,3 +516,4 @@ disposable_email_services:
   - zippymail.info
   - zoaxe.com
   - zoemail.org
+  -

data/lib/valid_email/email_validator.rb

@@ -11,15 +11,15 @@ class EmailValidator < ActiveModel::EachValidator
     # Check if domain has DNS MX record
     if r && options[:mx]
       require 'valid_email/mx_validator'
-      r &&= MxValidator.new(:attributes => attributes).validate(record)
+      r = MxValidator.new(:attributes => attributes).validate(record)
     elsif r && options[:mx_with_fallback]
       require 'valid_email/mx_with_fallback_validator'
-      r &&= MxWithFallbackValidator.new(:attributes => attributes).validate(record)
+      r = MxWithFallbackValidator.new(:attributes => attributes).validate(record)
     end
     # Check if domain is disposable
     if r && options[:ban_disposable_email]
       require 'valid_email/ban_disposable_email_validator'
-      r &&= BanDisposableEmailValidator.new(:attributes => attributes).validate(record)
+      r = BanDisposableEmailValidator.new(:attributes => attributes).validate(record)
     end
     record.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => "valid_email.validations.email")) unless r
   end

data/lib/valid_email/validate_email.rb

@@ -1,51 +1,86 @@
 class ValidateEmail
-  
   class << self
+    SPECIAL_CHARS = %w(( ) , : ; < > @ [ ])
+    SPECIAL_ESCAPED_CHARS = %w(\  \\ ")
+    LOCAL_MAX_LEN = 64
 
     def valid?(value, user_options={})
-      options = { :mx => false, :message => nil }.merge!(user_options)
-      r       = false
-      begin
-        m = Mail::Address.new(value)
-        # We must check that value contains a domain and that value is an email address
-        r = m.domain && m.address == value
-        if r
-          # Check that domain consists of dot-atom-text elements > 1 and does not
-          # contain spaces.
-          #
-          # In mail 2.6.1, domains are invalid per rfc2822 are parsed when they shouldn't
-          # This is to make sure we cover those cases
-          domain_dot_elements = m.domain.split(/\./)
-          r &&= m.domain.match(/^\S+$/) && domain_dot_elements.none?(&:blank?) && domain_dot_elements.size > 1
-
-          # Check if domain has DNS MX record
-          if r && options[:mx]
-            require 'valid_email/mx_validator'
-            r &&= mx_valid?(email)
+      options = { :mx => false, :message => nil }.merge(user_options)
+
+      m = Mail::Address.new(value)
+      # We must check that value contains a domain and that value is an email address
+      return false unless m.domain && m.address == value
+
+      # Check that domain consists of dot-atom-text elements > 1 and does not
+      # contain spaces.
+      #
+      # In mail 2.6.1, domains are invalid per rfc2822 are parsed when they shouldn't
+      # This is to make sure we cover those cases
+
+      return false unless m.domain.match(/^\S+$/)
+
+      domain_dot_elements = m.domain.split(/\./)
+      return false unless domain_dot_elements.size > 1 && domain_dot_elements.all?(&:present?)
+
+      # Ensure that the local segment adheres to adheres to RFC-5322
+      return false unless valid_local?(m.local)
+
+      # Check if domain has DNS MX record
+      if options[:mx]
+        require 'valid_email/mx_validator'
+        return mx_valid?(value)
+      end
+
+      true
+    rescue Mail::Field::ParseError
+      false
+    end
+
+    def valid_local?(local)
+      return false unless local.length <= LOCAL_MAX_LEN
+      # Emails can be validated by segments delineated by '.', referred to as dot atoms.
+      # See http://tools.ietf.org/html/rfc5322#section-3.2.3
+      return local.split('.', -1).all? { |da| valid_dot_atom?(da) }
+    end
+
+    def valid_dot_atom?(dot_atom)
+      # Leading, trailing, and double '.'s aren't allowed
+      return false if dot_atom.empty?
+      # A dot atom can be quoted, which allows use of the SPECIAL_CHARS
+      if dot_atom[0] == '"' || dot_atom[-1] == '"'
+        # A quoted segment must have leading and trailing '"#"'s
+        return false if dot_atom[0] != dot_atom[-1]
+
+        # Excluding the bounding quotes, all of the SPECIAL_ESCAPED_CHARS must have a leading '\'
+        index = dot_atom.length - 2
+        while index > 0
+          if SPECIAL_ESCAPED_CHARS.include? dot_atom[index]
+            return false if index == 1 || dot_atom[index - 1] != '\\'
+            # On an escaped special character, skip an index to ignore the '\' that's doing the escaping
+            index -= 1
           end
+          index -= 1
         end
-      rescue Mail::Field::ParseError
-        r = false
+      else
+        # If we're not in a quoted dot atom then no special characters are allowed.
+        return false unless ((SPECIAL_CHARS | SPECIAL_ESCAPED_CHARS) & dot_atom.split('')).empty?
       end
-      r
+      return true 
     end
 
     def mx_valid?(value, fallback=false)
-      r = false
-      begin
-        m = Mail::Address.new(value)
-        if m.domain
-          mx = []
-          Resolv::DNS.open do |dns|
-            mx.concat dns.getresources(m.domain, Resolv::DNS::Resource::IN::MX)
-            mx.concat dns.getresources(m.domain, Resolv::DNS::Resource::IN::A) if fallback
-          end
-          r = mx.size > 0
-        end
-      rescue Mail::Field::ParseError
-        r = false
+      m = Mail::Address.new(value)
+      return false unless m.domain
+
+      mx = []
+      Resolv::DNS.open do |dns|
+        mx.concat dns.getresources(m.domain, Resolv::DNS::Resource::IN::MX)
+        mx.concat dns.getresources(m.domain, Resolv::DNS::Resource::IN::A) if fallback
       end
-      r
+
+      return mx.any?
+    rescue Mail::Field::ParseError
+      false
     end
 
     def mx_valid_with_fallback?(value)
@@ -53,17 +88,10 @@ class ValidateEmail
     end
 
     def ban_disposable_email?(value)
-      r = false
-      begin
-        m = Mail::Address.new(value)
-        r = !BanDisposableEmailValidator.config.include?(m.domain) if m.domain
-      rescue Mail::Field::ParseError
-        r = false
-      end
-
-      r
+      m = Mail::Address.new(value)
+      m.domain && !BanDisposableEmailValidator.config.include?(m.domain)
+    rescue Mail::Field::ParseError
+      false
     end
-
   end
-
 end

data/lib/valid_email/version.rb

@@ -1 +1 @@
-ValidEmailVersion = "0.0.10"
+ValidEmailVersion = "0.0.11"

data/spec/validate_email_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe ValidateEmail do
+  describe '.valid?' do
+    it 'should return true when passed email has valid format' do
+      ValidateEmail.valid?('user@gmail.com').should be_truthy
+      ValidateEmail.valid?('valid.user@gmail.com').should be_truthy
+    end
+
+    it 'should return false when passed email has invalid format' do
+      ValidateEmail.valid?('user@gmail.com.').should be_falsey
+      ValidateEmail.valid?('user.@gmail.com').should be_falsey
+    end
+
+    context 'when mx: true option passed' do
+      it 'should return true when mx record exist' do
+        ValidateEmail.valid?('user@gmail.com', mx: true).should be_truthy
+      end
+
+      it "should return false when mx record doesn't exist" do
+        ValidateEmail.valid?('user@example.com', mx: true).should be_falsey
+      end
+    end
+  end
+
+  describe '.valid_local?' do
+    it 'should return false if the local segment is too long' do
+      ValidateEmail.valid_local?(
+        'abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde'
+      ).should be_falsey
+    end
+
+    it 'should return false if the local segment has an empty dot atom' do
+      ValidateEmail.valid_local?('.user').should be_falsey
+      ValidateEmail.valid_local?('.user.').should be_falsey
+      ValidateEmail.valid_local?('user.').should be_falsey
+      ValidateEmail.valid_local?('us..er').should be_falsey
+    end
+
+    it 'should return false if the local segment has a special character in an unquoted dot atom' do
+      ValidateEmail.valid_local?('us@er').should be_falsey
+      ValidateEmail.valid_local?('user.\\.name').should be_falsey
+      ValidateEmail.valid_local?('user."name').should be_falsey
+    end
+
+    it 'should return false if the local segment has an unescaped special character in a quoted dot atom' do
+      ValidateEmail.valid_local?('test." test".test').should be_falsey
+      ValidateEmail.valid_local?('test."test\".test').should be_falsey
+      ValidateEmail.valid_local?('test."te"st".test').should be_falsey
+      ValidateEmail.valid_local?('test."\".test').should be_falsey
+    end
+
+    it 'should return true if special characters exist but are properly quoted and escaped' do
+      ValidateEmail.valid_local?('"\ test"').should be_truthy
+      ValidateEmail.valid_local?('"\\\\"').should be_truthy
+      ValidateEmail.valid_local?('test."te@st".test').should be_truthy
+      ValidateEmail.valid_local?('test."\\\\\"".test').should be_truthy
+      ValidateEmail.valid_local?('test."blah\"\ \\\\"').should be_truthy
+    end
+
+    it 'should return true if all characters are within the set of allowed characters' do
+      ValidateEmail.valid_local?('!#$%&\'*+-/=?^_`{|}~."\\\\\ \"(),:;<>@[]"').should be_truthy
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ramihajamalala Hery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -99,6 +99,7 @@ files:
 - spec/email_validator_spec.rb
 - spec/extensions_validator_spec.rb
 - spec/spec_helper.rb
+- spec/validate_email_spec.rb
 - valid_email.gemspec
 homepage: http://my.rails-royce.org/2010/07/21/email-validation-in-ruby-on-rails-without-regexp
 licenses: []
@@ -127,3 +128,5 @@ test_files:
 - spec/email_validator_spec.rb
 - spec/extensions_validator_spec.rb
 - spec/spec_helper.rb
+- spec/validate_email_spec.rb
+has_rdoc: