wx_pay 0.10 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 038caab730253b977ea49f6bdcdfffd9f4781db5
-  data.tar.gz: 33a5cce8cb7515dacc6b696017d47b13d5a27885
+  metadata.gz: 4f7728aa39f6881fdc10e4f9ce5eb0ea4e8f1aa4
+  data.tar.gz: 06ef45d78a887b2472f7dc3fabe6a32432c18567
 SHA512:
-  metadata.gz: 80788f5ecdca5d258fde467185c672d9b15df9a9f10b3d894ebad92621afeea3829e96f629467010cfb103a75f0b0f931895f8a9e18d46f777434cb412115cb0
-  data.tar.gz: 3edd8fbed54e78146f1eeda6bc741ca5f1e67c5d7323cd355f7568f09876a0a39abf7a17957b24aef0a637a68396206179c0c4286410be19daf82404e31c0ace
+  metadata.gz: 7724c41f2256d30f2813bc2ab5a70e4917abe6627566e6cd9dd7ad6f9edf849690dfed287c8dd6ad018593fe0ac06a6babf8f83a455bfa8e4abb6fe344b261e7
+  data.tar.gz: 861bae20ef39e12fcaf639240c2aa3aa039ee7fdf765193bd69a789520ae972d98397b7882b2460ab690387ac6e601900692862be3d661cf09f638c4bdd00af6

data/lib/wx_pay/service.rb

@@ -16,7 +16,7 @@ module WxPay
 
       check_required_options(params, INVOKE_UNIFIEDORDER_REQUIRED_FIELDS)
 
-      r = invoke_remote("#{GATEWAY_URL}/pay/unifiedorder", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/unifiedorder", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -34,7 +34,7 @@ module WxPay
 
       check_required_options(params, INVOKE_CLOSEORDER_REQUIRED_FIELDS)
 
-      r = invoke_remote("#{GATEWAY_URL}/pay/closeorder", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/closeorder", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -92,7 +92,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = invoke_remote("#{GATEWAY_URL}/secapi/pay/refund", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/secapi/pay/refund", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -109,7 +109,7 @@ module WxPay
 
       check_required_options(params, ORDER_QUERY_REQUIRED_FIELDS)
 
-      r = invoke_remote("#{GATEWAY_URL}/pay/refundquery", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/refundquery", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -132,7 +132,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/promotion/transfers", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/promotion/transfers", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -155,7 +155,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = invoke_remote("#{GATEWAY_URL}/secapi/pay/reverse", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/secapi/pay/reverse", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -178,7 +178,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = invoke_remote("#{GATEWAY_URL}/pay/micropay", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/micropay", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -195,7 +195,7 @@ module WxPay
 
       check_required_options(params, ORDER_QUERY_REQUIRED_FIELDS)
 
-      r = invoke_remote("#{GATEWAY_URL}/pay/orderquery", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/orderquery", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -234,7 +234,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/sendgroupredpack", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/sendgroupredpack", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -256,7 +256,7 @@ module WxPay
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
       }.merge(options)
 
-      r = invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/sendredpack", make_payload(params), options)
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/sendredpack", make_payload(params), options)))
 
       yield r if block_given?
 
@@ -282,7 +282,7 @@ module WxPay
       def invoke_remote(url, payload, options = {})
         options = WxPay.extra_rest_client_options.merge(options)
 
-        r = RestClient::Request.execute(
+        RestClient::Request.execute(
           {
             method: :post,
             url: url,
@@ -290,8 +290,6 @@ module WxPay
             headers: { content_type: 'application/xml' }
           }.merge(options)
         )
-
-        WxPay::Result.new(Hash.from_xml(r))
       end
     end
   end

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = "0.10"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: 0.11.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -141,4 +141,3 @@ test_files:
 - test/wx_pay/result_test.rb
 - test/wx_pay/service_test.rb
 - test/wx_pay/sign_test.rb
-has_rdoc: