solidus_br_common 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a1c9f1cbc965f0e89c598f09cb2768d9d19d59
-  data.tar.gz: 914cf27c94005ef27b1174b19d96b5122e6c035e
+  metadata.gz: 59064445995a3c758e8e9d7744504aeac0127565
+  data.tar.gz: 4eefd345f10455fa62eb379bc41a6e768a6c2334
 SHA512:
-  metadata.gz: 05135c35c3cc34b3f1492480bcebe5e36f89021f453d338ea6c4e2c4b95edc3d31e576eb04439f6c2f84c6c873ce51eafc486be68a1e121aeed0964adde6153f
-  data.tar.gz: a16498a56e9045bef9b273297cd5e5c0a51b0bf74346b376c7dbebd0ecf3641e5e6458313c192212aa802fdd810cd6da8759d057f2b6938fc400da18ed594d06
+  metadata.gz: af8e33de2576ebaf7b0d58e0a32e94b3f619cf450c3a33be4a39565e8ca96832f2a93e3a149df3a37e72fba10a5a4c31825bac11f98b9840abf654135f782d16
+  data.tar.gz: a7a805070f3659bb2e7b4b396ffe0fe80e40f7a7358850e703c183d1a150f36576ec92776b200c03f8cf8985d22982d7b2d64e115c1aad41bd571696282c6a80

data/app/models/spree/address_decorator.rb

@@ -3,4 +3,19 @@ Spree::Address.class_eval do
 
   validates :number, :numericality => {greater_than: 0}, :presence => true
   validates :district, length: { maximum: 150}, presence: true
+
+  before_validation :sanitize_phone
+
+  def phone_area_code
+    phone[0..1] if phone
+  end
+
+  def phone_number
+    phone[2..-1] if phone
+  end
+
+  private
+  def sanitize_phone
+    phone.gsub!(/[^\d]/, '')
+  end
 end

data/app/models/spree/user_decorator.rb

@@ -3,7 +3,7 @@ require 'validates_timeliness'
 
 Spree::User.class_eval do
 
-  validates_presence_of :phone
+  validates_presence_of :phone, :cpf
   validates :date_of_birth,
             presence: true,
             timeliness: {
@@ -11,7 +11,6 @@ Spree::User.class_eval do
               on_or_after: lambda { 100.years.ago.at_midnight },
               type: :datetime
             }
-  validates :cpf, presence: true
   validates :first_name, :last_name, presence: true, length: {maximum: 100}
   validates :phone, :alternative_phone, length: {maximum: 11}
   validate :valid_cpf

data/solidus_br_common.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_br_common'
-  s.version     = '1.1.2'
+  s.version     = '1.1.3'
   s.summary     = 'Brazil commons aspects'
   s.description = 'This extension has goal to provide common aspects as cities, extras address information and some seeds to Brazil'
   s.required_ruby_version = '>= 2.0.0'

data/spec/models/spree/address_spec.rb

@@ -1,31 +1,77 @@
 require 'spec_helper'
 
 describe Spree::Address do
-  let(:address) {build(:address)}
+  subject { build(:address, phone: '(11) 2334-4433') }
 
-  it { is_expected.to validate_presence_of(:number) }
-  it { is_expected.to validate_presence_of(:district) }
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:number) }
+    it { is_expected.to validate_presence_of(:district) }
 
-  it 'should validate length of district' do
-    address.district = string_with_length(151)
+    context 'phone' do
+      it 'validates length of district' do
+        subject.district = string_with_length(151)
 
-    expect(address).to_not be_valid
-  end
+        expect(subject).to_not be_valid
+      end
 
-  it 'should validate number negative' do
-    address.number = -1
+      it 'validates number negative' do
+        subject.number = -1
 
-    expect(address).to_not be_valid
+        expect(subject).to_not be_valid
+      end
+    end
   end
 
   context '#save' do
-    subject { address }
-
-    before { address.save! }
+    before { subject.save! }
 
     it { is_expected.to be_persisted }
   end
 
+  context '#phone_area_code' do
+    context 'when there is phone' do
+      before { subject.valid? }
+
+      it 'returns only the phone area code' do
+        expect(subject.phone_area_code).to eq('11')
+      end
+    end
+
+    context 'when there is not phone' do
+      before { subject.phone = nil }
+
+      it 'returns nil' do
+        expect(subject.phone_area_code).to be_nil
+      end
+    end
+  end
+
+  context '#phone_number' do
+    context 'when there is phone' do
+      before { subject.valid? }
+
+      it 'returns only the phone number' do
+        expect(subject.phone_number).to eq('23344433')
+      end
+    end
+
+    context 'when there is not phone' do
+      before { subject.phone = nil }
+
+      it 'returns nil' do
+        expect(subject.phone_number).to be_nil
+      end
+    end
+  end
+
+  context 'sanitize_phone' do
+    it 'keeps only numbers' do
+      subject.valid?
+
+      expect(subject.phone).to eq('1123344433')
+    end
+  end
+
   def string_with_length(length)
     (1..length).map { (65 + rand(26)).chr }.join
   end

data/spec/models/spree/user_spec.rb

@@ -5,15 +5,57 @@ describe Spree::User do
     (1..length).map { (65 + rand(26)).chr }.join
   end
 
-  let(:user) { build(:user) }
+  subject(:user) { build(:user, phone: '(11) 2334-4433') }
 
-  it {
-    is_expected.to validate_presence_of(:cpf)
-    is_expected.to validate_presence_of(:first_name)
-    is_expected.to validate_presence_of(:last_name)
-    is_expected.to validate_presence_of(:date_of_birth)
-    is_expected.to validate_presence_of(:phone)
-  }
+  context 'validations' do
+    it { is_expected.to validate_presence_of(:cpf)}
+    it { is_expected.to validate_presence_of(:first_name)}
+    it { is_expected.to validate_presence_of(:last_name)}
+    it { is_expected.to validate_presence_of(:date_of_birth)}
+    it { is_expected.to validate_presence_of(:phone)}
+
+    context 'cpf' do
+      it 'returns valid' do
+        user.cpf = CPF.generate(true)
+
+        expect(user).to be_valid
+      end
+
+      context 'when the length is incorrect' do
+        it 'returns invalid' do
+          user.cpf = '123456789'
+
+          expect(user).to_not be_valid
+        end
+      end
+
+      context 'when the number is incorrect' do
+        it 'returns invalid' do
+          user.cpf = '12345678910'
+
+          expect(user).to_not be_valid
+        end
+      end
+    end
+
+    it 'validates length of first_name' do
+      user.first_name = string_with_length(101)
+
+      expect(user).to_not be_valid
+    end
+
+    it 'validates length of last_name' do
+      user.last_name = string_with_length(101)
+
+      expect(user).to_not be_valid
+    end
+
+    it 'validates date_of_birth is greater or equal to 18 years' do
+      user.date_of_birth = 17.years.ago
+
+      expect(user).to_not be_valid
+    end
+  end
 
   context '#full_name' do
     it 'should return first_name + last_name' do
@@ -31,58 +73,69 @@ describe Spree::User do
     end
   end
 
-  it 'should respond to extra properties' do
+  it 'responds to extra properties' do
     expect(user).to respond_to :first_name, :last_name, :cpf, :date_of_birth, :phone, :alternative_phone
   end
 
-  it 'should save user with success' do
+  it 'saves user with success' do
     expect(user.save!).to be_truthy
   end
 
-  it 'should save user with sanitize cpf' do
-    cpf_formatted = CPF.generate(true)
-    user.cpf = cpf_formatted
-    cpf = CPF.new(cpf_formatted)
+  context '#phone_area_code' do
+    context 'when there is phone' do
+      before { subject.valid? }
 
-    user.save!
-
-    expect(user.cpf).to eq(cpf.stripped)
-  end
+      it 'returns only the phone area code' do
+        expect(subject.phone_area_code).to eq('11')
+      end
+    end
 
-  it 'should save user with sanitize phone' do
-    user.phone = '(011) 3882-8877'
-    user.save!
+    context 'when there is not phone' do
+      before { subject.phone = nil }
 
-    expect(user.phone).to eq('01138828877')
+      it 'returns nil' do
+        expect(subject.phone_area_code).to be_nil
+      end
+    end
   end
 
-  it 'should validate cpf' do
-    expect(user).to be_valid
-
-    user.cpf = '123456789'
+  context '#phone_number' do
+    context 'when there is phone' do
+      before { subject.valid? }
 
-    expect(user).to_not be_valid
+      it 'returns only the phone number' do
+        expect(subject.phone_number).to eq('23344433')
+      end
+    end
 
-    user.cpf = '12345678910'
+    context 'when there is not phone' do
+      before { subject.phone = nil }
 
-    expect(user).to_not be_valid
+      it 'returns nil' do
+        expect(subject.phone_number).to be_nil
+      end
+    end
   end
 
-  it 'should validate length of first_name' do
-    user.first_name = string_with_length(101)
-
-    expect(user).to_not be_valid
-  end
+  context 'sanitize' do
+    context 'phone' do
+      it 'keeps only numbers' do
+        subject.valid?
 
-  it 'should validate length of last_name' do
-    user.last_name = string_with_length(101)
+        expect(subject.phone).to eq('1123344433')
+      end
+    end
 
-    expect(user).to_not be_valid
-  end
+    context 'cpf' do
+      it 'keeps only number' do
+        cpf_formatted = CPF.generate(true)
+        user.cpf = cpf_formatted
+        cpf = CPF.new(cpf_formatted)
 
-  it 'should validate date_of_birth is greater or equal to 18 years' do
-    user.date_of_birth = 17.years.ago
+        user.valid?
 
-    expect(user).to_not be_valid
+        expect(user.cpf).to eq(cpf.stripped)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_br_common
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Diego Domingues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core