catarse_paypal_express 0.0.2 → 0.1.0

data/Gemfile

@@ -12,21 +12,26 @@ gem "jquery-rails"
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'
-source 'http://rubygems.org'
+source :gemcutter
 source 'http://gems.github.com'
 
 gem 'rails', '3.2.6'
 gem 'rake', '0.9.2.2'
-gem 'catarse_paypal_express', :path => '~/store/code/catarse_paypal_express'
 
-# Database [Putting pg to the end because of a weird bug with Lion, pg and openssl]
+# Database and data related [Putting pg to the end because of a weird bug with Lion, pg and openssl]
 gem 'pg'
 gem 'foreigner'
 gem 'activerecord-postgresql-adapter'
 
+gem 'catarse_paypal_express', :path => '~/store/code/catarse_paypal_express'
+#gem 'catarse_paypal_express', '~> 0.0.2'
+gem 'catarse_moip', '~> 0.1.1'
+gem 'moip_catarse', '~> 1.0.6', require: 'moip'
+
+gem 'maxim-sexy_pg_constraints'
+gem 'dalli'
+gem 'draper'
+
 # Frontend stuff
 gem 'jquery-rails'
 gem 'slim'
@@ -43,35 +48,42 @@ gem 'omniauth-yahoo', '~> 0.0.4'
 gem 'devise', '1.5.3'
 gem 'cancan'
 
-gem 'rails_autolink', '~> 1.0.7'
 
-# Tools
-gem 'mailchimp'
+# Error reporting
 gem "airbrake"
-gem 'feedzirra'
-gem 'formtastic'
+
+# Email marketing
+#gem 'mailchimp'
+gem 'catarse_mailchimp'
+
+# HTML manipulation and formatting
+gem 'formtastic', "~> 2.1.1"
 gem "auto_html", '= 1.4.2'
+gem 'kaminari'
+gem 'rails_autolink', '~> 1.0.7'
+
+# Uploads
+gem 'carrierwave', '= 0.5.8'
+gem 'rmagick'
+gem 'fog'
+
+# Other Tools
+gem 'feedzirra'
 gem 'validation_reflection', git: 'git://github.com/ncri/validation_reflection.git'
-gem 'maxim-sexy_pg_constraints'
 gem 'inherited_resources', '1.3.1'
+gem 'has_scope'
 gem 'spectator-validates_email', require: 'validates_email'
-gem 'has_vimeo_video', '>= 0.0.4'
+gem 'has_vimeo_video', '~> 0.0.5'
 gem 'wirble'
 gem "on_the_spot"
 gem 'weekdays'
 gem 'brcep'
 gem "RedCloth"
 gem 'unicode'
-gem 'carrierwave', '= 0.5.8'
-gem 'rmagick'
-gem 'fog'
 gem 'enumerate_it'
 gem 'httparty', '~> 0.6.1'
 gem "rack-timeout"
-gem 'kaminari'
 gem 'tumblr-api'
-gem 'dalli'
-gem 'capybara', ">= 1.0.1"
 
 # Translations
 gem 'http_accept_language'
@@ -82,12 +94,8 @@ gem 'routing-filter' #, :git => 'git://github.com/svenfuchs/routing-filter.git'
 gem 'activeadmin', git: 'git://github.com/gregbell/active_admin.git'
 gem "meta_search", "1.1.3"
 
-# Payment (moip)
-gem 'moip', git: 'https://github.com/danielweinmann/moip-ruby.git', ref: 'db1b879358c623b597dc1c221b53336f9f06db0e'
-
-# Payment (paypal adaptive)
+# Payment
 gem 'activemerchant', '1.17.0', require: 'active_merchant'
-#gem 'active_paypal_adaptive_payment', '~> 0.3.13'
 gem 'httpclient', '2.2.5'
 gem 'selenium-webdriver', '~> 2.25.0'
 gem 'bourbon'
@@ -112,14 +120,12 @@ group :test, :development do
   gem 'rspec-rails', "~> 2.10.0"
   gem 'rcov', '= 0.9.11'
   gem 'mocha', '0.10.4'
+  gem 'shoulda'
+  gem 'factory_girl_rails', '1.7.0'
+  gem 'capybara', ">= 1.0.1"
 end
 
 group :development do
   gem 'mailcatcher'
   gem 'ruby-debug19'
 end
-
-group :test do
-  gem 'shoulda'
-  gem 'factory_girl_rails', '1.7.0'
-end

data/Gemfile.lock

@@ -21,20 +21,10 @@ GIT
   specs:
     validation_reflection (1.0.0)
 
-GIT
-  remote: https://github.com/danielweinmann/moip-ruby.git
-  revision: db1b879358c623b597dc1c221b53336f9f06db0e
-  ref: db1b879358c623b597dc1c221b53336f9f06db0e
-  specs:
-    moip (1.0.2)
-      activesupport (>= 2.3.2)
-      httparty (~> 0.6.1)
-      nokogiri (~> 1.4.3)
-
 PATH
   remote: .
   specs:
-    catarse_paypal_express (0.0.1)
+    catarse_paypal_express (0.0.2)
       activemerchant (~> 1.17.0)
       rails (~> 3.2.6)
 
@@ -111,6 +101,12 @@ GEM
       xpath (~> 0.1.4)
     carrierwave (0.5.8)
       activesupport (~> 3.0)
+    catarse_mailchimp (0.0.1)
+      mailchimp
+      supermodel
+    catarse_moip (0.1.1)
+      moip_catarse (~> 1.0.6)
+      rails (~> 3.2.6)
     childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
     chunky_png (1.2.6)
@@ -140,6 +136,9 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     diff-lcs (1.1.3)
+    draper (0.17.0)
+      actionpack (~> 3.2)
+      activesupport (~> 3.2)
     enumerate_it (0.7.16)
       activesupport (>= 3.0.0)
     erubis (2.7.0)
@@ -179,8 +178,8 @@ GEM
     foreigner (1.2.0)
       activerecord (>= 3.0.0)
     formatador (0.2.3)
-    formtastic (2.2.1)
-      actionpack (>= 3.0)
+    formtastic (2.1.1)
+      actionpack (~> 3.0)
     fssm (0.2.9)
     haml (3.1.6)
     has_scope (0.5.1)
@@ -243,6 +242,10 @@ GEM
     mime-types (1.19)
     mocha (0.10.4)
       metaclass (~> 0.0.1)
+    moip_catarse (1.0.6)
+      activesupport (>= 2.3.2)
+      httparty (~> 0.6.1)
+      nokogiri (~> 1.4.2)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     net-scp (1.0.4)
@@ -461,6 +464,8 @@ DEPENDENCIES
   cancan
   capybara (>= 1.0.1)
   carrierwave (= 0.5.8)
+  catarse_mailchimp
+  catarse_moip (~> 0.1.1)
   catarse_paypal_express!
   coffee-rails (~> 3.2.2)
   compass-960-plugin (~> 0.10.4)
@@ -468,13 +473,15 @@ DEPENDENCIES
   dalli
   database_cleaner
   devise (= 1.5.3)
+  draper
   enumerate_it
   factory_girl_rails (= 1.7.0)
   feedzirra
   fog
   foreigner
-  formtastic
-  has_vimeo_video (>= 0.0.4)
+  formtastic (~> 2.1.1)
+  has_scope
+  has_vimeo_video (~> 0.0.5)
   http_accept_language
   httparty (~> 0.6.1)
   httpclient (= 2.2.5)
@@ -483,11 +490,10 @@ DEPENDENCIES
   kaminari
   launchy
   mailcatcher
-  mailchimp
   maxim-sexy_pg_constraints
   meta_search (= 1.1.3)
   mocha (= 0.10.4)
-  moip!
+  moip_catarse (~> 1.0.6)
   omniauth (~> 1.1.0)
   omniauth-facebook (~> 1.2.0)
   omniauth-github (~> 1.0.1)

data/app/controllers/catarse_paypal_express/payment/paypal_express_controller.rb

@@ -1,3 +1,5 @@
+require 'catarse_paypal_express/processors'
+
 module CatarsePaypalExpress::Payment
   class PaypalExpressController < ApplicationController
     skip_before_filter :verify_authenticity_token, :only => [:notifications]
@@ -8,11 +10,12 @@ module CatarsePaypalExpress::Payment
 
     SCOPE = "projects.backers.checkout"
 
+
     def notifications
       backer = Backer.find params[:id]
       response = @@gateway.details_for(backer.payment_token)
       if response.params['transaction_id'] == params['txn_id']
-        backer.confirm! if response.success?
+        build_notification(backer, response.params)
         render status: 200, nothing: true
       else
         render status: 404, nothing: true
@@ -36,6 +39,8 @@ module CatarsePaypalExpress::Payment
         backer.update_attribute :payment_method, 'PayPal'
         backer.update_attribute :payment_token, response.token
 
+        build_notification(backer, response.params)
+
         if response.params['correlation_id']
           backer.update_attribute :payment_id, response.params['correlation_id']
         end
@@ -59,9 +64,7 @@ module CatarsePaypalExpress::Payment
           payer_id: details.payer_id
         })
 
-        if response.success?
-          backer.confirm!
-        end
+        build_notification(backer, details.params)
 
         if details.params['transaction_id'] 
           backer.update_attribute :payment_id, details.params['transaction_id']
@@ -88,6 +91,11 @@ module CatarsePaypalExpress::Payment
 
   private
 
+    def build_notification(backer, data)
+      processor = CatarsePaypalExpress::Processors::Paypal.new
+      processor.process!(backer, data)
+    end
+
     def paypal_flash_error
       flash[:failure] = t('paypal_error', scope: SCOPE)
     end

data/lib/catarse_paypal_express/processors.rb

@@ -0,0 +1,5 @@
+require 'catarse_paypal_express/processors/paypal'
+module CatarsePaypalExpress
+  module Processors
+  end
+end

data/lib/catarse_paypal_express/processors/paypal.rb

@@ -0,0 +1,26 @@
+module CatarsePaypalExpress
+  module Processors
+    class Paypal
+
+      def process!(backer, data)
+        status = data["checkout_status"] || "pending"
+
+        notification = backer.payment_notifications.new({
+          status: status,
+          extra_data: data
+        })
+
+        notification.save!
+
+        backer.confirm! if success_payment?(status)
+      end
+
+      protected
+
+      def success_payment?(status)
+        status == 'PaymentActionCompleted'
+      end
+
+    end
+  end
+end

data/lib/catarse_paypal_express/version.rb

@@ -1,3 +1,3 @@
 module CatarsePaypalExpress
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/controllers/catarse_paypal_express/payment/paypal_express_controller_spec.rb

@@ -23,9 +23,24 @@ describe CatarsePaypalExpress::Payment::PaypalExpressController do
       response.status.should eq(404)
     end
 
+    it 'should create a payment_notification' do
+      success_payment_response = mock()
+      success_payment_response.stubs(:params).returns({ 'transaction_id' => '1234', "checkout_status" => "PaymentActionCompleted" })
+      success_payment_response.stubs(:success?).returns(true)
+      ActiveMerchant::Billing::PaypalExpressGateway.any_instance.stub(:details_for).and_return(success_payment_response)
+
+      backer = Factory(:backer, payment_id: '1234')
+      backer.payment_notifications.should be_empty
+
+      post :notifications, { id: backer.id, txn_id: 1234 , use_route: 'catarse_paypal_express' }
+      backer.reload
+
+      backer.payment_notifications.should_not be_empty
+    end
+
     it 'and the transaction ID match, should update the payment status if successful' do
       success_payment_response = mock()
-      success_payment_response.stubs(:params).returns({ 'transaction_id' => '1234' })
+      success_payment_response.stubs(:params).returns({ 'transaction_id' => '1234', "checkout_status" => "PaymentActionCompleted" })
       success_payment_response.stubs(:success?).returns(true)
       ActiveMerchant::Billing::PaypalExpressGateway.any_instance.stub(:details_for).and_return(success_payment_response)
       backer = Factory(:backer, payment_id: '1234', confirmed: false)
@@ -74,6 +89,17 @@ describe CatarsePaypalExpress::Payment::PaypalExpressController do
         ActiveMerchant::Billing::PaypalExpressGateway.any_instance.stub(:setup_purchase).and_return(success_response)
       end
 
+      it 'should create a payment_notification' do
+        session[:user_id] = current_user.id
+        backer = Factory(:backer, user: current_user)
+
+        get :pay, { id: backer.id, locale: 'en', use_route: 'catarse_paypal_express' }
+        backer.reload
+
+        backer.payment_notifications.should_not be_empty
+        backer.payment_notifications.first.status == 'pending'
+      end
+
       it 'payment method, token and id should be persisted ' do
         session[:user_id] = current_user.id
         backer = Factory(:backer, user: current_user)
@@ -110,17 +136,19 @@ describe CatarsePaypalExpress::Payment::PaypalExpressController do
 
         fake_success_details = mock()
         fake_success_details.stub(:payer_id).and_return('123')
-        fake_success_details.stub(:params).and_return({'transaction_id' => '12345'})
+        fake_success_details.stub(:params).and_return({'transaction_id' => '12345', "checkout_status" => "PaymentActionCompleted"})
         ActiveMerchant::Billing::PaypalExpressGateway.any_instance.stub(:details_for).and_return(fake_success_details)
       end
 
       it 'should update the backer and redirect to thank_you' do
         session[:user_id] = current_user.id
         backer = Factory(:backer, user: current_user, payment_token: 'TOKEN')
+        backer.payment_notifications.should be_empty
 
         get :success, { id: backer.id, locale: 'en', use_route: 'catarse_paypal_express' }
         backer.reload
 
+        backer.payment_notifications.should_not be_empty
         backer.confirmed.should be_true
         backer.payment_id.should == '12345'
         session[:thank_you_id].should == backer.project.id

data/spec/lib/processors/paypal_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe CatarsePaypalExpress::Processors::Paypal do
+  context "process paypal details_for response" do
+    let(:backer) { Factory(:backer, confirmed: false) }
+
+    it "should create a new payment_notifications for backer" do
+      backer.payment_notifications.should be_empty
+      subject.process!(backer, paypal_details_response)
+      backer.payment_notifications.should_not be_empty
+    end
+
+    it "should fill status based on checkout_status" do
+      subject.process!(backer, paypal_details_response)
+      backer.payment_notifications.first.status.should == 'PaymentActionCompleted'
+    end
+
+    it "should fill extra_data with all response data" do
+      subject.process!(backer, paypal_details_response)
+      backer.payment_notifications.first.extra_data.should == paypal_details_response
+    end
+
+    it "should confirm backer when checkout status is completed" do
+      subject.process!(backer, paypal_details_response)
+      backer.confirmed.should be_true
+    end
+
+    it "should not confirm when checkout status is not completed" do
+      subject.process!(backer, paypal_details_response.merge!({"checkout_status" => "just_another_status"}) )
+      backer.confirmed.should be_false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -66,3 +66,10 @@ def paypal_setup_purchase_success_response
     "token"=>"EC-49X25168KR2556548", "Timestamp"=>"2012-07-23T00:24:21Z", "Ack"=>"Success", "CorrelationID"=>"dcb8596be51cd", 
     "Version"=>"62.0", "Build"=>"3332236", "Token"=>"EC-49X25168KR2556548" }
 end
+
+def paypal_details_response
+  {
+    "transaction_id" => "1234",
+    "checkout_status" => "PaymentActionCompleted"
+  }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_paypal_express
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,10 +112,13 @@ files:
 - config/routes.rb
 - lib/catarse_paypal_express.rb
 - lib/catarse_paypal_express/engine.rb
+- lib/catarse_paypal_express/processors.rb
+- lib/catarse_paypal_express/processors/paypal.rb
 - lib/catarse_paypal_express/version.rb
 - lib/tasks/catarse_paypal_express_tasks.rake
 - script/rails
 - spec/controllers/catarse_paypal_express/payment/paypal_express_controller_spec.rb
+- spec/lib/processors/paypal_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/devton/catarse_paypal_express
 licenses: []
@@ -143,4 +146,5 @@ specification_version: 3
 summary: PaypalExpress integration with Catarse
 test_files:
 - spec/controllers/catarse_paypal_express/payment/paypal_express_controller_spec.rb
+- spec/lib/processors/paypal_spec.rb
 - spec/spec_helper.rb