validates_cnpj 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe45c5e355e2676e043807b3adee04fdaae824d333df328529f397cb585f3b0
-  data.tar.gz: f6205a0583c337bc030944f12129bec61334655c655611fcc2b725a2e2a0ecf1
+  metadata.gz: 76d72b266a42dbde1f4a3bd6b0d4822450b29e617049699a8c9c7ec13248ce79
+  data.tar.gz: 21b2439edb281c481c1a3199ecbc992db3452bbdf775101010c29d9ed06d5f61
 SHA512:
-  metadata.gz: 4900d074a6a9658a0cf256ada2d30e4beb83017b94ee77d02bd0d9afd0f184d64d17d3428f8a7e9cbcf6c507b5f2cb3320100494965012b808bc5f4466f7cd3a
-  data.tar.gz: d09478b9a608031cb86e6bfc3724f4b09ee35f6fe90b7f8d704812dae26dec0c8c0eee5dd0aef8e3e0642f8ad742db64a121e0c93ba43b69f5478dca487f085e
+  metadata.gz: 5182b579f3926d2e29fb0a7e58c1894b2b6455e3a8e09fe6698ff307f56e7fd4680cb0a054513754b02ac810934a23e598b6ba72b439234ee7f015756e6897a9
+  data.tar.gz: c2621693f873408f0864f59f69d6d2df85f7ec72a18ca3129776cb00f2a9353c0f8b1b041ebc1c9a78d5e3c1b92cc27fac7427512eb14d0fdd393a9d313ee9e1

data/.rubocop.yml

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

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+4.0.5

data/.travis.yml

@@ -1,10 +1,37 @@
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-gemfile:
-  - gemfiles/Gemfile.rails4
-  - gemfiles/Gemfile.rails5
-before_script:
-  - bundle exec rubocop
+matrix:
+  include:
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.3
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.3
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.4
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.4
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.5
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.5
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.5
+      gemfile: gemfiles/Gemfile.rails6
+    - rvm: 2.6
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.6
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.6
+      gemfile: gemfiles/Gemfile.rails6
+    - rvm: 2.7
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.7
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.7
+      gemfile: gemfiles/Gemfile.rails6
+    - rvm: 3.0
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 3.0
+      gemfile: gemfiles/Gemfile.rails6
+      script: rake complete

data/README.md

@@ -2,7 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/validates_cnpj.png)](http://badge.fury.io/rb/validates_cnpj) [![Build Status](https://secure.travis-ci.org/plribeiro3000/validates_cnpj.png?branch=master)](http://travis-ci.org/plribeiro3000/validates_cnpj) [![Coverage Status](https://coveralls.io/repos/plribeiro3000/validates_cnpj/badge.png?branch=master)](https://coveralls.io/r/plribeiro3000/validates_cnpj)  [![Code Climate](https://codeclimate.com/github/plribeiro3000/validates_cnpj.png)](https://codeclimate.com/github/plribeiro3000/validates_cnpj)
 
-Validates cnpj and test it in a simple way
+Validates cnpj and test it in a simple way.
+Supports ruby 2.2+ and rails 3+.
 
 ## Installation
 

data/Rakefile

@@ -2,8 +2,11 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new
+RuboCop::RakeTask.new
 
 desc 'Default Task'
 task default: [:spec]
+task complete: %i[spec rubocop]

data/gemfiles/Gemfile.rails5

@@ -1,5 +1,5 @@
 source :rubygems
 
-gem 'activesupport', '>= 5.0.0'
+gem 'activesupport', '>= 5.0.0', '< 6.0.0'
 
 gemspec :path => '../'

data/gemfiles/Gemfile.rails6

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '>= 6.0.0'
+
+gemspec :path => '../'

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,9 +5,20 @@ 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
-      record.errors.add(attribute, :invalid, options)
+      ruby_prior_version_three =
+        Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
+
+      if ruby_prior_version_three
+        record.errors.add(attribute, :invalid, options)
+      else
+        record.errors.add(attribute, :invalid, **options)
+      end
     end
   end
 end

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.0.0'
+  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

@@ -3,18 +3,8 @@
 require 'rspec'
 require 'active_model'
 require 'coveralls'
-require 'jazz_fingers'
 require 'shoulda-matchers'
 
-JazzFingers.configure do |config|
-  config.colored_prompt = false
-  config.awesome_print = false
-  config.coolline = false
-  config.application_name = ValidatesCnpj
-end
-
-require 'jazz_fingers/setup'
-
 RSpec.configure do |config|
   config.include Shoulda::Matchers::ActiveModel
 end
@@ -23,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}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.require_paths = %w[lib]
 
@@ -19,12 +18,13 @@ Gem::Specification.new do |gem|
   gem.license = 'MIT'
 
   gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'jazz_fingers', '< 5.0.0'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   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', '> 4.0', '< 6.0'
+  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.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -25,21 +24,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jazz_fingers
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,23 +111,16 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-description: 
+        version: '0'
 email: plribeiro3000@gmail.com
 executables: []
 extensions: []
@@ -146,6 +138,7 @@ files:
 - Rakefile
 - gemfiles/Gemfile.rails4
 - gemfiles/Gemfile.rails5
+- gemfiles/Gemfile.rails6
 - lib/validates_cnpj.rb
 - lib/validates_cnpj/cnpj.rb
 - lib/validates_cnpj/cnpj_validator.rb
@@ -153,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
@@ -176,13 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Validates CNPJ and test it with matchers in a simple way.
-test_files:
-- 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: []