br_documents 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70d69d78462e3ab61040e25f8540bf7775a80f0f
-  data.tar.gz: da45afd43f7ab8283f2175a6d7202d1bbe34ae5e
+SHA256:
+  metadata.gz: 25cf99032b0bea6b2a016595a560e0a7ea5777154f74d9259009b50323473a61
+  data.tar.gz: f19aa466afa9077bfbe14184d8311bc7db6486d36d1f73ed855c2b00218a062a
 SHA512:
-  metadata.gz: 53f7b3ca1a384b09aa3a4ece17793fc5707e9443015b0916822c808278d1f1c18eb2e0dff24346b24a1b68815b85088fbe9478f38f92330bfeda1f58f1afd5ae
-  data.tar.gz: f7bc5af898cd89ceaa00ac06261fa91559a9187d72bce79fc4121eba7cc501c69710774bac7b6c1eb032e542dde2351905a63ce306e4445784537ae5fbebfd5c
+  metadata.gz: 3f37a4a5244a984e8ed4bf93077e43dd92caec88ea2e9ee7243b8819c6c520050658d7fdcc3164518a7b324f0e777b78346cbe3e024bc019515e258d251d68a3
+  data.tar.gz: 67cf2292f3ca90a52ff6790155c6a32382f7c54475b7d572c3fd491f63a756676c88c333f83bd6f961cc97a6fc321df5139c2c7f10881a0af3239bafac313a5c

data/Gemfile.lock

@@ -1,30 +1,31 @@
 PATH
   remote: .
   specs:
-    br_documents (0.1.2)
+    br_documents (0.1.3)
       activemodel (>= 4.0.0)
       i18n (>= 0.6.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     byebug (10.0.2)
     codeclimate-test-reporter (1.0.7)
       simplecov
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     docile (1.1.5)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     json (2.0.3)
-    minitest (5.11.3)
+    minitest (5.13.0)
     rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -45,8 +46,9 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -61,4 +63,4 @@ DEPENDENCIES
   simplecov (>= 0.9.0)
 
 BUNDLED WITH
-   1.16.3
+   1.17.2

data/lib/br_documents/ie_validator.rb

@@ -1,10 +1,9 @@
 class IeValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if ie_present?(value)
-      attribute_uf_was_configured_at_validator?(record) and
-      can_read_uf_at_record?(options, record) and
+    ie_present?(value) &&
+      attribute_uf_was_configured_at_validator?(record) &&
+      can_read_uf_at_record?(options, record) &&
       ie_valid?(record, attribute, value)
-    end
   end
 
   private
@@ -15,18 +14,20 @@ class IeValidator < ActiveModel::EachValidator
   def attribute_uf_was_configured_at_validator?(record)
     record.errors.add(:base,
       I18n.t("validator.ie.uf.no_configured")) unless options[:uf].present?
-    record.errors.messages.empty?
+
+    options[:uf].present?
   end
 
   def can_read_uf_at_record?(options, record)
     begin
-      read_uf(record)
+      uf = read_uf(record)
     rescue NoMethodError
       record.errors.add(:base, I18n.t("validator.ie.uf.no_present",
         uf: options[:uf])
       )
     end
-    record.errors.messages.empty?
+
+    uf.present?
   end
 
   def ie_valid?(record, attribute, value)
@@ -42,7 +43,7 @@ class IeValidator < ActiveModel::EachValidator
     uf = read_uf(record)
     ie_number = BrDocuments::IE::Factory.create(uf, value)
     ie_number.valid?
-  end  
+  end
 
   def read_uf(record)
     attribute = record

data/lib/br_documents/version.rb

@@ -1,3 +1,3 @@
 module BrDocuments
-  VERSION = "0.1.2"
+  VERSION = '0.1.3'
 end

data/spec/ie_validator_spec.rb

@@ -1,73 +1,83 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe IeValidator do
-  let(:record) { double("model") }
+RSpec.describe IeValidator do
+  let(:record) { double('model') }
 
   before do
-    allow(record).to receive(:uf) {"SC"}
-    allow(record).to receive(:errors).and_return([])
+    allow(record).to receive(:uf) {'SC'}
+    allow(record).to receive(:errors).and_return({})
     allow(record.errors).to receive(:messages).and_return({})
     allow(record.errors).to receive(:add) do | attribute, error |
-      record.errors.messages[attribute] = [error]
+      record.errors[attribute] ||= []
+      record.errors[attribute] << error
+      record.errors.messages[attribute] = record.errors[attribute]
     end
   end
 
-  subject { IeValidator.new(attributes: "ie", uf: "uf") }
+  subject { IeValidator.new(attributes: 'ie', uf: 'uf') }
 
   context "when IE's number is valid" do
-    before { subject.validate_each(record, "ie", "253667852") }
+    before { subject.validate_each(record, 'ie', '253667852') }
 
-    it "doesn't add errors in model" do
+    it 'does not add errors in model' do
       expect(record.errors.messages).to be_empty
     end
   end
 
-  context "when IE is blank" do
-    before { subject.validate_each(record, "ie", "") }
+  context 'when IE is blank' do
+    before { subject.validate_each(record, 'ie', '') }
 
-    it "doesn't add errors in model" do
+    it 'does not add errors in model' do
       expect(record.errors.messages).to be_empty
     end
   end
 
-  context "when IE is invalid" do
-    before { subject.validate_each(record, "ie", "253667853") }
+  context 'when IE is invalid' do
+    it 'adds :invalid error in the model' do
+      subject.validate_each(record, 'ie', '253667853')
 
-    it "adds errors in model" do
-      expect(record.errors.messages).to_not be_empty
+      expect(record.errors.messages['ie']).to include(:invalid)
+    end
+
+    it 'does not override the previous message' do
+      record.errors.add('ie', 'another error message')
+      subject.validate_each(record, 'ie', '253667853')
+
+      expect(record.errors.messages['ie']).to include('another error message')
+      expect(record.errors.messages['ie']).to include(:invalid)
     end
   end
 
-  context "when UF is invalid" do
+  context 'when UF is invalid' do
     before do
-      allow(record).to receive(:uf){""}
-      subject.validate_each(record, "ie", "253667852")
+      allow(record).to receive(:uf) {'XX'}
+      subject.validate_each(record, 'ie', '253667852')
     end
 
-    it "adds error in model" do
-      expect(record.errors.messages["ie"]).to eql [t("validator.ie.uf.invalid")]
+    it 'adds error in model' do
+      expect(record.errors.messages['ie']).to include t('validator.ie.uf.invalid')
     end
   end
 
-  context "when it can't find attribute uf in model" do
+  context 'when cannot be found attribute uf in model' do
     before do
       allow(record).to receive(:uf).and_raise(NoMethodError)
-      subject.validate_each(record, "ie", "253667852")
+      subject.validate_each(record, 'ie', '253667852')
     end
 
-    it "adds error in model" do
+    it 'adds error in model' do
       expect(record.errors.messages[:base]).to eql [
-        t("validator.ie.uf.no_present", uf: "uf")]
+        t('validator.ie.uf.no_present', uf: 'uf')]
     end
   end
 
-  context "when attribute uf is not defined" do
-    subject { IeValidator.new(attributes: "ie") }
-    before { subject.validate_each(record, "ie", "253667852") }
+  context 'when attribute uf is not defined' do
+    subject { IeValidator.new(attributes: 'ie') }
+    before { subject.validate_each(record, 'ie', '253667852') }
 
-    it "adds error in model" do
+    it 'adds error in model' do
       expect(record.errors.messages[:base]).to eql [
-        t("validator.ie.uf.no_configured")]
+        t('validator.ie.uf.no_configured')]
     end
   end
 end

data/spec/spec_helper.rb

@@ -15,5 +15,8 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+
   config.order = "random"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: br_documents
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ASSEINFO - Sistemas de Informação
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -239,8 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Validates brazilian documents like CPF, CNPJ and IE. It can be used with