dancroak-validates_email_format_of 1.2.1 → 1.2.2

data/CHANGELOG

@@ -18,4 +18,5 @@
  * added :unless option
 
 == Unreleased
- * Now available as a gem on GitHub
+ * Now available as a gem on GitHub
+ * added should_validate_email_format_of

data/README.markdown

@@ -5,6 +5,10 @@ Validate various formats of email address against RFC 2822.
 
 Usage
 -----
+  
+    class PersonTest < ActiveSupport::TestCase
+      should_validate_email_format_of :email
+    end
 
     class Person < ActiveRecord::Base
       validates_email_format_of :email

data/Rakefile

@@ -0,0 +1,12 @@
+require 'rake'
+require 'rake/testtask'
+
+test_files_pattern = 'test/*_test.rb'
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = test_files_pattern
+  t.verbose = false
+end
+
+desc "Run the test suite"
+task :default => :test

data/test/test_helper.rb

@@ -10,7 +10,7 @@ ActiveRecord::Base.establish_connection(
   :database => ':memory:')
 
 ActiveRecord::Schema.define(:version => 0) do
-  create_table :people, :force => true do |t|
+  create_table :users, :force => true do |t|
     t.column 'email', :string
   end
 end
@@ -19,43 +19,28 @@ class Person < ActiveRecord::Base
   validates_email_format_of :email, :on => :create, :message => 'fails with custom message', :allow_nil => true
 end
 
-# Set up Feedback testing framework, a la carte
-
 require 'test/unit'
 require 'shoulda'
 require "#{File.dirname(__FILE__)}/../init"
 
 class Test::Unit::TestCase #:nodoc:
-  
-  def self.should_allow_values(*good_values)
-    get_options!(good_values)
+  def self.should_allow_values(klass,*good_values)
     good_values.each do |v|
       should "allow email to be set to #{v.inspect}" do
-        user = User.new(:email => v)
+        user = klass.new(:email => v)
         user.save
         assert_nil user.errors.on(:email)
       end
     end
   end
 
-  def self.should_not_allow_values(*bad_values)
-    message = get_options!(bad_values, :message)
-    message ||= /invalid/
+  def self.should_not_allow_values(klass,*bad_values)
     bad_values.each do |v|
       should "not allow email to be set to #{v.inspect}" do
-        user = User.new(:email => v)
+        user = klass.new(:email => v)
         assert !user.save, "Saved user with email set to \"#{v}\""
         assert user.errors.on(:email), "There are no errors set on email after being set to \"#{v}\""
       end
     end
   end
-  
-  def self.get_options!(args, *wanted)
-    ret  = []
-    opts = (args.last.is_a?(Hash) ? args.pop : {})
-    wanted.each {|w| ret << opts.delete(w)}
-    raise ArgumentError, "Unsuported options given: #{opts.keys.join(', ')}" unless opts.keys.empty?
-    return *ret
-  end
-  
 end

data/test/validates_email_format_of_test.rb

@@ -1,137 +1,37 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class ValidatesEmailFormatOfTest < Test::Unit::TestCase
-  @@valid_email = 'valid@example.com'
-  @@invalid_email = 'invalid@example.'
-  
-  @@valid_emails = ['valid@example.com',
-     'Valid@test.example.com',
-     'valid+valid123@test.example.com',
-     'valid_valid123@test.example.com',
-     'valid-valid+123@test.example.co.uk',
-     'valid-valid+1.23@test.example.com.au',
-     'valid@example.co.uk',
-     'v@example.com',
-     'valid@example.ca',
-     'valid_@example.com',
-     'valid123.456@example.org',
-     'valid123.456@example.travel',
-     'valid123.456@example.museum',
-     'valid@example.mobi',
-     'valid@example.info',
-     'valid-@example.com',
-  # from RFC 3696, page 6
-     'customer/department=shipping@example.com',
-     '$A12345@example.com',
-     '!def!xyz%abc@example.com',
-     '_somename@example.com',
-  # apostrophes
-     "test'test@example.com",
-     ]
-     
-  def test_should_allow_valid_email_addresses
-    @@valid_emails.each do |email|
-      p = create_person(:email => email)
-      save_passes(p, email)
-    end
-  end
-  
-  @@invalid_emails = ['invalid@example-com',
-  # period can not start local part
-     '.invalid@example.com',
-  # period can not end local part
-     'invalid.@example.com', 
-  # period can not appear twice consecutively in local part
-     'invali..d@example.com',
-     'invalid@example.com.',
-     'invalid@example.com_',
-     'invalid@example.com-',
-     'invalid-example.com',
-     'invalid@example.b#r.com',
-     'invalid@example.c',
-     'invali d@example.com',
-     'invalidexample.com',
-     'invalid@example.']
-
-  def test_should_not_allow_invalid_email_addresses
-    @@invalid_emails.each do |email|
-      p = create_person(:email => email)
-      save_fails(p, email)
-    end
-  end
-  
-  @@quoted_emails = ['"Abc\@def"@example.com',     
-   '"Fred\ Bloggs"@example.com',
-   '"Joe.\\Blow"@example.com',
-   ]
-
-  # from http://www.rfc-editor.org/errata_search.php?rfc=3696
-  def test_should_allow_quoted_characters
-    @@quoted_emails.each do |email|
-      p = create_person(:email => email)
-      save_passes(p, email)
-    end
-  end
-  
-  @@unescaped_emails = ['Fred\ Bloggs_@example.com',
-   'Abc\@def+@example.com',
-   'Joe.\\Blow@example.com'
-   ]
-
-  # from http://tools.ietf.org/html/rfc3696, page 5
-  # corrected in http://www.rfc-editor.org/errata_search.php?rfc=3696
-  def test_should_not_allow_escaped_characters_without_quotes
-    @@unescaped_emails.each do |email|
-      p = create_person(:email => email)
-      save_fails(p, email)
-    end
-  end
-  
-  @@long_emails = ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@example.com',
-   'test@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com'
-   ]
-
-  def test_should_check_length_limits
-    @@long_emails.each do |email|
-      p = create_person(:email => email)
-      save_fails(p, email)
-    end
-  end
-
-  def test_should_respect_validate_on_option
-    p = create_person(:email => @@valid_email)
-    save_passes(p)
-    
-    # we only asked to validate on :create so this should fail
-    assert p.update_attributes(:email => @@invalid_email)
-    assert_equal @@invalid_email, p.email
-  end
-  
-  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)
-  end
-
-  def test_should_allow_nil
-    p = create_person(:email => nil)
-    save_passes(p)
-  end
-
-  protected
-    def create_person(params)
-      Person.new(params)
-    end
-
-    def save_passes(p, email = '')
-      assert p.valid?, " validating #{email}"
-      assert p.save
-      assert_nil p.errors.on(:email)
-    end
-    
-    def save_fails(p, email = '')
-      assert !p.valid?, " validating #{email}"
-      assert !p.save
-      assert p.errors.on(:email)
-    end
-end
+require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../shoulda_macros/validates_email_format_of'
+
+class User < ActiveRecord::Base
+  validates_email_format_of :email, 
+    :on        => :create, 
+    :message   => 'fails with custom message', 
+    :allow_nil => true
+end
+
+class ValidatesEmailFormatOfTest < Test::Unit::TestCase
+  should_validate_email_format_of_klass(User, :email)
+
+  context 'An invalid user on update' do
+    setup do
+      @user = User.new(:email => 'dcroak@thoughtbot.com')
+      assert @user.save
+      assert @user.update_attribute :email, '..dcroak@thoughtbot.com'
+    end
+      
+    should 'pass validation' do
+      assert @user.valid?
+      assert @user.save
+      assert_nil @user.errors.on(:email)
+    end
+  end
+  
+  context 'A user with a nil email' do
+    setup { @user = User.new(:email => nil) }
+    
+    should 'pass validation' do
+      assert @user.valid?
+      assert @user.save
+      assert_nil @user.errors.on(:email)
+    end
+  end
+end

data/validates_email_format_of.gemspec

@@ -1,33 +1,32 @@
 Gem::Specification.new do |s|
-  s.name = %q{validates_email_format_of}
-  s.version = "1.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new("= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alex Dunae"]
-  s.date = %q{2008-07-02}
-  s.description = %q{Validate e-mail addreses against RFC 2822 and RFC 3696}
-  s.email = %q{code@code.dunae.ca}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/validates_email_format_of.rb", "README.markdown"]
-  s.files = ["CHANGELOG", "init.rb", "lib/validates_email_format_of.rb", "MIT-LICENSE", "rails/init.rb", "rakefile", "README", "test/database.yml", "test/fixtures/people.yml", "test/fixtures/person.rb", "test/schema.rb", "test/test_helper.rb", "test/validates_email_format_of_test.rb", "Rakefile", "Manifest", "validates_email_format_of.gemspec"]
+  s.name = "validates_email_format_of"
+  s.version = "1.2.2"
+  s.date = "2008-10-01"
+  s.summary = "Validate e-mail addreses against RFC 2822 and RFC 3696."
+  s.email = "dcroak@thoughtbot.com"
+  s.description = "Validate e-mail addreses against RFC 2822 and RFC 3696."
+  s.authors = ["Alex Dunae", "Dan Croak", "Mike Burns"]
+  s.extra_rdoc_files = ["CHANGELOG", 
+    "lib/validates_email_format_of.rb", 
+    "README.markdown"]
+  s.files = ["CHANGELOG", 
+    "init.rb", 
+    "lib/validates_email_format_of.rb", 
+    "MIT-LICENSE", 
+    "rails/init.rb", 
+    "Rakefile", 
+    "README", 
+    "test/database.yml", 
+    "test/fixtures/people.yml", 
+    "test/fixtures/person.rb", 
+    "test/schema.rb", 
+    "test/test_helper.rb", 
+    "test/validates_email_format_of_test.rb", 
+    "Rakefile", 
+    "validates_email_format_of.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://code.dunae.ca/validates_email_format_of.html}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Validates_email_format_of"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{validates_email_format_of}
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{Validate e-mail addreses against RFC 2822 and RFC 3696}
-  s.test_files = ["test/test_helper.rb", "test/validates_email_format_of_test.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if current_version >= 3 then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
-    else
-      s.add_dependency(%q<echoe>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<echoe>, [">= 0"])
-  end
 end
+

metadata

@@ -1,28 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: dancroak-validates_email_format_of
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Alex Dunae
+- Dan Croak
+- Mike Burns
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-07-02 00:00:00 -07:00
+date: 2008-10-01 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: Validate e-mail addreses against RFC 2822 and RFC 3696
-email: code@code.dunae.ca
+dependencies: []
+
+description: Validate e-mail addreses against RFC 2822 and RFC 3696.
+email: dcroak@thoughtbot.com
 executables: []
 
 extensions: []
@@ -37,7 +31,7 @@ files:
 - lib/validates_email_format_of.rb
 - MIT-LICENSE
 - rails/init.rb
-- rakefile
+- Rakefile
 - README
 - test/database.yml
 - test/fixtures/people.yml
@@ -45,8 +39,6 @@ files:
 - test/schema.rb
 - test/test_helper.rb
 - test/validates_email_format_of_test.rb
-- Rakefile
-- Manifest
 - validates_email_format_of.gemspec
 - README.markdown
 has_rdoc: true
@@ -67,17 +59,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
-rubyforge_project: validates_email_format_of
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Validate e-mail addreses against RFC 2822 and RFC 3696
-test_files: 
-- test/test_helper.rb
-- test/validates_email_format_of_test.rb
+summary: Validate e-mail addreses against RFC 2822 and RFC 3696.
+test_files: []
+

data/Manifest

@@ -1,15 +0,0 @@
-CHANGELOG
-init.rb
-lib/validates_email_format_of.rb
-MIT-LICENSE
-rails/init.rb
-rakefile
-README.markdown
-test/database.yml
-test/fixtures/people.yml
-test/fixtures/person.rb
-test/schema.rb
-test/test_helper.rb
-test/validates_email_format_of_test.rb
-Rakefile
-Manifest

data/rakefile

@@ -1,10 +0,0 @@
-require 'rake'
-require 'echoe'
-
-Echoe.new("validates_email_format_of") do |p|
-  p.author = "Alex Dunae"
-  p.summary = "Validate e-mail addreses against RFC 2822 and RFC 3696"
-  p.url = "http://code.dunae.ca/validates_email_format_of.html"
-  p.version = '1.2.1'
-  p.email = 'code@code.dunae.ca'
-end