validates_as_email_address 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,6 +1,10 @@
 == master
 
-== 0.2.1 / 2008-01-11
+== 0.2.2 / 2009-03-15
+
+* Add support for Rails 2.2 i18n error messages [Saimon Moore]
+
+== 0.2.1 / 2009-01-11
 
 * Ensure correct encoding for regular expressions to be compatible with Ruby 1.9+
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'validates_as_email_address'
-  s.version           = '0.2.1'
+  s.version           = '0.2.2'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for validating the format/length of email addresses'
   

data/lib/validates_as_email_address.rb

@@ -3,6 +3,10 @@ require 'validates_as_email_address/rfc_1035'
 
 # Adds validations for email addresses
 module ValidatesAsEmailAddress
+  # The default error message to use for improperly formatted e-mail addresses
+  mattr_accessor :invalid_email_message
+  self.invalid_email_message = 'is an invalid email address'
+  
   # Validates whether the value of the specific attribute matches against the
   # RFC822/RFC1035 specification.
   # 
@@ -46,7 +50,7 @@ module ValidatesAsEmailAddress
   def validates_as_email_address(*attr_names)
     configuration = attr_names.last.is_a?(Hash) ? attr_names.pop : {}
     configuration.reverse_merge!(
-      :wrong_format => ActiveRecord::Errors.default_error_messages[:invalid_email],
+      :wrong_format => Object.const_defined?(:I18n) ? :invalid_email : ActiveRecord::Errors.default_error_messages[:invalid_email],
       :strict => true
     )
     
@@ -67,7 +71,12 @@ ActiveRecord::Base.class_eval do
   extend ValidatesAsEmailAddress
 end
 
-# Add error messages specific to this validation
-ActiveRecord::Errors.default_error_messages.update(
-  :invalid_email => 'is an invalid email address'
-)
+
+# Load default error messages
+if Object.const_defined?(:I18n) # Rails >= 2.2
+  I18n.load_path << "#{File.dirname(__FILE__)}/validates_as_email_address/locale.rb"
+else
+  ActiveRecord::Errors.default_error_messages.update(
+    :invalid_email => ValidatesAsEmailAddress.invalid_email_message
+  )
+end

data/lib/validates_as_email_address/locale.rb

@@ -0,0 +1,9 @@
+{:en => {
+  :activerecord => {
+    :errors => {
+      :messages => {
+        :invalid_email => ValidatesAsEmailAddress.invalid_email_message
+      }
+    }
+  }
+}}

data/test/unit/validates_as_email_address_test.rb

@@ -9,6 +9,7 @@ class ValidatesAsEmailAddressByDefaultTest < Test::Unit::TestCase
     user = new_user(:email => 'a@')
     assert !user.valid?
     assert user.errors.invalid?(:email)
+    assert_equal 'is an invalid email address', user.errors.on(:email).first
     
     user.email = 'a@a'
     assert user.valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validates_as_email_address
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -05:00
+date: 2009-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files: []
 files: 
 - lib/validates_as_email_address
 - lib/validates_as_email_address/rfc_822.rb
+- lib/validates_as_email_address/locale.rb
 - lib/validates_as_email_address/rfc_1035.rb
 - lib/validates_as_email_address.rb
 - test/factory.rb