Improvements and Corrections: separated validations for CPF and CNPJ, added dependencies, updated tests to Rspec3, make validation keep original value, value normalization after validation & some bug fixes.

README.rdoc

@@ -50,6 +50,14 @@ Regular validation options:
   :if          - Executes validation when :if evaluates true
   :unless      - Executes validation when :unless evaluates false
   :on          - Specifies validation context (e.g :save, :create or :update). Default is :save
+  :message     - Sets a custom message to be passed to the attribute (default is 'is invalid')
+
+CPF and CNPJ formatting:
+
+  When you run the validation on an attribute, if the value is a valid CPF or CNPJ, it will be formatted as so:
+  - valid CPF will be returned as 999.999.999-99
+  - valid CNPJ will be returned as 99.999.999/9999-99
+
 
 == Contributing
 

lib/validates_cpf_cnpj.rb

@@ -7,27 +7,88 @@ module Validations
     class CpfOrCnpjValidator < ActiveModel::EachValidator
       include ValidatesCpfCnpj
 
+      ELEVEN_DIGITS_REGEXP = /\A\d{11}\z/
+      FOURTEEN_DIGITS_REGEXP = /\A\d{14}\z/
+      CPF_FORMAT_REGEXP = /\A\d{3}\.\d{3}\.\d{3}\-\d{2}\z/
+      CNPJ_FORMAT_REGEXP = /\A\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}\z/
+      NON_DIGITS_REGEXP = /[^0-9]/
+
       def validate_each(record, attr_name, value)
-        return if (options[:allow_nil] and value.nil?) or (options[:allow_blank] and value.blank?)
-        return if (options[:if] == false) or (options[:unless] == true)
-        return if (options[:on].to_s == 'create' and not record.new_record?) or (options[:on].to_s == 'update' and record.new_record?)
-
-        if value.to_s.gsub(/[^0-9]/, '').length <= 11
-          if (not value.to_s.match(/\A\d{11}\z/) and not value.to_s.match(/\A\d{3}\.\d{3}\.\d{3}\-\d{2}\z/)) or not Cpf.valid?(value)
-            record.errors.add(attr_name)
-          end
+        return if should_skip?(record, attr_name, value)
+
+        inside_cpf_length = value.to_s.gsub(NON_DIGITS_REGEXP, '').length <= 11
+
+        if inside_cpf_length
+          validate_only_cpf(record, attr_name, value)
+        else
+          validate_only_cnpj(record, attr_name, value)
+        end
+      end
+
+    protected
+
+      def should_skip?(record, attr_name, value)
+        return true if (options[:allow_nil] && value.nil?) || (options[:allow_blank] && value.blank?)
+        return true if (options[:if] == false) || (options[:unless] == true)
+        return true if (options[:on].to_s == 'create' && !record.new_record?) || (options[:on].to_s == 'update' && record.new_record?)
+        false
+      end
+
+      def validate_only_cpf(record, attr_name, value)
+        return if should_skip?(record, attr_name, value)
+        valid_cpf_format = value.to_s.match(ELEVEN_DIGITS_REGEXP) || value.to_s.match(CPF_FORMAT_REGEXP)
+
+        if (valid_cpf_format && Cpf.valid?(value))
+          format_cpf(record, attr_name, value)
+        else
+          add_error(record, attr_name)
+        end
+      end
+
+      def validate_only_cnpj(record, attr_name, value)
+        return if should_skip?(record, attr_name, value)
+        valid_cnpj_format = value.to_s.match(FOURTEEN_DIGITS_REGEXP) || value.to_s.match(CNPJ_FORMAT_REGEXP)
+
+        if (valid_cnpj_format && Cnpj.valid?(value))
+          format_cnpj(record, attr_name, value)
         else
-          if (not value.to_s.match(/\A\d{14}\z/) and not value.to_s.match(/\A\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}\z/)) or not Cnpj.valid?(value)
-            record.errors.add(attr_name)
-          end
+          add_error(record, attr_name)
         end
       end
+
+      def add_error(record, attr_name)
+        if options[:message]
+          record.errors.add(attr_name, options[:message])
+        else
+          record.errors.add(attr_name)
+        end
+      end
+
+      def format_cpf(record, attr_name, value)
+        return unless value
+        value.gsub!(NON_DIGITS_REGEXP, '')
+        formatted_value = "#{value[0..2]}.#{value[3..5]}.#{value[6..8]}-#{value[9..10]}"
+        record.send("#{attr_name}=", formatted_value)
+      end
+
+      def format_cnpj(record, attr_name, value)
+        return unless value
+        value.gsub!(NON_DIGITS_REGEXP, '')
+        formatted_value = "#{value[0..1]}.#{value[2..4]}.#{value[5..7]}/#{value[8..11]}-#{value[12..13]}"
+        record.send("#{attr_name}=", formatted_value)
+      end
     end
 
     class CpfValidator < CpfOrCnpjValidator
+      def validate_each(record, attr_name, value)
+        validate_only_cpf(record, attr_name, value)
+      end
     end
 
     class CnpjValidator < CpfOrCnpjValidator
+      def validate_each(record, attr_name, value)
+        validate_only_cnpj(record, attr_name, value)
+      end
     end
 
     module HelperMethods

lib/validates_cpf_cnpj/cnpj.rb

@@ -1,15 +1,21 @@
 module ValidatesCpfCnpj
   module Cnpj
+    NON_DIGITS_REGEXP = /[^0-9]/
+    FOURTEEN_PLUS_EQUAL_CHARACTERS_REGEXP = /\A(\d)\1{13,}\z/
+
     def self.valid?(value)
-      value.gsub!(/[^0-9]/, '')
-      digit = value.slice(-2, 2)
+      value_only_digits = value.gsub(NON_DIGITS_REGEXP, '')
+
+      return false if value_only_digits =~ FOURTEEN_PLUS_EQUAL_CHARACTERS_REGEXP
+
+      digit = value_only_digits.slice(-2, 2)
       control = ''
-      if value.size == 14
+      if value_only_digits.size == 14
         factor = 0
         2.times do |i|
           sum = 0;
           12.times do |j|
-            sum += value.slice(j, 1).to_i * ((11 + i - j) % 8 + 2)
+            sum += value_only_digits.slice(j, 1).to_i * ((11 + i - j) % 8 + 2)
           end
           sum += factor * 2 if i == 1
           factor = 11 - sum  % 11

lib/validates_cpf_cnpj/cpf.rb

@@ -1,20 +1,21 @@
 module ValidatesCpfCnpj
   module Cpf
     @@invalid_cpfs = %w{12345678909 11111111111 22222222222 33333333333 44444444444 55555555555 66666666666 77777777777 88888888888 99999999999 00000000000}
+    NON_DIGITS_REGEXP = /[^0-9]/
 
     def self.valid?(value)
-      value.gsub!(/[^0-9]/, '')
+      value_only_digits = value.gsub(NON_DIGITS_REGEXP, '')
 
-      return false if @@invalid_cpfs.member?(value)
-      
-      digit = value.slice(-2, 2)
+      return false if @@invalid_cpfs.member?(value_only_digits)
+
+      digit = value_only_digits.slice(-2, 2)
       control = ''
-      if value.size == 11
+      if value_only_digits.size == 11
         factor = 0
         2.times do |i|
           sum = 0
           9.times do |j|
-            sum += value.slice(j, 1).to_i * (10 + i - j)
+            sum += value_only_digits.slice(j, 1).to_i * (10 + i - j)
           end
           sum += (factor * 2) if i == 1
           factor = (sum * 10) % 11

lib/validates_cpf_cnpj/version.rb

@@ -1,3 +1,3 @@
 module ValidatesCpfCnpj
-  VERSION = "0.2.0"
+  VERSION = "1.0.1"
 end