catarse_pagarme 2.10.2 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92cef6d2e2207c5f2085a2608ae8fb391fc70eb
-  data.tar.gz: 7e8c3e743cf8a0de16c60911ced7b2737645d885
+  metadata.gz: 6ef478d781c5314e5ea06725a0464fa6b8a61c5f
+  data.tar.gz: 415e0282212a4049794b59eae0eb2f709019aaa9
 SHA512:
-  metadata.gz: 04070141b9c6c38b6424ca80767db10bcbe02775447c32b3de6eee58ae5077378e56581ae18df0d677857662e15d6f23c153ee9f037304cb4c72d8bf51e827f7
-  data.tar.gz: 0043c6adc7d3782e8dac4a05b5508dad456b79ed771bcefd168c38b5122666a3af2ff1fe32ed6edbf78fdbbf9d4fa24e34dc72d604c44ada6b1b02b10458ff21
+  metadata.gz: 46a0cdbeb6b608be866b4f9b8f89cc0d89be53c4271bf0349024347827bde4d3078b6f207aeb10b0a37ee9d7f056c1015ed9206828a43c5b70b14567ebcc5d9e
+  data.tar.gz: e0da1d06e2b7e5c55904b2b9488088e666078a739107731ac970f07fcd91cd685d2b4f492612063a27db8421dccf1e049c48fecc894bc5ef71bbc233b63c89fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.10.2)
+    catarse_pagarme (2.10.4)
       pagarme (= 2.1.4)
       rails (~> 4.0)
       sentry-raven
@@ -53,7 +53,7 @@ GEM
     connection_pool (2.2.1)
     database_cleaner (1.5.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.20161129)
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     factory_girl (4.5.0)
@@ -123,7 +123,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     redis (3.3.2)
-    rest-client (2.0.0)
+    rest-client (2.0.1)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)

data/app/controllers/catarse_pagarme/credit_cards_controller.rb

@@ -142,7 +142,6 @@ module CatarsePagarme
     def af_metadata
       return {} unless CatarsePagarme.configuration.use_simility
       project = contribution.project
-      project_account = project.account
       user = contribution.user
 
       {
@@ -235,16 +234,16 @@ module CatarsePagarme
             name: contribution.project.name,
             type: contribution.project.mode == 'flex' ? 'flex' : 'full',
             date: contribution.project.expires_at.to_s,
-            venue_name: project_account.try(:owner_name),
+            venue_name: project.user.name,
             address: {
               country: "Brasil",
-              state: project_account.address_state,
-              city: project_account.address_city,
-              zipcode: project_account.address_zip_code,
-              neighborhood: project_account.address_neighbourhood,
-              street: project_account.address_street,
-              street_number: project_account.address_number,
-              complementary: project_account.address_complement,
+              state: project.user.address_state,
+              city: project.user.address_city,
+              zipcode: project.user.address_zip_code,
+              neighborhood: project.user.address_neighbourhood,
+              street: project.user.address_street,
+              street_number: project.user.address_number,
+              complementary: project.user.address_complement,
               latitude: 0.0,
               longitude: 0.0
             },

data/app/models/catarse_pagarme/balance_transfer_delegator.rb

@@ -29,7 +29,8 @@ module CatarsePagarme
     end
 
     def bank_account_attributes
-      account = balance_transfer.project.account
+      user = balance_transfer.user
+      account = user.bank_account
 
       bank_account_attrs = {
         bank_account: {
@@ -38,8 +39,9 @@ module CatarsePagarme
           agencia_dv: account.agency_digit,
           conta: account.account,
           conta_dv: account.account_digit,
-          legal_name: account.owner_name[0..29],
-          document_number: account.owner_document
+          legal_name: user.name[0..29],
+          document_number: user.cpf,
+          type: account.account_type
         }
       }
 

data/app/models/catarse_pagarme/bank_account_concern.rb

@@ -33,8 +33,9 @@ module CatarsePagarme::BankAccountConcern
         agencia: self.agency,
         conta: self.account,
         conta_dv: self.account_digit,
-        legal_name: self.owner_name,
-        document_number: self.owner_document
+        legal_name: self.user.name,
+        document_number: self.user.cpf,
+        type: self.account_type
       }
       pagarme_params[:agencia_dv] = self.agency_digit unless self.agency_digit.blank?
       pagarme_params
@@ -48,7 +49,8 @@ module CatarsePagarme::BankAccountConcern
         conta: :account,
         conta_dv: :account_digit,
         legal_name: :owner_name,
-        document_number: :owner_document
+        document_number: :owner_document,
+        type: :account_type
       }
     end
 

data/app/models/catarse_pagarme/payment_delegator.rb

@@ -120,7 +120,8 @@ module CatarsePagarme
     protected
 
     def bank_account_attributes
-      bank = payment.user.bank_account
+      user = payment.user
+      bank = user.bank_account
 
       bank_account_attrs = {
         bank_account: {
@@ -129,8 +130,9 @@ module CatarsePagarme
           agencia_dv: bank.agency_digit,
           conta: bank.account,
           conta_dv: bank.account_digit,
-          legal_name: bank.owner_name,
-          document_number: bank.owner_document
+          legal_name: user.name[0..29],
+          document_number: user.cpf,
+          type: bank.account_type
         }
       }
 

data/lib/catarse_pagarme/engine.rb

@@ -5,7 +5,6 @@ module CatarsePagarme
     config.to_prepare do
       ::Payment.send(:include, CatarsePagarme::PaymentConcern)
       ::BalanceTransfer.send(:include, CatarsePagarme::BalanceTransferConcern)
-      ::BalanceTransferPing.send(:include, CatarsePagarme::BalanceTransferPingConcern)
     end
   end
 end

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.10.2"
+  VERSION = "2.10.4"
 end

data/spec/models/catarse_pagarme/balance_transfer_delegator_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe CatarsePagarme::BalanceTransferDelegator do
   let(:project) { create(:project, state: 'successful') }
   let(:project_acc) { create(:project_account, project: project) }
+  let(:bank) { create(:bank) }
+  let!(:bank_account) { create(:bank_account, user: project.user)}
   let(:balance_transfer) { create(:balance_transfer, amount: 10, user: project.user, project: project)}
   let(:delegator) { balance_transfer.pagarme_delegator }
 

data/spec/models/catarse_pagarme/bank_account_concern_spec.rb

@@ -5,10 +5,11 @@ class FakeBankAccount < BankAccount
 end
 
 describe FakeBankAccount do
+  let(:user) { create(:user) }
   let(:bank) { create(:bank) }
 
   let(:valid_attr) do
-    vb = build(:bank_account, bank: bank, owner_name: 'fo')
+    vb = build(:bank_account, bank: bank, owner_name: 'fo', user: user)
     vb.attributes
   end
 

data/spec/support/factories.rb

@@ -21,6 +21,7 @@ FactoryGirl.define do
 
   factory :user do |f|
     f.name "Foo bar"
+    f.public_name "Foo bar"
     f.cpf "111.111.111-11"
     f.email { generate(:email) }
   end
@@ -62,6 +63,7 @@ FactoryGirl.define do
     f.agency_digit '2'
     f.owner_name 'Lorem amenori'
     f.owner_document '11111111111'
+    f.account_type 'conta_corrente'
   end
 
   factory :project do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.10.4
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,8 +162,6 @@ files:
 - app/helpers/catarse_pagarme/application_helper.rb
 - app/models/catarse_pagarme/balance_transfer_concern.rb
 - app/models/catarse_pagarme/balance_transfer_delegator.rb
-- app/models/catarse_pagarme/balance_transfer_ping_concern.rb
-- app/models/catarse_pagarme/balance_transfer_ping_delegator.rb
 - app/models/catarse_pagarme/bank_account_concern.rb
 - app/models/catarse_pagarme/credit_card_transaction.rb
 - app/models/catarse_pagarme/fee_calculator_concern.rb
@@ -199,7 +197,6 @@ files:
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/balance_transfer.rb
-- spec/dummy/app/models/balance_transfer_ping.rb
 - spec/dummy/app/models/bank.rb
 - spec/dummy/app/models/bank_account.rb
 - spec/dummy/app/models/category.rb
@@ -298,7 +295,6 @@ test_files:
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/balance_transfer.rb
-- spec/dummy/app/models/balance_transfer_ping.rb
 - spec/dummy/app/models/bank.rb
 - spec/dummy/app/models/bank_account.rb
 - spec/dummy/app/models/category.rb

data/app/models/catarse_pagarme/balance_transfer_ping_concern.rb

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

data/app/models/catarse_pagarme/balance_transfer_ping_delegator.rb

@@ -1,59 +0,0 @@
-module CatarsePagarme
-  class BalanceTransferPingDelegator
-    attr_accessor :balance_transfer_ping, :transfer
-
-    def initialize(balance_transfer_ping)
-      configure_pagarme
-      self.balance_transfer_ping = balance_transfer_ping
-    end
-
-    def transfer_funds
-      ActiveRecord::Base.transaction do
-        raise "unable to create transfer ping, need to be authorized" if !balance_transfer_ping.authorized?
-
-        bank_account = PagarMe::BankAccount.new(bank_account_attributes.delete(:bank_account))
-        bank_account.create
-        raise "unable to create an bank account" unless bank_account.id.present?
-
-        transfer = PagarMe::Transfer.new({
-          bank_account_id: bank_account.id,
-          amount: value_for_transaction
-        })
-        transfer.create
-        raise "unable to create a transfer ping" unless transfer.id.present?
-
-        balance_transfer_ping.update_attributes(transfer_id: transfer.id,
-          metadata: transfer.to_hash,
-          state: 'processing')
-        balance_transfer_ping
-      end
-    end
-
-    def bank_account_attributes
-      account = balance_transfer_ping.balance_transfer.project.account
-
-      bank_account_attrs = {
-        bank_account: {
-          bank_code: (account.bank.code || account.bank.name),
-          agencia: account.agency,
-          agencia_dv: account.agency_digit,
-          conta: account.account,
-          conta_dv: account.account_digit,
-          legal_name: account.owner_name[0..29],
-          document_number: account.owner_document
-        }
-      }
-
-      bank_account_attrs[:bank_account].delete(:agencia_dv) if account.agency_digit.blank?
-      return bank_account_attrs
-    end
-
-    def configure_pagarme
-      ::PagarMe.api_key = CatarsePagarme.configuration.api_key
-    end
-
-    def value_for_transaction
-      (self.balance_transfer_ping.amount * 100).to_i
-    end
-  end
-end

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

@@ -1,2 +0,0 @@
-class BalanceTransferPing < ActiveRecord::Base
-end