catarse_pagarme 2.8.5 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f159f3d2a054bdd5836655a9c763fb3c6e6ef8f9
-  data.tar.gz: 52a927a4fd2eb822c042e5cd1f057a7a589be0a2
+  metadata.gz: 26db4840bcee5eb2022afcb48281573e17c0de16
+  data.tar.gz: 2272b857389fe2035707d0de97db553344f10f57
 SHA512:
-  metadata.gz: 184991715e15d6d9109a35e888152699aa95c0c9dc208012c301ab65e734d7194608b027eb1c4edbcd0f13556185c3b9b5b8bd76febb9ef61b18cba8f67276e8
-  data.tar.gz: 19ce011fec619af4b6f169b9797a178934ff7166a8ef651dda53af4959bf5e7e8bf8247eb558147463c5fce75fa70b810c27183f95bc2fe679c7aa28909762ac
+  metadata.gz: 7845edbad5266a3f09668c2a16c2a3e0e1a9aa9a64f4c0a7363e1ec9deee57773f27cbe8f66c5df62cd95cb546549f662cb538c42091d3e3b04b6840a315d97d
+  data.tar.gz: 6583532ef3e7b6797ec751b3ee526e332fb7f308623272ce4c2e87475c1c5da13b2803657d065cdb32abc39f09594cf0a1867dbc2f978a0f2b708d08f5aa3495

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    catarse_pagarme (2.8.5)
+    catarse_pagarme (2.8.6)
       pagarme (= 1.10.0)
       rails (~> 4.0)
       sidekiq
@@ -48,7 +48,7 @@ GEM
     arel (6.0.3)
     builder (3.2.2)
     coderay (1.1.0)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.1)
     connection_pool (2.2.0)
     database_cleaner (1.5.0)
     diff-lcs (1.2.5)
@@ -71,7 +71,7 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.99)
+    mime-types (2.99.1)
     mini_portile (0.6.2)
     minitest (5.8.1)
     multi_json (1.11.2)
@@ -141,12 +141,13 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       redis (~> 3.2, >= 3.2.1)
     slop (3.6.0)
-    sprockets (3.4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)

data/app/controllers/catarse_pagarme/credit_cards_controller.rb

@@ -24,8 +24,20 @@ module CatarsePagarme
         soft_descriptor: payment.project.permalink.gsub(/[\W\_]/, ' ')[0, MAX_SOFT_DESCRIPTOR_LENGTH],
         installments: get_installment,
         customer: {
-          email: payment.user.email,
-          name: payment.user.name
+          email: contribution.payer_email,
+          name: contribution.payer_name,
+          document_number: document_number,
+          address: {
+            street: contribution.address_street,
+            neighborhood: contribution.address_neighbourhood,
+            zipcode: zip_code,
+            street_number: contribution.address_number,
+            complementary: contribution.address_complement
+          },
+          phone: {
+            ddd: phone_matches.try(:[], 1),
+            number: phone_matches.try(:[], 2)
+          }
         },
         metadata: metadata_attributes
       }
@@ -36,13 +48,27 @@ module CatarsePagarme
         hash[:card_id] = params[:card_id]
       end
 
-      if params[:save_card] === "true"
-        hash[:save_card] = true
-      end
+      hash[:save_card] = (params[:save_card] == 'true')
 
       hash
     end
 
+    def document_number
+      (international? || contribution.payer_document.present?) ? '00000000000' : contribution.payer_document.gsub(/[-.\/_\s]/,'')
+    end
+
+    def phone_matches
+      international? ? ['33', '33335555'] : contribution.address_phone_number.gsub(/[\s,-]/, '').match(/\((.*)\)(\d+)/)
+    end
+
+    def zip_code
+      international? ? '00000000' : contribution.address_zip_code.gsub(/[-.]/, '')
+    end
+
+    def international?
+      contribution.international?
+    end
+
     def get_installment
       if payment.value.to_f < CatarsePagarme.configuration.minimum_value_for_installment.to_f
         1

data/lib/catarse_pagarme/version.rb

@@ -1,3 +1,3 @@
 module CatarsePagarme
-  VERSION = "2.8.5"
+  VERSION = "2.8.6"
 end

data/spec/controllers/catarse_pagarme/credit_cards_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe CatarsePagarme::CreditCardsController, type: :controller do
   before do
+    @routes = CatarsePagarme::Engine.routes
     controller.stub(:current_user).and_return(user)
   end
 
@@ -15,7 +16,7 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
 
       it 'should raise a error' do
         expect {
-          post :create, { locale: :pt, id: contribution.id, use_route: 'catarse_pagarme' }
+          post :create, { locale: :pt, id: contribution.id }
         }.to raise_error('invalid user')
       end
     end
@@ -26,7 +27,7 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
         before do
           allow(CatarsePagarme::CreditCardTransaction).to receive(:new).and_call_original
           post :create, {
-            locale: :pt, id: contribution.id, use_route: 'catarse_pagarme',
+            locale: :pt, id: contribution.id,
             card_hash: sample_card_hash }
         end
 
@@ -42,7 +43,7 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
       context 'with invalid card data' do
         before do
           post :create, {
-            locale: :pt, id: contribution.id, use_route: 'catarse_pagarme', card_hash: "abcd" }
+            locale: :pt, id: contribution.id, card_hash: "abcd" }
         end
 
         it 'payment_status should be failed' do
@@ -54,7 +55,7 @@ describe CatarsePagarme::CreditCardsController, type: :controller do
         before do
           allow_any_instance_of(PagarMe::Transaction).to receive(:charge).and_raise(PagarMe::PagarMeError)
           post :create, {
-            locale: :pt, id: contribution.id, use_route: 'catarse_pagarme',
+            locale: :pt, id: contribution.id,
             card_hash: sample_card_hash }
         end
 

data/spec/controllers/catarse_pagarme/notifications_controller_spec.rb

@@ -4,6 +4,7 @@ describe CatarsePagarme::NotificationsController, type: :controller do
   let(:fake_transaction) { double("fake transaction", id: payment.gateway_id, card_brand: 'visa', acquirer_name: 'stone', tid: '404040404', installments: 2) }
 
   before do
+    @routes = CatarsePagarme::Engine.routes
     PagarMe.stub(:validate_fingerprint).and_return(true)
     PagarMe::Transaction.stub(:find_by_id).and_return(fake_transaction)
   end
@@ -21,7 +22,7 @@ describe CatarsePagarme::NotificationsController, type: :controller do
     context "with invalid payment" do
       before do
         PaymentEngines.stub(:find_payment).and_return(nil)
-        post :create, { locale: :pt, id: 'abcdfg', use_route: 'catarse_pagarme' }
+        post :create, { locale: :pt, id: 'abcdfg'}
       end
 
       it "should not found the payment" do
@@ -32,7 +33,7 @@ describe CatarsePagarme::NotificationsController, type: :controller do
     context "with valid payment" do
       before do
         PaymentEngines.stub(:find_payment).and_return(payment)
-        post :create, { locale: :pt, id: 'abcd', use_route: 'catarse_pagarme' }
+        post :create, { locale: :pt, id: 'abcd'}
       end
 
       it "should save an extra_data into payment_notifications" do

data/spec/controllers/catarse_pagarme/slip_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe CatarsePagarme::SlipController, type: :controller do
   before do
+    @routes = CatarsePagarme::Engine.routes
     controller.stub(:current_user).and_return(user)
     Bank.create(name: 'foo', code: '123')
   end
@@ -17,7 +18,7 @@ describe CatarsePagarme::SlipController, type: :controller do
 
       it 'should raise a error' do
         expect {
-          get :update, locale: :pt, id: contribution.id, use_route: 'catarse_pagarme'
+          get :update, locale: :pt, id: contribution.id
         }.to raise_error('invalid user')
       end
     end
@@ -26,7 +27,7 @@ describe CatarsePagarme::SlipController, type: :controller do
       let(:user) { payment.user }
 
       before do
-        get :update, locale: :pt, id: contribution.id, use_route: 'catarse_pagarme'
+        get :update, locale: :pt, id: contribution.id
       end
 
       it 'boleto_url should be filled' do
@@ -41,7 +42,7 @@ describe CatarsePagarme::SlipController, type: :controller do
 
       it 'should raise a error' do
         expect {
-          post :create, { locale: :pt, id: contribution.id, use_route: 'catarse_pagarme' }
+          post :create, { locale: :pt, id: contribution.id }
         }.to raise_error('invalid user')
       end
     end
@@ -51,7 +52,7 @@ describe CatarsePagarme::SlipController, type: :controller do
 
       before do
         post :create, {
-          locale: :pt, id: contribution.id, use_route: 'catarse_pagarme',
+          locale: :pt, id: contribution.id,
           user: { bank_account_attributes: {
             bank_id: Bank.first.id, agency: '1', agency_digit: '1', account: '1', account_digit: '1', owner_name: 'foo', owner_document: '1'
           } } }

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

@@ -0,0 +1,7 @@
+class City < ActiveRecord::Base
+  belongs_to :state
+
+  def show_name
+    "#{self.name}, #{self.state.acronym}"
+  end
+end

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

@@ -1,6 +1,11 @@
 class Contribution < ActiveRecord::Base
   belongs_to :user
   belongs_to :project
+  belongs_to :country
   has_many :payment_notifications
   has_many :payments
+
+  def international?
+    false
+  end
 end

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

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

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

@@ -2,4 +2,21 @@ class Project < ActiveRecord::Base
   belongs_to :user
   belongs_to :category
   has_many :contributions
+  has_many :rewards
+  has_many :project_transitions
+  belongs_to :city
+  has_one :account, class_name: "ProjectAccount", inverse_of: :project
+
+  def pluck_from_database attribute
+    Project.where(id: self.id).pluck("projects.#{attribute}").first
+  end
+
+  %w(
+    draft rejected online successful waiting_funds
+    deleted in_analysis approved failed
+  ).each do |st|
+    define_method "#{st}_at" do
+      pluck_from_database("#{st}_at")
+    end
+  end
 end

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

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+class ProjectAccount < ActiveRecord::Base
+  belongs_to :project
+  belongs_to :bank
+end

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

@@ -0,0 +1,3 @@
+class ProjectTransition < ActiveRecord::Base
+  belongs_to :project, inverse_of: :project_transitions
+end

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

@@ -0,0 +1,3 @@
+class Reward < ActiveRecord::Base
+  belongs_to :project
+end

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

@@ -0,0 +1,10 @@
+class State < ActiveRecord::Base
+  validates_presence_of :name, :acronym
+  validates_uniqueness_of :name, :acronym
+
+  has_many :cities
+
+  def self.array
+    @array ||= order(:name).pluck(:name, :acronym).push(['Outro / Other', 'outro / other'])
+  end
+end

data/spec/support/factories.rb

@@ -3,6 +3,10 @@ FactoryGirl.define do
     "Foo bar #{n}"
   end
 
+  sequence :serial do |n|
+    n
+  end
+
   sequence :email do |n|
     "person#{n}@example.com"
   end
@@ -33,7 +37,7 @@ FactoryGirl.define do
 
   factory :bank do |f|
     f.name { generate(:uid) }
-    f.code '237'
+    f.code { generate(:serial) }
   end
 
   factory :bank_account do |f|
@@ -47,23 +51,99 @@ FactoryGirl.define do
   end
 
   factory :project do |f|
+    #after(:create) do |project|
+    #  create(:reward, project: project)
+    #  if project.state == 'change_to_online_after_create'
+    #    project.update_attributes(state: 'online')
+    #  end
+    #end
     f.name "Foo bar"
     f.permalink { generate(:permalink) }
-    f.association :user, factory: :user
-    f.association :category, factory: :category
+    f.association :user
+    f.association :category
+    f.association :city
     f.about_html "Foo bar"
     f.headline "Foo bar"
     f.goal 10000
-    f.online_date Time.now
     f.online_days 5
+    f.more_links 'Ipsum dolor'
+    f.first_contributions 'Foo bar'
     f.video_url 'http://vimeo.com/17298435'
-    f.video_thumbnail 'http://vimeo.com/17298435'
     f.state 'online'
+    f.budget '1000'
+    f.uploaded_image File.open("#{Rails.root}/spec/support/testimg.png")
+    after :create do |project| 
+      unless project.project_transitions.where(to_state: project.state).present?
+        FactoryGirl.create(:project_transition, to_state: project.state, project: project)
+      end
+
+      # should set expires_at when create a project in these states
+      if %w(online waiting_funds failed successful).include?(project.state) && project.online_days.present? && project.online_at.present?
+        project.expires_at = (project.online_at + project.online_days.days).end_of_day
+        project.save
+      end
+    end
+    after :build do |project|
+      project.account = build(:project_account, project: nil)
+      project.rewards.build(deliver_at: Time.now, minimum_value: 10, description: 'test')
+    end
+  end
+
+  factory :flexible_project do |f|
+    f.association :project
+    f.state 'draft'
+
+    after :create do |flex_project| 
+      FactoryGirl.create(:flexible_project_transition, {
+        to_state: flex_project.state,
+        flexible_project: flex_project
+      })
+    end
+  end
+
+  factory :flexible_project_transition do |f|
+    f.association :flexible_project
+    f.most_recent true
+    f.to_state 'online'
+    f.sort_key { generate(:serial) }
+  end
+
+  factory :project_transition do |f|
+    f.association :project
+    f.most_recent true
+    f.to_state 'online'
+    f.sort_key { generate(:serial) }
+  end
+
+  factory :project_account do |f|
+    f.association :project
+    f.association :bank
+    f.email "foo@bar.com"
+    f.address_zip_code "foo"
+    f.address_neighbourhood "foo"
+    f.address_state "foo"
+    f.address_city "foo"
+    f.address_number "foo"
+    f.address_street "foo"
+    f.phone_number "1234"
+    f.agency "fooo"
+    f.agency_digit "foo"
+    f.owner_document "foo"
+    f.owner_name "foo"
+    f.account "1"
+    f.account_digit "1000"
+    f.account_type "foo"
   end
 
   factory :contribution do |f|
     f.association :project, factory: :project
     f.association :user, factory: :user
+    f.address_phone_number '(33) 3333-3333'
+    f.address_neighbourhood 'lorem'
+    f.address_number 'lnumber'
+    f.address_street 'lstreet lorem'
+    f.address_zip_code '33600-000'
+    f.payer_document '872.123.775-11'
     f.value 10.00
     f.payer_name 'Foo Bar'
     f.payer_email 'foo@bar.com'
@@ -84,6 +164,16 @@ FactoryGirl.define do
       payment.gateway = 'pagarme'
     end
   end
+
+  factory :state do
+    name { generate(:name) }
+    acronym { generate(:name) }
+  end
+
+  factory :city do |f|
+    f.association :state
+    f.name "foo"
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_pagarme
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.6
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,14 +189,20 @@ files:
 - spec/dummy/app/models/bank.rb
 - spec/dummy/app/models/bank_account.rb
 - spec/dummy/app/models/category.rb
+- spec/dummy/app/models/city.rb
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/contribution.rb
+- spec/dummy/app/models/country.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/payment_transfer.rb
 - spec/dummy/app/models/project.rb
+- spec/dummy/app/models/project_account.rb
+- spec/dummy/app/models/project_transition.rb
+- spec/dummy/app/models/reward.rb
+- spec/dummy/app/models/state.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_total.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -229,6 +235,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/spec/support/testimg.png
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
 - spec/models/catarse_pagarme/bank_account_concern_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb
@@ -278,14 +285,20 @@ test_files:
 - spec/dummy/app/models/bank.rb
 - spec/dummy/app/models/bank_account.rb
 - spec/dummy/app/models/category.rb
+- spec/dummy/app/models/city.rb
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/contribution.rb
+- spec/dummy/app/models/country.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/payment_transfer.rb
 - spec/dummy/app/models/project.rb
+- spec/dummy/app/models/project_account.rb
+- spec/dummy/app/models/project_transition.rb
+- spec/dummy/app/models/reward.rb
+- spec/dummy/app/models/state.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_total.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -318,6 +331,7 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/spec/support/testimg.png
 - spec/helpers/catarse_pagarme/application_helper_spec.rb
 - spec/models/catarse_pagarme/bank_account_concern_spec.rb
 - spec/models/catarse_pagarme/credit_card_transaction_spec.rb