catarse_pagarme 2.6.7 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde1496ec238e0d5eb66fb9539a1a438ff8db222
-  data.tar.gz: fe18515868434cf83ef8c5eff163e53e3ac0b98f
+  metadata.gz: ff6a622cd627167a2333b62e2eae22e0c17fb007
+  data.tar.gz: 45724e635fba48ff21551025a623098f2804e98f
 SHA512:
-  metadata.gz: 984980c21c46981942229089382a7cf58c0d14350d1f7a2db5c531e3e55dc98914768dd6db1e3f9e01d5c8d1373def63d2237e3bbf724062fe75d41c4614874c
-  data.tar.gz: 0e2818fa88cb2984e19256f62d93516ac1b7eeb6646e0048dca151b8b69673b96a20575c6c037a139d899210077508699fba78a750d0e8dd200f5afdf30984bb
+  metadata.gz: 38a7838bb9ffbec7561f2383ec5adc01dfbbc02a0e594e30b3f0780e2794de87475361af9e7fc26215dace3d3997332f3a76ef935691b554b9a7e7189bb23883
+  data.tar.gz: 3b38c79e101ab60cd8af03f4d4be3adbd70ab01383c0003c747e7b126296b329a9c7c318fd4128d3b78b3ed4d2d2503b6f99e71599833ad5b2dfa6076410bc28

data/Gemfile.lock

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

data/app/controllers/catarse_pagarme/notifications_controller.rb

@@ -7,13 +7,8 @@ module CatarsePagarme
         payment.payment_notifications.create(contribution: payment.contribution, extra_data: params.to_json)
 
         if PagarMe::validate_fingerprint(payment.try(:gateway_id), params[:fingerprint])
-
-          if params[:current_status] == 'paid' && params[:desired_status] == 'refunded'
-            payment.try(:invalid_refund)
-          else
-            delegator.change_status_by_transaction(params[:current_status])
-            delegator.update_transaction
-          end
+          delegator.change_status_by_transaction(params[:current_status])
+          delegator.update_transaction
 
           return render nothing: true, status: 200
         end

data/app/models/catarse_pagarme/payment_delegator.rb

@@ -11,7 +11,11 @@ module CatarsePagarme
     def change_status_by_transaction(transactin_status)
       case transactin_status
       when 'paid', 'authorized' then
-        self.payment.pay unless self.payment.paid?
+        if payment.refunded? || payment.pending_refund?
+          payment.invalid_refund
+        elsif !self.payment.paid?
+          self.payment.pay
+        end
       when 'refunded' then
         self.payment.refund unless self.payment.refunded?
       when 'refused' then

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.6.7"
+  VERSION = "2.6.8"
 end

data/spec/dummy/app/models/payment.rb

@@ -28,6 +28,10 @@ class Payment < ActiveRecord::Base
     end
   end
 
+  def invalid_refund
+    true
+  end
+
   def refunded?
     true
   end

data/spec/models/catarse_pagarme/payment_delegator_spec.rb

@@ -104,9 +104,33 @@ describe CatarsePagarme::PaymentDelegator do
 
     %w(paid authorized).each do |status|
       context "when status is #{status}" do
+        context "when payment is refunded" do
+          before do
+            payment.stub(:paid?).and_return(false)
+            payment.stub(:refunded?).and_return(true)
+            payment.stub(:pending_refund?).and_return(false)
+            payment.should_receive(:invalid_refund)
+          end
+
+          it { delegator.change_status_by_transaction(status) }
+        end
+
+        context "when payment is pending_refund" do
+          before do
+            payment.stub(:paid?).and_return(false)
+            payment.stub(:refunded?).and_return(false)
+            payment.stub(:pending_refund?).and_return(true)
+            payment.should_receive(:invalid_refund)
+          end
+
+          it { delegator.change_status_by_transaction(status) }
+        end
+
         context "and payment is already paid" do
           before do
             payment.stub(:paid?).and_return(true)
+            payment.stub(:refunded?).and_return(false)
+            payment.stub(:pending_refund?).and_return(false)
             payment.should_not_receive(:pay)
           end
 
@@ -116,6 +140,8 @@ describe CatarsePagarme::PaymentDelegator do
         context "and payment is not paid" do
           before do
             payment.stub(:paid?).and_return(false)
+            payment.stub(:refunded?).and_return(false)
+            payment.stub(:pending_refund?).and_return(false)
             payment.should_receive(:pay)
           end
 

metadata

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