active_paypal_adaptive_payment 0.3.13 → 0.3.14

data/CHANGELOG.md

@@ -1,21 +1,28 @@
-## 0 0.3.12 (2012-05-18)
-  - Added option displayMaxTotalAmount to build_preapproval_payment to display amount with paypal on payment (04b37c9) by eldoy
+## 0.3.14 (2012-07-06)
 
-## 0 0.3.12 (2012-05-02)
+  - Expose raw and request objects for easier logging / debugging (pull req #25) by saizai
+  - rm unusued refund fields (pull req #25) by saizai
+  - Also added: receiver_list is optional for refunds (refunds everything on that paykey if not specified) (pull req #25) by saizai
+  
+## 0.3.12 (2012-05-18)
+
+- Added option displayMaxTotalAmount to build_preapproval_payment to display amount with paypal on payment (04b37c9) by eldoy
+
+## 0.3.12 (2012-05-02)
 
   - Add displayOptions and receiverOptions support to
     SetPaymentOptionsRequest (Niels Ganser) by 597ecad
   
-## 0 0.3.11 (2012-04-28)
+## 0.3.11 (2012-04-28)
 
   - Added option :action_type to build_adaptive_payment_pay_request to enable delayed chained payments (3df6948) by eldoy
   
   
-## 0 0.3.10 (2012-03-30)
+## 0.3.10 (2012-03-30)
 
   - Added referrerCode in SetPaymentOptions request (by njvitto)
   
-## 0 0.3.3 (16/Nov/11)
+## 0.3.3 (16/Nov/11)
 
   - add functionality to allow a user to redirect to the correct URL
     when creating a pre-approval request. In addition, the

data/README.md

@@ -181,6 +181,7 @@ xml request, raw json response and the URL of the endpoint.
 * Nicola Junior Vitto (<https://github.com/njvitto>)
 * Vidar Eldøy (https://github.com/eldoy)
 * Niels Ganser (https://github.com/Nielsomat)
+* saizai (Sai) (https://github.com/saizai)
 
 ## Other previous contributors where some code was taken from.
 

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

@@ -33,9 +33,9 @@ module ActiveMerchant
       self.homepage_url = 'http://x.com/'
       self.display_name = 'Paypal Adaptive Payments'
 
-      def initialize(config = {})
-        requires!(config, :login, :password, :signature, :appid)
-        @config = config.dup
+      def initialize(options = {})
+        requires!(options, :login, :password, :signature, :appid)
+        @options = options.dup
         super
       end
 
@@ -92,7 +92,7 @@ module ActiveMerchant
       end
 
       def debug
-        "Url: #{@url}\n\n Request: #{@xml} \n\n Response: #{@response.json}"
+        {:url => @url, :request => @xml, :response => @response.json}
       end
 
       private
@@ -261,28 +261,21 @@ module ActiveMerchant
             x.errorLanguage options[:error_language] ||= 'en_US'
           end
           x.actionType 'REFUND'
-          if options[:pay_key]
-            x.payKey options[:pay_key]
-          end
-          if options[:transaction_id]
-            x.payKey options[:transaction_id]
-          end
-          if options[:tracking_id]
-            x.trackingId options[:tracking_id]
-          end
-          x.cancelUrl options[:cancel_url]
-          x.returnUrl options[:return_url]
+          x.payKey options[:pay_key] if options[:pay_key]
+          x.payKey options[:transaction_id] if options[:transaction_id]
+          x.trackingId options[:tracking_id] if options[:tracking_id]
           x.currencyCode options[:currency_code] ||= 'USD'
           x.receiverList do |x|
             options[:receiver_list].each do |receiver|
               x.receiver do |x|
                 x.amount receiver[:amount]
-                x.paymentType receiver[:payment_type] ||= 'GOODS'
-                x.invoiceId receiver[:invoice_id] if receiver[:invoice_id]
+                # x.paymentType receiver[:payment_type] ||= 'GOODS' # API specifies "not used"
+                # x.invoiceId receiver[:invoice_id] if receiver[:invoice_id] # API specifies "not used"
                 x.email receiver[:email]
+                x.primary receiver[:primary] if receiver.key?(:primary)
               end
             end
-          end
+          end if options[:receiver_list]
           x.feesPayer options[:fees_payer] ||= 'EACHRECEIVER'
         end
       end
@@ -377,17 +370,17 @@ module ActiveMerchant
       end
 
       def commit(action, data)
-        @response = AdaptivePaymentResponse.new(post_through_ssl(action, data))
+        @response = AdaptivePaymentResponse.new(post_through_ssl(action, data), data, action)
       end
 
       def post_through_ssl(action, parameters = {})
         headers = {
           "X-PAYPAL-REQUEST-DATA-FORMAT" => "XML",
           "X-PAYPAL-RESPONSE-DATA-FORMAT" => "JSON",
-          "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-SECURITY-USERID" => @options[:login],
+          "X-PAYPAL-SECURITY-PASSWORD" => @options[:password],
+          "X-PAYPAL-SECURITY-SIGNATURE" => @options[:signature],
+          "X-PAYPAL-APPLICATION-ID" => @options[:appid],
         }
         action_url(action)
         request = Net::HTTP::Post.new(@url.path)
@@ -396,6 +389,10 @@ module ActiveMerchant
         request.content_type = 'text/xml'
         server = Net::HTTP.new(@url.host, 443)
         server.use_ssl = true
+        # OSX: sudo port install curl-ca-bundle
+        server.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        server.ca_path = '/etc/ssl/certs' if File.exists?('/etc/ssl/certs') # Ubuntu
+        server.ca_file = '/opt/local/share/curl/curl-ca-bundle.crt' if File.exists?('/opt/local/share/curl/curl-ca-bundle.crt') # Mac OS X
         server.start { |http| http.request(request) }.body
       end
 
@@ -404,7 +401,7 @@ module ActiveMerchant
       end
 
       def test?
-        @config[:test] || Base.gateway_mode == :test
+        @options[:test] || Base.gateway_mode == :test
       end
 
       def action_url(action)

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

@@ -1,4 +1,4 @@
-require 'multi_json'
+      require 'multi_json'
 require 'hashie'
 
 module ActiveMerchant
@@ -7,16 +7,20 @@ module ActiveMerchant
 
       SUCCESS = 'Success'.freeze
 
-      attr_reader :json
+      attr_reader :json, :request, :action, :response, :xml_request
       alias :raw :json
+      alias :raw_request :xml_request
 
-      def initialize(json)
+      def initialize(json, xml_request = nil, action = nil)
         @json = json
-        @response_rash = Hashie::Rash.new(MultiJson.decode(json))
+        @response = Hashie::Rash.new(MultiJson.decode(json))
+        @xml_request = xml_request
+        @request =  Hashie::Rash.from_xml(xml_request)
+        @action = action
       end
 
       def method_missing(method, *args, &block)
-        @response_rash.send(method, *args, &block)
+        @response.send(method, *args, &block)
       end
 
       # def redirect_url_for

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_paypal_adaptive_payment
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &88363450 !ruby/object:Gem::Requirement
+  requirement: &86350740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *88363450
+  version_requirements: *86350740
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &88363210 !ruby/object:Gem::Requirement
+  requirement: &86350500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *88363210
+  version_requirements: *86350500
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &88362970 !ruby/object:Gem::Requirement
+  requirement: &86366660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *88362970
+  version_requirements: *86366660
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &88362730 !ruby/object:Gem::Requirement
+  requirement: &86366420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *88362730
+  version_requirements: *86366420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &88362490 !ruby/object:Gem::Requirement
+  requirement: &86366180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *88362490
+  version_requirements: *86366180
 description: ! '    This library is meant to interface with PayPal''s Adaptive Payment
   Gateway.