paypal_adaptive 0.1.0 → 0.2.0

data/config/paypal_adaptive.yml

@@ -4,6 +4,7 @@ development:
   password: "signupforuseratsandboxpaypal"
   signature: "signupforuseratsandboxpaypal"
   application_id: "APP-TEST"
+  ssl_cert_file:
 
 test:
   environment: "sandbox"
@@ -11,10 +12,12 @@ test:
   password: "signupforuseratsandboxpaypal"
   signature: "signupforuseratsandboxpaypal"
   application_id: "APP-TEST"
+  ssl_cert_file:
 
 production:
   environment: "production"
   username: "my_production_username"
   password: "my_production_password"
   signature: "my_production_signature"
-  application_id: "my_production_app_id"
+  application_id: "my_production_app_id"
+  ssl_cert_file:

data/lib/config.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module PaypalAdaptive
   class Config
     PAYPAL_BASE_URL_MAPPING = {
@@ -12,27 +14,30 @@ module PaypalAdaptive
       :beta_sandbox => "https://svcs.beta-sandbox.paypal.com"
     } unless defined? API_BASE_URL_MAPPING
 
-    attr_accessor :config_filepath, :paypal_base_url, :api_base_url, :headers
+    attr_accessor :config_filepath, :paypal_base_url, :api_base_url, :headers, :ssl_cert_path, :ssl_cert_file
   
-    def initialize(env=nil)
+    def initialize(env=nil, config_override=nil)
       if env
         #non-rails env
-        @config_filepath = "../config/paypal_adaptive.yml"
-        load(env)
+        @config_filepath = File.join(File.dirname(__FILE__), "..", "config", "paypal_adaptive.yml")
+        load(env, config_override)
       else
-        @config_filepath = File.join(Rails.root, "config/paypal_adaptive.yml")
-        load(Rails.env)
+        @config_filepath = File.join(Rails.root, "config", "paypal_adaptive.yml")
+        load(Rails.env, config_override)
       end
     end
 
-    def load(rails_env)
-      config= YAML.load_file(@config_filepath)[rails_env]
+    def load(rails_env, config_override)
+      config = YAML.load_file(@config_filepath)[rails_env]
+      config.merge!(config_override) unless config_override.nil?
 
       if config["retain_requests_for_test"] == true
         @retain_requests_for_test = true
       else
         pp_env = config['environment'].to_sym
 
+        @ssl_cert_path = nil
+        @ssl_cert_file = nil
         @paypal_base_url = PAYPAL_BASE_URL_MAPPING[pp_env]
         @api_base_url = API_BASE_URL_MAPPING[pp_env]
         @headers = {
@@ -43,6 +48,14 @@ module PaypalAdaptive
           "X-PAYPAL-REQUEST-DATA-FORMAT" => "JSON",
           "X-PAYPAL-RESPONSE-DATA-FORMAT" => "JSON"
         }
+
+        if config['ssl_cert_file'] && config['ssl_cert_file'].length > 0
+          @ssl_cert_file = config['ssl_cert_file']
+        elsif File.exists?("/etc/ssl/certs")
+          @ssl_cert_path = "/etc/ssl/certs"
+        else
+          @ssl_cert_file = "../cacert.pem"
+        end
       end
     end
 
@@ -51,4 +64,4 @@ module PaypalAdaptive
     end
 
   end
-end
+end

data/lib/ipn_notification.rb

@@ -10,13 +10,18 @@ module PaypalAdaptive
       @env = env
       @@config ||= PaypalAdaptive::Config.new(@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
       http = Net::HTTP.new(url.host, 443)
-      http.use_ssl = (url.scheme == 'https')
+      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?
       
       path = "#{@@paypal_base_url}/cgi-bin/webscr"
       resp, response_data = http.post(path, data)

data/lib/paypal_adaptive.rb

@@ -1,4 +1,4 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "config"))
 require File.expand_path(File.join(File.dirname(__FILE__), "request"))
 require File.expand_path(File.join(File.dirname(__FILE__), "response"))
-require File.expand_path(File.join(File.dirname(__FILE__), "ipn_notification"))
+require File.expand_path(File.join(File.dirname(__FILE__), "ipn_notification"))

data/lib/request.rb

@@ -14,6 +14,8 @@ module PaypalAdaptive
       @@config ||= PaypalAdaptive::Config.new(@env)
       @@api_base_url ||= @@config.api_base_url
       @@headers ||= @@config.headers
+      @@ssl_cert_path ||= @@config.ssl_cert_path
+      @@ssl_cert_file ||= @@config.ssl_cert_file
     end
     
     def validate
@@ -74,7 +76,10 @@ module PaypalAdaptive
       api_request_data = JSON.unparse(data) rescue data.to_json
       url = URI.parse @@api_base_url
       http = Net::HTTP.new(url.host, 443)
-      http.use_ssl = (url.scheme == 'https')
+      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?
 
       resp, response_data = http.post(path, api_request_data, @@headers)
 

data/lib/response.rb

@@ -35,4 +35,4 @@ module PaypalAdaptive
       self['preapprovalKey'].nil? ? nil : "#{@@paypal_base_url}/webscr?cmd=_ap-preapproval&preapprovalkey=#{self['preapprovalKey']}"
     end
   end
-end
+end

data/paypal_adaptive.gemspec

@@ -1,68 +1,69 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{paypal_adaptive}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tommy Chheng"]
-  s.date = %q{2010-05-05}
+  s.date = %q{2011-04-25}
   s.description = %q{Lightweight wrapper for Paypal's Adaptive Payments API.}
   s.email = %q{tommy.chheng@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "config/paypal_adaptive.yml",
-     "lib/config.rb",
-     "lib/ipn_notification.rb",
-     "lib/pay_request_schema.json",
-     "lib/paypal_adaptive.rb",
-     "lib/request.rb",
-     "lib/response.rb",
-     "paypal_adaptive.gemspec",
-     "templates/paypal_ipn.rb",
-     "test/data/invalid_chain_pay_request.json",
-     "test/data/invalid_parallel_pay_request.json",
-     "test/data/invalid_preapproval.json",
-     "test/data/invalid_simple_pay_request_1.json",
-     "test/data/valid_chain_pay_request.json",
-     "test/data/valid_parallel_pay_request.json",
-     "test/data/valid_preapproval.json",
-     "test/data/valid_simple_pay_request_1.json",
-     "test/helper.rb",
-     "test/pay_request_schema_test.rb",
-     "test/pay_request_test.rb",
-     "test/payment_details_test.rb",
-     "test/preapproval_test.rb"
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "cacert.pem",
+    "config/paypal_adaptive.yml",
+    "lib/config.rb",
+    "lib/ipn_notification.rb",
+    "lib/pay_request_schema.json",
+    "lib/paypal_adaptive.rb",
+    "lib/request.rb",
+    "lib/response.rb",
+    "paypal_adaptive.gemspec",
+    "templates/paypal_ipn.rb",
+    "test/data/dummy_cacert.pem",
+    "test/data/invalid_chain_pay_request.json",
+    "test/data/invalid_parallel_pay_request.json",
+    "test/data/invalid_preapproval.json",
+    "test/data/invalid_simple_pay_request_1.json",
+    "test/data/valid_chain_pay_request.json",
+    "test/data/valid_parallel_pay_request.json",
+    "test/data/valid_preapproval.json",
+    "test/data/valid_simple_pay_request_1.json",
+    "test/test_helper.rb",
+    "test/unit/config_test.rb",
+    "test/unit/pay_request_schema_test.rb",
+    "test/unit/pay_request_test.rb",
+    "test/unit/payment_details_test.rb",
+    "test/unit/preapproval_test.rb"
   ]
   s.homepage = %q{http://github.com/tc/paypal_adaptive}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{initial import}
   s.test_files = [
-    "test/helper.rb",
-     "test/pay_request_schema_test.rb",
-     "test/pay_request_test.rb",
-     "test/payment_details_test.rb",
-     "test/preapproval_test.rb"
+    "test/test_helper.rb",
+    "test/unit/config_test.rb",
+    "test/unit/pay_request_schema_test.rb",
+    "test/unit/pay_request_test.rb",
+    "test/unit/payment_details_test.rb",
+    "test/unit/preapproval_test.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<jsonschema>, [">= 0"])
     else

data/test/data/dummy_cacert.pem

@@ -0,0 +1 @@
+# Dummy file for testing.

data/test/data/valid_preapproval.json

@@ -5,7 +5,7 @@
 "cancelUrl":"http://127.0.0.1:3000/payments/canceled_payment_request",
  "maxTotalAmountOfAllPayments": "1500.00",
   "maxNumberOfPayments":"30",
- "startingDate":"2010-07-13T07:00:00.000Z",
- "endingDate":"2010-12-13T07:00:00.000Z" 
+ "startingDate":"2020-07-13T07:00:00.000Z",
+ "endingDate":"2020-12-13T07:00:00.000Z" 
 }
 

data/test/{helper.rb → test_helper.rb}

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'JSON'
 require 'test/unit'
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'paypal_adaptive'

data/test/unit/config_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class ConfigTest < Test::Unit::TestCase
+  def test_ssl_cert_logic
+    @config = PaypalAdaptive::Config.new("test", { "ssl_cert_file" => "" })
+
+    assert_equal File.join("..","cacert.pem"), @config.ssl_cert_file
+  end
+
+  def test_ssl_cert_file
+    @config = PaypalAdaptive::Config.new("test", { "ssl_cert_file" => "data/dummy_cacert.pem" })
+    assert_equal File.join("data", "dummy_cacert.pem"), @config.ssl_cert_file
+    assert_equal nil, @config.ssl_cert_path
+  end
+end

data/test/{pay_request_schema_test.rb → unit/pay_request_schema_test.rb}

@@ -1,15 +1,15 @@
-require 'helper'
+require 'test_helper'
 require 'json'
 require 'jsonschema'
 
 class PayRequestSchemaTest < Test::Unit::TestCase
   def setup
-    @schema_filepath = "../lib/pay_request_schema.json"
+    @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_valid_simple_pay
-    data_filepath =  "data/valid_simple_pay_request_1.json"
+ def test_valid_simple_pay
+    data_filepath = File.join(File.dirname(__FILE__),"..", "data","valid_simple_pay_request_1.json")
     data   = read_json_file(data_filepath)
     
     #receiverList not validating correctly, is it due to the schema or jsonschema parsing?
@@ -19,7 +19,7 @@ class PayRequestSchemaTest < Test::Unit::TestCase
   end
   
   def test_invalid_simple_pay
-    data_filepath =  "data/invalid_simple_pay_request_1.json"
+    data_filepath = File.join(File.dirname(__FILE__),"..", "data","invalid_simple_pay_request_1.json")
     data   = read_json_file(data_filepath)
     
     assert_raise JSON::Schema::ValueError do 
@@ -46,4 +46,4 @@ class PayRequestSchemaTest < Test::Unit::TestCase
   def read_json_file(filepath)
     File.open(filepath,   "rb"){|f| JSON.parse(f.read)}
   end
-end
+end

data/test/{pay_request_test.rb → unit/pay_request_test.rb}

@@ -1,5 +1,4 @@
-require 'helper'
-require '../lib/request'
+require 'test_helper'
 
 class PayRequestTest < Test::Unit::TestCase
   def setup
@@ -10,7 +9,7 @@ class PayRequestTest < Test::Unit::TestCase
     puts "-------"
     puts "simple"
 
-    data_filepath =  "../test/data/valid_simple_pay_request_1.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","valid_simple_pay_request_1.json")
 
     data = read_json_file(data_filepath)
     pp_response = @pay_request.pay(data)
@@ -20,7 +19,7 @@ class PayRequestTest < Test::Unit::TestCase
   end
   
   def test_invalid_simple_pay
-    data_filepath =  "../test/data/invalid_simple_pay_request_1.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","invalid_simple_pay_request_1.json")
 
     data = read_json_file(data_filepath)
     pp_response = @pay_request.pay(data)
@@ -31,7 +30,7 @@ class PayRequestTest < Test::Unit::TestCase
   def test_valid_chain_pay
     puts "-------"
     puts "chain"
-    data_filepath =  "../test/data/valid_chain_pay_request.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","valid_chain_pay_request.json")
 
     data = read_json_file(data_filepath)
     pp_response = @pay_request.pay(data)
@@ -45,7 +44,7 @@ class PayRequestTest < Test::Unit::TestCase
   end
 
   def test_invalid_chain_pay
-    data_filepath =  "../test/data/invalid_chain_pay_request.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","invalid_chain_pay_request.json")
 
     data = read_json_file(data_filepath)
     pp_response = @pay_request.pay(data)
@@ -57,7 +56,7 @@ class PayRequestTest < Test::Unit::TestCase
     puts "-------"
     puts "parallel"
 
-    data_filepath =  "../test/data/valid_chain_pay_request.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","valid_parallel_pay_request.json")
 
     data = read_json_file(data_filepath)
     pp_response = @pay_request.pay(data)
@@ -66,7 +65,7 @@ class PayRequestTest < Test::Unit::TestCase
   end
 
   def test_invalid_parallel_pay
-    data_filepath =  "../test/data/invalid_parallel_pay_request.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","invalid_parallel_pay_request.json")
 
     data = read_json_file(data_filepath)
     pp_response = @pay_request.pay(data)
@@ -74,6 +73,9 @@ class PayRequestTest < Test::Unit::TestCase
     assert pp_response.success? == false
   end
   
+  def test_set_payment_options
+    #TODO
+  end
   
   def test_preapproval
     #TODO
@@ -99,4 +101,4 @@ class PayRequestTest < Test::Unit::TestCase
     File.open(filepath,   "rb"){|f| JSON.parse(f.read)}
   end
   
-end
+end

data/test/{payment_details_test.rb → unit/payment_details_test.rb}

@@ -1,5 +1,4 @@
-require 'helper'
-require '../lib/request'
+require 'test_helper'
 
 class PaymentDetailsTest < Test::Unit::TestCase
   def setup
@@ -10,7 +9,7 @@ class PaymentDetailsTest < Test::Unit::TestCase
   def test_payment_details
     puts "-------"
     puts "payment details"
-    data_filepath =  "../test/data/valid_chain_pay_request.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","valid_chain_pay_request.json")
 
     data = read_json_file(data_filepath)
     pp_response = @pay_request.pay(data)
@@ -32,4 +31,4 @@ class PaymentDetailsTest < Test::Unit::TestCase
     File.open(filepath,   "rb"){|f| JSON.parse(f.read)}
   end
 
-end
+end

data/test/{preapproval_test.rb → unit/preapproval_test.rb}

@@ -1,5 +1,4 @@
-require 'helper'
-require '../lib/request'
+require 'test_helper'
 
 class PreapprovalTest < Test::Unit::TestCase
   def setup
@@ -9,9 +8,10 @@ class PreapprovalTest < Test::Unit::TestCase
   def test_preapproval
     puts "-------"
     puts "valid test"
-    data_filepath =  "../test/data/valid_preapproval.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","valid_preapproval.json")
 
     data = read_json_file(data_filepath)
+    p data
 
     pp_response = @preapproval_request.preapproval(data)
     puts "preapproval code is #{pp_response['preapprovalKey']}"
@@ -25,7 +25,7 @@ class PreapprovalTest < Test::Unit::TestCase
   def test_invalid_preapproval
     puts "-------"
     puts "invalid"
-    data_filepath =  "../test/data/invalid_preapproval.json"
+    data_filepath =  File.join(File.dirname(__FILE__),"..", "data","invalid_preapproval.json")
 
     data = read_json_file(data_filepath)
     pp_response = @preapproval_request.preapproval(data)
@@ -37,7 +37,7 @@ class PreapprovalTest < Test::Unit::TestCase
   end
 
   def read_json_file(filepath)
-    File.open(filepath,   "rb"){|f| JSON.parse(f.read)}
+    File.open(filepath, "rb"){|f| JSON.parse(f.read)}
   end
 
-end
+end