alipay 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ab4182025a5c424e036fc878d9a2ff04f200ee0
-  data.tar.gz: 617a08da13708da51031f937dd28afebcf22b45b
+  metadata.gz: d3edec82f680c00773ce90092f2fa9b0d53ad176
+  data.tar.gz: 5657552ff665d594f71babfe43ac4f5da535e580
 SHA512:
-  metadata.gz: ed830a42c1b9126097d744f5eb7502265f235bf9420f2c93149c2325d7d6325b48e6265e5c18f7aea855700e094bd13e21a8a850aa4133b19b128ec24efe66d8
-  data.tar.gz: d643dbe25d39935f954002ce4ebf476545bb41b25a06e1fda0b764058139d97e3b5233ded2d7f5d69ff3f1542474bc2fb51bf235d7f41b10e2e1163bbe0eaad4
+  metadata.gz: 3a3bfcb3f8dab931dd2ffef9d2304fd5155b5665dd73f0ae32d72ee823d049c9146142c8f2a331af4eb8c075a89fb9e6ddee51a0641ee00bc9108680aa38ef77
+  data.tar.gz: 12de1a73d39b7e660a143c9f72e1e8f06e95b92c136b6ebd5200fed63282d5007a9caf8e4070c0f904954f3aab56cbafce0aab35c89b9e40a19748c0c27604d9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.8.0 (2015-07-20)
+
+- Add `Alipay::Mobile::Service.mobile_security_pay_string` method, thanks @Sen #49
+- Remove `Alipay::Service.mobile_security_pay_url` #49
+
 ## v0.7.1 (2015-04-10)
 
 - Don't warning when `rmb_fee` is used in forex_refund_url method.

data/README.md

@@ -110,7 +110,8 @@ Alipay::Service.send_goods_confirm_by_platform({ARGUMENTS}, {OPTIONS})
 ```ruby
 Alipay::Service.send_goods_confirm_by_platform(
   trade_no: '201504010000001',
-  logistics_name: 'example.com'
+  logistics_name: 'example.com',
+  transport_type: 'DIRECT'
 )
 # => '<!xml version="1.0" encoding="utf-8"?><alipay><is_success>T</is_success></alipay>'
 ```
@@ -121,6 +122,7 @@ Alipay::Service.send_goods_confirm_by_platform(
 | --- | ----------- | ----------- |
 | trade_no | required | Trade number in Alipay system, should get from notify message. |
 | logistics_name | required | Logistics Name. |
+| transport_type/create_transport_type | required | Allowed values: POST, EXPRESS, EMS, DIRECT. |
 
 This is not a complete list of arguments, please read official document: http://download.alipay.com/public/api/base/alipayescow.zip .
 
@@ -360,7 +362,33 @@ Alipay::Service.forex_refund_url(
 
 \* Auto set Time.now if not set.
 
-### 快捷支付(无线)
+### 验证通知
+
+#### Name
+
+```ruby
+notify_verify
+```
+
+#### Definition
+
+```ruby
+Alipay::Notify.verify?({PARAMS}, {OPTIONS})
+```
+
+#### Example
+
+```ruby
+# Rails
+# params except :controller_name, :action_name, :host, etc.
+notify_params = params.except(*request.path_parameters.keys)
+
+Alipay::Notify.verify?(notify_params)
+```
+
+## Mobile::Service
+
+### 移动支付接口
 
 #### Name
 
@@ -371,19 +399,20 @@ mobile.securitypay.pay
 #### Definition
 
 ```ruby
-Alipay::Service.mobile_security_pay_url({ARGUMENTS}, {OPTIONS})
+Alipay::Mobile::Service.mobile_security_pay_string({ARGUMENTS}, {OPTIONS})
 ```
 
 #### Example
 
 ```ruby
-Alipay::Service.mobile_security_pay_url(
+Alipay::Mobile::Service.mobile_security_pay_string(
   out_trade_no: '20150401000-0001',
   notify_url: 'https://example.com/orders/20150401000-0001/notify'
   subject: 'subject',
   total_fee: '10.00',
   body: 'text'
 )
+# => service="mobile.securitypay.pay"&_input_charset="utf-8"&partner=...
 ```
 
 #### ARGUMENTS
@@ -400,30 +429,6 @@ Alipay::Service.mobile_security_pay_url(
 
 This is not a complete list of arguments, please read official document: http://download.alipay.com/public/api/base/WS_MOBILE_PAY_SDK_BASE.zip .
 
-### 验证通知
-
-#### Name
-
-```ruby
-notify_verify
-```
-
-#### Definition
-
-```ruby
-Alipay::Notify.verify?({PARAMS}, {OPTIONS})
-```
-
-#### Example
-
-```ruby
-# Rails
-# params except :controller_name, :action_name, :host, etc.
-notify_params = params.except(*request.path_parameters.keys)
-
-Alipay::Notify.verify?(notify_params)
-```
-
 ## Wap::Service
 
 ### 授权接口
@@ -485,13 +490,13 @@ alipay.wap.auth.authAndExecute
 #### Definition
 
 ```ruby
-Alipay::Wap::Service.auth_and_execute({ARGUMENTS}, {OPTIONS})
+Alipay::Wap::Service.auth_and_execute_url({ARGUMENTS}, {OPTIONS})
 ```
 
 #### Example
 
 ```ruby
-Alipay::Wap::Service.auth_and_execute(request_token: token)
+Alipay::Wap::Service.auth_and_execute_url(request_token: token)
 ```
 #### ARGUMENTS
 

data/lib/alipay.rb

@@ -11,6 +11,8 @@ require 'alipay/notify'
 require 'alipay/wap/service'
 require 'alipay/wap/notify'
 require 'alipay/wap/sign'
+require 'alipay/mobile/service'
+require 'alipay/mobile/sign'
 
 module Alipay
   @debug_mode = true

data/lib/alipay/mobile/service.rb

@@ -0,0 +1,27 @@
+module Alipay
+  module Mobile
+    module Service
+      MOBILE_SECURITY_PAY_REQUIRED_PARAMS = %w( notify_url out_trade_no subject total_fee body )
+      def self.mobile_securitypay_pay_string(params, options = {})
+        params = Utils.stringify_keys(params)
+        Alipay::Service.check_required_params(params, MOBILE_SECURITY_PAY_REQUIRED_PARAMS)
+        sign_type = options[:sign_type] || Alipay.sign_type
+        key = options[:key] || Alipay.key
+        raise ArgumentError, "only support RSA sign_type" if sign_type != 'RSA'
+
+        params = {
+          'service'        => 'mobile.securitypay.pay',
+          '_input_charset' => 'utf-8',
+          'partner'        => options[:pid] || Alipay.pid,
+          'seller_id'      => options[:pid] || Alipay.pid,
+          'payment_type'   => '1'
+        }.merge(params)
+
+        string = Alipay::Mobile::Sign.params_to_string(params)
+        sign = CGI.escape(Alipay::Sign::RSA.sign(key, string))
+
+        %Q(#{string}&sign="#{sign}"&sign_type="RSA")
+      end
+    end
+  end
+end

data/lib/alipay/mobile/sign.rb

@@ -0,0 +1,9 @@
+module Alipay
+  module Mobile
+    module Sign
+      def self.params_to_string(params)
+        params.map { |key, value| %Q(#{key}="#{value}") }.join('&')
+      end
+    end
+  end
+end

data/lib/alipay/service.rb

@@ -162,24 +162,6 @@ module Alipay
       Net::HTTP.get(request_uri(params, options))
     end
 
-    MOBILD_SECURITY_PAY_REQUIRED_PARAMS = %w( notify_url out_trade_no subject total_fee body )
-    def self.mobile_security_pay_url(params, options = {})
-      params = Utils.stringify_keys(params)
-      check_required_params(params, MOBILD_SECURITY_PAY_REQUIRED_PARAMS)
-      sign_type = options[:sign_type] || Alipay.sign_type
-      raise ArgumentError, "only support RSA sign_type" if sign_type != 'RSA'
-
-      params = {
-        'service'        => 'mobile.securitypay.pay',
-        '_input_charset' => 'utf-8',
-        'partner'        => options[:pid] || Alipay.pid,
-        'seller_id'      => options[:pid] || Alipay.pid,
-        'payment_type'   => '1'
-      }.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/sign/rsa.rb

@@ -6,12 +6,12 @@ module Alipay
     class RSA
       def self.sign(key, string)
         rsa = OpenSSL::PKey::RSA.new(key)
-        Base64.encode64(rsa.sign('sha1', string))
+        Base64.strict_encode64(rsa.sign('sha1', string))
       end
 
       def self.verify?(key, string, sign)
         rsa = OpenSSL::PKey::RSA.new(key)
-        rsa.verify('sha1', Base64.decode64(sign), string)
+        rsa.verify('sha1', Base64.strict_decode64(sign), string)
       end
     end
   end

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/lib/alipay/wap/sign.rb

@@ -17,7 +17,7 @@ Udmh5Ua2xg6IEfk493VQIDAQAB
 
         case params['sec_id']
         when 'MD5'
-          key = options[:pid] || Alipay.key
+          key = options[:key] || Alipay.key
           ::Alipay::Sign::MD5.verify?(key, string, sign)
         when '0001' # RSA
           ::Alipay::Sign::RSA.verify?(ALIPAY_RSA_PUBLIC_KEY, string, sign)

data/test/alipay/mobile/service_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class Alipay::Mobile::ServiceTest < Minitest::Test
+  def test_mobile_securitypay_pay_string
+    assert_equal %q(service="mobile.securitypay.pay"&_input_charset="utf-8"&partner="1000000000000000"&seller_id="1000000000000000"&payment_type="1"&out_trade_no="1"&notify_url="/some_url"&subject="subject"&total_fee="0.01"&body="test"&sign="if1qjK4qnT7eQ5fw%2BBddHhO1LY6iuPY9Xmhkx81YKuCdceKWBdv798j%2BrxF9ZAhNW4Y3TMURm%2BXpgxhOh8lj8vorFup%2BMJ6fe2rXRWgxFhK9B8xuP2XH%2F3878g6d8Jq2D2gINTgDDL7%2BB5%2FIWWlwInas40cQTsVngG8mWkzB788%3D"&sign_type="RSA"), Alipay::Mobile::Service.mobile_securitypay_pay_string({
+      out_trade_no: '1',
+      notify_url: '/some_url',
+      subject: 'subject',
+      total_fee: '0.01',
+      body: 'test'
+    }, {
+      sign_type: 'RSA',
+      key: TEST_RSA_PRIVATE_KEY
+    })
+  end
+end

data/test/alipay/mobile/sign_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Alipay::Mobile::SignTest < Minitest::Test
+  def test_params_to_string
+    assert_equal %q(a="1"&b="2"), Alipay::Mobile::Sign.params_to_string(a: 1, b: 2)
+  end
+end

data/test/alipay/service_test.rb

@@ -165,17 +165,4 @@ class Alipay::ServiceTest < Minitest::Test
       transport_type: 'DIRECT'
     )
   end
-
-  def test_mobile_security_pay_url
-    assert_equal 'https://mapi.alipay.com/gateway.do?service=mobile.securitypay.pay&_input_charset=utf-8&partner=1000000000000000&seller_id=1000000000000000&payment_type=1&out_trade_no=1&notify_url=%2Fsome_url&subject=subject&total_fee=0.01&body=test&sign_type=RSA&sign=EuHBKhLyXFBFM28s8nNM45r4gIWccPijVl8SHAmRaAC11wFNRiOfc3jEzJYJ%0A%2FADJNytARSNVSu3vXvRWhsNDHE9%2F%2BkFRckoXjjC10IApWa8bN7%2ByfHQk2w88%0AkDEVfv9Z%2F0t%2B8yHZD0Po4OBBHoEC9d%2FodPZYBElfcQvJ5vilQsc%3D%0A', Alipay::Service.mobile_security_pay_url({
-      out_trade_no: '1',
-      notify_url: '/some_url',
-      subject: 'subject',
-      total_fee: '0.01',
-      body: 'test'
-    }, {
-      sign_type: 'RSA',
-      key: TEST_RSA_PRIVATE_KEY
-    })
-  end
 end

data/test/alipay/sign/rsa_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class Alipay::Sign::RSATest < Minitest::Test
   def setup
     @string = "partner=123&service=test"
-    @sign = "TaVXdP/0ia5NxIv9T76v6vGOrtgoaFrwnchKIWP9PQeX1UkUVxaq6ejDFmXF\nrFR+Plk+E/XzfV2DYJSVt0Am0qJRSgeg+PuvK+yWGCGm9GJgUJlS4Eyta3g+\n8DWwRWTjUyh5yzlf9JoSnbNjYpBolnMRD7B/u1JLkTMJuMx2TVM=\n"
+    @sign = "TaVXdP/0ia5NxIv9T76v6vGOrtgoaFrwnchKIWP9PQeX1UkUVxaq6ejDFmXFrFR+Plk+E/XzfV2DYJSVt0Am0qJRSgeg+PuvK+yWGCGm9GJgUJlS4Eyta3g+8DWwRWTjUyh5yzlf9JoSnbNjYpBolnMRD7B/u1JLkTMJuMx2TVM="
   end
 
   def test_sign

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,8 @@ files:
 - Rakefile
 - alipay.gemspec
 - lib/alipay.rb
+- lib/alipay/mobile/service.rb
+- lib/alipay/mobile/sign.rb
 - lib/alipay/notify.rb
 - lib/alipay/service.rb
 - lib/alipay/sign.rb
@@ -93,6 +95,8 @@ files:
 - lib/alipay/wap/notify.rb
 - lib/alipay/wap/service.rb
 - lib/alipay/wap/sign.rb
+- test/alipay/mobile/service_test.rb
+- test/alipay/mobile/sign_test.rb
 - test/alipay/notify_test.rb
 - test/alipay/service_test.rb
 - test/alipay/sign/md5_test.rb
@@ -124,11 +128,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: An unofficial simple alipay gem
 test_files:
+- test/alipay/mobile/service_test.rb
+- test/alipay/mobile/sign_test.rb
 - test/alipay/notify_test.rb
 - test/alipay/service_test.rb
 - test/alipay/sign/md5_test.rb