validates_cnpj 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f7bf2a713f6e1ef009efd5302209acf3c458c0124bc4516f7f42c18fbc4c50
-  data.tar.gz: 2965ec419a36e3ca0e16e046cf95042e196314f59e76c0ebba11a3a1e3cb2d18
+  metadata.gz: 76d72b266a42dbde1f4a3bd6b0d4822450b29e617049699a8c9c7ec13248ce79
+  data.tar.gz: 21b2439edb281c481c1a3199ecbc992db3452bbdf775101010c29d9ed06d5f61
 SHA512:
-  metadata.gz: 6a91cc9adf37d0459b5b2842825e120b695ed29270b538f7daf70cbf715ff079ba5105ea5085fbeaa2929e053580da9b72408ce9f3b70dcd5a0d9d000bd2298e
-  data.tar.gz: bbbd2b21a57737c85f60d190a6ed1fb7cbe694262b95b9d335cf058b07a3c1f191839c585ecb1f2fff11b248809136d4cac784c62e8ed1d1e12e13cdcf1bafab
+  metadata.gz: 5182b579f3926d2e29fb0a7e58c1894b2b6455e3a8e09fe6698ff307f56e7fd4680cb0a054513754b02ac810934a23e598b6ba72b439234ee7f015756e6897a9
+  data.tar.gz: c2621693f873408f0864f59f69d6d2df85f7ec72a18ca3129776cb00f2a9353c0f8b1b041ebc1c9a78d5e3c1b92cc27fac7427512eb14d0fdd393a9d313ee9e1

data/.rubocop.yml

@@ -1,17 +1,37 @@
+plugins:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.2
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 150
+
 Metrics/AbcSize:
-  Max: 17
+  Enabled: false
 
 Metrics/BlockLength:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 150
+Metrics/CyclomaticComplexity:
+  Enabled: false
 
 Metrics/MethodLength:
   Max: 25
 
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+RSpec/DescribedClass:
+  Enabled: false
+
 Style/Documentation:
-  Enabled: false
+  Enabled: false
+
+Style/RedundantConstantBase:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.7.3
+4.0.5

data/lib/validates_cnpj/cnpj.rb

@@ -3,11 +3,11 @@
 module ValidatesCnpj
   class Cnpj
     def initialize(number)
-      number =~ %r{^(\d{2}\.?\d{3}\.?\d{3}/?\d{4})-?(\d{2})$}
+      number.to_s.upcase =~ %r{^([A-Z\d]{2}\.?[A-Z\d]{3}\.?[A-Z\d]{3}/?[A-Z\d]{4})-?(\d{2})$}
       @number = number
       @pure_number = Regexp.last_match(1)
       @result = Regexp.last_match(2)
-      @cleaned_number = @pure_number.nil? ? nil : @number.gsub(%r{[\./-]}, '')
+      @cleaned_number = @pure_number.nil? ? nil : @number.to_s.upcase.gsub(%r{[./-]}, '')
       format_number! if @pure_number
     end
 
@@ -15,15 +15,15 @@ module ValidatesCnpj
       return true if @number.blank?
       return false unless @pure_number
 
-      check_cnpj
+      valid_cnpj?
     end
 
     attr_reader :number
 
     private
 
-    def check_cnpj
-      return false if (@cleaned_number.length != 14) || (@cleaned_number.scan(/\d/).uniq.length == 1)
+    def valid_cnpj?
+      return false if (@cleaned_number.length != 14) || (@cleaned_number[0, 12].chars.uniq.length == 1)
 
       @result == first_digit_verifier + second_digit_verifier
     end
@@ -40,8 +40,8 @@ module ValidatesCnpj
 
     def multiply_and_sum(array, number)
       multiplied = []
-      number.scan(/\d{1}/).each_with_index { |e, i| multiplied[i] = e.to_i * array[i] }
-      multiplied.inject { |s, e| s + e }
+      number.scan(/[A-Z\d]/).each_with_index { |character, index| multiplied[index] = (character.ord - 48) * array[index] }
+      multiplied.inject { |sum, element| sum + element }
     end
 
     def digit_verifier(rest)
@@ -49,7 +49,7 @@ module ValidatesCnpj
     end
 
     def format_number!
-      @cleaned_number =~ /(\d{2})(\d{3})(\d{3})(\d{4})(\d{2})/
+      @cleaned_number =~ /([A-Z\d]{2})([A-Z\d]{3})([A-Z\d]{3})([A-Z\d]{4})(\d{2})/
 
       match1 = Regexp.last_match(1)
       match2 = Regexp.last_match(2)

data/lib/validates_cnpj/cnpj_validator.rb

@@ -5,7 +5,11 @@ class CnpjValidator < ActiveModel::EachValidator
     cnpj = ValidatesCnpj::Cnpj.new(value)
 
     if cnpj.valid?
-      record.send("#{attribute}=", cnpj.number) if options[:mask]
+      if options[:mask]
+        record.send("#{attribute}=", cnpj.number)
+      elsif value.is_a?(String) && value != value.upcase
+        record.send("#{attribute}=", value.upcase)
+      end
     else
       ruby_prior_version_three =
         Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')

data/lib/validates_cnpj/require_a_valid_cnpj_matcher.rb

@@ -17,7 +17,7 @@ module Shoulda
 
         def matches?(subject)
           @subject = subject
-          disallows_value_of('123456') && allows_value_of('51.114.450/0001-46')
+          disallows_value_of('123456') && allows_value_of('51.114.450/0001-46') && allows_value_of('AB.12C.D34/EFGH-83')
         end
       end
     end

data/lib/validates_cnpj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ValidatesCnpj
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.2.0'
 end

data/spec/cnpj_validator_spec.rb

@@ -8,12 +8,12 @@ describe CnpjValidator do
   context 'when cnpj is invalid' do
     before do
       company.cnpj = 12_345
-      allow(I18n).to receive(:t).with(:"activerecord.errors.models.company.attributes.cnpj.invalid",
-                                      default: :"activerecord.errors.messages.invalid").and_return('is invalid')
+      allow(I18n).to receive(:t).with(:'activerecord.errors.models.company.attributes.cnpj.invalid',
+                                      default: :'activerecord.errors.messages.invalid').and_return('is invalid')
     end
 
     it 'sets object as invalid' do
-      expect(company.valid?).to eq(false)
+      expect(company.valid?).to be(false)
     end
 
     it 'sets an error on attribute' do
@@ -28,7 +28,7 @@ describe CnpjValidator do
     end
 
     it 'sets object as valid' do
-      expect(company.valid?).to eq(true)
+      expect(company.valid?).to be(true)
     end
 
     it 'does not set an error on attribute' do
@@ -37,7 +37,42 @@ describe CnpjValidator do
     end
   end
 
+  context 'when cnpj has lowercase letters' do
+    before do
+      company.cnpj = 'ab12cd34efgh83'
+      company.valid?
+    end
+
+    it 'upcases the value' do
+      expect(company.cnpj).to eq('AB12CD34EFGH83')
+    end
+  end
+
+  context 'when cnpj is numeric' do
+    before do
+      company.cnpj = '37525685000108'
+      company.valid?
+    end
+
+    it 'keeps the value as it was' do
+      expect(company.cnpj).to eq('37525685000108')
+    end
+  end
+
+  context 'with the mask option' do
+    let(:company) { MaskedCompany.new }
+
+    before do
+      company.cnpj = 'ab12cd34efgh83'
+      company.valid?
+    end
+
+    it 'upcases and masks the value' do
+      expect(company.cnpj).to eq('AB.12C.D34/EFGH-83')
+    end
+  end
+
   it 'accepts a nil value' do
-    expect(company.valid?).to eq(true)
+    expect(company.valid?).to be(true)
   end
 end

data/spec/fake_app/masked_company.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class MaskedCompany
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :cnpj, :name
+
+  validates :cnpj, cnpj: { mask: true }
+
+  def initialize(attributes = {})
+    attributes.each do |key, value|
+      instance_variable_set("@#{key}", value)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -13,3 +13,4 @@ Coveralls.wear!
 
 require File.expand_path('lib/validates_cnpj')
 require File.expand_path('spec/fake_app/company')
+require File.expand_path('spec/fake_app/masked_company')

data/spec/validates_cnpj/cnpj_spec.rb

@@ -47,6 +47,26 @@ describe ValidatesCnpj::Cnpj do
     it '6910360400016000 as number' do
       expect(ValidatesCnpj::Cnpj.new('6910360400016000')).not_to be_valid
     end
+
+    it 'AB12CD34EFGH84 as number' do
+      expect(ValidatesCnpj::Cnpj.new('AB12CD34EFGH84')).not_to be_valid
+    end
+
+    it 'AB.12C.D34/EFGH-84 as number' do
+      expect(ValidatesCnpj::Cnpj.new('AB.12C.D34/EFGH-84')).not_to be_valid
+    end
+
+    it 'AAAAAAAAAAAA00 as number' do
+      expect(ValidatesCnpj::Cnpj.new('AAAAAAAAAAAA00')).not_to be_valid
+    end
+
+    it 'AB12CD34EFGH8 as number' do
+      expect(ValidatesCnpj::Cnpj.new('AB12CD34EFGH8')).not_to be_valid
+    end
+
+    it 'AB12CD34EFGHAB as number' do
+      expect(ValidatesCnpj::Cnpj.new('AB12CD34EFGHAB')).not_to be_valid
+    end
   end
 
   context 'with valid option' do
@@ -77,12 +97,32 @@ describe ValidatesCnpj::Cnpj do
     it '00.000.000/1447-89 as number' do
       expect(ValidatesCnpj::Cnpj.new('00.000.000/1447-89')).to be_valid
     end
+
+    it 'AB12CD34EFGH83 as number' do
+      expect(ValidatesCnpj::Cnpj.new('AB12CD34EFGH83')).to be_valid
+    end
+
+    it 'AB.12C.D34/EFGH-83 as number' do
+      expect(ValidatesCnpj::Cnpj.new('AB.12C.D34/EFGH-83')).to be_valid
+    end
+
+    it 'ab12cd34efgh83 as number' do
+      expect(ValidatesCnpj::Cnpj.new('ab12cd34efgh83')).to be_valid
+    end
   end
 
   context 'with a valid value' do
     it 'returns it formatted' do
       expect(ValidatesCnpj::Cnpj.new('69103604000160').number).to eq('69.103.604/0001-60')
     end
+
+    it 'returns an alphanumeric number formatted' do
+      expect(ValidatesCnpj::Cnpj.new('AB12CD34EFGH83').number).to eq('AB.12C.D34/EFGH-83')
+    end
+
+    it 'returns a lowercase alphanumeric number formatted and upcased' do
+      expect(ValidatesCnpj::Cnpj.new('ab12cd34efgh83').number).to eq('AB.12C.D34/EFGH-83')
+    end
   end
 
   context 'with an invalid value' do

data/validates_cnpj.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
   gem.summary     = 'Validates CNPJ and test it with matchers in a simple way.'
 
   gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features,examples,gemfiles}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.require_paths = %w[lib]
 
@@ -21,9 +20,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rubocop', '< 0.68'
+  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'rubocop-rake'
   gem.add_development_dependency 'rubocop-rspec'
   gem.add_development_dependency 'shoulda-matchers'
 
-  gem.add_runtime_dependency 'activemodel'
+  gem.add_dependency 'activemodel'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: validates_cnpj
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -56,16 +55,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +121,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: plribeiro3000@gmail.com
 executables: []
 extensions: []
@@ -134,15 +146,15 @@ files:
 - lib/validates_cnpj/version.rb
 - spec/cnpj_validator_spec.rb
 - spec/fake_app/company.rb
+- spec/fake_app/masked_company.rb
 - spec/shoulda/matchers/active_model/require_a_valid_cnpj_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/validates_cnpj/cnpj_spec.rb
 - validates_cnpj.gemspec
-homepage:
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -157,16 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Validates CNPJ and test it with matchers in a simple way.
-test_files:
-- gemfiles/Gemfile.rails4
-- gemfiles/Gemfile.rails5
-- gemfiles/Gemfile.rails6
-- spec/cnpj_validator_spec.rb
-- spec/fake_app/company.rb
-- spec/shoulda/matchers/active_model/require_a_valid_cnpj_matcher_spec.rb
-- spec/spec_helper.rb
-- spec/validates_cnpj/cnpj_spec.rb
+test_files: []