bra_document_validation 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d8c78d6db49bc48c0e1dfd5ed47ed8dc9ae540e2b8972c28ef1a19d763b8bc
-  data.tar.gz: 2a2694b688925f879cf5d0fd2d859e107eab8305c33ea87f402674c7f469540f
+  metadata.gz: be7fed5ec9bede122da6a1c7199604ac279bb2ad6fa306a1f7bae4b82b23f348
+  data.tar.gz: 2a15db815a15aceb31e7328da962362f6d99b5b5f285782c9a79ecd195d0a5ec
 SHA512:
-  metadata.gz: 3179114b07dbd55af289d116e5d2c8dfb860aa67c7b6b7523d5051a79a17b1bc3e8e3d91a38d33b5fc54e544ad3df711b30dd0cecb20f2a4182a9b902dca2c3c
-  data.tar.gz: 047cede5bb6692ac13edd7fc06aca61382954df487d1708103de5f25ff96b4d785e28871449ac788b80a1aa86ede1b171d9a09d5a8299bca84a8205c6fd4dbb1
+  metadata.gz: 810e1af48bfc0ea25c639e119a591f6407935ecc2ee49f1db193e1d098ef1619daca3cfd34cc1ae1555828136a85a8c2f70e96ecd759af4e2e56d207b7ea89ec
+  data.tar.gz: 848176ec17b7f940ea092f9a28245360b24045851e97212cff3b174784a2b17d8c184466bdd0fa4aed535b22ffce52256b5052671557ed9e430cff1a4e3857cb

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "09:00"
+  open-pull-requests-limit: 10

data/.travis.yml

@@ -2,5 +2,8 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.7.2
+  - 2.7.5
+  - 3.0.3
+  - 3.1.1
+
 before_install: gem install bundler -v 2.1.4

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
@@ -7,6 +8,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.2] - 2022-01-04
+
+### Removed
+
+- Drop Support for Ruby 2.6 or less
+
+### Refactory
+
+- Refactory CPF and CNPJ Validators to use new bra_documents's methods
+
+### Added
+
+- Add new validator to check if an attribute is a CPF or a CNPJ
+
+## [1.0.1] - 2020-11-08
+
+### Fixed
+
+- Fix Gemfile lock
+
 ## [1.0.0] - 2020-11-08
+
 ### Added
-  - CPF and CNPJ Validators
+
+- CPF and CNPJ Validators

data/Gemfile.lock

@@ -1,52 +1,49 @@
 PATH
   remote: .
   specs:
-    bra_document_validation (0.1.0)
+    bra_document_validation (1.0.2)
       activemodel (>= 4.0)
-      bra_documents
+      bra_documents (>= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    bra_documents (1.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    bra_documents (1.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    i18n (1.8.5)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
-    minitest (5.14.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-nav (0.3.0)
-      pry (>= 0.9.10, < 0.13.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-nav (1.0.0)
+      pry (>= 0.9.10, < 0.15)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
@@ -59,4 +56,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.1.4
+   2.2.31

data/README.md

@@ -1,5 +1,7 @@
 # BraDocumentValidation
 
+[![Build Status](https://travis-ci.com/bvicenzo/bra_document_validation.svg?branch=master)](https://travis-ci.com/bvicenzo/bra_document_validation)
+
 This gem allows to validate Brazilian documents, CPF and CNPJ, with format and digit verification.
 
 ## Installation
@@ -12,17 +14,32 @@ gem 'bra_document_validation'
 
 And then execute:
 
-    $ bundle install
+```sh
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install bra_document_validation
+```sh
+gem install bra_document_validation
+```
 
 ## Usage
 
 ```rb
 validates :document_number, 'bra_document_validation/cpf': true
 validates :document_number, 'bra_document_validation/cnpj': true
+validates :document_number, 'bra_document_validation/cpf_or_cnpj': true
+```
+
+You might need add CPF and CNPJ acronyms to inflactions.
+
+```rb
+# config/initializers/inflections.rb
+ActiveSupport::Inflector.inflections do |inflect|
+    inflect.acronym 'CPF'
+    inflect.acronym 'CNPJ'
+end
 ```
 
 # Format
@@ -33,6 +50,7 @@ However you can pass options if your number is formatted.
 ```rb
 validates :document_number, 'bra_document_validation/cpf': { formatted: true }
 validates :document_number, 'bra_document_validation/cnpj': { formatted: false }
+validates :document_number, 'bra_document_validation/cpf_or_cnpj': { formatted: false }
 ```
 
 # Messaging
@@ -44,6 +62,7 @@ However you can add a custom message that substitute the above messages.
 ```rb
 validates :document_number, 'bra_document_validation/cpf': { message: :invalid }
 validates :document_number, 'bra_document_validation/cnpj': { message: 'A custom message' }
+validates :document_number, 'bra_document_validation/cpf_or_cnpj': { message: :invalid }
 ```
 
 ## Development

data/bin/console

@@ -7,8 +7,8 @@ require 'bra_document_validation'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
- require 'pry'
- Pry.start
+require 'pry'
+require 'pry-nav'
 
 require 'irb'
 IRB.start(__FILE__)

data/bra_document_validation.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activemodel', '>= 4.0'
-  spec.add_runtime_dependency 'bra_documents'
+  spec.add_runtime_dependency 'bra_documents', '>= 1.0.2'
 
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-nav'

data/lib/bra_document_validation/cnpj_validator.rb

@@ -2,43 +2,24 @@
 
 module BraDocumentValidation
   class CNPJValidator < ActiveModel::EachValidator
-    FORMATTED_CNPJ_PATTERN = /\A(\d{2}\.\d{3}\.\d{3}\/\d{4})-(\d{2})\Z/.freeze
-    RAW_CNPJ_PATTERN = /\A\d{14}\Z/.freeze
-    NOT_NUMBER_PATTERN = /\D/.freeze
-
     def validate_each(record, attribute, value)
-      return record.errors.add(attribute, error_message(:invalid_format)) unless document_format.match?(value.to_s)
-      full_number = only_numbers_for(value.to_s)
-      record.errors.add(attribute, error_message(:invalid_verification_digit)) if black_listed?(full_number) || !digit_verified?(full_number)
-    end
-
-    private
+      return record.errors.add(attribute, error_message(:invalid_format)) unless valid_format?(value)
 
-    def digit_verified?(full_number)
-      company_number, matrix_subsidiary_number = numbers_for(full_number)
-
-      full_number == BraDocuments::CNPJGenerator.generate(company_number: company_number, matrix_subsidiary_number: matrix_subsidiary_number)
+      record.errors.add(attribute, error_message(:invalid_verification_digit)) unless valid_verification_digit?(value)
     end
 
-    def numbers_for(value)
-      number = value.gsub(NOT_NUMBER_PATTERN, '').chars
-
-      [
-        number.shift(BraDocuments::CNPJGenerator::COMPANY_NUMBER_SIZE).join,
-        number.shift(BraDocuments::CNPJGenerator::MATRIX_SUBSIDIARY_SIZE).join
-      ]
-    end
+    private
 
-    def only_numbers_for(value)
-      value.gsub(NOT_NUMBER_PATTERN, '')
+    def valid_format?(document)
+      BraDocuments::Matcher.match?(document.to_s, kind: :cnpj, mode: document_format)
     end
 
-    def black_listed?(number)
-      number.chars.uniq.size == 1
+    def valid_verification_digit?(document)
+      BraDocuments::CNPJGenerator.valid_verification_digit?(document: document.to_s)
     end
 
     def document_format
-      options[:formatted] ? FORMATTED_CNPJ_PATTERN : RAW_CNPJ_PATTERN
+      options[:formatted] ? :formatted : :raw
     end
 
     def error_message(default_message)

data/lib/bra_document_validation/cpf_or_cnpj_validator.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module BraDocumentValidation
+  class CPFOrCNPJValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      return record.errors.add(attribute, error_message(:invalid_format)) unless valid_format?(value)
+
+      record.errors.add(attribute, error_message(:invalid_verification_digit)) unless valid_verification_digit?(value)
+    end
+
+    private
+
+    def valid_format?(document)
+      BraDocuments::Matcher.match?(document.to_s, kind: :cpf, mode: document_format) ||
+        BraDocuments::Matcher.match?(document.to_s, kind: :cnpj, mode: document_format)
+    end
+
+    def valid_verification_digit?(document)
+      BraDocuments::CPFGenerator.valid_verification_digit?(document: document.to_s) ||
+        BraDocuments::CNPJGenerator.valid_verification_digit?(document: document.to_s)
+    end
+
+    def document_format
+      options[:formatted] ? :formatted : :raw
+    end
+
+    def error_message(default_message)
+      options.fetch(:message, default_message)
+    end
+  end
+end

data/lib/bra_document_validation/cpf_validator.rb

@@ -2,38 +2,24 @@
 
 module BraDocumentValidation
   class CPFValidator < ActiveModel::EachValidator
-    FORMATTED_CPF_PATTERN = /^(\d{3}\.\d{3}\.\d{3})-(\d{2})$/.freeze
-    RAW_CPF_PATTERN = /\A\d{11}\z/
-    NOT_NUMBER_PATTERN = /\D/.freeze
-
     def validate_each(record, attribute, value)
-      return record.errors.add(attribute, error_message(:invalid_format)) unless document_format.match?(value.to_s)
-      full_number = only_numbers_for(value.to_s)
-      record.errors.add(attribute, error_message(:invalid_verification_digit)) if black_listed?(full_number) || !digit_verified?(full_number)
-    end
-
-    private
+      return record.errors.add(attribute, error_message(:invalid_format)) unless valid_format?(value)
 
-    def digit_verified?(number)
-      person_number = number_without_verifying_digits_for(number)
-
-      number == BraDocuments::CPFGenerator.generate(person_number: person_number)
+      record.errors.add(attribute, error_message(:invalid_verification_digit)) unless valid_verification_digit?(value)
     end
 
-    def number_without_verifying_digits_for(number)
-      number.chars.shift(BraDocuments::CPFGenerator::PERSON_NUMBER_SIZE).join
-    end
+    private
 
-    def only_numbers_for(value)
-      value.gsub(NOT_NUMBER_PATTERN, '')
+    def valid_format?(document)
+      BraDocuments::Matcher.match?(document.to_s, kind: :cpf, mode: document_format)
     end
 
-    def black_listed?(number)
-      number.chars.uniq.size == 1
+    def valid_verification_digit?(document)
+      BraDocuments::CPFGenerator.valid_verification_digit?(document: document.to_s)
     end
 
     def document_format
-      options[:formatted] ? FORMATTED_CPF_PATTERN : RAW_CPF_PATTERN
+      options[:formatted] ? :formatted : :raw
     end
 
     def error_message(default_message)

data/lib/bra_document_validation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BraDocumentValidation
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/lib/bra_document_validation.rb

@@ -5,6 +5,7 @@ require 'bra_documents'
 require 'bra_document_validation/version'
 require 'bra_document_validation/cnpj_validator'
 require 'bra_document_validation/cpf_validator'
+require 'bra_document_validation/cpf_or_cnpj_validator'
 
 module BraDocumentValidation
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bra_document_validation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Bruno Vicenzo
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -115,6 +116,7 @@ files:
 - bra_document_validation.gemspec
 - lib/bra_document_validation.rb
 - lib/bra_document_validation/cnpj_validator.rb
+- lib/bra_document_validation/cpf_or_cnpj_validator.rb
 - lib/bra_document_validation/cpf_validator.rb
 - lib/bra_document_validation/version.rb
 homepage: https://github.com/bvicenzo/bra_document_validation
@@ -125,7 +127,7 @@ metadata:
   homepage_uri: https://github.com/bvicenzo/bra_document_validation
   source_code_uri: https://github.com/bvicenzo/bra_document_validation
   changelog_uri: https://github.com/bvicenzo/bra_document_validation/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -140,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.31
+signing_key: 
 specification_version: 4
 summary: This gem add ActiveModel validations to Brazilian documents.
 test_files: []