activevalidators 1.2.0 → 1.2.1

data/.gitignore

@@ -1,2 +1,3 @@
 *.swp
 *.gem
+*.rbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activevalidators (1.2.0)
+    activevalidators (1.2.1)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       date_validator (= 0.5.9)
@@ -46,6 +46,7 @@ GEM
     tzinfo (0.3.23)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/activevalidators.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.2.0'
+  s.version     = '1.2.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Franck Verrot"]
   s.email       = ["franck@verrot.fr"]

data/lib/active_model/validations/email_validator.rb

@@ -4,14 +4,12 @@ module ActiveModel
     class EmailValidator < EachValidator
       def validate_each(record,attribute,value)
         begin
-          m = Mail::Address.new(value)
-          r = m.domain && m.address == value
-          t = m.__send__(:tree)
-          r &&= (t.domain.dot_atom_text.elements.size > 1)
-        rescue Exception => e
-          r = false
+          address = Mail::Address.new(value)
+          valid = address.domain && value.include?(address.address)
+        rescue Mail::Field::ParseError
+          valid = false
         end
-        record.errors.add(attribute) unless r
+        record.errors.add(attribute) unless valid
       end
     end
   end

data/lib/active_model/validations/ip_validator.rb

@@ -1,13 +1,39 @@
 module ActiveModel
   module Validations
-    require 'resolv'
     class IpValidator < EachValidator
       def validate_each(record, attribute, value)
-        r = Resolv.const_get("IP#{options[:format]}")
-        raise "Unknown IP validator format #{options[:format].inspect}" if r.nil?
-        record.errors.add(attribute) unless !(r::Regex !~ value)
+        record.errors.add(attribute) unless regex.match(value)
       end
 
+      def check_validity!
+        raise ArgumentError, "Unknown IP validator format #{options[:format].inspect}" unless [:v4, :v6].include? options[:format]
+      end
+
+      private
+        def regex
+          case options[:format]
+          when :v4
+            ipv4_regex
+          when :v6
+            ipv6_regex
+          end
+        end
+
+        def ipv4_regex
+          # Extracted from ruby 1.9.2
+          regex256 = 
+            /0
+            |1(?:[0-9][0-9]?)?
+            |2(?:[0-4][0-9]?|5[0-5]?|[6-9])?
+            |[3-9][0-9]?/x
+          /\A(#{regex256})\.(#{regex256})\.(#{regex256})\.(#{regex256})\z/
+        end
+
+        def ipv6_regex
+          require 'resolv'
+          Resolv::IPv6::Regex
+        end
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,3 +6,8 @@ end
 
 RSpec.configure do |config|
 end
+
+class TestRecord
+  include ActiveModel::Validations
+  attr_accessor :ip, :url, :slug, :responder, :global_condition, :local_condition, :phone, :email, :card
+end

data/spec/validations/credit_card_spec.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Credit Card Validation" do
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :card,  :credit_card => { :type => :any }
+  end
+  
+  subject { TestRecord.new }
+
+  # Here are some valid credit cards
+  VALID_CARDS =  
+  {
+    #American Express
+    :amex =>	'3400 0000 0000 009',
+    #Carte Blanche	
+    :carte_blanche => '3000 0000 0000 04',
+    #Discover	
+    :discover => '6011 0000 0000 0004',
+    #Diners Club	
+    :diners_club => '3852 0000 0232 37',
+    #enRoute	
+    :en_route => '2014 0000 0000 009',
+    #JCB	
+    :jcb => '2131 0000 0000 0008',
+    #MasterCard	
+    :master_card => '5500 0000 0000 0004',
+    #Solo	
+    :solo => '6334 0000 0000 0004',
+    #Switch	
+    :switch => '4903 0100 0000 0009',
+    #Visa	
+    :visa => '4111 1111 1111 1111',
+    #Laser	
+    :laser => '6304 1000 0000 0008'
+  }
+
+  VALID_CARDS.each_pair do |card, number|
+    it "accepts #{card} valid cards" do
+      subject.card = number
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+  end
+
+  describe "for invalid cards" do
+
+    before :each do
+      subject.card = '99999'
+    end
+
+    it "rejects invalid cards" do
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generates an error message of type invalid" do
+      subject.should_not be_valid
+      subject.errors[:card].should include subject.errors.generate_message(:card, :invalid)
+    end
+  end
+end

data/spec/validations/email_spec.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Email Validation" do
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :email, :email => true
+  end
+  
+  subject { TestRecord.new }
+
+  it "accepts valid emails" do
+    subject.email = 'franck@verrot.fr'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  it "accepts complete emails" do
+    subject.email = 'Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  describe "for invalid emails" do
+    before :each do
+      subject.email = 'franck.fr'
+    end
+
+    it "rejects invalid emails" do
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it 'rejects local emails' do
+      subject.email = 'franck'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generates an error message of type invalid" do
+      subject.should_not be_valid
+      subject.errors[:email].should include subject.errors.generate_message(:email, :invalid)
+    end
+  end
+end

data/spec/validations/ip_spec.rb

@@ -0,0 +1,73 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "IP Validation" do
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+  end
+  
+  subject { TestRecord.new }
+
+  describe "IPv4 Validation" do
+    before :each do
+      TestRecord.validates :ip, :ip => { :format => :v4 }
+    end
+
+    it "accepts valid IPs" do
+      subject.ip = '192.168.1.1'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+
+    context "for invalid IPs" do
+      before :each do
+        subject.ip = '267.34.56.3'
+      end
+
+      it "rejects invalid IPs" do
+        subject.should_not be_valid
+        subject.should have(1).error
+      end
+
+      it "generates an error message of type invalid" do
+        subject.should_not be_valid
+        subject.errors[:ip].should include subject.errors.generate_message(:ip, :invalid)
+      end
+    end
+  end
+
+  describe "IPv6 Validation" do
+    before :each do
+      TestRecord.validates :ip, :ip => { :format => :v6 }
+    end
+
+    it "accepts valid IPs" do
+      subject.ip = '::1'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+
+    context "for invalid IPs" do
+      before :each do
+        subject.ip = '192.168.1.1'
+      end
+
+      it "rejects invalid IPs" do
+        subject.should_not be_valid
+        subject.should have(1).error
+      end
+
+      it "generates an error message of type invalid" do
+        subject.should_not be_valid
+        subject.errors[:ip].should include subject.errors.generate_message(:ip, :invalid)
+      end
+    end
+  end
+
+  it "checks validity of the arguments" do
+    [3, "foo", 1..6].each do |wrong_argument|
+      expect {
+        TestRecord.validates :ip, :ip => { :format => wrong_argument }
+      }.to raise_error(ArgumentError, "Unknown IP validator format #{wrong_argument.inspect}")
+    end
+  end
+end

data/spec/validations/phone_spec.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Phone Validation" do
+
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :phone, :phone => true
+  end
+  
+  subject { TestRecord.new }
+
+  it 'should validate format of phone with ###-###-####' do
+    subject.phone = '999-999-9999'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  it 'should validate format of phone with ##########' do
+    subject.phone = '9999999999'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  it 'should validate format of phone with ###.###.####' do
+    subject.phone = '999.999.9999'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  it 'should validate format of phone with ### ### ####' do
+    subject.phone = '999 999 9999'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  it 'should validate format of phone with (###) ###-####' do
+    subject.phone = '(999) 999-9999'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  describe "for invalid formats" do
+    before :each do
+      subject.phone = '999'
+    end
+
+    it "rejects invalid formats" do
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generates an error message of type invalid" do
+      subject.should_not be_valid
+      subject.errors[:phone].should include subject.errors.generate_message(:phone, :invalid)
+    end
+  end
+end

data/spec/validations/respond_to_spec.rb

@@ -0,0 +1,37 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Respond To Validation" do
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :responder, :respond_to => { :call => true, :if => :local_condition }, :if => :global_condition
+  end
+  
+  subject { TestRecord.new }
+
+  it "respond_to?" do
+    subject.responder = lambda {}
+    subject.global_condition = true
+    subject.local_condition = true
+
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  describe "when does not respond_to?" do
+    before :each do
+      subject.responder        = 42
+      subject.global_condition = true
+      subject.local_condition  = true
+    end
+
+    it "rejects the responder" do
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generates an error message of type invalid" do
+      subject.should_not be_valid
+      subject.errors[:responder].should include subject.errors.generate_message(:responder, :invalid)
+    end
+  end
+end

data/spec/validations/slug_spec.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Slug Validation" do
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :slug, :slug => true
+  end
+  
+  subject { TestRecord.new }
+
+  it "accepts valid slugs" do
+    subject.slug = '1234567890-foo-bar-bar'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  describe "for invalid slugs" do
+    before :each do
+      subject.slug = '@#$%^'
+    end
+
+    it "rejects invalid slugs" do
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generates an error message of type invalid" do
+      subject.should_not be_valid
+      subject.errors[:slug].should include subject.errors.generate_message(:slug, :invalid)
+    end
+  end
+end

data/spec/validations/url_spec.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Url Validation" do
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :url, :url => true
+  end
+  
+  subject { TestRecord.new }
+
+  it "accepts valid urls" do
+    subject.url = 'http://www.verrot.fr'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  it "accepts valid SSL urls" do
+    subject.url = 'https://www.verrot.fr'
+    subject.should be_valid
+    subject.should have(0).errors
+  end
+
+  describe "for invalid urls" do
+    before :each do
+      subject.url = 'http://^^^^.fr'
+    end
+
+    it "rejects invalid urls" do
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generates an error message of type invalid" do
+      subject.should_not be_valid
+      subject.errors[:url].should include subject.errors.generate_message(:url, :invalid)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Franck Verrot
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 +01:00
+date: 2010-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,22 +154,14 @@ files:
 - lib/active_model/validations/slug_validator.rb
 - lib/active_model/validations/url_validator.rb
 - lib/activevalidators.rb
-- spec/models/credit_card_validator_model.rb
-- spec/models/email_validator_model.rb
-- spec/models/ip_validator_model.rb
-- spec/models/phone_validator_model.rb
-- spec/models/respond_to_validator_model.rb
-- spec/models/slug_validator_model.rb
-- spec/models/url_validator_model.rb
 - spec/spec_helper.rb
-- spec/specs/credit_card_spec.rb
-- spec/specs/date_validator_spec.rb
-- spec/specs/email_spec.rb
-- spec/specs/ip_spec.rb
-- spec/specs/phone_spec.rb
-- spec/specs/respond_to_spec.rb
-- spec/specs/slug_spec.rb
-- spec/specs/url_spec.rb
+- spec/validations/credit_card_spec.rb
+- spec/validations/email_spec.rb
+- spec/validations/ip_spec.rb
+- spec/validations/phone_spec.rb
+- spec/validations/respond_to_spec.rb
+- spec/validations/slug_spec.rb
+- spec/validations/url_spec.rb
 has_rdoc: true
 homepage: http://github.com/cesario/activevalidators
 licenses: []
@@ -203,19 +195,11 @@ signing_key:
 specification_version: 3
 summary: Collection of ActiveModel/ActiveRecord validations
 test_files: 
-- spec/models/credit_card_validator_model.rb
-- spec/models/email_validator_model.rb
-- spec/models/ip_validator_model.rb
-- spec/models/phone_validator_model.rb
-- spec/models/respond_to_validator_model.rb
-- spec/models/slug_validator_model.rb
-- spec/models/url_validator_model.rb
 - spec/spec_helper.rb
-- spec/specs/credit_card_spec.rb
-- spec/specs/date_validator_spec.rb
-- spec/specs/email_spec.rb
-- spec/specs/ip_spec.rb
-- spec/specs/phone_spec.rb
-- spec/specs/respond_to_spec.rb
-- spec/specs/slug_spec.rb
-- spec/specs/url_spec.rb
+- spec/validations/credit_card_spec.rb
+- spec/validations/email_spec.rb
+- spec/validations/ip_spec.rb
+- spec/validations/phone_spec.rb
+- spec/validations/respond_to_spec.rb
+- spec/validations/slug_spec.rb
+- spec/validations/url_spec.rb

data/spec/models/credit_card_validator_model.rb

@@ -1,7 +0,0 @@
-module Models
-  class CreditCardValidatorModel
-    include ActiveModel::Validations
-    attr_accessor :card
-    validates :card,  :credit_card => { :type => :any }, :if => :card
-  end
-end

data/spec/models/email_validator_model.rb

@@ -1,7 +0,0 @@
-module Models
-  class EmailValidatorModel
-    include ActiveModel::Validations
-    attr_accessor :email
-    validates :email, :email => true
-  end
-end

data/spec/models/ip_validator_model.rb

@@ -1,8 +0,0 @@
-module Models
-  class IpValidatorModel
-    include ActiveModel::Validations
-    attr_accessor :ipv4, :ipv6
-    validates :ipv4, :ip => { :format => :v4 }, :if => :ipv4
-    validates :ipv6, :ip => { :format => :v6 }, :if => :ipv6
-  end
-end

data/spec/models/phone_validator_model.rb

@@ -1,7 +0,0 @@
-module Models
-  class PhoneValidatorModel
-    include ActiveModel::Validations
-    attr_accessor :phone
-    validates :phone, :phone => true
-  end
-end

data/spec/models/respond_to_validator_model.rb

@@ -1,7 +0,0 @@
-module Models
-  class RespondToValidatorModel
-    include ActiveModel::Validations
-    attr_accessor :responder, :global_condition, :local_condition
-    validates :responder, :respond_to => { :call => true, :if => :local_condition }, :if => :global_condition
-  end
-end

data/spec/models/slug_validator_model.rb

@@ -1,7 +0,0 @@
-module Models
-  class SlugValidatorModel
-    include ActiveModel::Validations
-    attr_accessor :slug
-    validates :slug, :slug => true
-  end
-end

data/spec/models/url_validator_model.rb

@@ -1,7 +0,0 @@
-module Models
-  class UrlValidatorModel
-    include ActiveModel::Validations
-    attr_accessor :url
-    validates :url, :url => true
-  end
-end

data/spec/specs/credit_card_spec.rb

@@ -1,56 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-# Here are some valid credit cards
-CARDS = {
-  #American Express
-  :amex =>	'3400 0000 0000 009',
-  #Carte Blanche	
-  :carte_blanche => '3000 0000 0000 04',
-  #Discover	
-  :discover => '6011 0000 0000 0004',
-  #Diners Club	
-  :diners_club => '3852 0000 0232 37',
-  #enRoute	
-  :en_route => '2014 0000 0000 009',
-  #JCB	
-  :jcb => '2131 0000 0000 0008',
-  #MasterCard	
-  :master_card => '5500 0000 0000 0004',
-  #Solo	
-  :solo => '6334 0000 0000 0004',
-  #Switch	
-  :switch => '4903 0100 0000 0009',
-  #Visa	
-  :visa => '4111 1111 1111 1111',
-  #Laser	
-  :laser => '6304 1000 0000 0008'
-}
-
-describe "Credit Card Validation" do
-  CARDS.each_pair do |card, number|
-  it "accepts #{card} valid cards" do
-    model = Models::CreditCardValidatorModel.new
-    model.card = number
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-  end
-
-  describe "for invalid cards" do
-    let(:model) do
-      Models::CreditCardValidatorModel.new.tap do |m|
-        m.card = '99999'
-      end
-    end
-
-    it "rejects invalid cards" do
-      model.valid?.should be(false)
-      model.should have(1).errors
-    end
-
-    it "generates an error message of type invalid" do
-      model.valid?.should be(false)
-      model.errors[:card].should == [model.errors.generate_message(:card, :invalid)]
-    end
-  end
-end

data/spec/specs/date_validator_spec.rb

@@ -1,124 +0,0 @@
-#Copied from DateValidator v0.5.9
-#The translation stuff has been removed though
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-require 'active_support/time' # For testing Date and TimeWithZone objects
-
-class TestRecord
-  include ActiveModel::Validations
-  attr_accessor :expiration_date
-
-  def initialize(expiration_date)
-    @expiration_date = expiration_date
-  end
-end
-
-describe "DateValidator" do
-
-  before(:each) do
-    TestRecord.reset_callbacks(:validate)
-  end
-
-  it "checks validity of the arguments" do
-    [3, "foo", 1..6].each do |wrong_argument|
-      expect {
-        TestRecord.validates :expiration_date, :date => {:before => wrong_argument}
-      }.to raise_error(ArgumentError, ":before must be a time, a date, a time_with_zone, a symbol or a proc")
-    end
-  end
-
-  it "complains if provided with no options" do
-    TestRecord.validates :expiration_date, :date => {:before => Time.now}
-    model = TestRecord.new(nil)
-    model.should_not be_valid
-  end
-
-  [:valid,:invalid].each do |should_be|
-
-    _context = should_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
-
-    context _context do
-
-      [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
-
-          now = Time.now.to_datetime
-
-          model_date = case check
-            when :after then should_be == :valid ? now + 21000 : now - 1
-            when :before then should_be == :valid ? now - 21000 : now + 1
-            when :after_or_equal_to then should_be == :valid ? now : now - 21000
-            when :before_or_equal_to then should_be == :valid ? now : now + 21000
-          end
-
-#          it "ensures that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
-            #TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
-            #model = TestRecord.new(model_date)
-            #should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check") : model.should_not(be_valid, "an attribute should be invalidwhen offending the #{check} check")
-          #end
-
-          if _context == 'when value does not match validation requirements'
-
-            it "yields a default error message indicating that value must be #{check} validation requirements" do
-              TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
-              model = TestRecord.new(model_date)
-              model.should_not be_valid
-            end
-            
-          end
-
-      end
-
-      if _context == 'when value does not match validation requirements'
-
-        it "allows for a custom validation message" do
-          TestRecord.validates :expiration_date, :date => {:before_or_equal_to => Time.now, :message => 'must be after Christmas'}
-          model = TestRecord.new(Time.now + 21000)
-          model.should_not be_valid
-        end
-
-      end
-
-    end
-
-  end
-
-  extra_types = [:proc, :symbol]
-  extra_types.push(:date) if defined?(Date) and defined?(DateTime)
-  extra_types.push(:time_with_zone) if defined?(ActiveSupport::TimeWithZone)
-
-  extra_types.each do |type|
-    it "accepts a #{type} as an argument to a check" do
-      case type
-        when :proc then
-          expect {
-            TestRecord.validates :expiration_date, :date => {:after => Proc.new{Time.now + 21000}}
-          }.to_not raise_error
-        when :symbol then
-          expect {
-            TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
-            TestRecord.validates :expiration_date, :date => {:after => :min_date}
-          }.to_not raise_error
-        when :date then
-          expect {
-            TestRecord.validates :expiration_date, :date => {:after => Time.now.to_date}
-          }.to_not raise_error
-        when :time_with_zone then
-          expect {
-            Time.zone = "Hawaii"
-            TestRecord.validates :expiration_date, :date => {:before => Time.zone.parse((Time.now + 21000).to_s)}
-          }.to_not raise_error
-      end
-    end
-  end
-
-  it "gracefully handles an unexpected result from a proc argument evaluation" do
-    TestRecord.validates :expiration_date, :date => {:after => Proc.new{ nil }}
-    TestRecord.new(Time.now).should_not be_valid
-  end
-
-  it "gracefully handles an unexpected result from a symbol argument evaluation" do
-    TestRecord.send(:define_method, :min_date, lambda { nil })
-    TestRecord.validates :expiration_date, :date => {:after => :min_date}
-    TestRecord.new(Time.now).should_not be_valid
-  end
-end

data/spec/specs/email_spec.rb

@@ -1,28 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe "Email Validation" do
-  it "accepts valid emails" do
-    model = Models::EmailValidatorModel.new
-    model.email = 'franck@verrot.fr'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  describe "for invalid emails" do
-    let(:model) do
-      Models::EmailValidatorModel.new.tap do |m|
-        m.email = 'franck.fr'
-      end
-    end
-
-    it "rejects invalid emails" do
-      model.valid?.should be(false)
-      model.should have(1).errors
-    end
-
-    it "generates an error message of type invalid" do
-      model.valid?.should be(false)
-      model.errors[:email].should == [model.errors.generate_message(:email, :invalid)]
-    end
-  end
-end

data/spec/specs/ip_spec.rb

@@ -1,57 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe "IP Validation" do
-  describe "IPv4 Validation" do
-    it "accepts valid IPs" do
-      model = Models::IpValidatorModel.new
-      model.ipv4 = '192.168.1.1'
-      model.valid?.should be(true)
-      model.should have(0).errors
-    end
-
-    describe "for invalid IPs" do
-      let(:model) do
-        Models::IpValidatorModel.new.tap do |m|
-          m.ipv4 = '267.34.56.3'
-        end
-      end
-
-      it "rejects invalid IPs" do
-        model.valid?.should be(false)
-        model.should have(1).errors
-      end
-
-      it "generates an error message of type invalid" do
-        model.valid?.should be(false)
-        model.errors[:ipv4].should == [model.errors.generate_message(:ipv4, :invalid)]
-      end
-    end
-  end
-
-  describe "IPv6 Validation" do
-    it "accepts valid IPs" do
-      model = Models::IpValidatorModel.new
-      model.ipv6 = '::1'
-      model.valid?.should be(true)
-      model.should have(0).errors
-    end
-
-    describe "for invalid IPs" do
-      let(:model) do
-        Models::IpValidatorModel.new.tap do |m|
-          m.ipv6 = '192.168.1.1'
-        end
-      end
-
-      it "rejects invalid IPs" do
-        model.valid?.should be(false)
-        model.should have(1).errors
-      end
-
-      it "generates an error message of type invalid" do
-        model.valid?.should be(false)
-        model.errors[:ipv6].should == [model.errors.generate_message(:ipv6, :invalid)]
-      end
-    end
-  end
-end

data/spec/specs/phone_spec.rb

@@ -1,57 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe "Phone Validation" do
-
-  it 'should validate format of phone with ###-###-####' do
-    model = Models::PhoneValidatorModel.new
-    model.phone = '999-999-9999'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  it 'should validate format of phone with ##########' do
-    model = Models::PhoneValidatorModel.new
-    model.phone = '9999999999'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  it 'should validate format of phone with ###.###.####' do
-    model = Models::PhoneValidatorModel.new
-    model.phone = '999.999.9999'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  it 'should validate format of phone with ### ### ####' do
-    model = Models::PhoneValidatorModel.new
-    model.phone = '999 999 9999'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  it 'should validate format of phone with (###) ###-####' do
-    model = Models::PhoneValidatorModel.new
-    model.phone = '(999) 999-9999'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  describe "for invalid formats" do
-    let(:model) do
-      Models::PhoneValidatorModel.new.tap do |m|
-        m.phone = '999'
-      end
-    end
-
-    it "rejects invalid formats" do
-      model.valid?.should be(false)
-      model.should have(1).errors
-    end
-
-    it "generates an error message of type invalid" do
-      model.valid?.should be(false)
-      model.errors[:phone].should == [model.errors.generate_message(:phone, :invalid)]
-    end
-  end
-end

data/spec/specs/respond_to_spec.rb

@@ -1,33 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe "Respond To Validation" do
-  it "respond_to?" do
-    model = Models::RespondToValidatorModel.new
-    model.responder = lambda {}
-    model.global_condition = true
-    model.local_condition = true
-
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  describe "when does not respond_to?" do
-    let(:model) do
-      Models::RespondToValidatorModel.new.tap do |m|
-        m.responder        = 42
-        m.global_condition = true
-        m.local_condition  = true
-      end
-    end
-
-    it "rejects the responder" do
-      model.valid?.should be(false)
-      model.should have(1).errors
-    end
-
-    it "generates an error message of type invalid" do
-      model.valid?.should be(false)
-      model.errors[:responder].should == [model.errors.generate_message(:responder, :invalid)]
-    end
-  end
-end

data/spec/specs/slug_spec.rb

@@ -1,28 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe "Slug Validation" do
-  it "accepts valid slugs" do
-    model = Models::SlugValidatorModel.new
-    model.slug = '1234567890-foo-bar-bar'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  describe "for invalid slugs" do
-    let(:model) do
-      Models::SlugValidatorModel.new.tap do |m|
-        m.slug = '@#$%^'
-      end
-    end
-
-    it "rejects invalid slugs" do
-      model.valid?.should be(false)
-      model.should have(1).errors
-    end
-
-    it "generates an error message of type invalid" do
-      model.valid?.should be(false)
-      model.errors[:slug].should == [model.errors.generate_message(:slug, :invalid)]
-    end
-  end
-end

data/spec/specs/url_spec.rb

@@ -1,28 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe "Url Validation" do
-  it "accepts valid urls" do
-    model = Models::UrlValidatorModel.new
-    model.url = 'http://www.verrot.fr'
-    model.valid?.should be(true)
-    model.should have(0).errors
-  end
-
-  describe "for invalid emails" do
-    let(:model) do
-      Models::UrlValidatorModel.new.tap do |m|
-        m.url = 'http://^^^^.fr'
-      end
-    end
-
-    it "rejects invalid emails" do
-      model.valid?.should be(false)
-      model.should have(1).errors
-    end
-
-    it "generates an error message of type invalid" do
-      model.valid?.should be(false)
-      model.errors[:url].should == [model.errors.generate_message(:url, :invalid)]
-    end
-  end
-end