alipay 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82251b3f0f9bf268033359506be8a6f6057498f
-  data.tar.gz: 9942b8e00d07cba64b1e911395a5a74b1936184b
+  metadata.gz: dbf13c5cf133ea25199a7ed7e051c1f6546d5e04
+  data.tar.gz: a4fc849d912fd9090a679b88f602d186940acb3c
 SHA512:
-  metadata.gz: 4983fcb2e960b7e6ccc9ad3bc16d1c4c625b963eaffafa45938be676f3b1119790019ead77a0278eaddcedf8b4c4b66a030dc6c30c727871e1ca46744742524c
-  data.tar.gz: b44a46ab7f5fd8b465375965ab99546e5bda8f2c32c9ab8ea455e8d2a6a39124f537695cfd4b7cb04914f187e741413abac32dbaad779307ed8c89604386e32d
+  metadata.gz: 1209e5d64b493f3cd0e3fcc8a511bfef6f9146eff3b0df5f139bb0451b5af707c8fc0d5376574f31da6b3aa765792c426cfd70512dbf61be09f67953c5764040
+  data.tar.gz: e19ff49a78fb10d7d5c394b7deff1295405dea96425b58e422347931a8ab112c980d1e839d55d74a262718cdb41c33a075494fbb68fbfd8eca0a542fd53b370f

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## v0.3.0 (2014-12-10)
+
+- Add `close_trade` service. by @linjunpop #16
+
 ## v0.2.0 (2014-12-03)
 
-- Add `create_forex_trade` service. by @christophe-dufour
+- Add `create_forex_trade` service. by @christophe-dufour #15
 
 ## v0.1.0 (2014-06-15)
 

data/README.md

@@ -6,6 +6,7 @@ It contain this API:
 
 * Generate payment url (web, wap)
 * Send goods
+* Close trade
 * Verify notify (web, wap, app)
 
 Please read alipay official document first: https://b.alipay.com/order/techService.htm .
@@ -105,6 +106,28 @@ Alipay::Service.send_goods_confirm_by_platform(options)
 # => '<!xml version="1.0" encoding="utf-8"?><alipay><is_success>T</is_success></alipay>'
 ```
 
+### Close trade
+
+```ruby
+Alipay::Service.close_trade(
+  :trade_no     => 'TRADE_NO',
+  :out_order_no => 'the-out-order-no'
+)
+# => '<?xml version="1.0" encoding="utf-8"?><alipay><is_success>T</is_success></alipay>'
+```
+
+You must specify either `trade_no` or `out_order_no`.
+
+If Alipay fail to close trade, this method will return XML similar to:
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<alipay>
+  <is_success>F</is_success>
+  <error>TRADE_STATUS_NOT_AVAILD</error>
+</alipay>
+```
+
 ### Refund
 
 ```ruby

data/lib/alipay/service.rb

@@ -99,7 +99,6 @@ module Alipay
       open("#{GATEWAY_URL}?#{query_string(options)}").read
     end
 
-
     CREATE_FOREX_TRADE_REQUIRED_OPTIONS = %w(service partner _input_charset notify_url subject out_trade_no currency total_fee)
     def self.create_forex_trade(options)
       options = {
@@ -114,6 +113,23 @@ module Alipay
       "#{GATEWAY_URL}?#{query_string(options)}"
     end
 
+    CLOSE_TRADE_REQUIRED_OPTIONS = %w( service partner _input_charset)
+    def self.close_trade(options)
+      options = {
+        'service'        => 'close_trade',
+        '_input_charset' => 'utf-8',
+        'partner'        => Alipay.pid
+      }.merge(Utils.stringify_keys(options))
+
+      check_required_options(options, CLOSE_TRADE_REQUIRED_OPTIONS)
+
+      if options['trade_no'].nil? and options['out_order_no'].nil?
+        warn("Ailpay Warn: must specify either trade_no or out_order_no")
+      end
+
+      open("#{GATEWAY_URL}?#{query_string(options)}").read
+    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)}"

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/alipay/service_test.rb

@@ -63,6 +63,23 @@ class Alipay::ServiceTest < Test::Unit::TestCase
     assert_not_nil Alipay::Service.create_forex_trade(options)
   end
 
+  def test_close_trade
+    response_body = <<-EOF
+      <?xml version="1.0" encoding="utf-8"?>
+      <alipay>
+        <is_success>T</is_success>
+      </alipay>
+    EOF
+    FakeWeb.register_uri(
+      :get,
+      %r|https://mapi\.alipay\.com/gateway\.do.*|,
+      :body => response_body
+    )
+
+    assert_equal response_body, Alipay::Service.close_trade(
+      :out_order_no => 'the-out-order-no'
+    )
+  end
 
   def test_should_send_goods_confirm_by_platform
     body = <<-EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler