alipay 0.6.0.beta2 → 0.6.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71cda0616aea582148d328443b0125336f53ccd7
-  data.tar.gz: 20c42fb725858fe8b9beb6f82d0c3d7868eb2048
+  metadata.gz: b1b40064ee7facb241d38d98705e5906f3a3f0dc
+  data.tar.gz: e5c62d859db374245b62359e9a76809cb62d8978
 SHA512:
-  metadata.gz: a5f1bb00e7372766e6af487093e775efe68f9ac08bc55a1127babbb8998244bea7c41ab30e6346b4060f0e5c7de8c1ad25ff5df2abbffa8540a439350d43cbfa
-  data.tar.gz: c6d52bf5024cf63e171e044bf34d0b1782e4ad4a48a2fa7773156990b3b97f06edcad400c363e2e12708fc29bd98dcfa93638408cab3038e85589de29f1a4db2
+  metadata.gz: d0b965d472f626fa8ad8379501ee3bbd1047f4f0a3c4bf57abfa8513861efdaf1ed4c497aa0e879c5fa7861457142e10c8d4bbdf40d72593afd95b2931f43b3d
+  data.tar.gz: 39877c9ae0e517cb47d4dc9609a78a81d47a10751ced9c3836e446369a3f53bb505fb4089fa8784c63fb40728a9f9a88a5cc634d7ad8ecdc95ab2c374259af38

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.6.0.beta3 (2015-04-02)
+
+- Don't raise exception when sign_type error in Sign.verify?.
+- Fixed gmt_return timezone to +08:00.
+
 ## v0.6.0.beta2 (2015-04-01)
 
 - Move `Alipay::Service::Wap` to `Alipay::Wap::Service`

data/README.md

@@ -11,7 +11,7 @@ Master branch(v0.6.0) is in develop, checkout [v0.5.0](https://github.com/chloer
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'alipay', '~> 0.6.0.beta2'
+gem 'alipay', '~> 0.6.0.beta3'
 ```
 
 or master branch:
@@ -351,7 +351,7 @@ Alipay::Service.forex_refund_url(
   return_amount: '10.00',
   currency: 'USD',
   reason: 'Reason',
-  gmt_return: '2015-04-01 00:00:00'
+  gmt_return: '20150401000000'
 )
 ```
 
@@ -364,7 +364,9 @@ Alipay::Service.forex_refund_url(
 | return_amount | required | Refund amount. |
 | currency | required | Abbreviated currency name. |
 | reason | required | Refun reason. |
-| notify_url | optional | Alipay asyn notify url. |
+| gmt_return | required * | YYYYMMDDHHMMSS Beijing Time. |
+
+\* Auto set Time.now if not set.
 
 ### 验证通知
 

data/lib/alipay/service.rb

@@ -96,7 +96,7 @@ module Alipay
         'service'        => 'forex_refund',
         'partner'        => options[:pid] || Alipay.pid,
         '_input_charset' => 'utf-8',
-        'gmt_return'     => Time.now.strftime('%Y%m%d%H%M%S')
+        'gmt_return'     => Time.now.getlocal('+08:00').strftime('%Y%m%d%H%M%S')
       }.merge(params)
 
       request_uri(params, options).to_s

data/lib/alipay/sign.rb

@@ -43,7 +43,7 @@ NG9zpgmLCUYuLkxpLQIDAQAB
       when 'DSA'
         DSA.verify?(string, sign)
       else
-        raise ArgumentError, "[Alipay] Invalid sign_type #{sign_type}, allow values: 'MD5', 'RSA', 'DSA'"
+        false
       end
     end
 

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.6.0.beta2"
+  VERSION = "0.6.0.beta3"
 end

data/lib/alipay/wap/sign.rb

@@ -22,7 +22,7 @@ Udmh5Ua2xg6IEfk493VQIDAQAB
         when '0001' # RSA
           ::Alipay::Sign::RSA.verify?(ALIPAY_RSA_PUBLIC_KEY, string, sign)
         else
-          raise ArgumentError, "[Alipay] Invalid sec_id, allow value: 'MD5', '0001'"
+          false
         end
       end
 

data/test/alipay/service_test.rb

@@ -60,9 +60,9 @@ class Alipay::ServiceTest < Minitest::Test
       :return_amount => '0.01',
       :currency      => 'USD',
       :reason        => 'reason',
-      :gmt_return    => '2015-01-01 00:00:00'
+      :gmt_return    => '20150101000000'
     }
-    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.forex_refund_url(options)
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=forex_refund&partner=1000000000000000&_input_charset=utf-8&gmt_return=20150101000000&out_return_no=1&out_trade_no=12345678980&return_amount=0.01&currency=USD&reason=reason&sign_type=MD5&sign=c9681fff5505fe993d1b2b8141308d0d', Alipay::Service.forex_refund_url(options)
   end
 
   def test_generate_create_forex_trade_url

data/test/alipay/sign_test.rb

@@ -23,6 +23,7 @@ class Alipay::SignTest < Minitest::Test
   end
 
   def test_verify_fail_when_sign_not_true
+    assert !Alipay::Sign.verify?(@params)
     assert !Alipay::Sign.verify?(@params.merge(:danger => 'danger', :sign_type => 'MD5', :sign => @md5_sign))
     assert !Alipay::Sign.verify?(@params.merge(:sign_type => 'MD5', :sign => 'danger'))
   end

data/test/alipay/wap/sign_test.rb

@@ -12,6 +12,8 @@ class Alipay::Wap::SignTest < Minitest::Test
   end
 
   def test_verify_sign
+    assert !Alipay::Wap::Sign.verify?(@params)
+    assert !Alipay::Wap::Sign.verify?(@params.merge(:sec_id => 'unknow'))
     assert Alipay::Wap::Sign.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.6.0.beta2
+  version: 0.6.0.beta3
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler