catarse_pagarme 2.5.1 → 2.6.0

data/spec/models/catarse_pagarme/{contribution_delegator_spec.rb → payment_delegator_spec.rb}

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
-describe CatarsePagarme::ContributionDelegator do
+describe CatarsePagarme::PaymentDelegator do
   let(:contribution) { create(:contribution, value: 10) }
-  let(:delegator) { contribution.pagarme_delegator }
+  let(:payment) { contribution.payments.first }
+  let(:delegator) { payment.pagarme_delegator }
 
-  context "instance of CatarsePagarme::ContributionDelegator" do
-    it { expect(delegator).to be_a CatarsePagarme::ContributionDelegator }
+  context "instance of CatarsePagarme::paymentDelegator" do
+    it { expect(delegator).to be_a CatarsePagarme::PaymentDelegator }
   end
 
   context "#value_for_transaction" do
     subject { delegator.value_for_transaction }
 
-    it "should convert contribution value to pagarme value format" do
+    it "should convert payment value to pagarme value format" do
       expect(subject).to eq(1000)
     end
   end
@@ -24,7 +25,7 @@ describe CatarsePagarme::ContributionDelegator do
       CatarsePagarme.configuration.stub(:interest_rate).and_return(1.8)
     end
 
-    it "should return the contribution value with installments tax" do
+    it "should return the payment value with installments tax" do
       expect(subject).to eq(1057)
     end
   end
@@ -49,26 +50,20 @@ describe CatarsePagarme::ContributionDelegator do
       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) }
+      let(:payment) { create(:payment, value: 10, payment_method: CatarsePagarme::PaymentType::CREDIT_CARD, gateway_data: {acquirer_name: nil}) }
       subject { delegator.get_fee }
       it { expect(subject).to eq(nil) }
     end
 
     context 'when choice is slip' do
-      let(:contribution) { create(:contribution, value: 10, payment_choice: CatarsePagarme::PaymentType::SLIP, acquirer_name: nil) }
+      let(:payment) { create(:payment, value: 10, payment_method: CatarsePagarme::PaymentType::SLIP, gateway_data: {acquirer_name: nil}) }
       subject { delegator.get_fee }
       it { expect(subject).to eq(2.00) }
     end
 
     context 'when choice is credit card' do
-      let(:contribution) { create(:contribution, value: 10, payment_choice: CatarsePagarme::PaymentType::CREDIT_CARD, acquirer_name: 'stone', card_brand: 'visa', installments: 1) }
+      let(:payment) { create(:payment, value: 10, payment_method: CatarsePagarme::PaymentType::CREDIT_CARD, gateway_data: {acquirer_name: 'stone', card_brand: 'visa'}, installments: 1) }
       subject { delegator.get_fee }
       it { expect(subject).to eq(0.76) }
     end
@@ -88,41 +83,19 @@ describe CatarsePagarme::ContributionDelegator do
 
     %w(paid authorized).each do |status|
       context "when status is #{status}" do
-        context "and contribution is already confirmed" do
-          before do
-            contribution.stub(:confirmed?).and_return(true)
-            contribution.should_not_receive(:confirm)
-          end
-
-          it { delegator.change_status_by_transaction(status) }
-        end
-
-        context "and contribution is not confirmed" do
-          before do
-            contribution.stub(:confirmed?).and_return(false)
-            contribution.should_receive(:confirm)
-          end
-
-          it { delegator.change_status_by_transaction(status) }
-        end
-      end
-    end
-
-    %w(waiting_payment processing).each do |status|
-      context "when status is #{status}" do
-        context "and contribution is already waiting confirmation" do
+        context "and payment is already paid" do
           before do
-            contribution.stub(:waiting_confirmation?).and_return(true)
-            contribution.should_not_receive(:waiting)
+            payment.stub(:paid?).and_return(true)
+            payment.should_not_receive(:pay)
           end
 
           it { delegator.change_status_by_transaction(status) }
         end
 
-        context "and contribution is pending" do
+        context "and payment is not paid" do
           before do
-            contribution.stub(:waiting_confirmation?).and_return(false)
-            contribution.should_receive(:waiting)
+            payment.stub(:paid?).and_return(false)
+            payment.should_receive(:pay)
           end
 
           it { delegator.change_status_by_transaction(status) }
@@ -131,19 +104,19 @@ describe CatarsePagarme::ContributionDelegator do
     end
 
     context "when status is refunded" do
-      context "and contribution is already refunded" do
+      context "and payment is already refunded" do
         before do
-          contribution.stub(:refunded?).and_return(true)
-          contribution.should_not_receive(:refund)
+          payment.stub(:refunded?).and_return(true)
+          payment.should_not_receive(:refund)
         end
 
         it { delegator.change_status_by_transaction('refunded') }
       end
 
-      context "and contribution is not refunded" do
+      context "and payment is not refunded" do
         before do
-          contribution.stub(:refunded?).and_return(false)
-          contribution.should_receive(:refund)
+          payment.stub(:refunded?).and_return(false)
+          payment.should_receive(:refund)
         end
 
         it { delegator.change_status_by_transaction('refunded') }
@@ -151,19 +124,19 @@ describe CatarsePagarme::ContributionDelegator do
     end
 
     context "when status is refused" do
-      context "and contribution is already canceled" do
+      context "and payment is already canceled" do
         before do
-          contribution.stub(:canceled?).and_return(true)
-          contribution.should_not_receive(:cancel)
+          payment.stub(:refused?).and_return(true)
+          payment.should_not_receive(:refuse)
         end
 
         it { delegator.change_status_by_transaction('refused') }
       end
 
-      context "and contribution is not canceled" do
+      context "and payment is not refused" do
         before do
-          contribution.stub(:canceled?).and_return(false)
-          contribution.should_receive(:cancel)
+          payment.stub(:refused?).and_return(false)
+          payment.should_receive(:refuse)
         end
 
         it { delegator.change_status_by_transaction('refused') }

data/spec/models/catarse_pagarme/slip_transaction_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe CatarsePagarme::SlipTransaction do
-  let(:contribution) { create(:contribution, value: 100) }
-  let(:pagarme_transaction) {
-    double({
+  let(:payment) { create(:payment, value: 100) }
+  let(:pagarme_transaction_attributes) {
+    {
       id: 'abcd',
       charge: true,
       status: 'paid',
@@ -12,13 +12,18 @@ describe CatarsePagarme::SlipTransaction do
       acquirer_name: 'pagarme',
       tid: '123123',
       card_brand: nil
-    })
+    }
   }
+
+  let(:pagarme_transaction) {
+    double(pagarme_transaction_attributes)
+  }
+
   let(:valid_attributes) do
     {
       slip_payment: {
         payment_method: 'boleto',
-        amount: contribution.pagarme_delegator.value_for_transaction,
+        amount: payment.pagarme_delegator.value_for_transaction,
         postback_url: 'http://test.foo'
       }, user: {
         bank_account_attributes: {
@@ -34,7 +39,7 @@ describe CatarsePagarme::SlipTransaction do
     {
       slip_payment: {
         payment_method: 'boleto',
-        amount: contribution.pagarme_delegator.value_for_transaction,
+        amount: payment.pagarme_delegator.value_for_transaction,
         postback_url: 'http://test.foo'
       }, user: {
         bank_account_attributes: {
@@ -44,22 +49,23 @@ describe CatarsePagarme::SlipTransaction do
     }
   end
 
-  let(:slip_transaction) { CatarsePagarme::SlipTransaction.new(valid_attributes, contribution) }
+  let(:slip_transaction) { CatarsePagarme::SlipTransaction.new(valid_attributes, payment) }
 
   before do
     PagarMe::Transaction.stub(:new).and_return(pagarme_transaction)
-    CatarsePagarme::ContributionDelegator.any_instance.stub(:change_status_by_transaction).and_return(true)
+    pagarme_transaction.stub(:to_json).and_return(pagarme_transaction_attributes.to_json)
+    CatarsePagarme::PaymentDelegator.any_instance.stub(:change_status_by_transaction).and_return(true)
   end
 
   context "#user" do
     subject { slip_transaction.user }
-    it { expect(subject).to eq(contribution.user) }
+    it { expect(subject).to eq(payment.user) }
   end
 
   context "#charge!" do
     context "with invalid attributes" do
       let(:slip_transaction) {
-        CatarsePagarme::SlipTransaction.new(invalid_attributes, contribution)
+        CatarsePagarme::SlipTransaction.new(invalid_attributes, payment)
       }
 
       it "should raises an error" do
@@ -73,44 +79,44 @@ describe CatarsePagarme::SlipTransaction do
       before do
         slip_transaction.should_receive(:update_user_bank_account).and_call_original
         slip_transaction.user.should_receive(:update_attributes).and_return(true)
-        contribution.should_receive(:update_attributes).at_least(1).and_call_original
+        payment.should_receive(:update_attributes).at_least(1).and_call_original
         PagarMe::Transaction.should_receive(:find_by_id).with(pagarme_transaction.id).and_return(pagarme_transaction)
-        CatarsePagarme::ContributionDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
+        CatarsePagarme::PaymentDelegator.any_instance.should_receive(:change_status_by_transaction).with('paid')
 
         slip_transaction.charge!
-        contribution.reload
+        payment.reload
       end
 
-      it "should update contribution payment_id" do
-        expect(contribution.payment_id).to eq('abcd')
+      it "should update payment payment_id" do
+        expect(payment.gateway_id).to eq('abcd')
       end
 
-      it "should update contribution payment_service_fee" do
-        expect(contribution.payment_service_fee).to eq(0.0)
+      it "should update payment payment_service_fee" do
+        expect(payment.gateway_fee).to eq(0.0)
       end
 
-      it "should update contribution payment_method" do
-        expect(contribution.payment_method).to eq('Pagarme')
+      it "should update payment payment_method" do
+        expect(payment.gateway).to eq('Pagarme')
       end
 
-      it "should update contribution slip_url" do
-        expect(contribution.slip_url).to eq('boleto url')
+      it "should update payment slip_url" do
+        expect(payment.gateway_data["boleto_url"]).to eq('boleto url')
       end
 
-      it "should update contribution payment_choice" do
-        expect(contribution.payment_choice).to eq(CatarsePagarme::PaymentType::SLIP)
+      it "should update payment payment_choice" do
+        expect(payment.payment_method).to eq(CatarsePagarme::PaymentType::SLIP)
       end
 
-      it "should update contribution acquirer_name" do
-        expect(contribution.acquirer_name).to eq('pagarme')
+      it "should update payment acquirer_name" do
+        expect(payment.gateway_data["acquirer_name"]).to eq('pagarme')
       end
 
-      it "should update contribution acquirer_tid" do
-        expect(contribution.acquirer_tid).to eq('123123')
+      it "should update payment acquirer_tid" do
+        expect(payment.gateway_data["acquirer_tid"]).to eq('123123')
       end
 
-      it "should update contribution installment_value" do
-        expect(contribution.installment_value).to_not be_nil
+      it "should update payment installment_value" do
+        expect(payment.installment_value).to_not be_nil
       end
     end
   end

data/spec/support/factories.rb

@@ -18,7 +18,6 @@ FactoryGirl.define do
   factory :user do |f|
     f.name "Foo bar"
     f.email { generate(:email) }
-    f.bio "This is Foo bar's biography."
   end
 
   factory :credi_card do |f|
@@ -52,7 +51,7 @@ FactoryGirl.define do
     f.permalink { generate(:permalink) }
     f.association :user, factory: :user
     f.association :category, factory: :category
-    f.about "Foo bar"
+    f.about_html "Foo bar"
     f.headline "Foo bar"
     f.goal 10000
     f.online_date Time.now
@@ -64,11 +63,22 @@ FactoryGirl.define do
   factory :contribution do |f|
     f.association :project, factory: :project
     f.association :user, factory: :user
-    f.confirmed_at Time.now
     f.value 10.00
-    f.state 'confirmed'
-    f.credits false
-    f.payment_id '1.2.3'
+    after :create do |contribution|
+      create(:payment, paid_at: Time.now, gateway_id: '1.2.3', state: 'paid', value: contribution.value, contribution: contribution)
+    end
+  end
+
+  factory :payment do |f|
+    f.association :contribution
+    f.gateway 'pagarme'
+    f.value 10.00
+    f.state 'paid'
+    f.installment_value 10.00
+    f.payment_method "CartaoDeCredito"
+    after :build do |payment|
+      payment.gateway = 'pagarme'
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,10 +109,10 @@ files:
 - app/controllers/catarse_pagarme/slip_controller.rb
 - app/helpers/catarse_pagarme/application_helper.rb
 - app/models/catarse_pagarme/bank_account_concern.rb
-- app/models/catarse_pagarme/contribution_concern.rb
-- app/models/catarse_pagarme/contribution_delegator.rb
 - app/models/catarse_pagarme/credit_card_transaction.rb
 - app/models/catarse_pagarme/fee_calculator_concern.rb
+- app/models/catarse_pagarme/payment_concern.rb
+- app/models/catarse_pagarme/payment_delegator.rb
 - app/models/catarse_pagarme/payment_type.rb
 - app/models/catarse_pagarme/slip_transaction.rb
 - app/models/catarse_pagarme/transaction_base.rb
@@ -149,6 +149,7 @@ files:
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/contribution.rb
 - spec/dummy/app/models/credit_card.rb
+- spec/dummy/app/models/payment.rb
 - spec/dummy/app/models/payment_engines.rb
 - spec/dummy/app/models/payment_notification.rb
 - spec/dummy/app/models/project.rb
@@ -186,8 +187,8 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
 - spec/models/catarse_pagarme/bank_account_concern_spec.rb
-- spec/models/catarse_pagarme/contribution_delegator_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb
+- spec/models/catarse_pagarme/payment_delegator_spec.rb
 - spec/models/catarse_pagarme/slip_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
@@ -235,6 +236,7 @@ test_files:
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/contribution.rb
 - spec/dummy/app/models/credit_card.rb
+- spec/dummy/app/models/payment.rb
 - spec/dummy/app/models/payment_engines.rb
 - spec/dummy/app/models/payment_notification.rb
 - spec/dummy/app/models/project.rb
@@ -272,8 +274,8 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
 - spec/models/catarse_pagarme/bank_account_concern_spec.rb
-- spec/models/catarse_pagarme/contribution_delegator_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb
+- spec/models/catarse_pagarme/payment_delegator_spec.rb
 - spec/models/catarse_pagarme/slip_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb

data/app/models/catarse_pagarme/contribution_concern.rb

@@ -1,9 +0,0 @@
-module CatarsePagarme::ContributionConcern
-  extend ActiveSupport::Concern
-
-  included do
-    def pagarme_delegator
-      CatarsePagarme::ContributionDelegator.new(self)
-    end
-  end
-end