valid_email2 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1d4fe39e4ead990b22676834dcea2a54e090d9a
-  data.tar.gz: 82de0c3528c6b6ea1bc10c730b6fa96f4343fbc3
+  metadata.gz: 1d3456e7cb1c7feb85fdff2260fd595711cd2a9f
+  data.tar.gz: 36f3e8a848db9bbb0abb3ea5c30cd5b85d182f8b
 SHA512:
-  metadata.gz: a538c07451106710b27fe29fc5437292be553ed73936fa819fea0bc651e14298e905627642237bf9a2058221247c8f02f5a9449ead73450b8994ddc7abec1d1f
-  data.tar.gz: 1252e5e86622060ad93538fd4e69db846b2bff6831f5e82f3ef9a0211429fe6fc2f36820c70671f221cfb8f8eacbbdc91c6af0149ee90db0870bdc5f073a31de
+  metadata.gz: 2bfb2d8ceaeba93622137e87ebf5fb2c990d04419dd3f5bd0e0f063022459859f2520f617a8ef943c120cc54034f242f946d337e6870ca803c700a410640c61c
+  data.tar.gz: 10eabac3bb4f6be94139d7820182598908ec4c721a282148aef741914603555608116d89eae4dd339ef7338df593688e80852381c7d6cef97cc2e6d9ac88f578

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+  - jruby-20mode
+  - rbx-19mode
+
+gemfile:
+  - gemfiles/activemodel3.gemfile
+  - gemfiles/activemodel4.gemfile

data/README.md

@@ -1,6 +1,11 @@
 # ValidEmail2
+[![Build Status](https://travis-ci.org/lisinge/valid_email2.png?branch=master)](https://travis-ci.org/lisinge/valid_email2)
+[![Coverage Status](https://coveralls.io/repos/lisinge/valid_email2/badge.png)](https://coveralls.io/r/lisinge/valid_email2)
+[![Code Climate](https://codeclimate.com/github/lisinge/valid_email2.png)](https://codeclimate.com/github/lisinge/valid_email2)
+[![Dependency Status](https://gemnasium.com/lisinge/valid_email2.png)](https://gemnasium.com/lisinge/valid_email2)
 
-TODO: Write a gem description
+Validate emails without regexp but with the help of the `mail` gem and MX server lookup.  
+Optionally validate against a list of disposable email domains.
 
 ## Installation
 

data/gemfiles/activemodel3.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 3.2.13"
+
+gemspec path: "../"

data/gemfiles/activemodel4.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 4.0.0"
+
+gemspec path: "../"

data/lib/valid_email2/address.rb

@@ -0,0 +1,48 @@
+require "resolv"
+require "mail"
+
+module ValidEmail2
+  class Address
+    attr_accessor :address
+
+    def initialize(address)
+      @parse_error = false
+
+      begin
+        @raw_address = address
+        @address = Mail::Address.new(address)
+      rescue Mail::Field::ParseError
+        @parse_error = true
+      end
+    end
+
+    def valid?
+      return false if @parse_error
+
+      if address.domain && address.address == @raw_address
+        tree = address.send(:tree)
+
+        # Valid address needs to have a dot in the domain
+        tree.domain.dot_atom_text.elements.size > 1
+      else
+        false
+      end
+    end
+
+    def disposable?
+      valid? && ValidEmail2.disposable_emails.include?(address.domain)
+    end
+
+    def valid_mx?
+      return false unless valid?
+
+      mx = []
+
+      Resolv::DNS.open do |dns|
+        mx.concat dns.getresources(address.domain, Resolv::DNS::Resource::IN::MX)
+      end
+
+      mx.any?
+    end
+  end
+end

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/valid_email2.rb

@@ -1,14 +1,15 @@
 require "valid_email2/version"
+require "valid_email2/address"
 require "active_model"
 require "active_model/validations"
-require "resolv"
-require "mail"
 
-class EmailValidator < ActiveModel::EachValidator
+module ValidEmail2
   def self.disposable_emails
-    @@disposable_emails ||= YAML.load_file(File.expand_path("../../disposable_emails.yml",__FILE__))
+    @@disposable_emails ||= YAML.load_file(File.expand_path("../../vendor/disposable_emails.yml",__FILE__))
   end
+end
 
+class EmailValidator < ActiveModel::EachValidator
   def default_options
     { regex: true, disposable: false, mx: false }
   end
@@ -17,40 +18,16 @@ class EmailValidator < ActiveModel::EachValidator
     return unless value.present?
     options = default_options.merge(self.options)
 
-    begin
-      email = Mail::Address.new(value)
-    rescue Mail::Field::ParseError
-      error(record, attribute) && return
-      return
-    end
-
-    if email.domain && email.address == value
-      tree = email.send(:tree)
+    address = ValidEmail2::Address.new(value)
 
-      # Valid email needs to have a dot in the domain
-      unless tree.domain.dot_atom_text.elements.size > 1
-        error(record, attribute) && return
-      end
-    else
-      error(record, attribute) && return
-    end
+    error(record, attribute) && return unless address.valid?
 
     if options[:disposable]
-      if self.class.disposable_emails.include?(email.domain)
-        error(record, attribute) && return
-      end
+      error(record, attribute) && return if address.disposable?
     end
 
     if options[:mx]
-      mx = []
-
-      Resolv::DNS.open do |dns|
-        mx.concat dns.getresources(email.domain, Resolv::DNS::Resource::IN::MX)
-      end
-
-      unless mx.any?
-        error(record, attribute) && return
-      end
+      error(record, attribute) && return unless address.valid_mx?
     end
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 $:.unshift File.expand_path("../lib",__FILE__)
+require "coveralls"
+Coveralls.wear!
 require "valid_email2"
 
 class TestModel

data/spec/valid_email2_spec.rb

@@ -30,11 +30,6 @@ describe ValidEmail2 do
       Mail::Address.stub(:new).and_raise(Mail::Field::ParseError.new(nil, nil, nil))
       user.valid?.should be_false
     end
-
-    it "blah" do
-      user = TestUserMX.new(email: "invalid_email.com")
-      user.valid?.should be_false
-    end
   end
 
   describe "disposable emails" do
@@ -44,7 +39,7 @@ describe ValidEmail2 do
     end
 
     it "should be invalid when email is in the list of disposable emails" do
-      user = TestUserDisallowDisposable.new(email: "foo@#{EmailValidator.disposable_emails.first}")
+      user = TestUserDisallowDisposable.new(email: "foo@#{ValidEmail2.disposable_emails.first}")
       user.valid?.should be_false
     end
   end

data/valid_email2.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14.1"
+  spec.add_development_dependency "coveralls"
   spec.add_runtime_dependency "mail"
   spec.add_runtime_dependency "activemodel"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -89,16 +103,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- disposable_emails.yml
+- gemfiles/activemodel3.gemfile
+- gemfiles/activemodel4.gemfile
 - lib/valid_email2.rb
+- lib/valid_email2/address.rb
 - lib/valid_email2/version.rb
 - spec/spec_helper.rb
 - spec/valid_email2_spec.rb
 - valid_email2.gemspec
+- vendor/disposable_emails.yml
 homepage: https://github.com/lisinge/valid_email2
 licenses:
 - MIT