paypal_adaptive 0.2.8 → 0.2.9

data/README.markdown

@@ -77,7 +77,7 @@ Additionally, you can make calls to Paypal Adaptive's other APIs:
 Input is just a Hash just like the pay method. Refer to the Paypal manual for more details.
 
 ### Certificate validation
-You can set the location of the .pem file you wish to use for SSL certificate validation in paypal_adaptive.yml
+You can set the location of the key file you downloaded from PayPal, in paypal_adaptive.yml
 for each environment, e.g.:
 
     development:
@@ -86,12 +86,14 @@ for each environment, e.g.:
       password: "sandbox_password"
       signature: "sandbox_signature"
       application_id: "sandbox_app_id"
-      ssl_cert_file: "/path/to/your/cacert.pem"
+      ssl_cert_file: "/path/to/your/private.key"
 
-If you don't set ssl_cert_file then paypal_adaptive will check for certificates in /etc/ssl/certs if
-this location exists, otherwise falling back to the cacert.pem file included with paypal_adaptive.
+The ssl_cert_file should point to your cert_key_pem.txt that is downloaded through the paypal developer interface. It will contain a section that specifies the RSA private key and another section that specifies a certificate. If this is left empty, paypal_adaptive will attempt to use the signature method of validation with PayPal, so your signature config must not be nil.
 
 ## Changelog
+0.2.9
+Fixed cert issues in last release. Exception handling for connection. 
+
 0.2.8
 Cert fixes and ruby 1.9.3 files. Thanks tonyla.
 

data/lib/paypal_adaptive/config.rb

@@ -43,12 +43,7 @@ module PaypalAdaptive
         }
         @headers.merge!({"X-PAYPAL-SECURITY-SIGNATURE" => config['signature']}) if config['signature']
 
-        if config['ssl_cert_file'] && config['ssl_cert_file'].length > 0
-          @ssl_cert_file = config['ssl_cert_file']
-        else
-          @ssl_cert_file = File.join(File.dirname(__FILE__), "..", "..", "cacert.pem")
-        end
-        puts "warning: coulf not find file: #{@ssl_cert_file}" unless File.exists?(@ssl_cert_file.to_s)
+        @ssl_cert_file = config['ssl_cert_file'] unless config['ssl_cert_file'].blank?
       end
     end
 

data/lib/paypal_adaptive/request.rb

@@ -75,6 +75,10 @@ module PaypalAdaptive
       PaypalAdaptive::Response.new(post(data, path), @env)
     end
 
+    def rescue_error_message(e, message = nil)
+      {"responseEvelope" => {"ack" => "Failure"}, "error" => [{"message" => (message ||= e)}]}
+    end
+
     def post(data, path)
       #hack fix: JSON.unparse doesn't work in Rails 2.3.5; only {}.to_json does..
       api_request_data = JSON.unparse(data) rescue data.to_json
@@ -90,9 +94,20 @@ module PaypalAdaptive
       end
       http.ca_path = @ssl_cert_path unless @ssl_cert_path.nil?
 
-      response_data = http.post(path, api_request_data, @headers).body
+      begin
+        response_data = http.post(path, api_request_data, @headers)
+        return JSON.parse(response_data.body)
+      rescue Net::HTTPBadGateway => e
+        rescue_error_message(e, "Error reading from remote server.")
+      rescue Exception => e
+        case e
+        when Errno::ECONNRESET
+          rescue_error_message(e, "Connection Reset. Request invalid URL.")
+        else
+          rescue_error_message(e)
+        end
+      end
 
-      JSON.parse(response_data)
     end
   end
 

data/lib/paypal_adaptive/version.rb

@@ -1,4 +1,4 @@
 module PaypalAdaptive
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end
 

data/test/test_helper.rb

@@ -6,3 +6,4 @@ require "test/unit"
 require "json"
 require "jsonschema"
 require 'paypal_adaptive'
+require 'active_support/core_ext/string'

data/test/unit/config_test.rb

@@ -7,12 +7,6 @@ class ConfigTest < Test::Unit::TestCase
     assert_equal nil, @config.ssl_cert_path
   end
 
-  def test_default_ssl_cert_file
-    @config = PaypalAdaptive::Config.new("test", { "ssl_cert_file" => "" })
-    assert File.exists?(@config.ssl_cert_file)
-    assert_equal nil, @config.ssl_cert_path
-  end
-
   def test_erb_tags
     ENV['paypal.username'] = 'account@email.com'
     ENV['paypal.password'] = 's3krit'

data/test/unit/request_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class RequestTest < Test::Unit::TestCase
+  def setup
+    @schema_filepath =  File.join(File.dirname(__FILE__),"..", "..", "lib","pay_request_schema.json")
+    @schema = File.open(@schema_filepath, "rb"){|f| JSON.parse(f.read)}
+  end
+
+  def test_post_should_return_hash
+    request = PaypalAdaptive::Request.new('test')
+    response = request.post({:data => true}, '/AdaptivePayments/Pay')
+    assert_instance_of Hash, response
+  end
+
+  def test_post_should_return_hash_when_request_is_invalid
+    request = PaypalAdaptive::Request.new('test')
+    response = request.post({:data => true}, '/some-random-url')
+    assert_instance_of Hash, response
+  end
+
+  def test_post_shoudl_return_error_message_when_request_is_invalid
+    request = PaypalAdaptive::Request.new('test')
+    response = request.post({:data => true}, '/some-random-url')
+    assert_not_nil response["error"][0]["message"]
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal_adaptive
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 -08:00
-default_executable: 
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157775420 !ruby/object:Gem::Requirement
+  requirement: &70231058458960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157775420
+  version_requirements: *70231058458960
 - !ruby/object:Gem::Dependency
   name: jsonschema
-  requirement: &2157774920 !ruby/object:Gem::Requirement
+  requirement: &70231058458120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157774920
+  version_requirements: *70231058458120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157774440 !ruby/object:Gem::Requirement
+  requirement: &70231058457000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +43,7 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2157774440
+  version_requirements: *70231058457000
 description: Lightweight wrapper for Paypal's Adaptive Payments API
 email:
 - tommy.chheng@gmail.com
@@ -90,7 +89,7 @@ files:
 - test/unit/payment_details_test.rb
 - test/unit/payment_options_test.rb
 - test/unit/preapproval_test.rb
-has_rdoc: true
+- test/unit/request_test.rb
 homepage: http://github.com/tc/paypal_adaptive
 licenses: []
 post_install_message: 
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: paypal_adaptive
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Lightweight wrapper for Paypal's Adaptive Payments API
@@ -138,3 +137,4 @@ test_files:
 - test/unit/payment_details_test.rb
 - test/unit/payment_options_test.rb
 - test/unit/preapproval_test.rb
+- test/unit/request_test.rb