cpf_cnpj 0.5.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae51c08f0746495d4b9470e710aea34f447b8ee11322554fa085e712d0f9f89
-  data.tar.gz: 2762cf150ab69f44c8c24d72da6c33dfd89db999dfacbccf329a66ac92477226
+  metadata.gz: 39920a466745460c30ee825d79ebea024b9fd2f76ea481d911564406ca651135
+  data.tar.gz: 5f32f4fac220fc8768ece5806270974590905b213464f4ab0e72f33e7d615013
 SHA512:
-  metadata.gz: 562be436dbdebcf3f0730430fe36c72897d3ce894c4806b2c8298988233008f5e28a80250e42bb97e5d363e14ffd14dd16eca9716066582c8ccd8848e08654dd
-  data.tar.gz: 6476ab415fc627a01f69407a1c8624f997ed40d8745313cc2ca092bd61f2e424571bb7dcd3ee3a8cca57c0239611b4f74b4aa30b34ff74942fb57454c1c64256
+  metadata.gz: b72011979e87333f55a565bbd999d9e0c14d31936d82d235f2f1981c90374f534d3026154abf053de133e2abc4092c6c12f82e951d9b4bd41d64ba8951859e16
+  data.tar.gz: bd0b2ab1c6731d5dd34173e9545b143ec506938b5333ef78835b1d14f0dd48e3d2d991c81ff5a7457693d24baaf0f1fd073200fbd5dac232e8ef10be8b07742d

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+---
+other: ["https://paypal.me/nandovieira/🍕"]
+github: [fnando]

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+---
+# Documentation:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ruby-tests.yml

@@ -0,0 +1,47 @@
+---
+name: ruby-tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request_target:
+  workflow_dispatch:
+    inputs: {}
+
+jobs:
+  build:
+    name: Tests with Ruby ${{ matrix.ruby }}
+    runs-on: "ubuntu-latest"
+    if: |
+      github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target' ||
+      github.actor != 'dependabot[bot]'
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.2", "3.3"]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          path: vendor/bundle
+          key: >
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{
+            hashFiles(matrix.gemfile) }}
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Install gem dependencies
+        run: |
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle update --jobs 4 --retry 3
+
+      - name: Run Tests
+        run: |
+          bundle exec rake

data/.rubocop.yml

@@ -1,59 +1,13 @@
-AllCops:
-  TargetRubyVersion: 2.3
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
 
-  Include:
-    - '**/*.gemspec'
-    - '**/*.podspec'
-    - '**/*.jbuilder'
-    - '**/*.rake'
-    - '**/*.opal'
-    - '**/config.ru'
-    - '**/Gemfile'
-    - '**/Rakefile'
-    - '**/Capfile'
-    - '**/Guardfile'
-    - '**/Podfile'
-    - '**/Thorfile'
-    - '**/Vagrantfile'
-    - '**/Berksfile'
-    - '**/Cheffile'
-    - '**/Vagabondfile'
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+  Exclude:
+    - vendor/**/*
+    - gemfiles/**/*
 
-Style/Documentation:
+Style/OptionalBooleanParameter:
   Enabled: false
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  EnforcedStyleForEmptyBraces: space
-  SpaceBeforeBlockParameters: false
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-  EnforcedStyleForEmptyBraces: no_space
-
-Layout/FirstArrayElementLineBreak:
-  Enabled: true
-
-Layout/FirstHashElementLineBreak:
-  Enabled: true
-
-Style/SymbolArray:
-  Enabled: true
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  '[]'
-    '%i': '[]'
-    '%q': '[]'
-    '%Q': '[]'
-    '%r': '[]'
-    '%s': '[]'
-    '%w': '[]'
-    '%W': '[]'
-    '%x': '[]'
-
-Metrics/LineLength:
-  Max: 100

data/README.md

@@ -1,14 +1,19 @@
 # CPF/CNPJ
 
-[![Build Status](https://travis-ci.org/fnando/cpf_cnpj.svg)](https://travis-ci.org/fnando/cpf_cnpj)
-[![Code Climate](https://codeclimate.com/github/fnando/cpf_cnpj/badges/gpa.svg)](https://codeclimate.com/github/fnando/cpf_cnpj)
-[![Gem Version](https://badge.fury.io/rb/cpf_cnpj.svg)](http://badge.fury.io/rb/cpf_cnpj)
+[![Tests](https://github.com/fnando/cpf_cnpj/workflows/ruby-tests/badge.svg)](https://github.com/fnando/cpf_cnpj)
+[![Gem](https://img.shields.io/gem/v/cpf_cnpj.svg)](https://rubygems.org/gems/cpf_cnpj)
+[![Gem](https://img.shields.io/gem/dt/cpf_cnpj.svg)](https://rubygems.org/gems/cpf_cnpj)
 
-This gem does some [CPF](http://en.wikipedia.org/wiki/Cadastro_de_Pessoas_F%C3%ADsicas)/[CNPJ](http://en.wikipedia.org/wiki/CNPJ) magic. It allows you to create, validate and format CPF/CNPJ, even through the command-line.
+This gem does some
+[CPF](http://en.wikipedia.org/wiki/Cadastro_de_Pessoas_F%C3%ADsicas)/[CNPJ](http://en.wikipedia.org/wiki/CNPJ)
+magic. It allows you to create, validate and format CPF/CNPJ, even through the
+command-line.
 
-Just making my life easier when filling these damn numbers on internet bankings and government sites.
+Just making my life easier when filling these damn numbers on internet bankings
+and government sites.
 
-For ActiveModel/ActiveRecord validations, please check <https://github.com/fnando/validators>.
+For ActiveModel/ActiveRecord validations, please check
+<https://github.com/fnando/validators>.
 
 ## Installation
 
@@ -28,24 +33,35 @@ Or install it yourself as:
 
 ### Ruby API
 
-This library has the same API for both CNPJ/CPF, so only one of them is documented below.
+This library has the same API for both CNPJ/CPF, so only one of them is
+documented below.
+
+> [!NOTE]
+>
+> This library already supports the new alphanumeric CNPJ algorithm that will be
+> available starting July 2026. For more information, see
+> <https://www.gov.br/receitafederal/pt-br/acesso-a-informacao/acoes-e-programas/programas-e-atividades/cnpj-alfanumerico>.
 
 ```ruby
 require "cpf_cnpj"
 
-CPF.valid?(number)    # Check if a CPF is valid
-CPF.generate          # Generate a random CPF number
-CPF.generate(true)    # Generate a formatted number
+CPF.format(number)            # Format CPF (xxx.xxx.xxx-xx)
+CPF.valid?(number)            # Check if a CPF is valid
+CPF.generate                  # Generate a random CPF number
+CPF.generate(true)            # Generate a formatted number
 
 cpf = CPF.new(number)
-cpf.formatted         # Return formatted CPF (xxx.xxx.xxx-xx)
-cpf.stripped          # Return stripped CPF (xxxxxxxxxxx)
-cpf.valid?            # Check if CPF is valid
+cpf.formatted                 # Return formatted CPF (xxx.xxx.xxx-xx)
+cpf.stripped                  # Return stripped CPF (xxxxxxxxxxx)
+cpf.valid?                    # Check if CPF is valid
+cpf.number_without_verifier   # Return CPF without verifier digits
 ```
 
 #### Strict Validation
 
-By default, validations will strip any characters that aren't numbers. This means that `532#####820------857\n96` is considered a valid number. To perform a strict validation use `strict: true`.
+By default, validations will strip any characters that aren't numbers. This
+means that `532#####820------857\n96` is considered a valid number. To perform a
+strict validation use `strict: true`.
 
 ```ruby
 CPF.valid?(number, strict: true)

data/Rakefile

@@ -2,6 +2,7 @@
 
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rubocop/rake_task"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -10,4 +11,6 @@ Rake::TestTask.new(:test) do |t|
   t.warning = false
 end
 
-task default: :test
+RuboCop::RakeTask.new
+
+task default: %i[test rubocop]

data/bin/cnpj

@@ -3,4 +3,4 @@
 
 $LOAD_PATH.unshift "#{__dir__}/../lib"
 require "cpf_cnpj"
-CpfCnpj::CLI.new(CNPJ, ARGV, STDIN, STDOUT, STDERR).start
+CpfCnpj::CLI.new(CNPJ, ARGV, $stdin, $stdout, $stderr).start

data/bin/cpf

@@ -3,4 +3,4 @@
 
 $LOAD_PATH.unshift "#{__dir__}/../lib"
 require "cpf_cnpj"
-CpfCnpj::CLI.new(CPF, ARGV, STDIN, STDOUT, STDERR).start
+CpfCnpj::CLI.new(CPF, ARGV, $stdin, $stdout, $stderr).start

data/cpf_cnpj.gemspec

@@ -2,20 +2,27 @@
 
 require "./lib/cpf_cnpj/version"
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Nando Vieira"]
-  gem.email         = ["fnando.vieira@gmail.com"]
-  gem.description   = "Validate, generate and format CPF/CNPJ numbers. Include command-line tools."
-  gem.summary       = gem.description
+Gem::Specification.new do |spec|
+  spec.authors       = ["Nando Vieira"]
+  spec.email         = ["fnando.vieira@gmail.com"]
+  spec.description   = "Validate, generate and format CPF/CNPJ numbers. " \
+                       "Include command-line tools."
+  spec.summary       = spec.description
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.homepage = "https://github.com/fnando/cpf_cnpj"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["rubygems_mfa_required"] = "true"
 
-  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  gem.executables   = gem.files.grep(%r[^bin/]).map {|f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r[^(test|spec|features)/])
-  gem.name          = "cpf_cnpj"
-  gem.require_paths = ["lib"]
-  gem.version       = CPF::VERSION
+  spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(%r{^bin/}).map {|f| File.basename(f) }
+  spec.name          = "cpf_cnpj"
+  spec.require_paths = ["lib"]
+  spec.version       = CPF::VERSION
 
-  gem.add_development_dependency "pry-meta"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "minitest-utils"
+  spec.add_development_dependency "minitest-utils"
+  spec.add_development_dependency "pry-meta"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-fnando"
 end

data/lib/cnpj/formatter.rb

@@ -2,11 +2,14 @@
 
 class CNPJ
   class Formatter
-    STRICT_REGEX = %r[[/.-]]
-    LOOSE_REGEX = /[^\d]/
+    STRICT_REGEX = %r{[/.-]}.freeze
+    LOOSE_REGEX = /[^A-Z\d]/.freeze
+    REPLACE_REGEX = /
+      \A([A-Z\d]{2})([A-Z\d]{3})([A-Z\d]{3})([A-Z\d]{4})([A-Z\d]{2})\Z
+    /x.freeze
 
     def self.format(number)
-      strip(number).gsub(/\A(\d{2})(\d{3})(\d{3})(\d{4})(\d{2})\Z/, "\\1.\\2.\\3/\\4-\\5")
+      strip(number).gsub(REPLACE_REGEX, "\\1.\\2.\\3/\\4-\\5")
     end
 
     def self.strip(number, strict = false)

data/lib/cnpj/verifier_digit.rb

@@ -6,7 +6,7 @@ class CNPJ
       index = 2
 
       sum = numbers.reverse.reduce(0) do |buffer, number|
-        (buffer + number * index).tap do
+        (buffer + (number * index)).tap do
           index = index == 9 ? 2 : index + 1
         end
       end

data/lib/cnpj.rb

@@ -5,14 +5,13 @@ class CNPJ
   require "cnpj/formatter"
   require "cnpj/verifier_digit"
 
-  attr_reader :number
-  attr_reader :strict
+  attr_reader :number, :strict
 
-  REGEX = %r[\A\d{2}\.\d{3}.\d{3}/\d{4}-\d{2}\Z]
-  VALIDATION_SIZE_REGEX = /^\d{14}$/
+  REGEX = %r[\A[\dA-Z]{2}\.[\dA-Z]{3}.[\dA-Z]{3}/[\dA-Z]{4}-\d{2}\Z].freeze
+  VALIDATION_SIZE_REGEX = /^[A-Z\d]{12}\d{2}$/.freeze
   NUMBER_SIZE = 12
 
-  BLACKLIST = %w[
+  DENYLIST = %w[
     00000000000000
     11111111111111
     22222222222222
@@ -25,18 +24,27 @@ class CNPJ
     99999999999999
   ].freeze
 
+  def self.format(number)
+    new(number).formatted
+  end
+
   def self.valid?(number, strict: false)
     new(number, strict).valid?
   end
 
   def self.generate(formatted = false)
-    number = CpfCnpj::Generator.generate(NUMBER_SIZE, VerifierDigit)
-    cnpj = new(number)
+    numbers = Array("0".."9") + ("A".."Z").to_a
+    digits = Array.new(NUMBER_SIZE) { numbers.sample }
+    numeric_digits = digits.map {|d| d.ord - 48 }
+    numeric_digits << VerifierDigit.generate(numeric_digits)
+    numeric_digits << VerifierDigit.generate(numeric_digits)
+
+    cnpj = new((digits + numeric_digits[-2, 2]).join)
     formatted ? cnpj.formatted : cnpj.stripped
   end
 
   def initialize(number, strict = false)
-    @number = number.to_s
+    @number = number.to_s.upcase
     @strict = strict
   end
 
@@ -56,24 +64,37 @@ class CNPJ
   end
 
   def valid?
-    return unless stripped =~ VALIDATION_SIZE_REGEX
-    return if BLACKLIST.include?(stripped)
+    if strict && !(number.match?(REGEX) || number.match?(VALIDATION_SIZE_REGEX))
+      return false
+    end
+
+    return false unless stripped.match?(VALIDATION_SIZE_REGEX)
 
-    digits = numbers[0...12]
+    return false if DENYLIST.include?(stripped)
+
+    digits = numbers[0...NUMBER_SIZE]
     digits << VerifierDigit.generate(digits)
     digits << VerifierDigit.generate(digits)
 
     digits[-2, 2] == numbers[-2, 2]
   end
 
-  def ==(object)
-    super || object.instance_of?(self.class) && object.stripped == stripped
+  def ==(other)
+    super || (other.instance_of?(self.class) && other.stripped == stripped)
+  end
+  alias eql? ==
+
+  def number_without_verifier
+    stripped_chars[0...NUMBER_SIZE].join
   end
-  alias :eql? :==
 
-  private
+  private def stripped_chars
+    @stripped_chars ||= stripped.chars
+  end
 
-  def numbers
-    @numbers ||= stripped.each_char.to_a.map(&:to_i)
+  private def numbers
+    @numbers ||= stripped_chars.map do |number|
+      number.ord - 48
+    end
   end
 end

data/lib/cpf/formatter.rb

@@ -2,8 +2,8 @@
 
 class CPF
   class Formatter
-    STRICT_REGEX = /[.-]/
-    LOOSE_REGEX = /[^\d]/
+    STRICT_REGEX = /[.-]/.freeze
+    LOOSE_REGEX = /[^\d]/.freeze
 
     def self.format(number)
       strip(number).gsub(/\A(\d{3})(\d{3})(\d{3})(\d{2})\Z/, "\\1.\\2.\\3-\\4")

data/lib/cpf/verifier_digit.rb

@@ -9,7 +9,7 @@ class CPF
         number * (modulus - index)
       end
 
-      mod = multiplied.reduce(:+) % 11
+      mod = multiplied.sum % 11
       mod < 2 ? 0 : 11 - mod
     end
   end

data/lib/cpf.rb

@@ -5,14 +5,13 @@ class CPF
   require "cpf/formatter"
   require "cpf/verifier_digit"
 
-  attr_reader :number
-  attr_reader :strict
+  attr_reader :number, :strict
 
-  REGEX = /\A\d{3}\.\d{3}\.\d{3}-\d{2}\Z/
-  VALIDATION_SIZE_REGEX = /^[0-9]{11}$/
+  REGEX = /\A\d{3}\.\d{3}\.\d{3}-\d{2}\Z/.freeze
+  VALIDATION_SIZE_REGEX = /^\d{11}$/.freeze
   NUMBER_SIZE = 9
 
-  BLACKLIST = %w[
+  DENYLIST = %w[
     00000000000
     11111111111
     22222222222
@@ -24,16 +23,23 @@ class CPF
     88888888888
     99999999999
     12345678909
-    01234567890
   ].freeze
 
+  def self.format(number)
+    new(number).formatted
+  end
+
   def self.valid?(number, strict: false)
     new(number, strict).valid?
   end
 
   def self.generate(formatted = false)
-    number = CpfCnpj::Generator.generate(NUMBER_SIZE, VerifierDigit)
-    cpf = new(number)
+    numbers = Array(0..9)
+    digits = Array.new(NUMBER_SIZE) { numbers.sample }
+    digits << VerifierDigit.generate(digits)
+    digits << VerifierDigit.generate(digits)
+
+    cpf = new(digits.join)
     formatted ? cpf.formatted : cpf.stripped
   end
 
@@ -58,24 +64,30 @@ class CPF
   end
 
   def valid?
-    return unless stripped =~ VALIDATION_SIZE_REGEX
-    return if BLACKLIST.include?(stripped)
+    if strict && !(number.match?(REGEX) || number.match?(VALIDATION_SIZE_REGEX))
+      return false
+    end
+
+    return false unless stripped.match?(VALIDATION_SIZE_REGEX)
+    return false if DENYLIST.include?(stripped)
 
-    digits = numbers[0...9]
+    digits = numbers[0...NUMBER_SIZE]
     digits << VerifierDigit.generate(digits)
     digits << VerifierDigit.generate(digits)
 
     digits[-2, 2] == numbers[-2, 2]
   end
 
-  def ==(object)
-    super || object.instance_of?(self.class) && object.stripped == stripped
+  def number_without_verifier
+    numbers[0...NUMBER_SIZE].join
   end
-  alias :eql? :==
 
-  private
+  def ==(other)
+    super || (other.instance_of?(self.class) && other.stripped == stripped)
+  end
+  alias eql? ==
 
-  def numbers
+  private def numbers
     @numbers ||= stripped.each_char.to_a.map(&:to_i)
   end
 end

data/lib/cpf_cnpj/cli.rb

@@ -24,7 +24,6 @@ module CpfCnpj
       @options ||= {}
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def process_command
       opts.banner = "Usage: #{bin_name} [options] [#{document_name} number]"
       opts.separator ""
@@ -58,7 +57,6 @@ module CpfCnpj
       opts.parse!(arguments)
       opts.permute!(arguments)
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def input
       stdin.tty? ? arguments.first : stdin.read
@@ -77,6 +75,7 @@ module CpfCnpj
 
     def validate(document)
       return if document.valid?
+
       stderr << "Error: Invalid number\n"
       exit 1
     end

data/lib/cpf_cnpj/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CpfCnpj
-  VERSION = "0.5.0"
+  VERSION = "1.0.1"
 end
 
 class CPF

data/lib/cpf_cnpj.rb

@@ -2,7 +2,6 @@
 
 require "English"
 require "optparse"
-require "cpf_cnpj/generator"
 require "cpf_cnpj/cli"
 require "cpf_cnpj/version"
 require "cpf"