active_paypal_adaptive_payment 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.4
+
+  - renamed the pay method to setup_purchase, again, more like active_merchant.
+  - added paypal_adaptive_payment_common.rb for handling the redirects more like active_merchant
+  - removed the autoloads, they look kind of messy
+
 ## 0.2.3
 
   - `autoload` the helper libs.

data/README.md

@@ -28,13 +28,13 @@ See [iAuction: An Adaptive Payments Tutorial Featuring Parallel Payments](https:
 
 ### Init
 
-   @gateway =
-        ActiveMerchant::Billing::PaypalAdaptivePayment.new(
-          :login => "acutio_1313133342_biz_api1.gmail.com",
-          :password => "1255043567",
-          :signature => "Abg0gYcQlsdkls2HDJkKtA-p6pqhA1k-KTYE0Gcy1diujFio4io5Vqjf",
-          :appid => "APP-80W284485P519543T"
-        )
+    gateway =
+          ActiveMerchant::Billing::PaypalAdaptivePayment.new(
+            :login => "acutio_1313133342_biz_api1.gmail.com",
+            :password => "1255043567",
+            :signature => "Abg0gYcQlsdkls2HDJkKtA-p6pqhA1k-KTYE0Gcy1diujFio4io5Vqjf",
+            :appid => "APP-80W284485P519543T"
+          )
 
 ### Pre-approved paymen
 

data/lib/active_merchant/billing/gateways/paypal_adaptive_payment.rb

@@ -1,17 +1,15 @@
 # -*- coding: utf-8 -*-
 require 'money'
+require File.dirname(__FILE__) + '/paypal_adaptive_payments/ext'
+require File.dirname(__FILE__) + '/paypal_adaptive_payment_common'
+require File.dirname(__FILE__) + '/paypal_adaptive_payments/exceptions'
+require File.dirname(__FILE__) + '/paypal_adaptive_payments/adaptive_payment_response'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
-    autoload :AdaptivePaymentResponse,
-    File.dirname(__FILE__) + '/paypal_adaptive_payments/adaptive_payment_response'
-
-    class PaypalAdaptivePayment < Gateway # :nodoc:
-
-      d = File.dirname(__FILE__) + '/paypal_adaptive_payments/'
-      autoload :PaypalAdaptivePaymentsApiError, d + 'exception'
-      autoload :HTTPHeader, d + 'ext'
+    class PaypalAdaptivePayment < Gateway # :nodoc
+      include PaypalAdaptivePaymentCommon
 
       TEST_URL = 'https://svcs.sandbox.paypal.com/AdaptivePayments/'
       LIVE_URL = 'https://svcs.paypal.com/AdaptivePayments/'
@@ -29,13 +27,9 @@ module ActiveMerchant #:nodoc:
         TYPES.each { |pt| const_set(pt, pt) }
       end
 
-      # The countries the gateway supports merchants from as 2 digit ISO country codes
+	    self.test_redirect_url= "https://www.sandbox.paypal.com/webscr?cmd=_ap-payment&paykey="
       self.supported_countries = ['US']
-
-      # The homepage URL of the gateway
       self.homepage_url = 'http://x.com/'
-
-      # The name of the gateway
       self.display_name = 'Paypal Adaptive Payments'
 
       def initialize(config = {})
@@ -44,7 +38,7 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      def pay(options)
+      def setup_purchase(options)
         commit('Pay', build_adaptive_payment_pay_request(options))
       end
 
@@ -95,6 +89,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def build_adaptive_payment_pay_request(opts)
         @xml = ''
         xml = Builder::XmlMarkup.new :target => @xml, :indent => 2
@@ -272,7 +267,7 @@ module ActiveMerchant #:nodoc:
           "X-PAYPAL-SECURITY-USERID" => @config[:login],
           "X-PAYPAL-SECURITY-PASSWORD" => @config[:password],
           "X-PAYPAL-SECURITY-SIGNATURE" => @config[:signature],
-          "X-PAYPAL-APPLICATION-ID" => @config[:appid]
+          "X-PAYPAL-APPLICATION-ID" => @config[:appid],
         }
         action_url(action)
         request = Net::HTTP::Post.new(@url.path)

data/lib/active_merchant/billing/gateways/paypal_adaptive_payment_common.rb

@@ -0,0 +1,19 @@
+module ActiveMerchant
+  module Billing
+    module PaypalAdaptivePaymentCommon
+      def self.included(base)
+        base.cattr_accessor :test_redirect_url
+        base.cattr_accessor :live_redirect_url
+        base.live_redirect_url = 'https://www.paypal.com/webscr?cmd=_ap-payment&paykey='
+      end
+
+      def redirect_url
+        test? ? test_redirect_url : live_redirect_url
+      end
+
+      def redirect_url_for(token)
+        redirect_url + token
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/gateways/paypal_adaptive_payments/adaptive_payment_response.rb

@@ -4,10 +4,7 @@ require 'rash'
 
 module ActiveMerchant
   module Billing
-    class AdaptivePaymentResponse
-
-      REDIRECT_URL = 'https://www.paypal.com/webscr?cmd=_ap-payment&paykey='
-      TEST_REDIRECT_URL = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_ap-payment&paykey='
+    class AdaptivePaymentResponse < Response
 
       SUCCESS = 'Success'.freeze
 
@@ -23,9 +20,9 @@ module ActiveMerchant
         @response_rash.send(method, *args, &block)
       end
 
-      def redirect_url_for
-        Base.gateway_mode == :test ? (TEST_REDIRECT_URL + pay_key) : (REDIRECT_URL + pay_key)
-      end
+      # def redirect_url_for
+      #   Base.gateway_mode == :test ? (TEST_REDIRECT_URL + pay_key) : (REDIRECT_URL + pay_key)
+      # end
 
       def ack
         response_envelope.ack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_paypal_adaptive_payment
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000Z
+date: 2011-08-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &14390140 !ruby/object:Gem::Requirement
+  requirement: &13313940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *14390140
+  version_requirements: *13313940
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &14389660 !ruby/object:Gem::Requirement
+  requirement: &13313400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14389660
+  version_requirements: *13313400
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &14389180 !ruby/object:Gem::Requirement
+  requirement: &13312880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *14389180
+  version_requirements: *13312880
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &14388700 !ruby/object:Gem::Requirement
+  requirement: &13312280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 3.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *14388700
+  version_requirements: *13312280
 description: ! '    This library is meant to interface with PayPal''s Adaptive Payment
   Gateway.
 
@@ -66,6 +66,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/active_paypal_adaptive_payment.rb
+- lib/active_merchant/billing/gateways/paypal_adaptive_payment_common.rb
 - lib/active_merchant/billing/gateways/paypal_adaptive_payments/exceptions.rb
 - lib/active_merchant/billing/gateways/paypal_adaptive_payments/adaptive_payment_response.rb
 - lib/active_merchant/billing/gateways/paypal_adaptive_payments/ext.rb
@@ -93,9 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: ActiveMercant PayPal Adaptive Payment Library
 test_files: []
-has_rdoc: