catarse_pagarme 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2dc18b893178e919d89e94cafdb79e61593f88
-  data.tar.gz: c6d160bb2125ec861ffb382960dfb51d470341fe
+  metadata.gz: ec4bf46c08fd53a8f3ad81da416096e0e563afa2
+  data.tar.gz: d9261190185e65ca22869256d2fb2acbe942bfd6
 SHA512:
-  metadata.gz: ed09efce5d14df55bf3fc7f7047802df835a1b2f62b3212b84d902d5ca7a2222ae90e2656817cb1dd2f09922c80dcb46c41882cc41851989374fd7ee3a79bf19
-  data.tar.gz: 77fc5db5f5c615713915e45f12f55039c2e6dd2163617f05f756a811f2c2ac81ab4eceb1eb865f62b59de07649230025b8d711a064e4cd9b9af4f63b8f515f12
+  metadata.gz: f7851fb114360c92a62791d1dba99df0fa520f7c6ffce0db2a61f8ae43fd514d5387345f851282568de9c054554763f09b918bc03dddc9f09b864b4157f40020
+  data.tar.gz: e46c9c5d8c1ae7d387d80728f60e7d4821f3cee9a4e4ab3b871a077d34a4fae6ddba5192931f883ffbf8e9ae0961d21ed5584ac16a9355191e8e375f72a21e54

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.4.7)
+    catarse_pagarme (2.4.8)
       pagarme (~> 1.9.8)
       rails (~> 4.0)
 

data/app/models/catarse_pagarme/fee_calculator_concern.rb

@@ -3,11 +3,13 @@ module CatarsePagarme::FeeCalculatorConcern
 
   included do
 
-    def get_fee(payment_method, acquirer_name = nil)
-      if payment_method == ::CatarsePagarme::PaymentType::SLIP
+    def get_fee
+      return nil if self.contribution.payment_choice.blank? # We always depend on the payment_choice
+      if self.contribution.payment_choice == ::CatarsePagarme::PaymentType::SLIP
         CatarsePagarme.configuration.slip_tax.to_f
       else
-        if acquirer_name == 'stone'
+        return nil if self.contribution.acquirer_name.blank? # Here we depend on the acquirer name
+        if self.contribution.acquirer_name == 'stone'
           self.contribution.installments > 1 ? tax_calc_for_installment(stone_tax) : tax_calc(stone_tax)
         else
           if self.contribution.card_brand == 'amex'

data/app/models/catarse_pagarme/transaction_base.rb

@@ -34,14 +34,15 @@ module CatarsePagarme
       }
     end
 
+    def delegator
+      self.contribution.pagarme_delegator
+    end
+
+    private
     def update_fee
       self.contribution.update_attributes({
-        payment_service_fee: delegator.get_fee(payment_method, self.transaction.acquirer_name),
+        payment_service_fee: delegator.get_fee,
       })
     end
-
-    def delegator
-      self.contribution.pagarme_delegator
-    end
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.4.7"
+  VERSION = "2.4.8"
 end

data/spec/models/catarse_pagarme/contribution_delegator_spec.rb

@@ -44,18 +44,33 @@ describe CatarsePagarme::ContributionDelegator do
       CatarsePagarme.configuration.stub(:pagarme_tax).and_return(0.0063)
       CatarsePagarme.configuration.stub(:cielo_tax).and_return(0.038)
       CatarsePagarme.configuration.stub(:stone_tax).and_return(0.0307)
+      CatarsePagarme.configuration.stub(:credit_card_cents_fee).and_return(0.39)
 
       delegator.stub(:transaction).and_return(fake_transaction)
     end
 
+    context 'when choice is nil' do
+      let(:contribution) { create(:contribution, value: 10, payment_choice: nil) }
+      subject { delegator.get_fee }
+      it { expect(subject).to eq(nil) }
+    end
+
+    context 'when choice is credit card and acquirer_name is nil' do
+      let(:contribution) { create(:contribution, value: 10, payment_choice: CatarsePagarme::PaymentType::CREDIT_CARD, acquirer_name: nil) }
+      subject { delegator.get_fee }
+      it { expect(subject).to eq(nil) }
+    end
+
     context 'when choice is slip' do
-      subject { delegator.get_fee(CatarsePagarme::PaymentType::SLIP).to_f }
+      let(:contribution) { create(:contribution, value: 10, payment_choice: CatarsePagarme::PaymentType::SLIP, acquirer_name: nil) }
+      subject { delegator.get_fee }
       it { expect(subject).to eq(2.00) }
     end
 
     context 'when choice is credit card' do
-      subject { delegator.get_fee(CatarsePagarme::PaymentType::CREDIT_CARD).to_f }
-      it { expect(subject).to eq(0.83) }
+      let(:contribution) { create(:contribution, value: 10, payment_choice: CatarsePagarme::PaymentType::CREDIT_CARD, acquirer_name: 'stone', card_brand: 'visa', installments: 1) }
+      subject { delegator.get_fee }
+      it { expect(subject).to eq(0.76) }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails