br_documents 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09c9aff76a8e9f8c1174cd31046388cca186a799
-  data.tar.gz: b585193cc05100900597b13177920012f0c809b5
+  metadata.gz: f64e2139b8c0f45f67ba0d9a3faaa849cf234f2d
+  data.tar.gz: a334fc18af1193c28d8faff57cc2f75c0e26c5f2
 SHA512:
-  metadata.gz: c8e5f19464173dc1dffceedf46bc56fa08df5a9b245d2af487183e0e6b09afa0669760c0a22316b29bec8a44110ab527f7beaf03fb50e98162970c36183df638
-  data.tar.gz: 16f4ed6b454c4da58866dbb976309754c2b512427238df3b7c8d55344d837ab50a5e40a2860ea41c9f0fcf3c1adaa4241d1b3f2cfd6f0d8043cda1dcbea97777
+  metadata.gz: 6b7e01d7e6ac58d51dde5d7ad3a117bff65e6b2957b58c96af99b61c0c298076243681a7f9ae044ec46803830c9ef41b8c94fce81f1653265752f0a99156fc5c
+  data.tar.gz: 74e23ac1af71312b733e33b9793072a0c98f3b9af1e5b86e1740bcd152ef55512662ca6c75aa847d05290a16f0f2d5f332dd7cd724ec108f07bab6de345a9505

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - jruby-19mode
+  - 2.2.2
+  - 2.2.5
 gemfile:
   - Gemfile

data/circle.yml

@@ -1,3 +1,3 @@
 machine:
   ruby:
-    version: 2.1.2
+    version: 2.2.5

data/lib/br_documents/cnpj_cpf/cnpj.rb

@@ -5,19 +5,17 @@ module BrDocuments
     class Cnpj
       include Document
 
-      def initialize(number)
-        @number = number
-      end
+      private
 
-      def valid?
-        regex = /^(\d{2}\.\d{3}\.\d{3}\/\d{4}-\d{2})$|^(\d{14})$/
-        weight13 = [5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2]
-        weight14 = [6, 5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2]
+      def format_regex
+        /^(\d{2}\.\d{3}\.\d{3}\/\d{4}-\d{2})$|^(\d{14})$/
+      end
 
-        valid_number?(@number, regex, weight13, weight14)
+      def weights_for_digital_check
+        [[5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2], [6, 5, 4, 3, 2, 9, 8, 7, 6, 5, 4, 3, 2]]
       end
 
-      def formatted
+      def format_number
         @number.sub(/(\d{2})(\d{3})(\d{3})(\d{4})(\d{2})/, "\\1.\\2.\\3/\\4-\\5")
       end
     end

data/lib/br_documents/cnpj_cpf/cpf.rb

@@ -5,19 +5,17 @@ module BrDocuments
     class Cpf
       include Document
 
-      def initialize(number)
-        @number = number
-      end
+      private
 
-      def valid?
-        regex = /^(\d{3}\.\d{3}\.\d{3}-\d{2})$|^(\d{11})$/
-        weight10 = [10, 9, 8, 7, 6, 5, 4, 3, 2]
-        weight11 = [11, 10, 9, 8, 7, 6, 5, 4, 3, 2]
+      def format_regex
+        /^(\d{3}\.\d{3}\.\d{3}-\d{2})$|^(\d{11})$/
+      end
 
-        valid_number?(@number, regex, weight10, weight11)
+      def weights_for_digital_check
+        [[10, 9, 8, 7, 6, 5, 4, 3, 2], [11, 10, 9, 8, 7, 6, 5, 4, 3, 2]]
       end
 
-      def formatted
+      def format_number
         @number.sub(/(\d{3})(\d{3})(\d{3})(\d{2})/, "\\1.\\2.\\3-\\4")
       end
     end

data/lib/br_documents/cnpj_cpf/document.rb

@@ -5,30 +5,38 @@ module BrDocuments
     module Document
       include Commons::Mod11
 
-      protected
-      def valid_number?(number, regex, weight1, weight2)
-        valid_format?(number, regex) and
-         not sequence_of_equal_numbers?(number) and
-         valid_digital_check?(number, weight1, weight2)
+      def initialize(number)
+        @number = number
+      end
+
+      def valid?
+        valid_format? && !sequence_of_equal_numbers? && valid_digital_check?
+      end
+
+      def formatted
+        valid? ? format_number : ""
       end
 
       private
-      def valid_format?(number, regex)
-        regex.match(number).present?
+
+      def valid_format?
+        format_regex.match(@number).present?
       end
 
-      def sequence_of_equal_numbers?(number)
-        remove_mask(number).split("").uniq.length == 1
+      def sequence_of_equal_numbers?
+        number_without_mask.split("").uniq.length == 1
       end
 
-      def valid_digital_check?(number, weight1, weight2)
-        digital_check1 = generate_digital_check(remove_mask(number), weight1)
-        digital_check2 = generate_digital_check(remove_mask(number), weight2)
-        number[-2, 2].eql? "#{digital_check1}#{digital_check2}"
+      def valid_digital_check?
+        weight1, weight2 = weights_for_digital_check
+
+        digital_check1 = generate_digital_check(number_without_mask, weight1)
+        digital_check2 = generate_digital_check(number_without_mask, weight2)
+        @number[-2, 2].eql? "#{digital_check1}#{digital_check2}"
       end
 
-      def remove_mask(number)
-        number.gsub(/[\.\/-]/, "")
+      def number_without_mask
+        @number.gsub(/[\.\/-]/, "")
       end
     end
   end

data/lib/br_documents/version.rb

@@ -1,3 +1,3 @@
 module BrDocuments
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/cnpj_cpf/cnpj_spec.rb

@@ -6,6 +6,13 @@ describe BrDocuments::CnpjCpf::Cnpj do
       cnpj = BrDocuments::CnpjCpf::Cnpj.new("04001155000101")
       expect(cnpj.formatted).to eq "04.001.155/0001-01"
     end
+
+    context "when is invalid" do
+      it "returns an empty string" do
+        cnpj = BrDocuments::CnpjCpf::Cnpj.new("123")
+        expect(cnpj.formatted).to eq ""
+      end
+    end
   end
 
   it "is invalid with malformed number" do

data/spec/cnpj_cpf/cpf_spec.rb

@@ -6,6 +6,13 @@ describe BrDocuments::CnpjCpf::Cpf do
       cpf = BrDocuments::CnpjCpf::Cpf.new("11144477735")
       expect(cpf.formatted).to eq "111.444.777-35"
     end
+
+    context "when is invalid" do
+      it "returns an empty string" do
+        cpf = BrDocuments::CnpjCpf::Cpf.new("123")
+        expect(cpf.formatted).to eq ""
+      end
+    end
   end
 
   it "is invalid with malformed number" do

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require "simplecov"
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
 SimpleCov.start
 
 require "bundler/setup"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: br_documents
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - ASSEINFO - Sistemas de Informação
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Validates brazilian documents like CPF, CNPJ and IE. It can be used with