more_validators 0.1.3 → 0.2.0

data/CHANGELOG

@@ -1,8 +1,11 @@
+0.2.0 - Apr 14th 2011
+* more_validators version >= 0.2.x is now compatible with Rails 3 ONLY
+
 0.1.3 - May 14th 2010
-* added allow_blank => true as default behaviour for validators
+* Added allow_blank => true as default behaviour for validators
 
 0.1.2 - May 13th 2010
-* new validators:
+* New validators:
 ** validates_as_uf_br
 
 0.1.0 - May 12th 2010

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (C) 2011 by Infosimples. http://www.infosimples.com.br/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,99 @@
+== MoreValidators
+
+MoreValidators is a Rails gem that provides a series of extra validators.
+
+The latest version of this library provides the following validation methods:
+
+* validates_as_cep: brazilian postal code validation;
+* validates_as_cnpj: brazilian CNPJ validation;
+* validates_as_cpf: brazilizan CPF validation;
+* validates_as_email: email address validation;
+* validates_as_phonenumber_br: brazilian phone number validation;
+* validates_as_uf_br: brazilian state validation;
+* validates_as_website: website URL validation.
+
+Contact us if you have any questions:
+contato@infosimples.com.br
+
+== Latest version:
+
+Version: 0.2.0
+
+== Installation:
+
+The latest version of MoreValidators is compatible with Rails 3 ONLY. However, it's possible to use this gem with Rails 2; if that's what you need, follow the installation instructions on the Rails 2 section below.
+
+=== Rails 3:
+
+You can install the latest version of MoreValidators with:
+
+	gem install more_validators
+	
+You can add it to your Gemfile:
+	
+	gem 'more_validators'
+
+=== Rails 2:
+
+You can install MoreValidators with:
+
+	gem install more_validators --version=0.1.3
+	
+You can add it to your Gemfile:
+	
+	gem 'more_validators', '0.1.3'
+
+== Usage:
+
+In your model file do something like:
+
+	class MyClass < ActiveRecord::Base
+
+		# Email validation
+		validates_as_email :email
+	
+		# Brazilian postal code validation
+		validates_as_cep :cep, :allow_blank => true
+	
+		# Brazilian phone number validation
+		validates_as_phonenumber_br :phonenumber, :allow_nil => true
+	
+		# CPF validation
+		validates_as_cpf :cpf
+	
+		# CNPJ validation
+		validates_as_cnpj :cnpj :allow_blank => true
+
+		# Brazilian UF validation
+		# Both upcase and downcase are allowed by default
+		validates_as_uf_br :uf
+
+	end
+
+== I18n
+
+The default error message is "is invalid".
+You can customize this message via Rails I18n defining the key :invalid.
+
+=== Example
+
+Your customized en.yaml file would look like this:
+
+	en:
+	  activerecord:
+	    errors:
+	      messages:
+	        invalid: "MY CUSTOM MESSAGE"
+
+== Tests:
+
+Some tests have been added to each validator.
+
+=== Maintainers
+
+* Rafael Barbolo Lopes (http://github.com/barbolo)
+* Rafael Ivan Garcia (http://github.com/rafaelivan)
+
+== License:
+
+MIT License. Copyright (C) 2011 by Infosimples. http://www.infosimples.com.br

data/init.rb

@@ -1 +1 @@
-require 'validates_as_'
+require 'more_validators'

data/lib/{validates_as_.rb → more_validators.rb}

@@ -4,4 +4,4 @@ require 'validates_as_cpf'
 require 'validates_as_email'
 require 'validates_as_phonenumber_br'
 require 'validates_as_website'
-require 'validates_as_uf_br'
+require 'validates_as_uf_br'

data/lib/validates_as_cep.rb

@@ -1,15 +1,18 @@
 module ActiveRecord
   module Validations
+  
+    class CEPValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if not (value.is_a?(String) ? value : value.to_s).match(/\A(\d{5})([-]{0,1})(\d{3})\Z/).nil?
+        record.errors.add(attribute, 
+                          I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid'), 
+                          options.merge(:value => value))
+      end
+    end
+  
     module ClassMethods
       def validates_as_cep(*attr_names)
-        configuration = {
-          :message => I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid' ),
-          :with => /\A(\d{5})([-]{0,1})(\d{3})\Z/,
-          :allow_nil => true,
-          :allow_blank => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_format_of attr_names, configuration
+        validates_with CEPValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/validates_as_cnpj.rb

@@ -1,71 +1,78 @@
-module CNPJ
-  BLACK_LIST = %w(00000000000000 11111111111111 22222222222222 33333333333333
-44444444444444 55555555555555 66666666666666 77777777777777
-88888888888888 99999999999999)
-
-  def self.valid?(cnpj)
+module ActiveRecord
+  module Validations
+  
+    class CNPJValidator < ActiveModel::EachValidator
+      @@black_list = %w(00000000000000 11111111111111 22222222222222 33333333333333 
+                      44444444444444 55555555555555 66666666666666 77777777777777
+                      88888888888888 99999999999999)
     
-    cnpj = cnpj.to_s
+      def validate_each(record, attribute, value)
+       return if valid? value
+       record.errors.add(attribute, 
+                         I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid'), 
+                         options.merge(:value => value))
+      end
+    
+      #
+      # Private methods.
+      #
+      private
+    
+      def valid? cnpj        
+        begin
+          cnpj = (cnpj.is_a?(String) ? cnpj : cnpj.to_s)
+        rescue Exception => exc
+          return false
+        end
 
-    # could be 13 or 14 digits or with mask 99.999.999/9999-99
-    if cnpj !~ /^\d{13,14}$|\d{2}\.\d{3}\.\d{3}\/\d{4}-\d{2}$/
-      return false
-    end
+        # could be 13 or 14 digits or with mask 99.999.999/9999-99
+        if cnpj !~ /^\d{13,14}$|\d{2}\.\d{3}\.\d{3}\/\d{4}-\d{2}$/
+          return false
+        end
 
-    cnpj = cnpj.scan(/\d/).collect(&:to_i)
-    cnpj.unshift(0) if cnpj.length == 13
+        cnpj = cnpj.scan(/\d/).collect(&:to_i)
+        cnpj.unshift(0) if cnpj.length == 13
 
-    # filter black list
-    if BLACK_LIST.include? cnpj.join
-      return false
-    end
+        # filter black list
+        if @@black_list.include? cnpj.join
+          return false
+        end
 
-    # calculate first digit
-    factor = [5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2]
+        # calculate first digit
+        factor = [5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2]
 
-    sum = (0..11).inject(0) do |sum, i|
-      sum + cnpj[i] * factor[i]
-    end
+        sum = (0..11).inject(0) do |sum, i|
+          sum + cnpj[i] * factor[i]
+        end
 
-    result = sum % 11
-    result = result < 2 ? 0 : 11 - result
+        result = sum % 11
+        result = result < 2 ? 0 : 11 - result
 
-    if result != cnpj[12]
-      return false
-    end
+        if result != cnpj[12]
+          return false
+        end
 
-    # calculate second digit
-    factor.unshift 6
+        # calculate second digit
+        factor.unshift 6
 
-    sum = (0..12).inject(0) do |sum, i|
-      sum + cnpj[i] * factor[i]
-    end
+        sum = (0..12).inject(0) do |sum, i|
+          sum + cnpj[i] * factor[i]
+        end
 
-    result = sum % 11
-    result = result < 2 ? 0 : 11 - result
+        result = sum % 11
+        result = result < 2 ? 0 : 11 - result
 
-    result == cnpj[13]
-  end
+        result == cnpj[13]
+      end
+    
+      def invalid? cnpj
+        not valid? cnpj
+      end
+    end
   
-  def self.invalid?(cnpj)
-    !valid?(cnpj)
-  end
-end
-
-module ActiveRecord
-  module Validations
     module ClassMethods
       def validates_as_cnpj(*attr_names)
-        configuration = {
-          :message => I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid' ),
-          :allow_nil => true,
-          :allow_blank => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_each attr_names, configuration do |record, attribute, value|
-          record.errors.add(attribute, configuration[:message]) if CNPJ.invalid?(value)
-        end
-        
+        validates_with CNPJValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/validates_as_cpf.rb

@@ -1,68 +1,77 @@
-module CPF
-  BLACK_LIST = %w(12345678909 11111111111 22222222222 33333333333 44444444444
-55555555555 66666666666 77777777777 88888888888 99999999999
-00000000000)
-
-  def self.valid?(cpf)    
-    cpf = cpf.to_s
-
-    # could be 10 or 11 digits or with mask 999.999.999-99
-    if cpf !~ /^\d{10,11}$|\d{3}\.\d{3}\.\d{3}-\d{2}$/
-      return false
-    end
-
-    cpf = cpf.scan(/\d/).collect(&:to_i)
-    cpf.unshift(0) if cpf.length == 10
+module ActiveRecord
+  module Validations
+    
+    class CPFValidator < ActiveModel::EachValidator
+      @@black_list = %w(12345678909 11111111111 22222222222 33333333333 44444444444
+                        55555555555 66666666666 77777777777 88888888888 99999999999
+                        00000000000)
+      
+      def validate_each(record, attribute, value)
+        return if valid? value
+        record.errors.add(attribute, 
+                          I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid'), 
+                          options.merge(:value => value))
+      end
+      
+      #
+      # Private methods.
+      #
+      private
+      
+      def valid? cpf
+        begin
+          cpf = (cpf.is_a?(String) ? cpf : cpf.to_s)
+        rescue Exception => exc
+          return false
+        end
+        
+        # could be 10 or 11 digits or with mask 999.999.999-99
+        if cpf !~ /^\d{10,11}$|\d{3}\.\d{3}\.\d{3}-\d{2}$/
+          return false
+        end
 
-    # filter black list
-    if BLACK_LIST.include? cpf.join
-      return false
-    end
+        cpf = cpf.scan(/\d/).collect(&:to_i)
+        cpf.unshift(0) if cpf.length == 10
 
-    # calculate first digit
-    sum = (0..8).inject(0) do |sum, i|
-      sum + cpf[i] * (10 - i)
-    end
+        # filter black list
+        if @@black_list.include? cpf.join
+          return false
+        end
 
-    result = sum % 11
-    result = result < 2 ? 0 : 11 - result
+        # calculate first digit
+        sum = (0..8).inject(0) do |sum, i|
+          sum + cpf[i] * (10 - i)
+        end
 
-    if result != cpf[9]
-      return false
-    end
+        result = sum % 11
+        result = result < 2 ? 0 : 11 - result
 
-    # calculate second digit
-    sum = (0..8).inject(0) do |sum, i|
-      sum + cpf[i] * (11 - i)
-    end
+        if result != cpf[9]
+          return false
+        end
 
-    sum += cpf[9] * 2
+        # calculate second digit
+        sum = (0..8).inject(0) do |sum, i|
+          sum + cpf[i] * (11 - i)
+        end
 
-    result = sum % 11
-    result = result < 2 ? 0 : 11 - result
+        sum += cpf[9] * 2
 
-    result == cpf[10]
-  end
-  
-  def self.invalid?(cpf)
-    !valid?(cpf)
-  end
-end
+        result = sum % 11
+        result = result < 2 ? 0 : 11 - result
 
-module ActiveRecord
-  module Validations
+        result == cpf[10]
+      end
+      
+      def invalid? cpf
+        not valid? cpf
+      end
+      
+    end
+    
     module ClassMethods
       def validates_as_cpf(*attr_names)
-        configuration = {
-          :message => I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid' ),
-          :allow_nil => true,
-          :allow_blank => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_each attr_names, configuration do |record, attribute, value|
-          record.errors.add(attribute, configuration[:message]) if CPF.invalid?(value)
-        end
-        
+        validates_with CPFValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/validates_as_email.rb

@@ -1,58 +1,18 @@
-#
-# RFC822 Email Address Regex
-# --------------------------
-#
-# Originally written by Cal Henderson
-# c.f. http://iamcal.com/publish/articles/php/parsing_email/
-#
-# Translated to Ruby by Tim Fletcher, with changes suggested by Dan Kubb.
-#
-# Licensed under a Creative Commons Attribution-ShareAlike 2.5 License
-# http://creativecommons.org/licenses/by-sa/2.5/
-#
-module RFC822
-  EmailAddress = begin
-    qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'
-    dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]'
-    atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-' +
-      '\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+'
-    quoted_pair = '\\x5c[\\x00-\\x7f]'
-    domain_literal = "\\x5b(?:#{dtext}|#{quoted_pair})*\\x5d"
-    quoted_string = "\\x22(?:#{qtext}|#{quoted_pair})*\\x22"
-    domain_ref = atom
-    sub_domain = "(?:#{domain_ref}|#{domain_literal})"
-    word = "(?:#{atom}|#{quoted_string})"
-    domain = "#{sub_domain}(?:\\x2e#{sub_domain})*"
-    local_part = "#{word}(?:\\x2e#{word})*"
-    addr_spec = "#{local_part}\\x40#{domain}"
-    pattern = /\A#{addr_spec}\z/
-  end
-end
-
-# Validation helper for ActiveRecord derived objects that cleanly and simply
-# allows the model to check if the given string is a syntactically valid email
-# address (by using the RFC822 module above).
-#
-# Original code by Ximon Eighteen <ximon.eightee@int.greenpeace.org> which was
-# heavily based on code I can no longer find on the net, my apologies to the
-# author!
-#
-# Huge credit goes to Dan Kubb <dan.kubb@autopilotmarketing.com> for
-# submitting a patch to massively simplify this code and thereby instruct me
-# in the ways of Rails too! I reflowed the patch a little to keep the line
-# length to a maximum of 78 characters, an old habit.
 module ActiveRecord
   module Validations
+    
+    class EmailValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if not (value.is_a?(String) ? value : value.to_s).match(/\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i).nil?
+        record.errors.add(attribute, 
+                          I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid'), 
+                          options.merge(:value => value))
+      end
+    end
+    
     module ClassMethods
       def validates_as_email(*attr_names)
-        configuration = {
-          :message => I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid' ),
-          :with => RFC822::EmailAddress,
-          :allow_nil => true,
-          :allow_blank => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_format_of attr_names, configuration
+        validates_with EmailValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/validates_as_phonenumber_br.rb

@@ -1,15 +1,18 @@
 module ActiveRecord
   module Validations
+    
+    class PhoneNumberBrValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if not (value.is_a?(String) ? value : value.to_s).match(/\A([1-9]{2})([- ]{0,1})(\d{3}|\d{4})([- ]{0,1})(\d{4})\Z/).nil?
+        record.errors.add(attribute, 
+                          I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid'), 
+                          options.merge(:value => value))
+      end
+    end
+    
     module ClassMethods
       def validates_as_phonenumber_br(*attr_names)
-        configuration = {
-          :message => I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid' ),
-          :with => /\A([1-9]{2})([- ]{0,1})(\d{3}|\d{4})([- ]{0,1})(\d{4})\Z/,
-          :allow_nil => true,
-          :allow_blank => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_format_of attr_names, configuration
+        validates_with PhoneNumberBrValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/validates_as_uf_br.rb

@@ -1,32 +1,35 @@
-module UF_BR
-  LIST_UP = %w(AC AL AM AP BA CE DF ES GO MA MG MS MT PA PB PE PI PR RJ RN RO RR RS SC SE SP TO)
-  LIST_DOWN = %w(ac al am ap ba ce df es go ma mg ms mt pa pb pe pi pr rj rn ro rr rs sc se sp to)
-
-  def self.valid?(uf_br, allow_up = true, allow_down = true)
-    (allow_up and LIST_UP.include? uf_br) or (allow_down and LIST_DOWN.include? uf_br)
-  end
-  
-  def self.invalid?(uf_br, allow_up = true, allow_down = true)
-    !valid?(uf_br, allow_up, allow_down)
-  end
-end
-
 module ActiveRecord
   module Validations
+    
+    class UFBRValidator < ActiveModel::EachValidator
+      
+      @@ufs = %w(AC AL AM AP BA CE DF ES GO MA MG MS MT PA PB PE PI PR RJ RN RO RR RS SC SE SP TO)
+      
+      def validate_each(record, attribute, value)
+        return if valid? value
+        record.errors.add(attribute, 
+                          I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid'), 
+                          options.merge(:value => value))
+      end
+      
+      #
+      # Private methods.
+      #
+      private
+      
+      def valid? uf_br
+        @@ufs.include? (uf_br.is_a?(String) ? uf_br.upcase : uf_br.to_s.upcase)
+      end
+      
+      def invalid? uf_br
+        not valid? uf_br
+      end
+      
+    end
+    
     module ClassMethods
       def validates_as_uf_br(*attr_names)
-        configuration = {
-          :message => I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid' ),
-          :allow_nil => true,
-          :allow_blank => true,
-          :allow_down => true,
-          :allow_up => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_each attr_names, configuration do |record, attribute, value|
-          record.errors.add(attribute, configuration[:message]) if UF_BR.invalid?(value, configuration[:allow_up], configuration[:allow_down])
-        end
-        
+        validates_with UFBRValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/validates_as_website.rb

@@ -1,15 +1,18 @@
 module ActiveRecord
   module Validations
+    
+    class WebsiteValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if not (value.is_a?(String) ? value : value.to_s).match(/\A(http|https)[:]\/{2}[^\/.]+([.][^\/.]+)+.*\Z/i).nil?
+        record.errors.add(attribute, 
+                          I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid'), 
+                          options.merge(:value => value))
+      end
+    end
+    
     module ClassMethods
       def validates_as_website(*attr_names)
-        configuration = {
-          :message => I18n.translate('activerecord.errors.messages.invalid', :default => 'invalid' ),
-          :with => /\A(http|https)[:]\/{2}[^\/.]+([.][^\/.]+)+.*\Z/i,
-          :allow_nil => true,
-          :allow_blank => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        validates_format_of attr_names, configuration
+        validates_with WebsiteValidator, _merge_attributes(attr_names)
       end
     end
   end

data/test/validates_as_cep_test.rb

@@ -22,11 +22,17 @@ end
 class ValidatesAsCepTest < Test::Unit::TestCase
   def test_illegal_cep
     values = [
+      nil,
+      '',
+      '0123456',
+      '12-432300',
+      '-',
       '1234',
       '11111111111111111',
       'name???',
       '1234567890'
-      ]
+    ]
+    
     values.each do |value|
       assert !TestRecord.new(:cep => value).valid?, "#{value} should be illegal."
     end
@@ -36,9 +42,10 @@ class ValidatesAsCepTest < Test::Unit::TestCase
     values = [
       '05012-101',
       '01234-000',
-      '12345-678']
-      
-    values.push('')
+      '12345-678',
+      '03124891',
+      '93123763'
+    ]
       
     values.each do |value|
       assert TestRecord.new(:cep => value).valid?, "#{value} should be legal."

data/test/validates_as_cnpj_test.rb

@@ -22,6 +22,18 @@ end
 class ValidatesAsCNPJTest < Test::Unit::TestCase
   def test_illegal_cnpj
     values = [
+      nil,
+      '',
+      '00000000000000',
+      '11111111111111',
+      '22222222222222',
+      '33333333333333',
+      '44444444444444',
+      '55555555555555',
+      '66666666666666',
+      '77777777777777',
+      '88888888888888',
+      '99999999999999',
       '1234',
       '11111111111111111',
       '1.2.3.4.1',
@@ -29,7 +41,7 @@ class ValidatesAsCNPJTest < Test::Unit::TestCase
       '00000000000',
       '227.566.442-42',
       '22756644242',
-      '11111111111111'
+      '11.111.111/1111-11'
       ]
     values.each do |value|
       assert !TestRecord.new(:cnpj => value).valid?, "#{value} should be illegal."
@@ -41,8 +53,6 @@ class ValidatesAsCNPJTest < Test::Unit::TestCase
       '28.261.861/0001-42',
       '28261861000142']
       
-    values.push('')
-      
     values.each do |value|
       assert TestRecord.new(:cnpj => value).valid?, "#{value} should be legal."
     end

data/test/validates_as_cpf_test.rb

@@ -22,6 +22,8 @@ end
 class ValidatesAsCpfTest < Test::Unit::TestCase
   def test_illegal_cpf
     values = [
+      nil,
+      '',
       '1234',
       '11111111111111111',
       '1.2.3.4.1',
@@ -40,9 +42,8 @@ class ValidatesAsCpfTest < Test::Unit::TestCase
   def test_legal_cpf
     values = [
       '227.566.442-42',
-      '22756644242']
-    
-    values.push('')
+      '22756644242'
+    ]
       
     values.each do |value|
       assert TestRecord.new(:cpf => value).valid?, "#{value} should be legal."

data/test/validates_as_email_test.rb

@@ -20,28 +20,25 @@ class TestRecord < ActiveRecord::Base
 end
 
 class ValidatesAsEmailTest < Test::Unit::TestCase
-  def test_illegal_rfc822_email_address
+  def test_illegal_email_address
     addresses = [
+      nil,
+      '',
       'Max@Job 3:14',
       'Job@Book of Job',
-      'J. P. \'s-Gravezande, a.k.a. The Hacker!@example.com',
-      ]
+      'J. P. \'s-Gravezande, a.k.a. The Hacker!@example.com'
+    ]
     addresses.each do |address|
       assert !TestRecord.new(:email => address).valid?, "#{address} should be illegal."
     end
   end
 
-  def test_legal_rfc822_email_address
+  def test_legal_email_address
     addresses = [
-      'test@example',
       'test@example.com',
       'test@example.co.uk',
-      '"J. P. \'s-Gravezande, a.k.a. The Hacker!"@example.com',
-      'me@[187.223.45.119]',
-      'someone@123.com',
-      ]
-    
-    addresses.push('')  
+      'someone@123.com'
+    ]
     
     addresses.each do |address|
       assert TestRecord.new(:email => address).valid?, "#{address} should be legal."

data/test/validates_as_phonenumber_br_test.rb

@@ -22,6 +22,8 @@ end
 class ValidatesAsPhoneNumberBRTest < Test::Unit::TestCase
   def test_illegal_phonenumber_br
     values = [
+      nil,
+      '',
       '1234',
       '11111111111111111',
       'name???',
@@ -42,9 +44,8 @@ class ValidatesAsPhoneNumberBRTest < Test::Unit::TestCase
       '11 5555 5555',
       '11 555 5555',
       '11-5555 5555',
-      '11 555-5555']
-      
-    values.push('')
+      '11 555-5555'
+    ]
       
     values.each do |value|
       assert TestRecord.new(:phonenumber_br => value).valid?, "#{value} should be legal."

data/test/validates_as_uf_br_test.rb

@@ -22,6 +22,8 @@ end
 class ValidatesAsUFBRTest < Test::Unit::TestCase
   def test_illegal_uf_br
     values = [
+      nil,
+      '',
       'rh',
       'cc',
       'sao paulo',
@@ -36,8 +38,6 @@ class ValidatesAsUFBRTest < Test::Unit::TestCase
     values = %w(ac al am ap ba ce df es go ma mg ms mt pa pb pe pi pr rj rn ro rr rs sc se sp to
     AC AL AM AP BA CE DF ES GO MA MG MS MT PA PB PE PI PR RJ RN RO RR RS SC SE SP TO)
 
-    values.push('')
-
     values.each do |value|
       assert TestRecord.new(:uf_br => value).valid?, "#{value} should be legal."
     end

data/test/validates_as_website_test.rb

@@ -22,6 +22,8 @@ end
 class ValidatesAsWebsiteTest < Test::Unit::TestCase
   def test_illegal_website
     values = [
+      nil,
+      '',
       'http://',
       'http:///',
       'http://www',
@@ -39,9 +41,8 @@ class ValidatesAsWebsiteTest < Test::Unit::TestCase
       'https://test.com',
       'https://test.com/',
       'http://www.test.com/test/test/test.html',
-      'https://www.test.com/test/test/test.html?test=test']
-
-    values.push('')
+      'https://www.test.com/test/test/test.html?test=test'
+    ]
       
     values.each do |value|
       assert TestRecord.new(:website => value).valid?, "#{value} should be legal."

metadata

@@ -4,25 +4,25 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
-- Rafael Barbolo
-- Ximon Eighteen
-- Dan Kubb
-- Thijs van der Vossen
+- Rafael Barbolo Lopes
+- Rafael Ivan Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -03:00
+date: 2011-04-14 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
 description: Rails gem/plugin that implements a series of ActiveRecord validation helpers
-email: rafael@barbolo.com.br
+email: 
+- rafael.barbolo@infosimples.com.br
+- rafael.ivan@infosimples.com.br
 executables: []
 
 extensions: []
@@ -31,11 +31,11 @@ extra_rdoc_files: []
 
 files: 
 - CHANGELOG
-- LICENSE
-- README
+- MIT-LICENSE
+- README.rdoc
 - Rakefile
 - init.rb
-- lib/validates_as_.rb
+- lib/more_validators.rb
 - lib/validates_as_cep.rb
 - lib/validates_as_cnpj.rb
 - lib/validates_as_cpf.rb
@@ -51,15 +51,16 @@ files:
 - test/validates_as_website_test.rb
 - test/validates_as_uf_br_test.rb
 has_rdoc: true
-homepage: http://github.com/barbolo/more_validators
+homepage: http://github.com/infosimples/more_validators
 licenses: []
 
-post_install_message: "\n  ============================================================\n  Thanks for installing MoreValidators!\n  ------------------------------------------------------------\n  Check it out at http://github.com/barbolo/more_validators\n  ============================================================\n  "
+post_install_message: "\n  ============================================================\n  Thanks for installing MoreValidators!\n  ------------------------------------------------------------\n  Check it out at http://github.com/infosimples/more_validators\n  ============================================================\n  "
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -67,6 +68,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 
@@ -76,7 +78,7 @@ 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: Rails gem/plugin that provides a series of validators

data/LICENSE

@@ -1,5 +0,0 @@
-Licensing terms follow:
- 
-This software is placed under the Creative Commons Attribution-Share Alike 3.0 Unported License
-
-http://creativecommons.org/licenses/by-sa/3.0/

data/README

@@ -1,59 +0,0 @@
-MoreValidators
-==============
-
-Rails gem/plugin is a series of validators provided by me or other people:
-
-ValidateAsEmail: http://github.com/gbdev/validates_as_email
-
-It's released under Creative Commons Attribution-Share Alike 3.0 Unported License.
-
-Talk to me if you have any questions:
-Rafael Barbolo: rafael@barbolo.com.br
-http://twitter.com/barbolo
-
-Installation:
-=============
-Install the gem(s):
-gem install more_validators
-
-Add to environment.rb initializer block:
-config.gem 'more_validators', :lib => 'validates_as_'
-
-LatestVersion
---------------
-Version: 0.1.3
---------------
-
-Usage:
-======
-In your model file do something like:
-
-class MyClass < ActiveRecord::Base
-
-	# Email validation
-	validates_as_email :email, :message => 'Invalid', :allow_nil => true, :allow_blank => true
-	
-	# Brazilian postal code validation
-	validates_as_cep :cep, :message => 'Invalid', :allow_nil => true, :allow_blank => true
-	
-	# Brazilian phone number validation
-	validates_as_phonenumber_br :phonenumber, :message => 'Invalid', :allow_nil => true, :allow_blank => true
-	
-	# CPF validation
-	validates_as_cpf :cpf, :message => 'Invalid', :allow_nil => true, :allow_blank => true
-	
-	# CNPJ validation
-	validates_as_cnpj :cnpj, :message => 'Invalid', :allow_nil => true, :allow_blank => true
-
-	# Brazilian UF validation, both upcase and downcase are allowed by default
-	validates_as_uf_br :uf, :allow_up => true, :allow_down => true
-
-end
-
-Tests:
-======
-Some tests have been added to each validator.
-
-License:
-========
-See the LICENSE file.