alipay 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50fd317ffe0f09e6373ee108b7c639a86b26124b
-  data.tar.gz: 59797caf889f4329bef61678c54f554725882f79
+  metadata.gz: 56fa9ffb9a707c4c25b499f1391790d4f6cc5474
+  data.tar.gz: 884b4d906a4081cba248165663911dd5280a35d1
 SHA512:
-  metadata.gz: e268d0cab27568b13cecb7c3e9b4ad0e8598fbc06cd58b4dc2269baae4b6dd9961363a8c6ccee9ecfac204688df62d327ec409e751cc499820bddc2251f7deff
-  data.tar.gz: 2b7cadd3ef6b1eb7192f8c0d541538a660a14433e296c6525da160ce9dec294f5bdcaad8a86b399e407b909337bd2e549315b404fa0e231bea3240c5cf61a270
+  metadata.gz: 85c28557052f7817d5b9723d8030b77b11c6f9c7ea91d6d242b4938e0afece3669174fe3cc46e709d40c46c647f35d126df8da78c641a3b9ef2faa61b822328f
+  data.tar.gz: 75865ab5a939cad580640768e240f4fae552fd26bdde50ae0a208253f64b9d61435c1e67be33409c0175375a4d11b136f288f51f4af3ae9d35d53cef21827ea1

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 ## master
 
+## v0.13.0 (2016-12-28)
+
+- Add `Alipay::App::Service.create_forex_trade_wap_url` method, thanks @xiaohesong #61
+
 ## v0.13.0 (2016-12-24)
 
-1 Add `Alipay::App::Service.alipay_trade_app_pay` method, thanks @FX-HAO #64
+- Add `Alipay::App::Service.alipay_trade_app_pay` method, thanks @FX-HAO #64
 
 ## v0.12.0 (2016-03-07)
 

data/README.md

@@ -9,7 +9,7 @@ Alipay official document: https://b.alipay.com/order/techService.htm .
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'alipay', '~> 0.13.0'
+gem 'alipay', '~> 0.14.0'
 ```
 
 And then execute:
@@ -202,6 +202,52 @@ Alipay::Service.create_direct_pay_by_user_wap_url(
 
 This is not a complete list of arguments, please read official document: http://download.alipay.com/public/api/base/alipaywapdirect.zip .
 
+
+
+
+### 国际支付宝移动接口
+
+#### Name
+
+```ruby
+create_forex_trade_wap
+```
+
+#### Definition
+
+```ruby
+Alipay::Service.create_forex_trade_wap_url({ARGUMENTS}, {OPTIONS})
+```
+
+#### Example
+
+```ruby
+Alipay::Service.create_forex_trade_wap_url(
+  out_trade_no: '20150401000-0001',
+  subject: 'Order Name',
+  merchant_url: 'http://example.com/itemback',
+  total_fee: '10.00', #or rmb_fee, only one
+  currency: 'USD',
+  return_url: 'https://example.com/orders/20150401000-0001',
+  notify_url: 'https://example.com/orders/20150401000-0001/notify'
+)
+```
+
+#### Arguments
+
+| Key | Requirement | Description |
+| --- | ----------- | ----------- |
+| out_order_no | required | Order id in your application. |
+| subject | required | Order subject. |
+| merchant_url | required | The link which customer could jump back to merchant page from Alipay cashier. |
+| total_fee or rmb_fee | required | Order's total fee. |
+| currency | required | currency type. |
+| return_url | optional | Redirect customer to this url after payment. |
+| notify_url | optional | Alipay asyn notify url. |
+
+This is not a complete list of arguments, please read official document: https://global.alipay.com/product/mobilepayments.html .
+
+
 ### 即时到账批量退款有密接口
 
 #### Name
@@ -488,7 +534,7 @@ Alipay::Notify.verify?({PARAMS}, {OPTIONS})
 # params except :controller_name, :action_name, :host, etc.
 notify_params = params.except(*request.path_parameters.keys)
 
-Alipay::Notify.verify?(notify_params)
+Alipay::Notify.verify?(notify_params, options = {})
 ```
 
 ## Mobile::Service

data/alipay.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "fakeweb"
+  spec.add_development_dependency "webmock"
 end

data/lib/alipay/service.rb

@@ -194,6 +194,21 @@ module Alipay
       request_uri(params, options).to_s
     end
 
+    CREATE_FOREX_TRADE_WAP_REQUIRED_PARAMS = %w( out_trade_no subject merchant_url currency )
+    def self.create_forex_trade_wap_url(params, options = {})
+      params = Utils.stringify_keys(params)
+      check_required_params(params, CREATE_FOREX_TRADE_WAP_REQUIRED_PARAMS)
+
+      params = {
+        'service'        => 'create_forex_trade_wap',
+        '_input_charset' => 'utf-8',
+        'partner'        => options[:pid] || Alipay.pid,
+        'seller_id'      => options[:pid] || Alipay.pid
+      }.merge(params)
+
+      request_uri(params, options).to_s
+    end
+
     def self.request_uri(params, options = {})
       uri = URI(GATEWAY_URL)
       uri.query = URI.encode_www_form(sign_params(params, options))

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/test/alipay/notify_test.rb

@@ -13,17 +13,23 @@ class Alipay::NotifyTest < Minitest::Test
   end
 
   def test_unsign_notify
-    FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234", body: "true")
+    stub_request(
+      :get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234"
+    ).to_return(body: "true")
     assert !Alipay::Notify.verify?(@unsign_params)
   end
 
   def test_verify_notify_when_true
-    FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234", body: "true")
+    stub_request(
+      :get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234"
+    ).to_return(body: "true")
     assert Alipay::Notify.verify?(@sign_params)
   end
 
   def test_verify_notify_when_false
-    FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234", body: "false")
+    stub_request(
+      :get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234"
+    ).to_return(body: "false")
     assert !Alipay::Notify.verify?(@sign_params)
   end
 end

data/test/alipay/service_test.rb

@@ -92,11 +92,10 @@ class Alipay::ServiceTest < Minitest::Test
         <is_success>T</is_success>
       </alipay>
     EOF
-    FakeWeb.register_uri(
+    stub_request(
       :get,
-      %r|https://mapi\.alipay\.com/gateway\.do.*|,
-      body: response_body
-    )
+      %r|https://mapi\.alipay\.com/gateway\.do.*|
+    ).to_return(body: response_body)
 
     assert_equal response_body, Alipay::Service.close_trade(
       out_order_no: '1'
@@ -144,11 +143,10 @@ class Alipay::ServiceTest < Minitest::Test
             <sign_type>MD5</sign_type>
           </alipay>
     EOF
-    FakeWeb.register_uri(
+    stub_request(
       :get,
-      %r|https://mapi\.alipay\.com/gateway\.do.*|,
-      body: response_body
-    )
+      %r|https://mapi\.alipay\.com/gateway\.do.*|
+    ).to_return(body: response_body)
 
     assert_equal response_body, Alipay::Service.single_trade_query(
       out_trade_no: '1'
@@ -162,11 +160,10 @@ class Alipay::ServiceTest < Minitest::Test
         <is_success>T</is_success>
       </alipay>
     EOF
-    FakeWeb.register_uri(
+    stub_request(
       :get,
-      %r|https://mapi\.alipay\.com/gateway\.do.*|,
-      body: body
-    )
+      %r|https://mapi\.alipay\.com/gateway\.do.*|
+    ).to_return(body: body)
 
     assert_equal body, Alipay::Service.send_goods_confirm_by_platform(
       trade_no: 'trade_no',
@@ -228,8 +225,9 @@ class Alipay::ServiceTest < Minitest::Test
         <sign_type>MD5</sign_type>
       </alipay>
     EOF
-    FakeWeb.register_uri(:get, %r|https://mapi\.alipay\.com/gateway\.do.*|, :body => body)
-
+    stub_request(
+      :get, %r|https://mapi\.alipay\.com/gateway\.do.*|
+    ).to_return(:body => body)
     assert_equal body, Alipay::Service.account_page_query(
       page_no: 1,
       gmt_start_time: (Time.now - 1).strftime('%Y-%m-%d %H:%M:%S'),
@@ -237,6 +235,19 @@ class Alipay::ServiceTest < Minitest::Test
     )
   end
 
+  def test_create_forex_trade_wap_url
+    options = {
+      out_trade_no: '20150401000-0001',
+      subject: 'Order Name',
+      merchant_url: 'http://example.com/itemback',
+      total_fee: '10.00', #or rmb_fee, only one
+      currency: 'USD',
+      return_url: 'https://example.com/orders/20150401000-0001',
+      notify_url: 'https://example.com/orders/20150401000-0001/notify'
+    }
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=create_forex_trade_wap&_input_charset=utf-8&partner=1000000000000000&seller_id=1000000000000000&out_trade_no=20150401000-0001&subject=Order+Name&merchant_url=http%3A%2F%2Fexample.com%2Fitemback&total_fee=10.00&currency=USD&return_url=https%3A%2F%2Fexample.com%2Forders%2F20150401000-0001&notify_url=https%3A%2F%2Fexample.com%2Forders%2F20150401000-0001%2Fnotify&sign_type=MD5&sign=f15d9e3d885c12f1a994048342c07bef', Alipay::Service.create_forex_trade_wap_url(options)
+  end
+
   def test_batch_trans_notify_url
     options = {
       notify_url: 'https://example.com/orders/20150401000-0001/notify',

data/test/alipay/wap/notify_test.rb

@@ -16,17 +16,23 @@ class Alipay::Wap::NotifyTest < Minitest::Test
   end
 
   def test_unsign_notify
-    FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}", body: "true")
+    stub_request(
+      :get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}"
+    ).to_return(body: "true")
     assert !Alipay::Wap::Notify.verify?(@notify_params)
   end
 
   def test_verify_notify_when_true
-    FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}", body: "true")
+    stub_request(
+      :get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}"
+    ).to_return(body: "true")
     assert Alipay::Wap::Notify.verify?(@sign_params)
   end
 
   def test_verify_notify_when_false
-    FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}", body: "false")
+    stub_request(
+      :get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}"
+    ).to_return(body: "false")
     assert !Alipay::Wap::Notify.verify?(@sign_params)
   end
 end

data/test/alipay/wap/service_test.rb

@@ -17,11 +17,10 @@ class Alipay::Wap::ServiceTest < Minitest::Test
       &sign=SIGN
     EOS
 
-    FakeWeb.register_uri(
+    stub_request(
       :get,
-      %r|https://wappaygw\.alipay\.com/service/rest\.htm.*|,
-      body: body
-    )
+      %r|https://wappaygw\.alipay\.com/service/rest\.htm.*|
+    ).to_return(body: body)
 
     assert_equal token, Alipay::Wap::Service.trade_create_direct_token(
       req_data: {
@@ -39,10 +38,11 @@ class Alipay::Wap::ServiceTest < Minitest::Test
   end
 
   def test_security_risk_detect
-    FakeWeb.register_uri(
+    stub_request(
       :post,
-      %r|https://wappaygw\.alipay\.com/service/rest\.htm.*|,
-      body: ''
+      %r|https://wappaygw\.alipay\.com/service/rest\.htm.*|
+    ).to_return(
+      body: ' '
     )
 
     params = {
@@ -62,6 +62,6 @@ class Alipay::Wap::ServiceTest < Minitest::Test
       key: TEST_RSA_PRIVATE_KEY
     }
 
-    assert_equal '', Alipay::Wap::Service.security_risk_detect(params, options).body
+    assert_equal ' ', Alipay::Wap::Service.security_risk_detect(params, options).body
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'minitest/autorun'
 require 'alipay'
-require 'fakeweb'
+require 'webmock/minitest'
 
 Alipay.pid = '1000000000000000'
 Alipay.key = '10000000000000000000000000000000'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="