validate_email 0.1.2 → 0.1.3

data/lib/validates_email.rb

@@ -1,18 +1,21 @@
 require 'active_model'
-require 'active_model/validations'
 require 'mail'
 
-module Perfectline
-  module ValidatesEmail
+module ActiveModel
+  module Validations
     class EmailValidator < ActiveModel::EachValidator
+      
       def initialize(options)
         options.reverse_merge!(:message => "is not valid email")
         super(options)
       end
 
       def validate_each(record, attribute, value)
+        return if options[:allow_nil] && value.nil?
+
         begin
-          mail = Mail::Address.new(value)          
+          mail = Mail::Address.new(value)
+
           unless mail.address == value && mail.domain.split(".").length > 1
             record.errors.add(attribute, options[:message])
           end
@@ -30,5 +33,3 @@ module Perfectline
   end
 end
 
-ActiveModel::Validations::HelperMethods.send(:include, Perfectline::ValidatesEmail::ClassMethods)
-ActiveModel::Validations::EmailValidator = Perfectline::ValidatesEmail::EmailValidator

data/rails/init.rb

@@ -1 +1 @@
-require 'validates_email'
+require 'validates_email'

data/spec/resources/user.rb

@@ -1,5 +1,3 @@
-require 'active_model/validations'
-
 class User
   include ActiveModel::Validations
 

data/spec/resources/user_with_ar.rb

@@ -0,0 +1,5 @@
+class UserWithAr < ActiveRecord::Base
+  self.table_name = "users"
+
+  validates :email_address, :email => true
+end

data/spec/resources/user_with_ar_legacy.rb

@@ -0,0 +1,5 @@
+class UserWithArLegacy < ActiveRecord::Base
+  self.table_name = "users"
+
+  validates_email :email_address
+end

data/spec/resources/user_with_blank.rb

@@ -1,5 +1,3 @@
-require 'active_model/validations'
-
 class UserWithBlank
   include ActiveModel::Validations
 

data/spec/resources/{user_with_legacy_syntax.rb → user_with_legacy.rb}

@@ -1,6 +1,4 @@
-require 'active_model/validations'
-
-class UserWithLegacySyntax
+class UserWithLegacy
   include ActiveModel::Validations
 
   attr_accessor :email_address

data/spec/resources/user_with_nil.rb

@@ -1,5 +1,3 @@
-require 'active_model/validations'
-
 class UserWithNil
   include ActiveModel::Validations
 

data/spec/spec_helper.rb

@@ -2,11 +2,23 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/resources')
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'spec'
-require 'validates_email'
+require 'rspec'
+require 'sqlite3'
+require 'active_record'
+require 'active_record/base'
+require 'active_record/migration'
 
-autoload :User,                 'resources/user'
-autoload :UserWithNil,          'resources/user_with_nil'
-autoload :UserWithBlank,        'resources/user_with_blank'
-autoload :UserWithLegacySyntax, 'resources/user_with_legacy_syntax'
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.establish_connection(
+    "adapter"   => "sqlite3",
+    "database"  => ":memory"
+)
 
+require File.join(File.dirname(__FILE__), '..', 'rails', 'init')
+
+autoload :User,             'resources/user'
+autoload :UserWithNil,      'resources/user_with_nil'
+autoload :UserWithBlank,    'resources/user_with_blank'
+autoload :UserWithLegacy,   'resources/user_with_legacy'
+autoload :UserWithAr,       'resources/user_with_ar'
+autoload :UserWithArLegacy, 'resources/user_with_ar_legacy'

data/spec/validates_email_spec.rb

@@ -1,6 +1,20 @@
 require 'spec_helper'
 
-describe "Enail validation", Perfectline::ValidatesEmail::EmailValidator do
+describe "Email validation" do
+
+  before(:all) do
+    ActiveRecord::Schema.define(:version => 1) do
+
+      create_table :users, :force => true do |t|
+        t.column :email_address, :string
+      end
+
+    end
+  end
+
+  after(:all) do
+    ActiveRecord::Base.connection.drop_table(:users)
+  end
 
   context "with regular validator" do
     before do
@@ -87,7 +101,7 @@ describe "Enail validation", Perfectline::ValidatesEmail::EmailValidator do
 
   context "with legacy syntax" do
     before do
-      @user = UserWithLegacySyntax.new
+      @user = UserWithLegacy.new
     end
 
     it "should allow nil as email" do
@@ -111,4 +125,26 @@ describe "Enail validation", Perfectline::ValidatesEmail::EmailValidator do
     end
   end
 
+  context "with ActiveRecord" do
+    before do
+      @user = UserWithAr.new
+    end
+
+    it "should not allow invalid email" do
+      @user.email_address = ""
+      @user.should_not be_valid
+    end
+  end
+
+  context "with ActiveRecord and legacy syntax" do
+    before do
+      @user = UserWithArLegacy.new
+    end
+
+    it "should not allow invalid email" do
+      @user.email_address = ""
+      @user.should_not be_valid
+    end
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tanel Suurhans
@@ -22,6 +22,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -34,6 +35,7 @@ dependencies:
   name: diff-lcs
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -45,9 +47,38 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mail
+  name: active_record
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mail
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,11 +88,12 @@ dependencies:
         - 5
         version: 2.2.5
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -70,7 +102,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 description: Library for validating email addresses in Rails 3 models.
 email: 
 - tanel.suurhans@perfectline.ee
@@ -86,6 +118,14 @@ files:
 - install.rb
 - lib/validates_email.rb
 - rails/init.rb
+- spec/resources/user_with_blank.rb
+- spec/resources/user_with_nil.rb
+- spec/resources/user_with_ar.rb
+- spec/resources/user_with_ar_legacy.rb
+- spec/resources/user_with_legacy.rb
+- spec/resources/user.rb
+- spec/validates_email_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/perfectline/validates_email/tree/master
 licenses: []
@@ -96,6 +136,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -103,6 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -112,14 +154,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Library for validating email addresses in Rails 3 models.
 test_files: 
-- spec/resources/user.rb
 - spec/resources/user_with_blank.rb
-- spec/resources/user_with_legacy_syntax.rb
 - spec/resources/user_with_nil.rb
-- spec/spec_helper.rb
+- spec/resources/user_with_ar.rb
+- spec/resources/user_with_ar_legacy.rb
+- spec/resources/user_with_legacy.rb
+- spec/resources/user.rb
 - spec/validates_email_spec.rb
+- spec/spec_helper.rb