catarse_paypal_express 2.2.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 07eed4533c5542caa215045ca70b7f41d716d322
+  data.tar.gz: 019bca2925c07d4c5bfcc43934b099d926f5d81e
+SHA512:
+  metadata.gz: 18032dd6c34667a2b1ce5b5375cf7033e1c7926ee88f3be84b0933b88a7ba9c0750231b8b1d9903581cc19c042c55f742f318a37c6f6e6cc3bf9b7479f0bac36
+  data.tar.gz: a41ae452e1c547953a9316cc7f2d7742e5e637cb20ecfb0c4dc6ba988805baa1485e79acd2e2fe1eae474833d6f01abce5d304222501d0df2ee8b209f1412845

data/app/controllers/catarse_paypal_express/paypal_express_controller.rb

@@ -8,19 +8,6 @@ class CatarsePaypalExpress::PaypalExpressController < ApplicationController
   def review
   end
 
-  def refund
-    refund_request = gateway.refund(nil, contribution.payment_id)
-
-
-    if refund_request.success?
-      flash[:notice] = I18n.t('projects.contributions.refund.success')
-    else
-      flash[:alert] = refund_request.try(:message) || I18n.t('projects.contributions.refund.error')
-    end
-
-    redirect_to main_app.admin_contributions_path
-  end
-
   def ipn
     if contribution && notification.acknowledge && (contribution.payment_method == 'PayPal' || contribution.payment_method.nil?)
       process_paypal_message params
@@ -115,15 +102,7 @@ class CatarsePaypalExpress::PaypalExpressController < ApplicationController
   end
 
   def gateway
-    if PaymentEngines.configuration[:paypal_username] and PaymentEngines.configuration[:paypal_password] and PaymentEngines.configuration[:paypal_signature]
-      @gateway ||= ActiveMerchant::Billing::PaypalExpressGateway.new({
-        login: PaymentEngines.configuration[:paypal_username],
-        password: PaymentEngines.configuration[:paypal_password],
-        signature: PaymentEngines.configuration[:paypal_signature]
-      })
-    else
-      puts "[PayPal] An API Certificate or API Signature is required to make requests to PayPal"
-    end
+    @gateway ||= CatarsePaypalExpress::Gateway.instance
   end
 
   protected

data/config/initializers/register.rb

@@ -4,8 +4,9 @@ begin
     review_path: ->(contribution) {
       CatarsePaypalExpress::Engine.routes.url_helpers.review_paypal_express_path(contribution)
     },
-    refund_path: ->(contribution) {
-      CatarsePaypalExpress::Engine.routes.url_helpers.refund_paypal_express_path(contribution)
+    can_do_refund?: true,
+    direct_refund: ->(contribution) {
+      CatarsePaypalExpress::ContributionActions.new(contribution).refund
     },
     locale: 'en'
   })

data/config/routes.rb

@@ -5,7 +5,6 @@ CatarsePaypalExpress::Engine.routes.draw do
     end
 
     member do
-      post :refund
       get  :review
       post :pay
       get  :success

data/lib/catarse_paypal_express.rb

@@ -1,5 +1,7 @@
 require 'active_merchant'
 require "catarse_paypal_express/engine"
+require "catarse_paypal_express/gateway"
+require "catarse_paypal_express/contribution_actions"
 
 module CatarsePaypalExpress
 end

data/lib/catarse_paypal_express/contribution_actions.rb

@@ -0,0 +1,20 @@
+module CatarsePaypalExpress
+  class ContributionActions
+
+    def initialize contribution
+      @contribution = contribution
+    end
+
+    def refund
+      refund_request = gateway.refund(nil, @contribution.payment_id)
+      refund_request.success?
+    end
+
+    private
+
+    def gateway
+      @gateway ||= CatarsePaypalExpress::Gateway.instance
+    end
+
+  end
+end

data/lib/catarse_paypal_express/gateway.rb

@@ -0,0 +1,36 @@
+module CatarsePaypalExpress
+  class Gateway
+    include ActiveMerchant::Billing::Integrations
+
+    def initialize configuration = PaymentEngines.configuration
+      @configuration = configuration
+    end
+
+    def self.instance
+      new.setup_gateway
+    rescue Exception => e
+      puts e.message
+    end
+
+    def setup_gateway
+      check_default_configurations!
+      ActiveMerchant::Billing::PaypalExpressGateway.new({
+        login: @configuration[:paypal_username],
+        password: @configuration[:paypal_password],
+        signature: @configuration[:paypal_signature]
+      })
+    end
+
+    private
+
+    def check_default_configurations!
+      %i(paypal_username paypal_password paypal_signature).each do |key|
+        raise pending_configuration_message unless @configuration[key].present?
+      end
+    end
+
+    def pending_configuration_message
+      "[PayPal] An API Certificate or API Signature is required to make requests to PayPal"
+    end
+  end
+end

data/lib/catarse_paypal_express/version.rb

@@ -1,3 +1,3 @@
 module CatarsePaypalExpress
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/controllers/catarse_paypal_express/paypal_express_controller_spec.rb

@@ -41,21 +41,6 @@ describe CatarsePaypalExpress::PaypalExpressController do
     payment_method: 'PayPal'
   }) }
 
-  describe "POST refund" do
-    before do
-      success_refund = double
-      success_refund.stub(:success?).and_return(true)
-
-      main_app.should_receive(:admin_contributions_path).and_return('admin_contributions_path')
-
-      gateway.should_receive(:refund).with(nil, contribution.payment_id).and_return(success_refund)
-
-      post :refund, id: contribution.id, use_route: 'catarse_paypal_express'
-    end
-
-    it { should redirect_to('admin_contributions_path') }
-  end
-
   describe "GET review" do
     before do
       get :review, id: contribution.id, use_route: 'catarse_paypal_express'

data/spec/lib/catarse_paypal_express/contribution_actions_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe CatarsePaypalExpress::ContributionActions do
+  let(:contribution_actions) { CatarsePaypalExpress::ContributionActions.new(contribution) }
+  let(:gateway) { double('gateway') }
+  let(:contribution) {
+    double(:contribution, {id: 1, payment_id: '123a'})
+  }
+  let(:refund_return) { double }
+
+  before do
+    CatarsePaypalExpress::Gateway.stub(:instance).and_return(gateway)
+  end
+
+  describe '#refund' do
+    subject do
+      contribution_actions.refund
+    end
+
+    before do
+      contribution_actions.should_receive(:gateway).and_call_original
+      gateway.should_receive(:refund).with(nil, contribution.payment_id).and_return(refund_return)
+    end
+
+    context "success refund" do
+      before do
+        refund_return.stub(:success?).and_return(true)
+      end
+
+      it { should be_true }
+    end
+
+    context "failed refund" do
+      before do
+        refund_return.stub(:success?).and_return(false)
+      end
+
+      it { should be_false }
+    end
+  end
+end

data/test/dummy/config/database.yml

@@ -9,6 +9,7 @@
 #       Choose the win32 build.
 #       Install PostgreSQL and put its /bin directory on your path.
 development:
+  host: localhost
   adapter: postgresql
   encoding: utf-8
   database: catarse_development
@@ -35,6 +36,7 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test: &test
+  host: localhost
   adapter: postgresql
   encoding: utf-8
   database: catarse_test
@@ -43,6 +45,7 @@ test: &test
 
 
 production:
+  host: localhost
   adapter: postgresql
   encoding: utf-8
   database: catarse_production

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_paypal_express
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -11,102 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.34.0
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: PaypalExpress integration with Catarse crowdfunding platform
@@ -118,9 +105,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -139,12 +126,15 @@ files:
 - config/locales/pt.yml
 - config/routes.rb
 - lib/catarse_paypal_express.rb
+- lib/catarse_paypal_express/contribution_actions.rb
 - lib/catarse_paypal_express/engine.rb
+- lib/catarse_paypal_express/gateway.rb
 - lib/catarse_paypal_express/version.rb
 - lib/tasks/catarse_paypal_express_tasks.rake
 - script/rails
 - spec/controllers/catarse_paypal_express/paypal_express_controller_spec.rb
 - spec/fixtures/ipn_data.txt
+- spec/lib/catarse_paypal_express/contribution_actions_spec.rb
 - spec/spec_helper.rb
 - spec/support/payment_engines.rb
 - test/dummy/README.rdoc
@@ -182,31 +172,31 @@ files:
 - test/dummy/script/rails
 homepage: http://github.com/catarse/catarse_paypal_express
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PaypalExpress integration with Catarse
 test_files:
 - spec/controllers/catarse_paypal_express/paypal_express_controller_spec.rb
 - spec/fixtures/ipn_data.txt
+- spec/lib/catarse_paypal_express/contribution_actions_spec.rb
 - spec/spec_helper.rb
 - spec/support/payment_engines.rb
 - test/dummy/README.rdoc