valid_email 0.0.2 → 0.0.3

data/README.md

@@ -42,7 +42,7 @@ Or
 
 If you don't want the MX validator stuff, just require the right file
 
-    require 'valid\_email/email_validator'
+    require 'valid_email/email_validator'
 
 Or in your Gemfile
 

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  active_record:
+    validations:
+      email:
+        invalid: "is invalid"

data/config/locales/fr.yml

@@ -0,0 +1,5 @@
+fr:
+  active_record:
+    validations:
+      email:
+        invalid: "est invalide"

data/lib/valid_email/email_validator.rb

@@ -23,6 +23,6 @@ class EmailValidator < ActiveModel::EachValidator
     rescue Exception => e
       r = false
     end
-    record.errors.add attribute, (options[:message] || "is invalid") unless r
+    record.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => "active_record.validations.email")) unless r
   end
 end

data/lib/valid_email/mx_validator.rb

@@ -10,7 +10,7 @@ class MxValidator < ActiveModel::EachValidator
       mx.concat dns.getresources(m.domain, Resolv::DNS::Resource::IN::MX)
     end
     r = mx.size > 0
-    record.errors.add attribute, (options[:message] || "is invalid") unless r
+    record.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => "active_record.validations.email")) unless r
     r
   end
 end

data/lib/valid_email/version.rb

@@ -1,2 +1,2 @@
-ValidEmailVersion = "0.0.2"
+ValidEmailVersion = "0.0.3"
 

data/lib/valid_email.rb

@@ -1,2 +1,2 @@
 require 'valid_email/all'
-
+I18n.load_path += Dir.glob(File.expand_path('../../config/locales/**/*',__FILE__))

data/spec/email_validator_spec.rb

@@ -7,74 +7,93 @@ describe EmailValidator do
     validates :email, :email => true
   end
 
-
-
-  describe "validating email" do
-    subject { person_class.new }
-
-    it "should fail when email empty" do
-      subject.valid?.should be_false
-      subject.errors[:email].should == [ "is invalid" ]
-    end
-
-    it "should fail when email is not valid" do
-      subject.email = 'joh@doe'
-      subject.valid?.should be_false
-      subject.errors[:email].should == [ "is invalid" ]
-    end
-
-    it "should fail when email is valid with information" do
-      subject.email = '"John Doe" <john@doe.com>'
-      subject.valid?.should be_false
-      subject.errors[:email].should == [ "is invalid" ]
-    end
-
-    it "should pass when email is simple email address" do
-      subject.email = 'john@doe.com'
-      subject.valid?.should be_true
-      subject.errors[:email].should be_empty
-    end
-
-    it "should fail when email is simple email address not stripped" do
-      subject.email = 'john@doe.com            '
-      subject.valid?.should be_false
-      subject.errors[:email].should == [ "is invalid" ]
-    end
-
-
-    it "should fail when passing multiple simple email addresses" do
-      subject.email = 'john@doe.com, maria@doe.com'
-      subject.valid?.should be_false
-      subject.errors[:email].should == [ "is invalid" ]
-    end
-  end
-    
   person_class_mx = Class.new do
     include ActiveModel::Validations
     attr_accessor :email
     validates :email, :email => {:mx => true}
   end
 
-  describe "validating email with MX" do
-    subject { person_class_mx.new }
 
-    it "should pass when email domain has MX record" do
-      subject.email = 'john@gmail.com'
-      subject.valid?.should be_true
-      subject.errors[:email].should be_empty
+  shared_examples_for "Validating emails" do
+    
+    before :each do
+      I18n.locale = locale
     end
 
-    it "should fail when email domain has no MX record" do
-      subject.email = 'john@subdomain.rubyonrails.org'
-      subject.valid?.should be_false
-      subject.errors[:email].should == [ "is invalid" ]
-    end
+    describe "validating email" do
+      subject { person_class.new }
+
+      it "should fail when email empty" do
+        subject.valid?.should be_false
+        subject.errors[:email].should == errors
+      end
+
+      it "should fail when email is not valid" do
+        subject.email = 'joh@doe'
+        subject.valid?.should be_false
+        subject.errors[:email].should == errors
+      end
+
+      it "should fail when email is valid with information" do
+        subject.email = '"John Doe" <john@doe.com>'
+        subject.valid?.should be_false
+        subject.errors[:email].should == errors
+      end
+
+      it "should pass when email is simple email address" do
+        subject.email = 'john@doe.com'
+        subject.valid?.should be_true
+        subject.errors[:email].should be_empty
+      end
+
+      it "should fail when email is simple email address not stripped" do
+        subject.email = 'john@doe.com            '
+        subject.valid?.should be_false
+        subject.errors[:email].should == errors
+      end
+
+      it "should fail when passing multiple simple email addresses" do
+        subject.email = 'john@doe.com, maria@doe.com'
+        subject.valid?.should be_false
+        subject.errors[:email].should == errors
+      end
 
-    it "should fail when domain does not exists" do
-      subject.email = 'john@nonexistentdomain.abc'
-      subject.valid?.should be_false
-      subject.errors[:email].should == [ "is invalid" ]
     end
 
+    describe "validating email with MX" do
+      subject { person_class_mx.new }
+
+      it "should pass when email domain has MX record" do
+        subject.email = 'john@gmail.com'
+        subject.valid?.should be_true
+        subject.errors[:email].should be_empty
+      end
+
+      it "should fail when email domain has no MX record" do
+        subject.email = 'john@subdomain.rubyonrails.org'
+        subject.valid?.should be_false
+        subject.errors[:email].should == errors
+      end
+
+      it "should fail when domain does not exists" do
+        subject.email = 'john@nonexistentdomain.abc'
+        subject.valid?.should be_false
+        subject.errors[:email].should == errors
+      end
+    end
+  end
+  
+  describe "Translating in english" do
+    let!(:locale){ :en }
+    let!(:errors) { [ "is invalid" ] }
+    it_should_behave_like "Validating emails"
+  end
+  
+  describe "Translating in french" do
+    let!(:locale){ :fr }
+    
+    let!(:errors) { [ "est invalide" ] }
+    it_should_behave_like "Validating emails"
   end
-end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valid_email
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70131339816040 !ruby/object:Gem::Requirement
+  requirement: &70132350643040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131339816040
+  version_requirements: *70132350643040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70131339815620 !ruby/object:Gem::Requirement
+  requirement: &70132350642620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131339815620
+  version_requirements: *70132350642620
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70131339815200 !ruby/object:Gem::Requirement
+  requirement: &70132350642200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131339815200
+  version_requirements: *70132350642200
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70131339814780 !ruby/object:Gem::Requirement
+  requirement: &70132350641780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131339814780
+  version_requirements: *70132350641780
 description: ActiveModel Validation for email
 email:
 - hery@rails-royce.org
@@ -67,6 +67,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/locales/en.yml
+- config/locales/fr.yml
 - lib/valid_email.rb
 - lib/valid_email/all.rb
 - lib/valid_email/email_validator.rb