paypal_adaptive 0.3.3 → 0.3.4

data/.gitignore

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

data/README.markdown

@@ -96,6 +96,9 @@ for each environment, e.g.:
 The api_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.3.4 
+Locale specific paypal urls and improved testing. changed approve_paypal_payment_url method signature with deprecation warning. thanks mreinsch.
+
 0.3.3
 Handle JSON parsing error. Added validation for config.
 

data/lib/paypal_adaptive/response.rb

@@ -1,6 +1,6 @@
 module PaypalAdaptive
   class Response < Hash    
-    def initialize(response, env=nil)
+    def initialize(response={}, env=nil)
       config = PaypalAdaptive.config(env)
       @paypal_base_url = config.paypal_base_url
       
@@ -26,14 +26,25 @@ module PaypalAdaptive
       message = errors.first['message'] rescue nil
     end
 
-    def approve_paypal_payment_url(type=nil)
-      if self['payKey'].nil?
-        return nil
-      elsif ['mini', 'light'].include?(type.to_s)
-        return "#{@paypal_base_url}/webapps/adaptivepayment/flow/pay?expType=#{type.to_s}&paykey=#{self['payKey']}"
+    # URL to redirect to in order for the user to approve the payment
+    #
+    # options:
+    # * country: default country code for the user
+    # * type: mini / light
+    def approve_paypal_payment_url(opts = {})
+      if opts.is_a?(Symbol) || opts.is_a?(String)
+        warn "[DEPRECATION] use approve_paypal_payment_url(:type => #{opts})"
+        opts = {:type => opts}
+      end
+      return nil if self['payKey'].nil?
+
+      if ['mini', 'light'].include?(opts[:type].to_s)
+        "#{@paypal_base_url}/webapps/adaptivepayment/flow/pay?expType=#{opts[:type]}&paykey=#{self['payKey']}"
+      else
+        base = @paypal_base_url
+        base = base + "/#{opts[:country]}" if opts[:country]
+        "#{base}/webscr?cmd=_ap-payment&paykey=#{self['payKey']}"
       end
-      
-      "#{@paypal_base_url}/webscr?cmd=_ap-payment&paykey=#{self['payKey']}"
     end
 
     def preapproval_paypal_payment_url

data/lib/paypal_adaptive/version.rb

@@ -1,4 +1,4 @@
 module PaypalAdaptive
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end
 

data/paypal_adaptive.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency("json", "~>1.0")
   s.add_dependency("jsonschema", "~>2.0.0")
-  s.add_dependency("rake")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("activesupport", "~> 3.2.0")
 
   s.rubyforge_project = "paypal_adaptive"
 

data/test/data/valid_parallel_pay_request.json

@@ -9,6 +9,6 @@
             ]},
 "cancelUrl":"http://127.0.0.1:3000/payments/canceled_payment_request", 
  "actionType":"PAY",
- "senderEmail": "a@a.com"
+ "senderEmail": "a@test.com"
 }
 

data/test/unit/pay_request_test.rb

@@ -4,73 +4,35 @@ class PayRequestTest < Test::Unit::TestCase
   def setup
     @pay_request = PaypalAdaptive::Request.new("test")
   end
-  
-  def test_valid_simple_pay
-    puts "-------"
-    puts "simple"
-
-    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)
-
-    puts "redirect url to\n #{pp_response.approve_paypal_payment_url}"
-    assert_equal true, pp_response.success?
+  def test_valid_simple_pay
+    data = read_json_file("valid_simple_pay_request_1.json")
+    assert_success_response @pay_request.pay(data)
   end
   
   def test_invalid_simple_pay
-    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)
-    puts pp_response.errors
-    assert_equal false, pp_response.success?
+    data = read_json_file("invalid_simple_pay_request_1.json")
+    assert_error_response "580022", @pay_request.pay(data)
   end
   
   def test_valid_chain_pay
-    puts "-------"
-    puts "chain"
-    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)
-    puts "redirect url to\n #{pp_response.approve_paypal_payment_url}"
-
-    unless pp_response.success?
-      puts pp_response.errors
-    end
-    
-    assert_equal true, pp_response.success?
+    data = read_json_file("valid_chain_pay_request.json")
+    assert_success_response @pay_request.pay(data)
   end
 
   def test_invalid_chain_pay
-    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)
-    puts pp_response.errors
-    assert_equal false, pp_response.success?
+    data = read_json_file("invalid_chain_pay_request.json")
+    assert_error_response "579017", @pay_request.pay(data)
   end
 
   def test_valid_parallel_pay
-    puts "-------"
-    puts "parallel"
-
-    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)
-    puts "redirect url to\n #{pp_response.approve_paypal_payment_url}"
-    assert_equal true, pp_response.success?
+    data = read_json_file("valid_parallel_pay_request.json")
+    assert_success_response @pay_request.pay(data)
   end
 
   def test_invalid_parallel_pay
-    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)
-    puts pp_response.errors
-    assert_equal false, pp_response.success?
+    data = read_json_file("invalid_parallel_pay_request.json")
+    assert_error_response "579040", @pay_request.pay(data)
   end
   
   def test_preapproval
@@ -93,8 +55,26 @@ class PayRequestTest < Test::Unit::TestCase
     #TODO
   end
 
-  def read_json_file(filepath)
-    File.open(filepath,   "rb"){|f| JSON.parse(f.read)}
+  def read_json_file(filename)
+    JSON.parse(File.read(File.join(File.dirname(__FILE__),"..","data",filename)))
   end
+
+  APPROVE_URL_PATTERN = %r{^https://www.sandbox.paypal.com/webscr\?cmd=_ap-payment&paykey=AP-}
+  APPROVE_URL_PATTERN_JP = %r{^https://www.sandbox.paypal.com/jp/webscr\?cmd=_ap-payment&paykey=AP-}
+  MINI_APPROVE_URL_PATTERN = %r{^https://www.sandbox.paypal.com/webapps/adaptivepayment/flow/pay\?expType=mini&paykey=AP-}
   
+  def assert_success_response(pp_response)
+    assert_equal true, pp_response.success?, "expected success: #{pp_response.inspect}"
+    assert_match APPROVE_URL_PATTERN, pp_response.approve_paypal_payment_url
+    assert_match APPROVE_URL_PATTERN_JP, pp_response.approve_paypal_payment_url(:country => :jp)
+    assert_match MINI_APPROVE_URL_PATTERN, pp_response.approve_paypal_payment_url('mini')
+    assert_match MINI_APPROVE_URL_PATTERN, pp_response.approve_paypal_payment_url(:type => 'mini')
+  end
+
+  def assert_error_response(error_code, pp_response)
+    assert_equal false, pp_response.success?
+    pp_errors = pp_response.errors.first
+    assert_equal "Error", pp_errors["severity"]
+    assert_equal error_code, pp_errors["errorId"]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal_adaptive
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -51,7 +51,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: Lightweight wrapper for Paypal's Adaptive Payments API
 email:
 - tommy.chheng@gmail.com