alipay 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1fec3c892e0b55b191bc1316243ac589e68873
-  data.tar.gz: 42685dccfaa74f0e8134d5acf3221aa0d325a0ac
+  metadata.gz: 57cea4f9dd8f88244a11f40af581f3cd89114ec3
+  data.tar.gz: a12dbafc0010a072db445ab1071537eb5e0d6313
 SHA512:
-  metadata.gz: bea8090f90b37e26cb1afa2fdc4c6f07a490f46d5a40496f7b1ad8f127966c69de850bb110e04aabc2c753a6e9ca8cac4b1cdd1cde83f8a27705a132e3f42682
-  data.tar.gz: 47cd59837789a0586b62af90d9e7b8b7c5bfc88f5a9d9d8fa30d9a4706623626f0763f95fa2b066f96deeb07e670f0aa71067382fa2d4919cef8baa8511cecb7
+  metadata.gz: d3ab2395763dc02a5eaad833cb39c7445deea0c7b0a8647a08b61d26adc20f483b75ab5c55bb99178d421c873e6d05d5faa46e1bc9c883bf60eafdb4bedb6ead
+  data.tar.gz: 96f194bcbd5163ef2b331a35acc931529f5c5ff19ca2b3643ba0fd9057b279898e8460ecdffd77b23551f67aef57e8bd5dc36ddee252a7e37e5a16da688c157b

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+
+## v0.0.5 (2014-06-15)
+
+- Add Wap API
+
+  via @HungYuHei
+
+- Add App API
+
+  via @HungYuHei

data/README.md

@@ -4,9 +4,9 @@ A simple alipay ruby gem, without unnecessary magic or wraper, it's directly fac
 
 It contain this API:
 
-* Generate payment url
+* Generate payment url (web, wap)
 * Send goods
-* Verify notify
+* Verify notify (web, wap, app)
 
 Please read alipay official document first: https://b.alipay.com/order/techService.htm .
 
@@ -40,7 +40,7 @@ Alipay.key = 'YOUR_KEY'
 Alipay.seller_email = 'YOUR_SELLER_EMAIL'
 ```
 
-### Generate payment url
+### Generate payment url for web
 
 ```ruby
 options = {
@@ -68,6 +68,30 @@ Current support three payment type:
     Alipay::Service#trade_create_by_buyer_url         # 标准双接口
     Alipay::Service#create_direct_pay_by_user_url     # 即时到帐
 
+### Generate payment url for wap
+
+```ruby
+options = {
+  :req_data => {
+    :out_trade_no  => 'YOUR_ORDER_ID',         # 20130801000001
+    :subject       => 'YOUR_ORDER_SUBJECCT',   # Writings.io Base Account x 12
+    :total_fee     => 'TOTAL_FEE',
+    :notify_url    => 'YOUR_ORDER_NOTIFY_URL', # https://writings.io/orders/20130801000001/alipay_notify
+    :call_back_url => 'YOUR_ORDER_RETURN_URL'  # https://writings.io/orders/20130801000001
+  }
+}
+
+token = Alipay::Service::Wap.trade_create_direct_token(options)
+Alipay::Service::Wap.auth_and_execute(request_token: token)
+# => 'http://wappaygw.alipay.com/service/rest.htm?req_data=...'
+```
+
+You can redirect user to this payment url, and user will see a payment page for his/her order.
+
+Current only support this payment type:
+
+    Alipay::Service::Wap.auth_and_execute # 即时到帐
+
 ### Send goods
 
 ```ruby
@@ -100,11 +124,13 @@ Notify Url Demo: http://git.io/pst4Tw
 ### Verify notify
 
 ```ruby
-# example in rails
-# The notify url MUST be set when generate payment url
-def alipay_notify
+# Example in rails,
+# notify url MUST be set when generate payment url
+
+def alipay_web_notify
   # except :controller_name, :action_name, :host, etc.
   notify_params = params.except(*request.path_parameters.keys)
+
   if Alipay::Notify.verify?(notify_params)
     # valid notify, code your business logic.
     render :text => 'success'
@@ -112,6 +138,32 @@ def alipay_notify
     render :text => 'error'
   end
 end
+
+def alipay_wap_notify
+  # except :controller_name, :action_name, :host, etc.
+  notify_params = params.except(*request.path_parameters.keys)
+
+  if Alipay::Notify::Wap.verify?(notify_params)
+    # valid notify, code your business logic.
+    # you may want to get you order id:
+    #   order_id = Hash.from_xml(params[:notify_data])['notify']['out_trade_no']
+    render :text => 'success'
+  else
+    render :text => 'error'
+  end
+end
+
+def alipay_app_notify
+  # except :controller_name, :action_name, :host, etc.
+  notify_params = params.except(*request.path_parameters.keys)
+
+  if Alipay::Notify::App.verify?(notify_params)
+    # valid notify, code your business logic.
+    render :text => 'success'
+  else
+    render :text => 'error'
+  end
+end
 ```
 
 ## Contributing
@@ -132,4 +184,4 @@ Please write unit test with your code if necessary.
 
 Donate to maintainer let him make this gem better.
 
-Alipay donate link: https://me.alipay.com/chloerei .
+Alipay donate link: http://chloerei.com/donate/ .

data/lib/alipay.rb

@@ -1,7 +1,8 @@
-require "alipay/version"
+require 'alipay/version'
 require 'alipay/utils'
 require 'alipay/sign'
 require 'alipay/service'
+require 'alipay/service/wap'
 require 'alipay/notify'
 
 module Alipay

data/lib/alipay/notify.rb

@@ -1,12 +1,30 @@
 module Alipay
-  class Notify
-    def self.verify?(params)
-      if Sign.verify?(params)
+  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)
-        open("https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{CGI.escape params['notify_id'].to_s}").read == 'true'
-      else
-        false
+        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'
+    end
   end
 end

data/lib/alipay/service/wap.rb

@@ -0,0 +1,68 @@
+require 'open-uri'
+
+module Alipay
+  module Service
+    module Wap
+      GATEWAY_URL = 'https://wappaygw.alipay.com/service/rest.htm'
+
+      REQ_DATA_REQUIRED_OPTIONS = %w( subject out_trade_no total_fee seller_account_name call_back_url )
+      WAP_TRADE_REQUIRED_OPTIONS = %w( service format v partner req_id req_data )
+
+      def self.trade_create_direct_token(options)
+        options = Utils.stringify_keys(options)
+
+        req_data_options = { 'seller_account_name' => Alipay.seller_email }.merge(
+          Utils.stringify_keys(options.delete('req_data'))
+        )
+
+        Alipay::Service.check_required_options(req_data_options, REQ_DATA_REQUIRED_OPTIONS)
+
+        xml = req_data_options.map {|k, v| "<#{k}>#{v}</#{k}>" }.join
+        req_data_xml = "<direct_trade_create_req>#{xml}</direct_trade_create_req>"
+
+        # About req_id: http://club.alipay.com/read-htm-tid-10078020-fpage-2.html
+        options = {
+          'service'  => 'alipay.wap.trade.create.direct',
+          'req_data' => req_data_xml,
+          'partner'  => Alipay.pid,
+          'req_id'   => Time.now.strftime('%Y%m%d%H%M%s'),
+          'format'   => 'xml',
+          'v'        => '2.0'
+        }.merge(options)
+
+        Alipay::Service.check_required_options(options, WAP_TRADE_REQUIRED_OPTIONS)
+
+        xml = open("#{GATEWAY_URL}?#{query_string(options)}").read
+        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)
+        options = Utils.stringify_keys(options)
+        Alipay::Service.check_required_options(options, ['request_token'])
+
+        req_data_xml = "<auth_and_execute_req><request_token>#{options.delete('request_token')}</request_token></auth_and_execute_req>"
+
+        options = {
+          'service'  => 'alipay.wap.auth.authAndExecute',
+          'req_data' => req_data_xml,
+          'partner'  => Alipay.pid,
+          'format'   => 'xml',
+          'v'        => '2.0'
+        }.merge(options)
+
+        Alipay::Service.check_required_options(options, AUTH_AND_EXECUTE_REQUIRED_OPTIONS)
+        "#{GATEWAY_URL}?#{query_string(options)}"
+      end
+
+      def self.query_string(options)
+        options.merge!('sec_id' => 'MD5')
+
+        options.merge('sign' => Alipay::Sign.generate(options)).map do |key, value|
+          "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
+        end.join('&')
+      end
+    end
+  end
+end

data/lib/alipay/sign.rb

@@ -1,4 +1,6 @@
 require 'digest/md5'
+require 'openssl'
+require 'base64'
 
 module Alipay
   module Sign
@@ -17,5 +19,42 @@ module Alipay
 
       generate(params) == sign
     end
+
+    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
+
+    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)
+
+        pkey = OpenSSL::PKey::RSA.new(PEM)
+        digest = OpenSSL::Digest::SHA1.new
+
+        params.delete('sign_type')
+        sign = params.delete('sign')
+        to_sign = params.sort.map { |item| item.join('=') }.join('&')
+
+        pkey.verify(digest, Base64.decode64(sign), to_sign)
+      end
+    end
   end
 end

data/lib/alipay/utils.rb

@@ -11,8 +11,9 @@ module Alipay
     # 退款批次号，支付宝通过此批次号来防止重复退款操作，所以此号生成后最好直接保存至数据库，不要在显示页面的时候生成
     # 共 24 位(8 位当前日期 + 9 位纳秒 + 1 位随机数)
     def self.generate_batch_no
-      time = Time.now
-      time.strftime('%Y%m%d%H%M%S') + time.nsec.to_s + Random.new.rand(1..9).to_s
+      t = Time.now
+      batch_no = t.strftime('%Y%m%d%H%M%S') + t.nsec.to_s
+      batch_no.ljust(24, Random.new.rand(1..9).to_s)
     end
   end
 end

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/alipay/notify/wap_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class Alipay::Notify::WapTest < Test::Unit::TestCase
+  def setup
+    @notify_id = 'notify_id_test'
+
+    @notify_params = {
+      :service => 'alipay.wap.trade.create.direct',
+      :v => '1.0',
+      :sec_id => 'MD5',
+      :notify_data => "<notify><notify_id>#{@notify_id}</notify_id><other_key>other_value</other_key></notify>"
+    }
+
+    query = [ :service, :v, :sec_id, :notify_data ].map {|key| "#{key}=#{@notify_params[key]}"}.join('&')
+    @sign_params = @notify_params.merge(:sign => Digest::MD5.hexdigest("#{query}#{Alipay.key}"))
+  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")
+    assert !Alipay::Notify::Wap.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")
+    assert Alipay::Notify::Wap.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")
+    assert !Alipay::Notify::Wap.verify?(@sign_params)
+  end
+end

data/test/alipay/service/wap_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class Alipay::Service::WapTest < Test::Unit::TestCase
+  def test_trade_create_direct_token
+    token = 'REQUEST_TOKEN'
+    body = <<-EOS
+      res_data=
+        <?xmlversion="1.0" encoding="utf-8"?>
+        <direct_trade_create_res>
+          <request_token>#{token}</request_token>
+        </direct_trade_create_res>
+      &partner=PID
+      &req_id=REQ_ID
+      &sec_id=MD5
+      &service=alipay.wap.trade.create.direct
+      &v=2.0
+      &sign=SIGN
+    EOS
+
+    FakeWeb.register_uri(
+      :get,
+      %r|https://wappaygw\.alipay\.com/service/rest\.htm.*|,
+      :body => body
+    )
+
+    assert_equal token, Alipay::Service::Wap.trade_create_direct_token(
+      :req_data => {
+        :out_trade_no  => '1',
+        :subject       => 'subject',
+        :total_fee     => '0.01',
+        :call_back_url => 'http://www.yoursite.com/call_back'
+      }
+    )
+  end
+
+  def test_auth_and_execute
+    options = { :request_token => 'token_test' }
+    assert_not_nil Alipay::Service::Wap.auth_and_execute(options)
+  end
+end

data/test/alipay/sign/wap_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class Alipay::Sign::WapTest < Test::Unit::TestCase
+  def setup
+    @params = {
+      :v => '1.0',
+      :sec_id => 'MD5',
+      :service => 'test',
+      :notify_data => 'notify_data'
+    }
+    @sign = Digest::MD5.hexdigest("service=test&v=1.0&sec_id=MD5&notify_data=notify_data#{Alipay.key}")
+  end
+
+  def test_verify_sign
+    assert Alipay::Sign::Wap.verify?(@params.merge(:sign => @sign, :whatever => 'x'))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,11 +69,15 @@ files:
 - lib/alipay.rb
 - lib/alipay/notify.rb
 - lib/alipay/service.rb
+- lib/alipay/service/wap.rb
 - lib/alipay/sign.rb
 - lib/alipay/utils.rb
 - lib/alipay/version.rb
+- test/alipay/notify/wap_test.rb
 - test/alipay/notify_test.rb
+- test/alipay/service/wap_test.rb
 - test/alipay/service_test.rb
+- test/alipay/sign/wap_test.rb
 - test/alipay/sign_test.rb
 - test/alipay/utils_test.rb
 - test/test_helper.rb
@@ -101,8 +106,11 @@ signing_key:
 specification_version: 4
 summary: An unofficial simple alipay gem
 test_files:
+- test/alipay/notify/wap_test.rb
 - test/alipay/notify_test.rb
+- test/alipay/service/wap_test.rb
 - test/alipay/service_test.rb
+- test/alipay/sign/wap_test.rb
 - test/alipay/sign_test.rb
 - test/alipay/utils_test.rb
 - test/test_helper.rb