valid_email 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4456e6c2847371b010454617b3f74f87570bbcd
-  data.tar.gz: d75f3182b16f5c2f7494bdb1b676a9ceab8fc861
+  metadata.gz: dfc486fd0dfb112acae3207a3d736b5209daedb8
+  data.tar.gz: c4e004a30caf02049223de8ae0f0bbf8eec8e2ac
 SHA512:
-  metadata.gz: 055db62d9c82b22cd0f62544672e982b2d319ff5be0b95e69db6f32018d56322d35bca05d6db068c62c1d6d5edae7d3558e451c3f2e97c7911f4b03e35f4b5a6
-  data.tar.gz: e7f916e652702635a7730eea9dbc2fdafaf1384d8af203ada7420d76990cf106e70bc595c1f988b5e32771f63f76eac1c869ac9fcd4146bf801a499e6d9e5697
+  metadata.gz: 1f819b01ba5a32c6dbf8b076f3a4adc8ba7113d7ad2ebef9844ceaaa52386afa7b767894e37216771b04b16e5c6c8cc1cf1a2d8c0f3bade63f340de3bb8161b7
+  data.tar.gz: fcb080bf8c42242267320265e878680c3dac036d3bd5364f9629cbb16b8a93ba1488c98ee2f4d3ffbd8b5593a2bf5d167fc411ac706e1e863b4e41ba685401f4

data/README.md

@@ -85,6 +85,10 @@ nil.email? # => false
 "john@gmail.com".email? # => May return true if it exists. It accepts a hash of options like ValidateEmail.valid?
 ```
 
+## Code Status
+
+* [![Build Status](https://travis-ci.org/hallelujah/valid_email.svg?branch=master)](https://travis-ci.org/hallelujah/valid_email)
+
 # Credits
 
 * Ramihajamalala Hery hery[at]rails-royce.org

data/config/locales/sv.yml

@@ -0,0 +1,5 @@
+sv:
+  valid_email:
+    validations:
+      email:
+        invalid: "är ogiltig"

data/lib/valid_email/email_validator.rb

@@ -4,26 +4,22 @@ require 'mail'
 require 'valid_email/validate_email'
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record,attribute,value)
-    begin
-      return if options[:allow_nil] && value.nil?
-      return if options[:allow_blank] && value.blank?
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
 
-      r = ValidateEmail.valid?(value)
-      # Check if domain has DNS MX record
-      if r && options[:mx]
-        require 'valid_email/mx_validator'
-        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)
-      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)
-      end
-    rescue Exception => e
-      r = false
+    r = ValidateEmail.valid?(value)
+    # Check if domain has DNS MX record
+    if r && options[:mx]
+      require 'valid_email/mx_validator'
+      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)
+    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)
     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

@@ -9,19 +9,20 @@ class ValidateEmail
         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
+          # 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 &&= domain_dot_elements.none?(&:blank?) && domain_dot_elements.size > 1
 
-        # Check that domain consists of dot-atom-text elements > 1
-        # 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 &&= 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)
+          # Check if domain has DNS MX record
+          if r && options[:mx]
+            require 'valid_email/mx_validator'
+            r &&= mx_valid?(email)
+          end
         end
-      rescue Exception => e
+      rescue Mail::Field::ParseError
         r = false
       end
       r
@@ -39,7 +40,7 @@ class ValidateEmail
           end
           r = mx.size > 0
         end
-      rescue Exception =>e
+      rescue Mail::Field::ParseError
         r = false
       end
       r
@@ -54,13 +55,13 @@ class ValidateEmail
       begin
         m = Mail::Address.new(value)
         r = !BanDisposableEmailValidator.config.include?(m.domain) if m.domain
-      rescue Exception => e
+      rescue Mail::Field::ParseError
         r = false
       end
-      
+
       r
     end
 
   end
 
-end
+end

data/lib/valid_email/version.rb

@@ -1 +1 @@
-ValidEmailVersion = "0.0.8"
+ValidEmailVersion = "0.0.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ramihajamalala Hery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -86,6 +86,7 @@ files:
 - config/locales/fr.yml
 - config/locales/pl.yml
 - config/locales/ru.yml
+- config/locales/sv.yml
 - config/valid_email.yml
 - lib/valid_email.rb
 - lib/valid_email/all.rb