paypal_adaptive 0.2.7 → 0.2.8

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.8
+Cert fixes and ruby 1.9.3 files. Thanks tonyla.
+
 0.2.7
 Refactored config file handling for better non-Rails support, thanks mreinsch and dave-thompson.
 

data/lib/paypal_adaptive/config.rb

@@ -16,7 +16,7 @@ module PaypalAdaptive
     } unless defined? API_BASE_URL_MAPPING
 
     attr_accessor :paypal_base_url, :api_base_url, :headers, :ssl_cert_path, :ssl_cert_file
-  
+
     def initialize(env=nil, config_override={})
       config = YAML.load(ERB.new(File.new(config_filepath).read).result)[env]
       raise "Could not load settings from config file" unless config
@@ -31,17 +31,17 @@ module PaypalAdaptive
         @ssl_cert_file = nil
         @paypal_base_url = PAYPAL_BASE_URL_MAPPING[pp_env]
         @api_base_url = API_BASE_URL_MAPPING[pp_env]
-        
+
         # http.rb requires headers to be strings. Protect against ints in paypal_adaptive.yml
         config.update(config){ |key,v| v.to_s }
         @headers = {
           "X-PAYPAL-SECURITY-USERID" => config['username'],
           "X-PAYPAL-SECURITY-PASSWORD" => config['password'],
-          "X-PAYPAL-SECURITY-SIGNATURE" => config['signature'],
           "X-PAYPAL-APPLICATION-ID" => config['application_id'],
           "X-PAYPAL-REQUEST-DATA-FORMAT" => "JSON",
           "X-PAYPAL-RESPONSE-DATA-FORMAT" => "JSON"
         }
+        @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']

data/lib/paypal_adaptive/ipn_notification.rb

@@ -4,14 +4,14 @@ require 'json'
 
 module PaypalAdaptive
   class IpnNotification
-    
+
     def initialize(env=nil)
       config = PaypalAdaptive.config(env)
       @paypal_base_url = config.paypal_base_url
       @ssl_cert_path = config.ssl_cert_path
       @ssl_cert_file = config.ssl_cert_file
     end
-    
+
     def send_back(data)
       data = "cmd=_notify-validate&#{data}"
       url = URI.parse @paypal_base_url
@@ -19,17 +19,22 @@ module PaypalAdaptive
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       http.ca_path = @ssl_cert_path unless @ssl_cert_path.nil?
-      http.ca_file = @ssl_cert_file unless @ssl_cert_file.nil?
-      
+
+      if @ssl_cert_file
+        cert = File.read(@ssl_cert_file)
+        http.cert = OpenSSL::X509::Certificate.new(cert)
+        http.key = OpenSSL::PKey::RSA.new(cert)
+      end
+
       path = "#{@paypal_base_url}/cgi-bin/webscr"
       response_data = http.post(path, data).body
-      
+
       @verified = response_data == "VERIFIED"
     end
-    
+
     def verified?
       @verified
     end
-    
+
   end
 end

data/lib/paypal_adaptive/request.rb

@@ -82,8 +82,13 @@ module PaypalAdaptive
       http = Net::HTTP.new(url.host, 443)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      if @ssl_cert_file
+        cert = File.read(@ssl_cert_file)
+        http.cert = OpenSSL::X509::Certificate.new(cert)
+        http.key = OpenSSL::PKey::RSA.new(cert)
+      end
       http.ca_path = @ssl_cert_path unless @ssl_cert_path.nil?
-      http.ca_file = @ssl_cert_file unless @ssl_cert_file.nil?
 
       response_data = http.post(path, api_request_data, @headers).body
 

data/lib/paypal_adaptive/version.rb

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

metadata

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