paypal_adaptive 0.2.5 → 0.2.6

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 config
+Gemfile.lock

data/README.markdown

@@ -92,6 +92,9 @@ If you don't set ssl_cert_file then paypal_adaptive will check for certificates
 this location exists, otherwise falling back to the cacert.pem file included with paypal_adaptive.
 
 ## Changelog
+0.2.6
+Fix for using correct status field in pre-approval, thanks nbibler. Fix for ruby 1.9.3, thanks deepj.
+
 0.2.5
 Fix for embedded payments, thanks rafaelivan.  Fix for Rails 3.1.1, thanks synth.
 

data/lib/paypal_adaptive/ipn_notification.rb

@@ -23,7 +23,7 @@ module PaypalAdaptive
       http.ca_file = @@ssl_cert_file unless @@ssl_cert_file.nil?
       
       path = "#{@@paypal_base_url}/cgi-bin/webscr"
-      resp, response_data = http.post(path, data)
+      response_data = http.post(path, data).body
       
       @verified = response_data == "VERIFIED"
     end

data/lib/paypal_adaptive/request.rb

@@ -85,7 +85,7 @@ module PaypalAdaptive
       http.ca_path = @@ssl_cert_path unless @@ssl_cert_path.nil?
       http.ca_file = @@ssl_cert_file unless @@ssl_cert_file.nil?
 
-      resp, response_data = http.post(path, api_request_data, @@headers)
+      response_data = http.post(path, api_request_data, @@headers).body
 
       JSON.parse(response_data)
     end

data/lib/paypal_adaptive/response.rb

@@ -8,7 +8,8 @@ module PaypalAdaptive
     end
     
     def success?
-      self['responseEnvelope']['ack'] == 'Success'
+      self['responseEnvelope']['ack'].to_s =~ /^Success$/i &&
+        !(self['paymentExecStatus'].to_s =~ /^ERROR$/i)
     end
     
     def errors

data/lib/paypal_adaptive/version.rb

@@ -1,4 +1,4 @@
 module PaypalAdaptive
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end
 

data/test/data/invalid_preapproval_error_execstatus.json

@@ -0,0 +1,22 @@
+{
+  "responseEnvelope":{
+    "timestamp":"2011-11-20T09:33:51.178-08:00",
+    "ack":"Success",
+    "correlationId":"XXXXX",
+    "build":"2279004"
+  },
+  "payKey":"AP-XXXXXXXXXXXXXXXXX",
+  "paymentExecStatus":"ERROR",
+  "payErrorList":{
+    "payError":[{
+      "receiver":{"amount":"25.0","email":"email@email.com"},
+      "error":{
+        "errorId":"580036",
+        "domain":"PLATFORM",
+        "severity":"Error",
+        "category":"Application",
+        "message":"This transaction cannot be processed. Please enter a valid credit card number and type"
+      }
+    }]
+  }
+}

data/test/unit/preapproval_test.rb

@@ -36,6 +36,18 @@ class PreapprovalTest < Test::Unit::TestCase
     assert_nil pp_response['preapprovalKey']
   end
 
+  def test_invalid_preapproval_with_bad_credit_information
+    puts "-------"
+    puts "invalid"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","invalid_preapproval_error_execstatus.json")
+
+    data = read_json_file(data_filepath)
+    pp_response = @preapproval_request.preapproval(data)
+    puts "error message is #{pp_response.error_message}"
+
+    assert pp_response.success? == false
+  end
+
   def read_json_file(filepath)
     File.open(filepath, "rb"){|f| JSON.parse(f.read)}
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal_adaptive
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000 Z
+date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70129552049880 !ruby/object:Gem::Requirement
+  requirement: &70119519086160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129552049880
+  version_requirements: *70119519086160
 - !ruby/object:Gem::Dependency
   name: jsonschema
-  requirement: &70129552049300 !ruby/object:Gem::Requirement
+  requirement: &70119519085000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129552049300
+  version_requirements: *70119519085000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70129552048840 !ruby/object:Gem::Requirement
+  requirement: &70119519084120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70129552048840
+  version_requirements: *70119519084120
 description: Lightweight wrapper for Paypal's Adaptive Payments API
 email:
 - tommy.chheng@gmail.com
@@ -53,7 +53,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
@@ -71,6 +70,7 @@ files:
 - test/data/invalid_chain_pay_request.json
 - test/data/invalid_parallel_pay_request.json
 - test/data/invalid_preapproval.json
+- test/data/invalid_preapproval_error_execstatus.json
 - test/data/invalid_simple_pay_request_1.json
 - test/data/valid_chain_pay_request.json
 - test/data/valid_get_payment_options_request.json
@@ -116,6 +116,7 @@ test_files:
 - test/data/invalid_chain_pay_request.json
 - test/data/invalid_parallel_pay_request.json
 - test/data/invalid_preapproval.json
+- test/data/invalid_preapproval_error_execstatus.json
 - test/data/invalid_simple_pay_request_1.json
 - test/data/valid_chain_pay_request.json
 - test/data/valid_get_payment_options_request.json

data/Gemfile.lock

@@ -1,20 +0,0 @@
-PATH
-  remote: .
-  specs:
-    paypal_adaptive (0.3)
-      json (~> 1.6.0)
-      jsonschema (~> 2.0.0)
-      rake (~> 0.8)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    json (1.6.1)
-    jsonschema (2.0.1)
-    rake (0.9.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  paypal_adaptive!