validate_as_email 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4626da4baee6844bc5862c747e58d60eccc7cd
-  data.tar.gz: 5660997cc54f2bbfc1b73f084c110064ed0f4db6
+  metadata.gz: 28ec894f592a434dcab3f7a29822fc68184248ca
+  data.tar.gz: 652bca29a770d9b1e52236f103cfb7ca3ebf32c9
 SHA512:
-  metadata.gz: 2324c402331da683d64a6b465650530ada5b99c754694c28a7c2a675b5ac605c371c499308de25313ad54a43849d0b223955bb62511895a6023f028be207015a
-  data.tar.gz: 35e7e558ce5b1dd6d3a023f97188890635010ae1f67636704e962c0fbe1271c6434796a1f238d32eb3c233b224ec8c3fd690b2390cb2461cdda87d8b9ed00359
+  metadata.gz: 03243e0cbdf5f6d4782943f66dab6fd65d00db62f839cad14c2f4a3f04e76795351115ce7dc3ccded97bfa5b70fb9fb956ae6b94ef448d7077351608b9a2ad87
+  data.tar.gz: 1713e9ae94e98dc9f9516e76e53243339cef1ee618c517288ae0cb098ea246e485dd91583ae608cbd8c161e87e03f81b6530cb87466c185332d7c29dba2cded2

data/README.md

@@ -1,6 +1,4 @@
-# Validate as Email
-
-[![Build Status](https://travis-ci.org/listora/validate_as_email.png?branch=master)](https://travis-ci.org/listora/validate_as_email)
+# Validate as Email [![Circle CI](https://circleci.com/gh/jcf/validate_as_email.svg?style=svg)](https://circleci.com/gh/jcf/validate_as_email)
 
 Validation of email addresses via the excellent Mail gem that is
 available in all Rails 3 and 4 applications.

data/lib/active_model/validations/email_validator.rb

@@ -4,19 +4,26 @@ require 'mail'
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
-      attr_reader :record, :attribute, :value, :email, :tree
+      attr_reader :record, :attribute, :value, :email
 
       def validate_each(record, attribute, value)
         @record, @attribute, @value = record, attribute, value
 
         @email = Mail::Address.new(value)
-        @tree  = email.__send__(:tree)
 
         add_error unless valid?
       rescue Mail::Field::ParseError
         add_error
       end
 
+      def domain_parts
+        @domain_parts ||= if email.domain
+                            email.domain.split('.')
+                          else
+                            []
+                          end
+      end
+
       private
 
       def valid?
@@ -28,7 +35,7 @@ module ActiveModel
       end
 
       def domain_has_more_than_one_atom?
-        tree.domain.dot_atom_text.elements.length > 1
+        domain_parts.length > 1
       end
 
       def add_error

data/lib/validate_as_email/version.rb

@@ -1,3 +1,3 @@
 module ValidateAsEmail
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

data/spec/active_model/validations/email_validator_spec.rb

@@ -1,75 +1,57 @@
 require 'spec_helper'
 
 describe ActiveModel::Validations::EmailValidator do
-  let(:person) { Person.new(email: 'invalid') }
-
-  let(:options) { {attributes: [:email]} }
-
-  def build_validator(options = {})
-    ActiveModel::Validations::EmailValidator.new(
-      options.merge(attributes: [:email])
-    )
-  end
-
-  subject(:validator) { build_validator }
-
   describe '#validate' do
-    context 'with a valid email address' do
-      before do
-        person.email = 'james@logi.cl'
-      end
-
-      it 'does not add errors' do
-        validator.validate(person)
-        person.errors.to_a.should == []
-      end
-    end
-
-    context 'with nil allowed' do
-      subject(:validator) do
-        build_validator(allow_nil: true)
-      end
-
-      before do
-        person.email = nil
-      end
-
-      it 'skips adding errors is email is nil' do
-        validator.validate(person)
-        person.errors.to_a.should == []
-      end
-    end
-
-    context 'with blank is allowed' do
-      subject(:validator) do
-        build_validator(allow_blank: true)
-      end
-
-      before do
-        person.email = '  '
-      end
-
-      it 'skips adding errors is email is nil' do
-        validator.validate(person)
-        person.errors.to_a.should == []
-      end
-    end
-
-    context 'with no message provided' do
-      it 'adds a symbol to errors for I18n lookup' do
-        validator.validate(person)
-        person.errors.to_a.should == ['Email is invalid']
-      end
-    end
-
-    context 'with a specific error message provided' do
-      subject(:validator) do
-        build_validator(message: 'is kinda odd looking')
-      end
-
-      it 'uses the message you specify' do
-        validator.validate(person)
-        person.errors.to_a.should == ['Email is kinda odd looking']
+    [
+      {
+        desc: 'with a valid email address',
+        validator: {},
+        people: [
+          {email: 'a@b.c'},
+          {email: 'a+x@b.c'},
+          {email: 'a@192.168.0.1'},
+          {email: '1@1.com'}
+        ],
+        errors: []
+      },
+      {
+        desc: 'with nil allowed',
+        validator: {allow_nil: true},
+        people: [ {email: nil} ],
+        errors: []
+      },
+      {
+        desc: 'with blank allowed',
+        validator: {allow_blank: true},
+        people: [ {email: ' '}, {email: "\t\n"} ],
+        errors: []
+      },
+      {
+        desc: 'with no message provided',
+        validator: {},
+        people: [ {email: 'invalid'}, {email: '  '} ],
+        errors: ['Email is invalid']
+      },
+      {
+        desc: 'with a custom error message',
+        validator: {message: 'is kinda odd looking'},
+        people: [ {email: 'invalid'}, {email: '  '} ],
+        errors: ['Email is kinda odd looking']
+      }
+    ].each do |data|
+      data[:people].each do |person_attributes|
+        context data do
+          let(:person) { Person.new(person_attributes) }
+
+          let(:validator) do
+            ActiveModel::Validations::EmailValidator.new(
+              data[:validator].merge(attributes: [:email])
+            )
+          end
+
+          before { validator.validate(person) }
+          it { expect(person.errors.to_a).to eq(data[:errors]) }
+        end
       end
     end
   end

metadata

@@ -1,50 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: validate_as_email
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - James Conroy-Finn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
-description: The ultimate Rails 3 email validator
+        version: '0'
+description: The ultimate email validator
 email:
 - james@logi.cl
 executables: []
@@ -60,7 +54,7 @@ files:
 - spec/active_model/validations/email_validator_spec.rb
 - spec/spec_helper.rb
 - spec/support/model.rb
-homepage: https://github.com/evently/mail_validator
+homepage: https://github.com/jcf/validate_as_email
 licenses: []
 metadata: {}
 post_install_message: 
@@ -79,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: The ultimate Rails 3 email validator. Powered by the Mail gem.
+summary: The ultimate email validator. Powered by the Mail gem.
 test_files:
 - spec/active_model/validations/email_validator_spec.rb
 - spec/spec_helper.rb