spectator-validates_email 0.0.2 → 0.0.3

data/.gitignore

@@ -6,6 +6,7 @@
 tmtags
 
 ## PROJECT::GENERAL
+.rvmrc
 pkg
 rdoc
 *.gem

data/README.rdoc

@@ -6,6 +6,10 @@ validates_email is a Rails 3 plugin that validates email addresses against RFC 2
 
   rails plugin install git://github.com/spectator/validates_email.git
 
+  or
+
+  gem 'spectator-validates_email', :require => 'validates_email'
+
 == Usage
 
   class User < ActiveRecord::Base
@@ -45,6 +49,7 @@ Most of the code were taken from Alex Dunae (dunae.ca) plugin (see http://github
 == Contributors
 
 Petr Blaho
+Christian Eichhorn
 
 == Notes
 

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "yury.velikanau@gmail.com"
     gem.homepage = "http://github.com/spectator/validates_email"
     gem.authors = ["Yury Velikanau"]
-    gem.add_development_dependency "activerecord", ">= 3.0.0.beta"
-    gem.add_development_dependency "activesupport", ">= 3.0.0.beta"
-    gem.add_development_dependency "sqlite3-ruby", ">= 1.3.1"
+    gem.add_development_dependency "activerecord", "~> 3.0.0.beta"
+    gem.add_development_dependency "activesupport", "~> 3.0.0.beta"
+    gem.add_development_dependency "sqlite3-ruby", "~> 1.3.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/validates_email.rb

@@ -10,7 +10,7 @@ class EmailValidator < ActiveModel::EachValidator
     # TODO: should this decode escaped entities before counting?
     begin
       local, domain = email.split('@', 2)
-    rescue
+    rescue NoMethodError
       return false
     end
 
@@ -19,7 +19,7 @@ class EmailValidator < ActiveModel::EachValidator
 
   def validates_email_domain(email, options)
     require 'resolv'
-    a_fallback = options.is_a?(Hash) ? options[:a_fallback] : nil
+    a_fallback = options.is_a?(Hash) ? options[:a_fallback] : false
     domain = email.match(/\@(.+)/)[1]
     Resolv::DNS.open do |dns|
       @mx = dns.getresources(domain, Resolv::DNS::Resource::IN::MX)
@@ -29,12 +29,15 @@ class EmailValidator < ActiveModel::EachValidator
   end
 
   def validate_each(record, attribute, value)
-    unless validates_email_format(value)
+    if validates_email_format(value)
+      # only test the mx if the email format is valid first
+      # (missing @ raises exception in validates_email_domain)
+      if options[:mx] && !validates_email_domain(value, options[:mx])
+        record.errors[attribute] << (options[:mx_message] || I18n.t(:mx_invalid, :scope => [:activerecord, :errors, :messages]))
+      end
+    else
       record.errors[attribute] << (options[:message] || I18n.t(:invalid, :scope => [:activerecord, :errors, :messages]))
     end
-    if options[:mx] && !validates_email_domain(value, options[:mx])
-      record.errors[attribute] << (options[:mx_message] || I18n.t(:mx_invalid, :scope => [:activerecord, :errors, :messages]))
-    end
   end
 
 end

data/test/validates_email_test.rb

@@ -136,6 +136,14 @@ class ValidatesEmailTest < ActiveSupport::TestCase
     save_passes(p, invalid_email)
   end
 
+  def test_should_not_validate_mx_with_invalid_email
+    invalid_email = 'testexample.com'
+    assert_nothing_raised do
+      p = MxFallback.new(:email => invalid_email)
+      save_fails(p, invalid_email)
+    end
+  end
+
   protected
 
   def create_person(params)

data/validates_email.gemspec

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{validates_email}
-  s.version = "0.0.2"
+  s.name = %q{spectator-validates_email}
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yury Velikanau"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-10-24}
   s.description = %q{validates_email is a Rails 3 plugin that validates email addresses against RFC 2822 and RFC 3696}
   s.email = %q{yury.velikanau@gmail.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/spectator/validates_email}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Gem to validate email addresses for Rails 3}
   s.test_files = [
     "test/schema.rb",
@@ -44,19 +44,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<activerecord>, [">= 3.0.0.beta"])
-      s.add_development_dependency(%q<activesupport>, [">= 3.0.0.beta"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<activerecord>, ["~> 3.0.0.beta"])
+      s.add_development_dependency(%q<activesupport>, ["~> 3.0.0.beta"])
+      s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.0.0.beta"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta"])
+      s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.0.0.beta"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta"])
+    s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.1"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Yury Velikanau
@@ -14,15 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +03:00
+date: 2010-10-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -36,8 +37,9 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -51,8 +53,9 @@ dependencies:
   name: sqlite3-ruby
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -92,6 +95,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -99,6 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -108,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gem to validate email addresses for Rails 3