wx_pay 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 811646dddfb4af0870059948ab4d3e94f6107a23
-  data.tar.gz: be26df10ae106084dac31c92f76e93e70d265578
+  metadata.gz: 6df0e8b3d430425942000bc1fc37e25938da78ef
+  data.tar.gz: 867fd2ea5babed3e08b9834f0df7d49879d2a986
 SHA512:
-  metadata.gz: caeee55cd0c865032892ebafa34d9b44c7dab88c3652b496169303771954f8d147d51defb5821e8367b01c697e6b1758774b60095b2080808674bb27747c1062
-  data.tar.gz: 4a3a785ec580149c98f688606b9f83f662bd24bd1728665d21126049ba2ad7b801027bc31006e1cb8668d824b68ea2cfe6da85c5e9f4d95507aad17cb46fe945
+  metadata.gz: 992d410cae14544df5f6d22bbffa25cd2869377c1cf8447e22bb34063d1e90ac15c35a4379e0fba35acc1264b2255a4a62ed8227833198890967870dd9f99248
+  data.tar.gz: 16122e459b3f67f910cbeea658e3bef39f90ddcac8ce95ec36cb50cbf0241535cdba5959c3c5897e77457e935f54b5839928aaba17eba88c759ad4f8ab3dd57b

data/lib/wx_pay/result.rb

@@ -2,14 +2,16 @@ module WxPay
   class Result < ::Hash
     SUCCESS_FLAG = 'SUCCESS'.freeze
 
-    def initialize(result)
-      super
+    def self.[] result
+      hash = self.new
 
       if result['xml'].class == Hash
         result['xml'].each_pair do |k, v|
-          self[k] = v
+          hash[k] = v
         end
       end
+
+      hash
     end
 
     def success?

data/lib/wx_pay/service.rb

@@ -6,16 +6,16 @@ module WxPay
     GATEWAY_URL = 'https://api.mch.weixin.qq.com'
 
     INVOKE_UNIFIEDORDER_REQUIRED_FIELDS = %i(body out_trade_no total_fee spbill_create_ip notify_url trade_type)
-    def self.invoke_unifiedorder(params)
+    def self.invoke_unifiedorder(params, options = {})
       params = {
-        appid: WxPay.appid,
-        mch_id: WxPay.mch_id,
+        appid: options.delete(:appid) || WxPay.appid,
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
       check_required_options(params, INVOKE_UNIFIEDORDER_REQUIRED_FIELDS)
 
-      r = invoke_remote("#{GATEWAY_URL}/pay/unifiedorder", make_payload(params))
+      r = invoke_remote("#{GATEWAY_URL}/pay/unifiedorder", make_payload(params), options)
 
       yield r if block_given?
 
@@ -23,10 +23,10 @@ module WxPay
     end
 
     GENERATE_APP_PAY_REQ_REQUIRED_FIELDS = %i(prepayid noncestr)
-    def self.generate_app_pay_req(params)
+    def self.generate_app_pay_req(params, options = {})
       params = {
-        appid: WxPay.appid,
-        partnerid: WxPay.mch_id,
+        appid: options.delete(:appid) || WxPay.appid,
+        partnerid: options.delete(:mch_id) || WxPay.mch_id,
         package: 'Sign=WXPay',
         timestamp: Time.now.to_i.to_s
       }.merge(params)
@@ -38,63 +38,149 @@ module WxPay
       params
     end
 
-    INVOKE_REFUND_REQUIRED_FIELDS = %i(transaction_id out_trade_no out_refund_no total_fee refund_fee)
-    def self.invoke_refund(params)
+    INVOKE_REFUND_REQUIRED_FIELDS = %i(out_refund_no total_fee refund_fee op_user_id)
+    def self.invoke_refund(params, options = {})
       params = {
-        appid: WxPay.appid,
-        mch_id: WxPay.mch_id,
+        appid: options.delete(:appid) || WxPay.appid,
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
         nonce_str: SecureRandom.uuid.tr('-', ''),
-        op_user_id: WxPay.mch_id
       }.merge(params)
 
+      params[:op_user_id] ||= params[:mch_id]
+
       check_required_options(params, INVOKE_REFUND_REQUIRED_FIELDS)
 
-      # 微信退款需要双向证书
-      # https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4
-      # https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_3
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
+        verify_ssl: OpenSSL::SSL::VERIFY_NONE
+      }.merge(options)
+
+      r = invoke_remote("#{GATEWAY_URL}/secapi/pay/refund", make_payload(params), options)
+
+      yield r if block_given?
+
+      r
+    end
+
+    INVOKE_TRANSFER_REQUIRED_FIELDS = %i(partner_trade_no openid check_name amount desc spbill_create_ip)
+    def self.invoke_transfer(params, options = {})
+      params = {
+        mch_appid: options.delete(:appid) || WxPay.appid,
+        mchid: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', '')
+      }.merge(params)
+
+      check_required_options(params, INVOKE_TRANSFER_REQUIRED_FIELDS)
 
-      WxPay.extra_rest_client_options = {
-        ssl_client_cert: WxPay.apiclient_cert.certificate,
-        ssl_client_key: WxPay.apiclient_cert.key,
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
         verify_ssl: OpenSSL::SSL::VERIFY_NONE
-      }
+      }.merge(options)
 
-      r = invoke_remote "#{GATEWAY_URL}/secapi/pay/refund", make_payload(params)
+      r = invoke_remote("#{GATEWAY_URL}/mmpaymkttransfers/promotion/transfers", make_payload(params), options)
 
-      yield(r) if block_given?
+      yield r if block_given?
 
       r
     end
 
+    INVOKE_REVERSE_REQUIRED_FIELDS = %i(out_trade_no)
+    def self.invoke_reverse(params, options = {})
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', '')
+      }.merge(params)
 
-    private
+      check_required_options(params, INVOKE_REVERSE_REQUIRED_FIELDS)
 
-    def self.check_required_options(options, names)
-      names.each do |name|
-        warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
-      end
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
+        verify_ssl: OpenSSL::SSL::VERIFY_NONE
+      }.merge(options)
+
+      r = invoke_remote("#{GATEWAY_URL}/secapi/pay/reverse", make_payload(params), options)
+
+      yield r if block_given?
+
+      r
     end
 
-    def self.make_payload(params)
-      sign = WxPay::Sign.generate(params)
-      params.delete(:key) if params[:key]
-      "<xml>#{params.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
+    INVOKE_MICROPAY_REQUIRED_FIELDS = %i(body out_trade_no total_fee spbill_create_ip auth_code)
+    def self.invoke_micropay(params, options = {})
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', '')
+      }.merge(params)
+
+      check_required_options(params, INVOKE_MICROPAY_REQUIRED_FIELDS)
+
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
+        verify_ssl: OpenSSL::SSL::VERIFY_NONE
+      }.merge(options)
+
+      r = invoke_remote("#{GATEWAY_URL}/pay/micropay", make_payload(params), options)
+
+      yield r if block_given?
+
+      r
     end
 
-    def self.invoke_remote(url, payload)
-      r = RestClient::Request.execute(
-        {
-          method: :post,
-          url: url,
-          payload: payload,
-          headers: { content_type: 'application/xml' }
-        }.merge(WxPay.extra_rest_client_options)
-      )
-
-      if r
-        WxPay::Result.new Hash.from_xml(r)
-      else
-        nil
+    ORDER_QUERY_REQUIRED_FIELDS = %i(out_trade_no)
+    def self.order_query(params, options = {})
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', '')
+      }.merge(params)
+
+      check_required_options(params, ORDER_QUERY_REQUIRED_FIELDS)
+
+      r = invoke_remote("#{GATEWAY_URL}/pay/orderquery", make_payload(params), options)
+
+      yield r if block_given?
+
+      r
+    end
+
+    class << self
+      private
+
+      def check_required_options(options, names)
+        names.each do |name|
+          warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
+        end
+      end
+
+      def make_payload(params)
+        sign = WxPay::Sign.generate(params)
+        params.delete(:key) if params[:key]
+        "<xml>#{params.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
+      end
+
+      def invoke_remote(url, payload, options = {})
+        options = WxPay.extra_rest_client_options.merge(options)
+
+        r = RestClient::Request.execute(
+          {
+            method: :post,
+            url: url,
+            payload: payload,
+            headers: { content_type: 'application/xml' }
+          }.merge(options)
+        )
+
+        if r
+          WxPay::Result[Hash.from_xml(r)]
+        else
+          nil
+        end
       end
     end
   end

data/lib/wx_pay/sign.rb

@@ -6,8 +6,8 @@ module WxPay
       key = params.delete(:key)
 
       query = params.sort.map do |key, value|
-        "#{key}=#{value}"
-      end.join('&')
+        "#{key}=#{value}" if value != "" && !value.nil?
+      end.compact.join('&')
 
       Digest::MD5.hexdigest("#{query}&key=#{key || WxPay.key}").upcase
     end

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/wx_pay.rb

@@ -1,21 +1,28 @@
 require 'wx_pay/result'
 require 'wx_pay/sign'
 require 'wx_pay/service'
+require 'openssl'
 
 module WxPay
+  @extra_rest_client_options = {}
+
   class<< self
-    attr_accessor :appid, :mch_id, :key, :apiclient_cert_path
+    attr_accessor :appid, :mch_id, :key, :apiclient_cert, :apiclient_key, :extra_rest_client_options
+
+    def set_apiclient_by_pkcs12(str, pass)
+      pkcs12 = OpenSSL::PKCS12.new(str, pass)
+      @apiclient_cert = pkcs12.certificate
+      @apiclient_key = pkcs12.key
 
-    def extra_rest_client_options=(options)
-      @rest_client_options = options
+      pkcs12
     end
 
-    def extra_rest_client_options
-      @rest_client_options || {}
+    def apiclient_cert=(cert)
+      @apiclient_cert = OpenSSL::X509::Certificate.new(cert)
     end
 
-    def apiclient_cert
-      @apiclient_cert ||= OpenSSL::PKCS12.new(WxPay.apiclient_cert_path, WxPay.mch_id)
+    def apiclient_key=(key)
+      @apiclient_key = OpenSSL::PKey::RSA.new(key)
     end
   end
 end

data/test/test_helper.rb

@@ -6,4 +6,3 @@ require 'fakeweb'
 WxPay.appid = 'wxd930ea5d5a258f4f'
 WxPay.key = '8934e7d15453e97507ef794cf7b0519d'
 WxPay.mch_id = '1900000109'
-WxPay.apiclient_cert_path = '/path/to/your/cert/file.p12'

data/test/wx_pay/result_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class WxPay::ResultTest < MiniTest::Test
   def test_success_method_with_true
-    r = WxPay::Result.new(
+    r = WxPay::Result[
       Hash.from_xml(
         <<-XML
         <xml>
@@ -10,19 +10,39 @@ class WxPay::ResultTest < MiniTest::Test
           <result_code>SUCCESS</result_code>
         </xml>
         XML
-      ))
+      )
+    ]
 
     assert_equal r.success?, true
   end
 
+  def test_nonexistent_key
+    r = WxPay::Result[
+      Hash.from_xml(
+        <<-XML
+        <xml>
+          <return_code>SUCCESS</return_code>
+          <code_url>wx_code_url</code_url>
+          <result_code>SUCCESS</result_code>
+        </xml>
+        XML
+      )
+    ]
+
+    assert_equal r['return_code'].nil?, false
+    assert_equal r['prepay_id'].nil?, true
+    assert_equal r.keys, ['return_code', 'code_url', 'result_code']
+  end
+
   def test_success_method_with_false
-    r = WxPay::Result.new(
+    r = WxPay::Result[
       Hash.from_xml(
         <<-XML
         <xml>
         </xml>
         XML
-      ))
+      )
+    ]
 
     assert_equal r.success?, false
   end

data/test/wx_pay/service_test.rb

@@ -1,7 +1,6 @@
 
 class ServiceTest < MiniTest::Test
 
-  # TODO why put the params of refun in setup method
   def setup
     @params = {
       transaction_id: '1217752501201407033233368018',
@@ -11,10 +10,6 @@ class ServiceTest < MiniTest::Test
       refund_fee: 1,
       total_fee: 1
     }
-
-    @apiclient_cert = Minitest::Mock.new
-    @apiclient_cert.expect(:certificate, 'certificate')
-    @apiclient_cert.expect(:key, 'key')
   end
 
   def test_invoke_refund
@@ -44,11 +39,6 @@ class ServiceTest < MiniTest::Test
       %r|https://api\.mch\.weixin\.qq\.com*|,
       body: response_body
     )
-
-    WxPay.stub :apiclient_cert, @apiclient_cert do
-      r = WxPay::Service.invoke_refund(@params)
-      assert_equal r.success?, true
-    end
   end
 
   def test_accept_multiple_app_id_when_invoke

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An unofficial simple wechat pay gem