validates_email_format_of 1.4.1 → 1.4.2

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = CHANGELOG
 
+== Version 1.4.2
+
+* See https://github.com/alexdunae/validates_email_format_of/compare/1.4.1...1.4.2
+
 == Version 1.4.1 (the George Anderson and 'history' edition)
  * don't allow domains with underscores
  * removed extra spaces in validation messages

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-09 Alex Dunae
+Copyright (c) 2006-10 Alex Dunae
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -6,13 +6,16 @@ Validate e-mail addresses against RFC 2822 and RFC 3696.
 
 Installing as a gem:
 
-  gem sources -a http://gems.github.com
-  gem install alexdunae-validates_email_format_of
+  gem install validates_email_format_of
 
-Installing as a Ruby on Rails plugin:
+Installing as a Ruby on Rails 2 plugin:
 
   ./script/plugin install http://github.com/alexdunae/validates_email_format_of.git
 
+Or in your Rails 3 Gemfile
+
+  gem 'validates_email_format_of', :git => 'git://github.com/alexdunae/validates_email_format_of.git'
+
 
 == Usage
 
@@ -61,12 +64,13 @@ The unit tests for this plugin use an in-memory sqlite3 database.
 
 == Resources
 
-* http://github.com/alexdunae/validates_email_format_of
-* http://code.dunae.ca/validates_email_format_of.html
+* https://github.com/alexdunae/validates_email_format_of
 
 == Credits
 
-Written by Alex Dunae (dunae.ca), 2006-09.
+Written by Alex Dunae (dunae.ca), 2006-10.
+
+Many thanks to the plugin's recent contributors: https://github.com/alexdunae/validates_email_format_of/contributors
 
 Thanks to Francis Hwang (http://fhwang.net/) at Diversion Media for creating the 1.1 update.
 

data/init.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/rails/init'
+require File.expand_path(File.dirname(__FILE__) + '/rails/init')

data/lib/validates_email_format_of.rb

@@ -1,15 +1,16 @@
+# encoding: utf-8
 module ValidatesEmailFormatOf
   require 'resolv'
   
   LocalPartSpecialChars = Regexp.escape('!#$%&\'*-/=?+-^_`{|}~')
   LocalPartUnquoted = '(([[:alnum:]' + LocalPartSpecialChars + ']+[\.\+]+))*[[:alnum:]' + LocalPartSpecialChars + '+]+'
   LocalPartQuoted = '\"(([[:alnum:]' + LocalPartSpecialChars + '\.\+]*|(\\\\[\x00-\xFF]))*)\"'
-  Regex = Regexp.new('^((' + LocalPartUnquoted + ')|(' + LocalPartQuoted + ')+)@(((\w+\-+[^_])|(\w+\.[^_]))*([a-z0-9-]{1,63})\.[a-z]{2,6}$)', Regexp::EXTENDED | Regexp::IGNORECASE)
+  Regex = Regexp.new('\A((' + LocalPartUnquoted + ')|(' + LocalPartQuoted + ')+)@(((\w+\-+[^_])|(\w+\.[a-z0-9-]*))*([a-z0-9-]{1,63})\.[a-z]{2,6}(?:\.[a-z]{2,6})?\Z)', Regexp::EXTENDED | Regexp::IGNORECASE, 'n')
 
   def self.validate_email_domain(email)
     domain = email.match(/\@(.+)/)[1]
     Resolv::DNS.open do |dns|
-      @mx = dns.getresources(domain, Resolv::DNS::Resource::IN::MX)
+      @mx = dns.getresources(domain, Resolv::DNS::Resource::IN::MX) + dns.getresources(domain, Resolv::DNS::Resource::IN::A)
     end
     @mx.size > 0 ? true : false
   end
@@ -23,12 +24,14 @@ module ValidatesEmailFormatOf
   # * <tt>mx_message</tt> - A custom error message when an MX record validation fails (default is: "is not routable.")
   # * <tt>with</tt> The regex to use for validating the format of the email address (default is ValidatesEmailFormatOf::Regex)</tt>
   def self.validate_email_format(email, options={})
-      default_options = { :message => 'does not appear to be a valid e-mail address', 
+      default_options = { :message => I18n.t(:invalid_email_address, :scope => [:activerecord, :errors, :messages], :default => 'does not appear to be a valid e-mail address'),
                           :check_mx => false,
-                          :mx_message => 'is not routable.',
+                          :mx_message => I18n.t(:email_address_not_routable, :scope => [:activerecord, :errors, :messages], :default => 'is not routable'),
                           :with => ValidatesEmailFormatOf::Regex }
       options.merge!(default_options) {|key, old, new| old}  # merge the default options into the specified options, retaining all specified options
-            
+
+      email.strip!
+
       # local part max is 64 chars, domain part max is 255 chars
       # TODO: should this decode escaped entities before counting?
       begin
@@ -85,4 +88,4 @@ module ActiveRecord
       end
     end   
   end
-end
+end

data/test/database.yml

@@ -0,0 +1,3 @@
+plugin_test:
+  adapter: sqlite3
+  database: ":memory:"

data/test/test_helper.rb

@@ -1,5 +1,4 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-RAILS_ROOT = File.dirname(__FILE__)
 
 require 'rubygems'
 require 'test/unit'
@@ -7,7 +6,6 @@ require 'active_record'
 require 'active_record/fixtures'
 require "#{File.dirname(__FILE__)}/../init"
 
-
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'plugin_test'])
@@ -22,7 +20,7 @@ else
 end
 
 TEST_CASE.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-$LOAD_PATH.unshift(TEST_CASE.fixture_path)
+$:.unshift(TEST_CASE.fixture_path)
 
 class TEST_CASE #:nodoc:
   def create_fixtures(*table_names)

data/test/validates_email_format_of_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class ValidatesEmailFormatOfTest < TEST_CASE
-  fixtures :people, :peoplemx
+  fixtures :people
 
   def setup
     @valid_email = 'valid@example.com'
@@ -31,6 +31,10 @@ class ValidatesEmailFormatOfTest < TEST_CASE
      'valid@example.mobi',
      'valid@example.info',
      'valid-@example.com',
+  # allow single character domain parts
+     'valid@mail.x.example.com',
+     'valid@x.com',
+     'valid@example.w-dash.sch.uk',
   # from RFC 3696, page 6
      'customer/department=shipping@example.com',
      '$A12345@example.com',
@@ -62,6 +66,11 @@ class ValidatesEmailFormatOfTest < TEST_CASE
      'invalid@example.c',
      'invali d@example.com',
      'invalidexample.com',
+  # should not allow special chars after a period in the domain
+     'local@sub.)domain.com',
+     'local@sub.#domain.com',
+  # one at a time
+     "foo@example.com\nexample@gmail.com",
      'invalid@example.'].each do |email|
       p = create_person(:email => email)
       save_fails(p, email)
@@ -112,7 +121,11 @@ class ValidatesEmailFormatOfTest < TEST_CASE
   def test_should_allow_custom_error_message
     p = create_person(:email => @invalid_email)
     save_fails(p)
-    assert_equal 'fails with custom message', p.errors.on(:email)
+    if ActiveRecord::VERSION::MAJOR >= 3
+      assert_equal 'fails with custom message', p.errors[:email].first
+    else
+      assert_equal 'fails with custom message', p.errors.on(:email)
+    end
   end
 
   def test_should_allow_nil
@@ -120,14 +133,21 @@ class ValidatesEmailFormatOfTest < TEST_CASE
     save_passes(p)
   end
 
+  # TODO: find a future-proof way to check DNS records
   def test_check_mx
     pmx = MxRecord.new(:email => 'test@dunae.ca')
     save_passes(pmx)
 
-    pmx = MxRecord.new(:email => 'test@example.com')
+    pmx = MxRecord.new(:email => 'test@somethingthathasntbeenregistered.com')
     save_fails(pmx)
   end
 
+  # TODO: find a future-proof way to check DNS records
+  def test_check_mx_fallback_to_a
+    pmx = MxRecord.new(:email => 'test@code.dunae.ca')
+    save_passes(pmx)
+  end
+
   protected
     def create_person(params)
       Person.new(params)
@@ -136,12 +156,20 @@ class ValidatesEmailFormatOfTest < TEST_CASE
     def save_passes(p, email = '')
       assert p.valid?, " validating #{email}"
       assert p.save
-      assert_nil p.errors.on(:email)
+      if ActiveRecord::VERSION::MAJOR >= 3
+        assert p.errors[:email].empty?
+      else
+        assert_nil p.errors.on(:email)
+      end
     end
     
     def save_fails(p, email = '')
       assert !p.valid?, " validating #{email}"
       assert !p.save
-      assert p.errors.on(:email)
+      if ActiveRecord::VERSION::MAJOR >= 3
+        assert_equal 1, p.errors[:email].size
+      else
+        assert p.errors.on(:email)
+      end
     end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: validates_email_format_of
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Alex Dunae
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +01:00
+date: 2010-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -24,15 +29,20 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - MIT-LICENSE
 files: 
+- MIT-LICENSE
 - init.rb
 - rakefile.rb
-- lib/validates_email_format_of.rb
-- rails/init.rb
-- README.rdoc
 - CHANGELOG.rdoc
-- MIT-LICENSE
+- README.rdoc
+- lib/validates_email_format_of.rb
+- test/fixtures/person.rb
+- test/schema.rb
+- test/test_helper.rb
+- test/validates_email_format_of_test.rb
+- test/database.yml
+- test/fixtures/people.yml
 has_rdoc: true
-homepage: http://code.dunae.ca/validates_email_format_of.html
+homepage: https://github.com/alexdunae/validates_email_format_of
 licenses: []
 
 post_install_message: 
@@ -42,27 +52,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Validate e-mail addresses against RFC 2822 and RFC 3696.
 test_files: 
-- test/validates_email_format_of_test.rb
-- test/test_helper.rb
-- test/schema.rb
 - test/fixtures/person.rb
+- test/schema.rb
+- test/test_helper.rb
+- test/validates_email_format_of_test.rb
+- test/database.yml
 - test/fixtures/people.yml

data/rails/init.rb

@@ -1 +0,0 @@
-require 'validates_email_format_of'