validates_as_cnpj 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/validates_as_cnpj.rb

@@ -1,2 +1,2 @@
 require 'validates_as_cnpj/cnpj'
-require 'validates_as_cnpj/validates_as_cnpj'
+require 'validates_as_cnpj/cnpj_validator'

data/lib/validates_as_cnpj/cnpj.rb

@@ -1,46 +1,52 @@
 module CNPJ
-  # Invalids
-  INVALIDS = %w(
-    00000000000000 11111111111111 22222222222222 33333333333333
-    44444444444444 55555555555555 66666666666666 77777777777777
-    88888888888888 99999999999999)
-
-  def self.valid? cnpj
-    # Basic validation
+  BLACK_LIST = %w(00000000000000 11111111111111 22222222222222 33333333333333
+                  44444444444444 55555555555555 66666666666666 77777777777777
+                  88888888888888 99999999999999)
+
+  def self.valid?(cnpj)
     cnpj = cnpj.to_s
 
-    if cnpj !~ /^\d{14}|\d{2}\.\d{3}\.\d{3}\/\d{4}-\d{2}$/
+    # 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
 
-    if INVALIDS.member? cnpj.to_s
+    # filter black list
+    if BLACK_LIST.include? cnpj.join
       return false
     end
 
-    # Parse first digit
+    # 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])
+      sum + cnpj[i] * factor[i]
     end
 
     result = sum % 11
     result = result < 2 ? 0 : 11 - result
 
-    return false unless cnpj[12] == result
+    if result != cnpj[12]
+      return false
+    end
 
-    # Parse second digit
+    # calculate second digit
     factor.unshift 6
 
     sum = (0..12).inject(0) do |sum, i|
-      sum + (cnpj[i] * factor[i])
+      sum + cnpj[i] * factor[i]
     end
 
     result = sum % 11
     result = result < 2 ? 0 : 11 - result
 
-    return result == cnpj[13]
+    result == cnpj[13]
+  end
+  
+  def self.invalid?(cnpj)
+    !valid?(cnpj)
   end
 end

data/lib/validates_as_cnpj/cnpj_validator.rb

@@ -0,0 +1,5 @@
+class CnpjValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors.add(attribute, options[:message]) if CNPJ.invalid?(value)
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,18 @@
 require 'rubygems'
+require 'test/unit'
 require 'active_support'
-require 'active_support/test_case'
+require 'active_record'
+require 'validates_as_cnpj/cnpj_validator'
+require 'validates_as_cnpj/cnpj'
+
+# create a temporary database
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+
+silence_stream(STDOUT) do
+  ActiveRecord::Schema.define do
+    create_table :companies do |t|
+      t.string :name
+      t.string :document
+    end
+  end
+end

data/test/validate_as_cnpj_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class ValidatesAsCnpjTest < ActiveSupport::TestCase
+  class Company < ActiveRecord::Base
+    validates :document, :cnpj => true
+  end
+  
+  test "blank values" do
+    assert_equal false, Company.new(:document => '').valid?
+    assert_equal false, Company.new(:document => false).valid?
+    assert_equal false, Company.new(:document => nil).valid?
+  end
+  
+  test "black list" do
+    CNPJ::BLACK_LIST.each do |cnpj|
+      assert_equal false, Company.new(:document => cnpj).valid?
+    end
+  end
+  
+  test "only digits" do
+    assert Company.new(:document => '41821571000174').valid?
+  end
+  
+  test "with mask" do
+    assert Company.new(:document => '41.821.571/0001-74').valid?
+  end
+  
+  test "integer value" do
+    assert Company.new(:document => 41821571000174).valid?
+  end
+  
+  test "integer value missing 0" do
+    assert Company.new(:document => 3133161000141).valid?
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gabriel Sobrinho
@@ -26,19 +26,17 @@ extensions: []
 
 extra_rdoc_files: 
 - README.textile
-- TODO
 files: 
 - MIT-LICENSE
 - README.textile
 - Rakefile
-- TODO
 - VERSION
 - init.rb
 - lib/validates_as_cnpj.rb
 - lib/validates_as_cnpj/cnpj.rb
-- lib/validates_as_cnpj/validates_as_cnpj.rb
+- lib/validates_as_cnpj/cnpj_validator.rb
 - test/test_helper.rb
-- test/validate_as_cpf_test.rb
+- test/validate_as_cnpj_test.rb
 has_rdoc: true
 homepage: http://github.com/sobrinho/validates_as_cnpj
 licenses: []
@@ -71,4 +69,4 @@ specification_version: 3
 summary: CNPJ validation for ActiveModel
 test_files: 
 - test/test_helper.rb
-- test/validate_as_cpf_test.rb
+- test/validate_as_cnpj_test.rb

data/TODO

@@ -1 +0,0 @@
-Create tests

data/lib/validates_as_cnpj/validates_as_cnpj.rb

@@ -1,16 +0,0 @@
-module ActiveRecord
-  module Validations
-    module ClassMethods
-      def validates_as_cnpj *attr_names
-        configuration = { :message => :invalid }
-        configuration.update(attr_names.extract_options!)
-
-        validates_each(attr_names, configuration) do |record, attr_name, value|
-          unless CNPJ::valid? value
-            record.errors.add attr_name, configuration[:message]
-          end
-        end
-      end
-    end
-  end
-end

data/test/validate_as_cpf_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class ValidatesAsCnpjTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end