cpf_cnpj 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b0bd493ddd22ed0ebe7128fd0e8dc17c8ff15bfb1209300e1ce60ae03b2c6b
-  data.tar.gz: c2f7a21d000907e8779790d8b72ce6177b58ddaa2fb0f369941d3e3d1989eae1
+  metadata.gz: af6460ddd8fccffc42d4f642c5a511c01f484a7ca7103d2d5cc4edcc23fbeae6
+  data.tar.gz: e314c5cf1b043811a0ed804a7634a64f5079e833160385768dd3cd113a02b2d6
 SHA512:
-  metadata.gz: b58f3e8547dda2131b290a4db50c0c84da0ccaf266ebd241cef0d34e43eb935d0e31d1310185749f9a929d19db01136484d1b54bbb1abb9c41d351409c6b685b
-  data.tar.gz: 3d62c15ab2f3b0be301a55a5328368bcca1ccf1d2b453c3e28c01fa868dc10c403690b2ee2d33cd0bba375271a8a20b2415a77f477d3c3d2b941fad4049f8417
+  metadata.gz: 9389e3356414b201c0bd9eeb1eef63e07c1bf869a1fd1fa30c3ef90d105711f466343f3cef8a7ea8899bbdfdfa4586725f10c67022bd7325ee39a8519668f8f2
+  data.tar.gz: 41c4f3ee6632bc631070ae5879506d4ed78711aa6bb645302aa9b5bf8c9d235e7bdde042268ffe4b3fa412c43434cac00fae03a9dde9fd212609750cfe735495

data/README.md

@@ -36,6 +36,12 @@ Or install it yourself as:
 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"
 

data/lib/cnpj/formatter.rb

@@ -3,11 +3,13 @@
 class CNPJ
   class Formatter
     STRICT_REGEX = %r{[/.-]}.freeze
-    LOOSE_REGEX = /[^\d]/.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.rb

@@ -7,8 +7,8 @@ class CNPJ
 
   attr_reader :number, :strict
 
-  REGEX = %r[\A\d{2}\.\d{3}.\d{3}/\d{4}-\d{2}\Z].freeze
-  VALIDATION_SIZE_REGEX = /^\d{14}$/.freeze
+  REGEX = %r[\A[\dA-Z]{2}\.[\dA-Z]{3}.[\dA-Z]{3}/[\dA-Z]{4}-[\dA-Z]{2}\Z].freeze
+  VALIDATION_SIZE_REGEX = /^[A-Z\d]{14}$/.freeze
   NUMBER_SIZE = 12
 
   DENYLIST = %w[
@@ -33,13 +33,18 @@ class CNPJ
   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
 
@@ -64,6 +69,7 @@ class CNPJ
     end
 
     return false unless stripped.match?(VALIDATION_SIZE_REGEX)
+
     return false if DENYLIST.include?(stripped)
 
     digits = numbers[0...NUMBER_SIZE]
@@ -79,10 +85,16 @@ class CNPJ
   alias eql? ==
 
   def number_without_verifier
-    numbers[0...NUMBER_SIZE].join
+    stripped_chars[0...NUMBER_SIZE].join
+  end
+
+  private def stripped_chars
+    @stripped_chars ||= stripped.chars
   end
 
   private def numbers
-    @numbers ||= stripped.each_char.to_a.map(&:to_i)
+    @numbers ||= stripped_chars.map do |number|
+      number.ord - 48
+    end
   end
 end

data/lib/cpf.rb

@@ -34,8 +34,12 @@ class CPF
   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
 

data/lib/cpf_cnpj/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CpfCnpj
-  VERSION = "0.6.0"
+  VERSION = "1.0.0"
 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"

data/test/cnpj/cli_test.rb

@@ -72,7 +72,7 @@ module CNPJCli
       exit_status, stdout = run_command(["-gs"])
 
       assert_equal 0, exit_status
-      assert_match(/\A\d{14}\Z/, stdout)
+      assert_match(/\A[A-Z\d]{14}\Z/, stdout)
     end
   end
 

data/test/cnpj_test.rb

@@ -30,6 +30,18 @@ class CnpjTest < Minitest::Test
     assert CNPJ.valid?(number)
   end
 
+  test "validates formatted strings with letters" do
+    number = "12.ABC.345/01DE-35"
+
+    assert CNPJ.valid?(number)
+  end
+
+  test "validates formatted strings with letters (lowercase)" do
+    number = "12.abc.345/01de-35"
+
+    assert CNPJ.valid?(number)
+  end
+
   test "formats number" do
     cnpj = CNPJ.new("54550752000155")
 
@@ -50,14 +62,17 @@ class CnpjTest < Minitest::Test
   end
 
   test "generates formatted number" do
-    assert_match %r[\A\d{2}\.\d{3}\.\d{3}/\d{4}-\d{2}\z], CNPJ.generate(true)
+    assert_match(
+      %r[\A[A-Z\d]{2}\.[A-Z\d]{3}\.[A-Z\d]{3}/[A-Z\d]{4}-[A-Z\d]{2}\z],
+      CNPJ.generate(true)
+    )
   end
 
   test "generates stripped number" do
-    assert_match(/\A\d{14}\z/, CNPJ.generate)
+    assert_match(/\A[A-Z\d]{14}\z/, CNPJ.generate)
   end
 
-  test "rejects strings" do
+  test "rejects invalid strings" do
     refute CNPJ.valid?("aa.bb.ccc/dddd-ee")
   end
 
@@ -66,6 +81,8 @@ class CnpjTest < Minitest::Test
     refute CNPJ.valid?("54....550....752///0001---55", strict: true)
     assert CNPJ.valid?("54.550.752/0001-55", strict: true)
     assert CNPJ.valid?("54550752000155", strict: true)
+    assert CNPJ.valid?("12.ABC.345/01DE-35", strict: true)
+    assert CNPJ.valid?("12ABC34501DE35", strict: true)
   end
 
   test "compare objects by their numeric value" do
@@ -80,8 +97,9 @@ class CnpjTest < Minitest::Test
   end
 
   test "returns number without verifier" do
-    cnpj = CNPJ.new("54550752000155")
-
-    assert_equal "545507520001", cnpj.number_without_verifier
+    assert_equal "545507520001",
+                 CNPJ.new("54550752000155").number_without_verifier
+    assert_equal "12ABC34501DE",
+                 CNPJ.new("12.ABC.345/01DE-35").number_without_verifier
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpf_cnpj
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Nando Vieira
@@ -110,7 +110,6 @@ files:
 - lib/cpf/verifier_digit.rb
 - lib/cpf_cnpj.rb
 - lib/cpf_cnpj/cli.rb
-- lib/cpf_cnpj/generator.rb
 - lib/cpf_cnpj/version.rb
 - test/cnpj/cli_test.rb
 - test/cnpj/formatter_test.rb

data/lib/cpf_cnpj/generator.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module CpfCnpj
-  class Generator
-    NUMBERS = Array(0..9).freeze
-
-    def self.generate(size, verifier_digit_generator)
-      numbers = Array.new(size) { NUMBERS.sample }
-      numbers << verifier_digit_generator.generate(numbers)
-      numbers << verifier_digit_generator.generate(numbers)
-      numbers.join
-    end
-  end
-end