Permalink
Browse files

Merge remote branch 'dekart/master'

Conflicts:
	.gitignore
	MIT-LICENSE
	init.rb
	lib/validates_email_format_of.rb
	test/test_helper.rb
	test/validates_email_format_of_test.rb
	validates_email_format_of.gemspec
  • Loading branch information...
2 parents dd5d4d3 + e47d15a commit c7bfb9e431c166f8c926278058077ce7b70e6a3e @alexdunae alexdunae committed Nov 15, 2010
Showing with 14 additions and 5 deletions.
  1. +3 −1 .gitignore
  2. +5 −0 config/locales/en.yml
  3. +1 −1 init.rb
  4. +2 −1 lib/validates_email_format_of.rb
  5. +3 −0 rails/init.rb
  6. +0 −1 test/test_helper.rb
  7. +0 −1 test/validates_email_format_of_test.rb
View
@@ -1,3 +1,5 @@
pkg
test/debug.log
-*.gem
+*.gem
+*.sqlite3
+*.swp
View
@@ -0,0 +1,5 @@
+en:
+ activerecord:
+ errors:
+ messages:
+ invalid_email_format: " does not appear to be a valid e-mail address"
View
@@ -1 +1 @@
-require 'validates_email_format_of'
+require File.expand_path(File.dirname(__FILE__) + '/rails/init')
@@ -1,3 +1,4 @@
+# encoding: utf-8
module ValidatesEmailFormatOf
require 'resolv'
@@ -88,4 +89,4 @@ def validates_email_format_of(*attr_names)
end
end
end
-end
+end
View
@@ -0,0 +1,3 @@
+require 'validates_email_format_of'
+
+I18n.load_path << Dir[File.join(File.dirname(__FILE__), "..", "config", "locales", "*.yml")]
View
@@ -1,5 +1,4 @@
$:.unshift(File.dirname(__FILE__) + '/../lib')
-RAILS_ROOT = File.dirname(__FILE__)
require 'rubygems'
require 'test/unit'
@@ -4,7 +4,6 @@ class ValidatesEmailFormatOfTest < TEST_CASE
fixtures :people, :peoplemx
def setup
-# puts Rails.inspect
@valid_email = 'valid@example.com'
@invalid_email = 'invalid@example.'
end

0 comments on commit c7bfb9e

Please sign in to comment.