portuguese_validators 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda9a0ba1218650749627b149ac72a33a2db99a6
-  data.tar.gz: cddc577ffa4606e7298f2b770082559ca77ca8c6
+  metadata.gz: ed26e48bd865b704a3d69135c056e5a7f38665f6
+  data.tar.gz: 04050615af5d667610996670df921f42ba070cac
 SHA512:
-  metadata.gz: 3741c81cce9cba804019218667329a609694220e37ef51731975eb01a8e2bbe5c4da775acbd225444c8e624803410c0d3f914ad1f77f007b55fed9452555d3f4
-  data.tar.gz: 40da33c44934c9a0cf6c8eaaa218d86c6ab69c04ec12f2a7e21e53eeac5abf808071ce965f6b5710925210ca08f1b77fccdd9d31f5e461911c7f328765a6ad74
+  metadata.gz: 196737f9a4080e6fa85775141f5b4114c0f9a7820390d665c1a736bd55b7114f9bb856cf488fb1fc71aa8aa4b0bf78de899aad8c9b3d2c5ac044f5ada1ae5af1
+  data.tar.gz: 2c66bf4476f365d63ed05279b87bb226a6727b5dcc734b5ea7a908a416eb658df97c6efefb060f8d31a39677401db8c1249782a18a3f00dce40125ba45537a5d

data/.rspec

@@ -1,2 +1,2 @@
 --colour
---format s -c
+--format documentation

data/lib/portuguese_validators/bi.rb

@@ -8,9 +8,8 @@ module PortugueseValidators
     BLACKLIST = %w(000000000)
 
     def validate_each(record, attribute, value) # :nodoc:
-      unless is_valid?(value)
-        record.errors[attribute] << (options[:message] || 'is not a valid BI')
-      end
+      return if value.blank?
+      record.errors.add(attribute, options[:message] || :invalid) unless is_valid?(value)
     end
 
     # Returns true if the number is a valid BI or false otherwise.
@@ -41,4 +40,4 @@ module PortugueseValidators
       number.match(/^\d{9}$/) ? true : false
     end
   end
-end
+end

data/lib/portuguese_validators/nib.rb

@@ -4,9 +4,8 @@ module PortugueseValidators
   # The number is always composed by 21 where the last two form the control number.
   class PortugueseNibValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
-      unless is_valid?(value)
-        record.errors[attribute] << (options[:message] || 'is not a valid NIB')
-      end
+      return if value.blank?
+      record.errors.add(attribute, options[:message] || :invalid) unless is_valid?(value)
     end
 
     def is_valid?(number)
@@ -36,4 +35,4 @@ module PortugueseValidators
       number.match(/^\d{21}$/) ? true : false
     end
   end
-end
+end

data/lib/portuguese_validators/nif.rb

@@ -5,9 +5,8 @@ module PortugueseValidators
   # last digit is the control digit.
   class PortugueseNifValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
-      unless is_valid?(value)
-        record.errors[attribute] << (options[:message] || 'is not a valid NIF')
-      end
+      return if value.blank?
+      record.errors.add(attribute, options[:message] || :invalid) unless is_valid?(value)
     end
 
     def is_valid?(number)
@@ -38,4 +37,4 @@ module PortugueseValidators
       number.match(/^\d{9}$/) && number.match(/^[1256789]/) ? true : false
     end
   end
-end
+end

data/lib/portuguese_validators/phone.rb

@@ -13,8 +13,8 @@ module PortugueseValidators
     def validate_each(record, attribute, value)
       return if value.blank?
 
-      number = value.gsub(" ", "")
-      record.errors.add(attribute, options[:message] || :invalid) unless is_valid?(number)
+      phone_number = value.to_s.gsub(" ", "")
+      record.errors.add(attribute, options[:message] || :invalid) unless is_valid?(phone_number)
     end
 
     def is_valid?(number)
@@ -33,5 +33,4 @@ module PortugueseValidators
       number.match(/^((00|\+)(\d{3}))?\d{9}$/) ? true : false
     end
   end
-
 end

data/lib/portuguese_validators/version.rb

@@ -1,3 +1,3 @@
 module PortugueseValidators
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/bi_validator_spec.rb

@@ -10,12 +10,12 @@ describe PortugueseBiValidator do
   after(:all) { Object.send(:remove_const, :User) }
 
   describe 'validation' do
-    it 'returns false if the number is empty' do
-      expect(User.new(bi: '')).to be_invalid
+    it 'returns true if the number is empty' do
+      expect(User.new(bi: '')).to be_valid
     end
 
-    it 'returns false if the number is not defined' do
-      expect(User.new(bi: nil)).to be_invalid
+    it 'returns true if the number is not defined' do
+      expect(User.new(bi: nil)).to be_valid
     end
 
     context 'given valid BI numbers' do

data/spec/nib_validator_spec.rb

@@ -10,12 +10,12 @@ describe PortugueseNibValidator do
   after(:all) { Object.send(:remove_const, :User) }
 
   describe 'validation' do
-    it 'returns false if the number is empty' do
-      expect(User.new(nib: '')).to be_invalid
+    it 'returns true if the number is empty' do
+      expect(User.new(nib: '')).to be_valid
     end
 
-    it 'returns false if the number is not defined' do
-      expect(User.new(nib: nil)).to be_invalid
+    it 'returns true if the number is not defined' do
+      expect(User.new(nib: nil)).to be_valid
     end
 
     context 'given invalid NIB numbers' do

data/spec/nif_validator_spec.rb

@@ -10,12 +10,12 @@ describe PortugueseNifValidator do
   after(:all) { Object.send(:remove_const, :User) }
 
   describe 'validation' do
-    it 'returns false if the number is empty' do
-      expect(User.new(nif: '')).to be_invalid
+    it 'returns true if the number is empty' do
+      expect(User.new(nif: '')).to be_valid
     end
 
-    it 'returns false if the number is not defined' do
-      expect(User.new(nif: nil)).to be_invalid
+    it 'returns true if the number is not defined' do
+      expect(User.new(nif: nil)).to be_valid
     end
   end
 end

data/spec/phone_validator_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe PortuguesePhoneValidator do
+  before(:all) {
+    class User < TestModel
+      validates :phone_number, portuguese_phone: true
+    end
+  }
+
+  after(:all) { Object.send(:remove_const, :User) }
+
+  describe 'validation' do
+    it 'returns true if the number is empty' do
+      expect(User.new(phone_number: '')).to be_valid
+    end
+
+    it 'returns true if the number is not defined' do
+      expect(User.new(phone_number: nil)).to be_valid
+    end
+
+    context 'given valid phone numbers' do
+      %w(912345678 212345678 00351923456789 +351236123456).each do |phone_number|
+        it "returns true for `#{phone_number}'" do
+          expect(User.new(phone_number: phone_number)).to be_valid
+        end
+      end
+    end
+
+    context 'given invalid phone numbers' do
+      %w(91234567 9123456789 0035192345678 +3519234567890 123456789 00351123456789 qwertyuio
+        -12345678).each do |phone_number|
+        it "returns false for `#{phone_number}'" do
+          expect(User.new(phone_number: phone_number)).to be_invalid
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portuguese_validators
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ricardo Otero
@@ -120,6 +120,7 @@ files:
 - spec/bi_validator_spec.rb
 - spec/nib_validator_spec.rb
 - spec/nif_validator_spec.rb
+- spec/phone_validator_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rikas/portuguese_validators/fork
 licenses:
@@ -149,4 +150,5 @@ test_files:
 - spec/bi_validator_spec.rb
 - spec/nib_validator_spec.rb
 - spec/nif_validator_spec.rb
+- spec/phone_validator_spec.rb
 - spec/spec_helper.rb