alipay 0.5.0 → 0.6.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648906b45fd753e402c10db9ccf0e970a8f428ef
-  data.tar.gz: f040ba7ef6493bd492768421df9f89850bed77d7
+  metadata.gz: bab9b64bdcabb60a0b79b493c3e78593a054d7c1
+  data.tar.gz: 07a77403d825afd35f50c31ddbc37ab8233db8eb
 SHA512:
-  metadata.gz: ee38265c8d03b4249f5dc53789c722f2aaba4821dd63e8778023da4e732da35dd8b937d8a9a3eef2d7a6ee96752116be280f9743dc581f45c6f92270242ee5d8
-  data.tar.gz: d8c61cfafa7dbfe64127e513c646898e84c0f98ba32a87eaa08ad2d8d5d1dcc643fe1d61396ba5b1d45699085aa38e005543755ab2f000ab0f14b887eb62472b
+  metadata.gz: de941fe25b59b27f1945a216c70e6e9324564dfe222414dbcb4ed48a2df4c0fb485424d533c50c7f1aaed32a7c6f7b04f72839cf1e49cefe7ffcb204a4d035c2
+  data.tar.gz: e27a47136177767eb98388791d2887b8ab8c4260920b6f220fe14cb13cf0760edc5969961ba785c2bc0f5478c840a64f1cf382c5d9b0f1cd16233bfd8c21497a

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## v0.6.0-beta1
+
+Usage:
+
+- Add `Alipay.sign_type`, default is 'MD5', 'RSA' and 'DSA' will implemented in the future.
+- Remove `Sign::App.verify?`, use `Sign.verify_rsa?` instead.
+- Remove `Notify::App.verify?`, use `Notify.verify?` instead.
+- Rename `Service::Wap.auth_and_execute` to `Service::Wap.auth_and_execute_url`
+
+Development:
+
+- Update Test::Unit to Minitest.
+- Fxied test case data.
+
 ## v0.5.0 (2015-03-09)
 
 - Add `forex_single_refund` service.

data/alipay.gemspec

@@ -20,5 +20,6 @@ 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"
 end

data/lib/alipay.rb

@@ -1,19 +1,22 @@
+require 'net/http'
 require 'alipay/version'
 require 'alipay/utils'
 require 'alipay/sign'
+require 'alipay/sign/wap'
 require 'alipay/service'
 require 'alipay/service/wap'
 require 'alipay/notify'
+require 'alipay/notify/wap'
 
 module Alipay
+  @debug_mode = true
+  @sign_type = 'MD5'
+
   class << self
-    attr_accessor :pid
-    attr_accessor :key
-    attr_accessor :seller_email
-    attr_writer :debug_mode
+    attr_accessor :pid, :key, :seller_email, :sign_type, :debug_mode
 
     def debug_mode?
-      @debug_mode.nil? ? true : !!@debug_mode
+      !!@debug_mode
     end
   end
 end

data/lib/alipay/notify.rb

@@ -1,30 +1,12 @@
 module Alipay
   module Notify
-    module Wap
-      def self.verify?(params)
-        params = Utils.stringify_keys(params)
-        notify_id = params['notify_data'].scan(/\<notify_id\>(.*)\<\/notify_id\>/).flatten.first
-
-        Sign::Wap.verify?(params) && Notify.verify_notify_id?(notify_id)
-      end
-    end
-
-    module App
-      def self.verify?(params)
-        params = Utils.stringify_keys(params)
-        Sign::App.verify?(params) && Notify.verify_notify_id?(params['notify_id'])
-      end
-    end
-
     def self.verify?(params)
       params = Utils.stringify_keys(params)
       Sign.verify?(params) && verify_notify_id?(params['notify_id'])
     end
 
-    private
-
     def self.verify_notify_id?(notify_id)
-      open("https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{CGI.escape(notify_id.to_s)}").read == 'true'
+      Net::HTTP.get(URI("https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{CGI.escape(notify_id.to_s)}")) == 'true'
     end
   end
 end

data/lib/alipay/notify/wap.rb

@@ -0,0 +1,12 @@
+module Alipay
+  module Notify
+    module Wap
+      def self.verify?(params)
+        params = Utils.stringify_keys(params)
+        notify_id = params['notify_data'].scan(/\<notify_id\>(.*)\<\/notify_id\>/).flatten.first
+
+        Sign::Wap.verify?(params) && Notify.verify_notify_id?(notify_id)
+      end
+    end
+  end
+end

data/lib/alipay/service.rb

@@ -1,5 +1,4 @@
 require 'cgi'
-require 'open-uri'
 
 module Alipay
   module Service
@@ -18,7 +17,7 @@ module Alipay
 
       check_required_options(options, CREATE_PARTNER_TRADE_BY_BUYER_REQUIRED_OPTIONS)
 
-      "#{GATEWAY_URL}?#{query_string(options)}"
+      request_uri(options).to_s
     end
 
     TRADE_CREATE_BY_BUYER_REQUIRED_OPTIONS = %w( service partner _input_charset out_trade_no subject payment_type logistics_type logistics_fee logistics_payment seller_email price quantity )
@@ -34,7 +33,7 @@ module Alipay
 
       check_required_options(options, TRADE_CREATE_BY_BUYER_REQUIRED_OPTIONS)
 
-      "#{GATEWAY_URL}?#{query_string(options)}"
+      request_uri(options).to_s
     end
 
     CREATE_DIRECT_PAY_BY_USER_REQUIRED_OPTIONS = %w( service partner _input_charset out_trade_no subject payment_type seller_email )
@@ -54,7 +53,7 @@ module Alipay
         warn("Ailpay Warn: total_fee or (price && quantiry) must have one")
       end
 
-      "#{GATEWAY_URL}?#{query_string(options)}"
+      request_uri(options).to_s
     end
 
     CREATE_REFUND_URL_REQUIRED_OPTIONS = %w( batch_no data notify_url )
@@ -79,7 +78,7 @@ module Alipay
         'detail_data'    => detail_data                             # 转换后的单笔数据集字符串
       }.merge(options)
 
-      "#{GATEWAY_URL}?#{query_string(options)}"
+      request_uri(options).to_s
     end
 
     CREATE_FOREX_SINGLE_REFUND_URL_REQUIRED_OPTIONS = %w( out_return_no out_trade_no return_amount currency reason )
@@ -98,7 +97,7 @@ module Alipay
 
       check_required_options(options, CREATE_FOREX_SINGLE_REFUND_URL_REQUIRED_OPTIONS)
 
-      "#{GATEWAY_URL}?#{query_string(options)}"
+      request_uri(options).to_s
     end
 
     SEND_GOODS_CONFIRM_BY_PLATFORM_REQUIRED_OPTIONS = %w( service partner _input_charset trade_no logistics_name )
@@ -115,7 +114,7 @@ module Alipay
         warn("Ailpay Warn: transport_type or create_transport_type must have one")
       end
 
-      open("#{GATEWAY_URL}?#{query_string(options)}").read
+      Net::HTTP.get(request_uri(options))
     end
 
     CREATE_FOREX_TRADE_REQUIRED_OPTIONS = %w(service partner _input_charset notify_url subject out_trade_no currency total_fee)
@@ -129,7 +128,7 @@ module Alipay
 
       check_required_options(options, CREATE_FOREX_TRADE_REQUIRED_OPTIONS)
 
-      "#{GATEWAY_URL}?#{query_string(options)}"
+      request_uri(options).to_s
     end
 
     CLOSE_TRADE_REQUIRED_OPTIONS = %w( service partner _input_charset)
@@ -144,7 +143,7 @@ module Alipay
       check_required_options(options, CLOSE_TRADE_REQUIRED_OPTIONS)
       check_optional_options(options, CLOSE_TRADE_REQUIRED_OPTIONAL_OPTIONS)
 
-      open("#{GATEWAY_URL}?#{query_string(options)}").read
+      Net::HTTP.get(request_uri(options))
     end
 
     SINGLE_TRADE_QUERY_OPTIONS = %w( service partner _input_charset)
@@ -159,13 +158,18 @@ module Alipay
       check_required_options(options, SINGLE_TRADE_QUERY_OPTIONS)
       check_optional_options(options, SINGLE_TRADE_QUERY_OPTIONAL_OPTIONS)
 
-      open("#{GATEWAY_URL}?#{query_string(options)}").read
+      Net::HTTP.get(request_uri(options))
     end
 
-    def self.query_string(options)
-      options.merge('sign_type' => 'MD5', 'sign' => Alipay::Sign.generate(options)).map do |key, value|
-        "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
-      end.join('&')
+    def self.request_uri(options)
+      uri = URI(GATEWAY_URL)
+      uri.query = URI.encode_www_form(sign_params(options))
+      uri
+    end
+
+    def self.sign_params(params)
+      params = params.merge('sign_type' => Alipay.sign_type) if params['sign_type'].nil?
+      params.merge('sign' => Alipay::Sign.generate(params))
     end
 
     def self.check_required_options(options, names)

data/lib/alipay/service/wap.rb

@@ -1,5 +1,3 @@
-require 'open-uri'
-
 module Alipay
   module Service
     module Wap
@@ -32,13 +30,13 @@ module Alipay
 
         Alipay::Service.check_required_options(options, WAP_TRADE_REQUIRED_OPTIONS)
 
-        xml = open("#{GATEWAY_URL}?#{query_string(options)}").read
+        xml = Net::HTTP.get(request_uri(options))
         CGI.unescape(xml).scan(/\<request_token\>(.*)\<\/request_token\>/).flatten.first
       end
 
       AUTH_AND_EXECUTE_REQUIRED_OPTIONS = %w( service format v partner )
 
-      def self.auth_and_execute(options)
+      def self.auth_and_execute_url(options)
         options = Utils.stringify_keys(options)
         Alipay::Service.check_required_options(options, ['request_token'])
 
@@ -53,15 +51,18 @@ module Alipay
         }.merge(options)
 
         Alipay::Service.check_required_options(options, AUTH_AND_EXECUTE_REQUIRED_OPTIONS)
-        "#{GATEWAY_URL}?#{query_string(options)}"
+        request_uri(options).to_s
       end
 
-      def self.query_string(options)
-        options.merge!('sec_id' => 'MD5')
+      def self.request_uri(options)
+        uri = URI(GATEWAY_URL)
+        uri.query = URI.encode_www_form(sign_params(options))
+        uri
+      end
 
-        options.merge('sign' => Alipay::Sign.generate(options)).map do |key, value|
-          "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
-        end.join('&')
+      def self.sign_params(params)
+        sign_type = (params['sec_id'] ||= Alipay.sign_type)
+        params.merge('sign'   => Alipay::Sign.generate(params.merge('sign_type' => sign_type)))
       end
     end
   end

data/lib/alipay/sign.rb

@@ -5,53 +5,68 @@ require 'base64'
 module Alipay
   module Sign
     def self.generate(params)
-      query = params.sort.map { |item| item.join('=') }.join('&')
-      Digest::MD5.hexdigest("#{query}#{Alipay.key}")
-    end
-
-    def self.verify?(params)
       params = Utils.stringify_keys(params)
-      params.delete('sign_type')
-      sign = params.delete('sign')
+      sign_type = params.delete('sign_type') || Alipay.sign_type
+      key = params.delete('key') || Alipay.key
 
-      generate(params) == sign
+      case sign_type
+      when 'MD5'
+        generate_md5(key, params)
+      when 'RSA'
+        raise NotImplementedError, "RSA sign is unimplemented"
+      when 'DSA'
+        raise NotImplementedError, "DSA sign is unimplemented"
+      else
+        raise ArgumentError, "wrong sign_type #{sign_type}, allow values: 'MD5', 'RSA', 'DSA'"
+      end
     end
 
-    module Wap
-      SORTED_VERIFY_PARAMS = %w( service v sec_id notify_data )
+    def self.generate_md5(key, params)
+      Digest::MD5.hexdigest("#{params_to_string(params)}#{key}")
+    end
 
-      def self.verify?(params)
-        params = Utils.stringify_keys(params)
+    def self.params_to_string(params)
+      params.sort.map { |item| item.join('=') }.join('&')
+    end
 
-        query = SORTED_VERIFY_PARAMS.map do |key|
-          "#{key}=#{params[key]}"
-        end.join('&')
+    def self.verify?(params)
+      params = Utils.stringify_keys(params)
+
+      sign_type = params.delete('sign_type')
 
-        params['sign'] == Digest::MD5.hexdigest("#{query}#{Alipay.key}")
+      case sign_type
+      when 'MD5'
+        verify_md5?(params)
+      when 'RSA'
+        verify_rsa?(params)
+      when 'DSA'
+        raise NotImplementedError, "DSA verify is unimplemented"
+      else
+        raise ArgumentError, "wrong sign_type #{sign_type}, allow values: 'MD5', 'RSA', 'DSA'"
       end
     end
 
-    module App
-      # Alipay public key
-      PEM = "-----BEGIN PUBLIC KEY-----\n" \
-            "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRA\n" \
-            "FljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQE\n" \
-            "B/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5Ksi\n" \
-            "NG9zpgmLCUYuLkxpLQIDAQAB\n" \
-            "-----END PUBLIC KEY-----"
-
-      def self.verify?(params)
-        params = Utils.stringify_keys(params)
+    def self.verify_md5?(params)
+      key = params.delete('key') || Alipay.key
+      sign = params.delete('sign')
+      generate_md5(key, params) == sign
+    end
 
-        pkey = OpenSSL::PKey::RSA.new(PEM)
-        digest = OpenSSL::Digest::SHA1.new
+    ALIPAY_RSA_PUBLIC_KEY = <<-EOF
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRA
+FljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQE
+B/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5Ksi
+NG9zpgmLCUYuLkxpLQIDAQAB
+-----END PUBLIC KEY-----
+    EOF
 
-        params.delete('sign_type')
-        sign = params.delete('sign')
-        to_sign = params.sort.map { |item| item.join('=') }.join('&')
+    def self.verify_rsa?(params)
+      pkey = OpenSSL::PKey::RSA.new(ALIPAY_RSA_PUBLIC_KEY)
+      digest = OpenSSL::Digest::SHA1.new
+      sign = params.delete('sign')
 
-        pkey.verify(digest, Base64.decode64(sign), to_sign)
-      end
+      pkey.verify(digest, Base64.decode64(sign), params_to_string(params))
     end
   end
 end

data/lib/alipay/sign/wap.rb

@@ -0,0 +1,17 @@
+module Alipay
+  module Sign
+    module Wap
+      SORTED_VERIFY_PARAMS = %w( service v sec_id notify_data )
+
+      def self.verify?(params)
+        params = Utils.stringify_keys(params)
+
+        query = SORTED_VERIFY_PARAMS.map do |key|
+          "#{key}=#{params[key]}"
+        end.join('&')
+
+        params['sign'] == Digest::MD5.hexdigest("#{query}#{Alipay.key}")
+      end
+    end
+  end
+end

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.5.0"
+  VERSION = "0.6.0.beta1"
 end

data/test/alipay/notify/wap_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::Notify::WapTest < Test::Unit::TestCase
+class Alipay::Notify::WapTest < Minitest::Test
   def setup
     @notify_id = 'notify_id_test'
 

data/test/alipay/notify_test.rb

@@ -1,11 +1,12 @@
 require 'test_helper'
 
-class Alipay::NotifyTest < Test::Unit::TestCase
+class Alipay::NotifyTest < Minitest::Test
   def setup
     @options = {
-      :notify_id => '1234'
+      :notify_id => '1234',
+      :sign_type => 'MD5'
     }
-    @sign_options = @options.merge(:sign_type => 'MD5', :sign => Alipay::Sign.generate(@options))
+    @sign_options = @options.merge(:sign => Alipay::Sign.generate(@options))
   end
 
   def test_unsign_notify

data/test/alipay/service/wap_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::Service::WapTest < Test::Unit::TestCase
+class Alipay::Service::WapTest < Minitest::Test
   def test_trade_create_direct_token
     token = 'REQUEST_TOKEN'
     body = <<-EOS
@@ -26,15 +26,15 @@ class Alipay::Service::WapTest < Test::Unit::TestCase
     assert_equal token, Alipay::Service::Wap.trade_create_direct_token(
       :req_data => {
         :out_trade_no  => '1',
-        :subject       => '<a&b>',
+        :subject       => 'subject',
         :total_fee     => '0.01',
-        :call_back_url => 'http://www.yoursite.com/call_back'
+        :call_back_url => 'https://example.com/call_back'
       }
     )
   end
 
-  def test_auth_and_execute
+  def test_auth_and_execute_url
     options = { :request_token => 'token_test' }
-    assert_not_nil Alipay::Service::Wap.auth_and_execute(options)
+    assert_equal 'https://wappaygw.alipay.com/service/rest.htm?service=alipay.wap.auth.authAndExecute&req_data=%3Cauth_and_execute_req%3E%3Crequest_token%3Etoken_test%3C%2Frequest_token%3E%3C%2Fauth_and_execute_req%3E&partner=1000000000000000&format=xml&v=2.0&sec_id=MD5&sign=3efe60d4a9b7960ba599da6764c959df', Alipay::Service::Wap.auth_and_execute_url(options)
   end
 end

data/test/alipay/service_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::ServiceTest < Test::Unit::TestCase
+class Alipay::ServiceTest < Minitest::Test
   def test_generate_create_partner_trade_by_buyer_url
     options = {
       :out_trade_no      => '1',
@@ -11,7 +11,8 @@ class Alipay::ServiceTest < Test::Unit::TestCase
       :price             => '0.01',
       :quantity          => 1
     }
-    assert_not_nil Alipay::Service.create_partner_trade_by_buyer_url(options)
+
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=create_partner_trade_by_buyer&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&payment_type=1&out_trade_no=1&subject=test&logistics_type=POST&logistics_fee=0&logistics_payment=SELLER_PAY&price=0.01&quantity=1&sign_type=MD5&sign=09c5d8fd3d7eac18268fffa4cdffd19e', Alipay::Service.create_partner_trade_by_buyer_url(options)
   end
 
   def test_generate_trade_create_by_buyer_url
@@ -24,7 +25,7 @@ class Alipay::ServiceTest < Test::Unit::TestCase
       :price             => '0.01',
       :quantity          => 1
     }
-    assert_not_nil Alipay::Service.trade_create_by_buyer_url(options)
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=trade_create_by_buyer&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&payment_type=1&out_trade_no=1&subject=test&logistics_type=POST&logistics_fee=0&logistics_payment=SELLER_PAY&price=0.01&quantity=1&sign_type=MD5&sign=62b029a767accbbd5f3b085da5959506', Alipay::Service.trade_create_by_buyer_url(options)
   end
 
   def test_generate_create_direct_pay_by_user_url
@@ -34,7 +35,7 @@ class Alipay::ServiceTest < Test::Unit::TestCase
       :price             => '0.01',
       :quantity          => 1
     }
-    assert_not_nil Alipay::Service.create_direct_pay_by_user_url(options)
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=create_direct_pay_by_user&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&payment_type=1&out_trade_no=1&subject=test&price=0.01&quantity=1&sign_type=MD5&sign=51c7f60e85eaff5136600d1942b2744c', Alipay::Service.create_direct_pay_by_user_url(options)
   end
 
   def test_generate_create_refund_url
@@ -44,34 +45,35 @@ class Alipay::ServiceTest < Test::Unit::TestCase
       :reason   => 'test'
     }]
     options = {
-      :batch_no   =>  '123456789',
-      :data       =>  data,
-      :notify_url =>  '/some_url'
+      :batch_no    => '123456789',
+      :data        => data,
+      :notify_url  => '/some_url',
+      :refund_date => '2015-01-01 00:00:00'
     }
-    assert_not_nil Alipay::Service.create_refund_url(options)
+    assert_equal "https://mapi.alipay.com/gateway.do?service=refund_fastpay_by_platform_pwd&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&refund_date=2015-01-01+00%3A00%3A00&batch_num=1&detail_data=1%5E0.01%5Etest&batch_no=123456789&notify_url=%2Fsome_url&sign_type=MD5&sign=3f5be5655b513334460a511e74a9ae57", Alipay::Service.create_refund_url(options)
   end
 
   def test_generate_create_forex_single_refund_url
     options = {
       :out_return_no => '1',
       :out_trade_no  => '12345678980',
-      :return_amount => 0.01,
+      :return_amount => '0.01',
       :currency      => 'USD',
-      :reason        => '订单取消'
+      :reason        => 'reason',
+      :gmt_return    => '2015-01-01 00:00:00'
     }
-    assert_not_nil Alipay::Service.create_forex_single_refund_url(options)
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=forex_refund&partner=1000000000000000&_input_charset=utf-8&gmt_return=2015-01-01+00%3A00%3A00&out_return_no=1&out_trade_no=12345678980&return_amount=0.01&currency=USD&reason=reason&sign_type=MD5&sign=123c50e884e560801fee8b73f1ac6172', Alipay::Service.create_forex_single_refund_url(options)
   end
 
   def test_generate_create_forex_trade
     options = {
-      :notify_url        => 'https://writings.io/orders/20130801000001/alipay_notify',
-      :return_url        => 'https://writings.io/orders/20130801000001',
+      :notify_url        => 'https://example.com/notify',
       :subject           => 'test',
       :out_trade_no      => '1',
       :currency          => 'EUR',
-      :total_fee         => '0.0.1',
+      :total_fee         => '0.01',
     }
-    assert_not_nil Alipay::Service.create_forex_trade(options)
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=create_forex_trade&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&notify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=test&out_trade_no=1&currency=EUR&total_fee=0.01&sign_type=MD5&sign=495a0e610134aa33f6ce021f8b8c6c8d', Alipay::Service.create_forex_trade(options)
   end
 
   def test_close_trade
@@ -88,7 +90,7 @@ class Alipay::ServiceTest < Test::Unit::TestCase
     )
 
     assert_equal response_body, Alipay::Service.close_trade(
-      :out_order_no => 'the-out-order-no'
+      :out_order_no => '1'
     )
   end
 
@@ -106,7 +108,7 @@ class Alipay::ServiceTest < Test::Unit::TestCase
         <response>
           <trade>
             <additional_trade_status>DAEMON_CONFIRM_CLOSE</additional_trade_status>
-            <buyer_email>foo@gmail.com</buyer_email>
+            <buyer_email>buyer@example.com</buyer_email>
             <buyer_id>BUYER_ID</buyer_id>
             <discount>0.00</discount>
             <flag_trade_locked>0</flag_trade_locked>
@@ -115,11 +117,11 @@ class Alipay::ServiceTest < Test::Unit::TestCase
             <gmt_last_modified_time>2015-01-20 02:37:00</gmt_last_modified_time>
             <is_total_fee_adjust>F</is_total_fee_adjust>
             <operator_role>B</operator_role>
-            <out_trade_no>OUT_TRADE_NO</out_trade_no>
+            <out_trade_no>1</out_trade_no>
             <payment_type>1</payment_type>
             <price>640.00</price>
             <quantity>1</quantity>
-            <seller_email>bar@gmail.com</seller_email>
+            <seller_email>seller@example.com</seller_email>
             <seller_id>SELLER_ID</seller_id>
             <subject>ORDER SUBJECT</subject>
             <to_buyer_fee>0.00</to_buyer_fee>
@@ -140,7 +142,7 @@ class Alipay::ServiceTest < Test::Unit::TestCase
     )
 
     assert_equal response_body, Alipay::Service.single_trade_query(
-      :out_trade_no => 'the-out-trade-no'
+      :out_trade_no => '1'
     )
   end
 
@@ -158,9 +160,9 @@ class Alipay::ServiceTest < Test::Unit::TestCase
     )
 
     assert_equal body, Alipay::Service.send_goods_confirm_by_platform(
-      :trade_no => 'trade_no_id',
-      :logistics_name => 'writings.io',
-      :transport_type => 'POST'
+      :trade_no => 'trade_no',
+      :logistics_name => 'example.com',
+      :transport_type => 'DIRECT'
     )
   end
 end

data/test/alipay/sign/wap_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::Sign::WapTest < Test::Unit::TestCase
+class Alipay::Sign::WapTest < Minitest::Test
   def setup
     @params = {
       :v => '1.0',

data/test/alipay/sign_test.rb

@@ -1,23 +1,27 @@
 require 'test_helper'
 
-class Alipay::SignTest < Test::Unit::TestCase
+class Alipay::SignTest < Minitest::Test
   def setup
     @params = {
       :service => 'test',
       :partner => '123'
     }
-    @sign = Digest::MD5.hexdigest("partner=123&service=test#{Alipay.key}")
+    @md5_sign = 'bbd13b52823b576291595f472ebcfbc2'
   end
 
   def test_generate_sign
-    assert_equal @sign, Alipay::Sign.generate(@params)
+    assert_equal @md5_sign, Alipay::Sign.generate(@params)
+  end
+
+  def test_generate_md5_sign
+    assert_equal @md5_sign, Alipay::Sign.generate_md5(Alipay.key, @params)
   end
 
   def test_verify_sign
-    assert Alipay::Sign.verify?(@params.merge(:sign => @sign))
+    assert Alipay::Sign.verify?(@params.merge(:sign_type => 'MD5', :sign => @md5_sign))
   end
 
   def test_verify_sign_when_fails
-    assert !Alipay::Sign.verify?(@params.merge(:danger => 'danger', :sign => @sign))
+    assert !Alipay::Sign.verify?(@params.merge(:danger => 'danger', :sign_type => 'MD5', :sign => @md5_sign))
   end
 end

data/test/alipay/utils_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::UtilsTest < Test::Unit::TestCase
+class Alipay::UtilsTest < Minitest::Test
   def test_stringify_keys
     hash = { 'a' => 1, :b => 2 }
     assert_equal({ 'a' => 1, 'b' => 2 }.sort, Alipay::Utils.stringify_keys(hash).sort)

data/test/alipay_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class AlipayTest < Minitest::Test
+  def test_debug_mode_default
+    assert Alipay.debug_mode?
+  end
+
+  def test_sign_type_default
+    assert_equal 'MD5', Alipay.sign_type
+  end
+end

data/test/test_helper.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'alipay'
 require 'fakeweb'
 
-Alipay.pid = 'pid'
-Alipay.key = 'key'
-Alipay.seller_email = 'chloerei@gmail.com'
-Alipay.debug_mode = true
+Alipay.pid = '1000000000000000'
+Alipay.key = '10000000000000000000000000000000'
+Alipay.seller_email = 'admin@example.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -68,9 +82,11 @@ files:
 - alipay.gemspec
 - lib/alipay.rb
 - lib/alipay/notify.rb
+- lib/alipay/notify/wap.rb
 - lib/alipay/service.rb
 - lib/alipay/service/wap.rb
 - lib/alipay/sign.rb
+- lib/alipay/sign/wap.rb
 - lib/alipay/utils.rb
 - lib/alipay/version.rb
 - test/alipay/notify/wap_test.rb
@@ -80,6 +96,7 @@ files:
 - test/alipay/sign/wap_test.rb
 - test/alipay/sign_test.rb
 - test/alipay/utils_test.rb
+- test/alipay_test.rb
 - test/test_helper.rb
 homepage: https://github.com/chloerei/alipay
 licenses:
@@ -96,12 +113,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An unofficial simple alipay gem
@@ -113,5 +130,5 @@ test_files:
 - test/alipay/sign/wap_test.rb
 - test/alipay/sign_test.rb
 - test/alipay/utils_test.rb
+- test/alipay_test.rb
 - test/test_helper.rb
-has_rdoc: