allpay_client 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289f14a5eea78b627c25e2ba352b8db3fefc0085
-  data.tar.gz: 33a5f66099a93de19b3a2d0fded4d3642bf195d5
+  metadata.gz: 3a446ba56f2f942e6440dc53a76f6387788a55b8
+  data.tar.gz: 9af5ae0d137d7530bf91caa58cf8c47ba187c314
 SHA512:
-  metadata.gz: 53a307012b9805ee5bd2c2f284d7eeaa6455b71d0b877d5ce00d1dc2bdf8e75910771e3dcc3a7c5d616c5fd3f7acab547d340c5a9061a02296b4f46f449fa952
-  data.tar.gz: c1e186805948c1339029b4bab674f2aa506687d7be994a41d07f69157de9f8c3a880eb71cf878dc05a77db55f14cc88af15c155a0315853e33007f3a4c530613
+  metadata.gz: ffe404699d2306918ba7636918a3e96b807867c6d4150fe78503dbbdf72dc5170988916ff406425dc424a310c5674787e50cc4ede15e641872da37f5768d6b4c
+  data.tar.gz: ff7969058c8c713835c41b597a240f64adeb3e5484986b1627ab7e184f0e3de66ee2e1888dc30c470e26f1edab2f09ec673792d09b2d0f06fb36d30cba8ca9b9

data/lib/allpay/client.rb

@@ -38,7 +38,7 @@ module Allpay
     end
 
     def make_mac params = {}
-      raw = params.sort.map!{|k,v| "#{k}=#{v}"}.join('&')
+      raw = params.sort_by{|k,v|k.downcase}.map!{|k,v| "#{k}=#{v}"}.join('&')
       padded = "HashKey=#{@options[:hash_key]}&#{raw}&HashIV=#{@options[:hash_iv]}"
       url_encoded = CGI.escape(padded).downcase!
       Digest::MD5.hexdigest(url_encoded).upcase!

data/lib/allpay/version.rb

@@ -1,3 +1,3 @@
 module Allpay
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/allpay_spec.rb

@@ -40,7 +40,7 @@ describe Allpay::Client do
       card6no TotalSuccessTimes TotalSuccessAmount ExecLog]
   end
 
-  it '#make_mac' do 
+  it '#make_mac' do
     client = Allpay::Client.new(merchant_id: '12345678', hash_key: 'xdfaefasdfasdfa32d', hash_iv: 'sdfxfafaeafwexfe', mode: :test)
     mac = client.make_mac({
       ItemName: 'sdfasdfa',
@@ -70,4 +70,50 @@ describe Allpay::Client do
       MerchantTradeNo: '355313'
     expect(result).to eq true
   end
+
+  it '#verify_mac with more parameters' do
+    result = @client.verify_mac AlipayID: nil,
+      AlipayTradeNo: nil,
+      amount: '1290',
+      ATMAccBank: nil,
+      ATMAccNo: nil,
+      auth_code: '777777',
+      card4no: '2222',
+      card6no: '431195',
+      eci: '0',
+      ExecTimes: nil,
+      Frequency: nil,
+      gwsr: '12303658',
+      MerchantID: '2000132',
+      MerchantTradeNo: 'R9710358221432568191',
+      PayFrom: nil,
+      PaymentDate: '2015/05/25 23:37:42',
+      PaymentNo: nil,
+      PaymentType: 'Credit_CreditCard',
+      PaymentTypeChargeFee: '26',
+      PeriodAmount: nil,
+      PeriodType: nil,
+      process_date: '2015/05/25 23:37:42',
+      red_dan: '0',
+      red_de_amt: '0',
+      red_ok_amt: '0',
+      red_yet: '0',
+      RtnCode: '1',
+      RtnMsg: '交易成功',
+      SimulatePaid: '0',
+      staed: '0',
+      stage: '0',
+      stast: '0',
+      TenpayTradeNo: nil,
+      TotalSuccessAmount: nil,
+      TotalSuccessTimes: nil,
+      TradeAmt: '1290',
+      TradeDate: '2015/05/25 23:37:13',
+      TradeNo: '1505252337131701',
+      WebATMAccBank: nil,
+      WebATMAccNo: nil,
+      WebATMBankName: nil,
+      CheckMacValue: 'B8C4C0524C6D0F8E6F855A072FE4A340'
+    expect(result).to eq true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allpay_client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jian Weihang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: "歐付寶（Allpay）API 包裝"