ll_pay 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2772f8f1ecafe1006c0452dea64efd64c67f2f
-  data.tar.gz: b6eb1d00781e7773c8036ec885177b2707bc0751
+  metadata.gz: 94394c8c5f44328970365b09b18e9218ba4e0357
+  data.tar.gz: 227ce1f3623584d8c9b15fbf62f10b3fa8bef3c1
 SHA512:
-  metadata.gz: ab32fa457432eb129c845aa3d06a09ce51482f836410a4399302002e65ca8fbc3f882f8d61d9d5a37be997bf24f8929e6472a601a20571f8a7224967d93804ca
-  data.tar.gz: 1b07b23cf8a733cf637dca50ae66d0b2dc60833015a80bf39aee56e86355085cb2050c09bcce380a8768f036b5950a1c90b0f0b18275a9b90d6c3d0e8e86d5e8
+  metadata.gz: d4f4b42fd89cdc6833398ec41967cb2106d261c044d13b5ce01e022f35ca5bc824d42b1f6de44e85a4dda013ceef38cadf7add43079948a72fa011dabf87acf1
+  data.tar.gz: 2fd39caa77553187688720d6b7399d335eba0862b4a0640e4cf9f7b8c05e5dca03bb663e0cbeca2ec769bb3653d790d684461a2b5781f9baf4824336f37f7259

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.5
-before_install: gem install bundler -v 1.12.5
+  - 2.3.3
+before_install: gem install bundler -v 1.13.7
+script:
+  - bundle exec rake
+  - bundle exec codeclimate-test-reporter

data/README.md

@@ -3,8 +3,6 @@ LlPay [![Gem Version][version-badge]][rubygems] [![Build Status][travis-badge]][
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ll_pay`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/ll_pay/query_order.rb

@@ -4,11 +4,11 @@ require 'http' # https://github.com/httprb/http
 
 module LlPay
   module QueryOrder
-    def query_single_order(sign_type, no_order, dt_order)
+    def query_single_order(sign_type, no_order, dt_order, options = {})
       query_order_hash = { oid_partner: LlPay.oid_partner, dt_order: dt_order, no_order: no_order, sign_type: sign_type }
-      query_order_hash[:sign] = LlPay::Sign.generate(query_order_hash)
+      query_order_hash[:sign] = LlPay::Sign.generate(query_order_hash, options)
 
-      request(:post, 'https://yintong.com.cn/queryapi/orderquery.htm', query_order_hash)
+      request(:post, 'https://yintong.com.cn/queryapi/orderquery.htm', query_order_hash, options)
     end
   end
 end

data/lib/ll_pay/refund_order.rb

@@ -1,43 +1,48 @@
 module LlPay
   module RefundOrder
-    def refund_order(params)
+    REFUND_ORDER_PARAMS = %w(oid_partner sign_type no_refund dt_refund money_refund no_order dt_order oid_paybill notify_url)
+    def refund_order(params, options = {})
+      LlPay::Utils.check_required_params(params, REFUND_ORDER_PARAMS)
       params = LlPay::Utils.stringify_keys(params)
-
-      params[:sign_type] = params[:sign_type] || LlPay.sign_type
-      params[:oid_partner] = LlPay.oid_partner
-
-      sign_params = { 'oid_partner' => params[:oid_partner],
-                      'sign_type' => params[:sign_type],
-                      'no_refund' => params[:no_refund],
-                      'dt_refund' => params[:dt_refund],
-                      'money_refund' => params[:money_refund],
-                      'no_order' => params[:no_order],
-                      'dt_order' => params[:dt_order],
-                      'oid_paybill' => params[:oid_paybill],
-                      'notify_url' => params[:notify_url]
+      options = LlPay::Utils.stringify_keys(options)
+
+      params[:sign_type] = params[:sign_type] || options[:sign_type] || LlPay.sign_type
+      params[:oid_partner] = params[:oid_partner] || options[:oid_partner] || LlPay.oid_partner
+
+      sign_params = { oid_partner: params[:oid_partner],
+                      sign_type: params[:sign_type],
+                      no_refund: params[:no_refund],
+                      dt_refund: params[:dt_refund],
+                      money_refund: params[:money_refund],
+                      no_order: params[:no_order],
+                      dt_order: params[:dt_order],
+                      oid_paybill: params[:oid_paybill],
+                      notify_url: params[:notify_url]
                     }
 
-      params[:sign] = LlPay::Sign.generate(sign_params)
+      params[:sign] = LlPay::Sign.generate(sign_params, options)
 
-      request(:post, 'https://yintong.com.cn/traderapi/refund.htm', params)
+      request(:post, 'https://yintong.com.cn/traderapi/refund.htm', params, options)
     end
 
-    def refund_order_query(params)
+    REFUND_ORDER_QUERY_PARAMS = %w(oid_partner sign_type no_refund dt_refund oid_refundno)
+    def refund_order_query(params, options = {})
       params = LlPay::Utils.stringify_keys(params)
+      options = LlPay::Utils.stringify_keys(options)
 
       params[:sign_type] = params[:sign_type] || LlPay.sign_type
       params[:oid_partner] = LlPay.oid_partner
 
-      sign_params = { 'oid_partner' => params[:oid_partner],
-                      'sign_type' => params[:sign_type],
-                      'no_refund' => params[:no_refund],
-                      'dt_refund' => params[:dt_refund],
-                      'oid_refundno' => params[:oid_refundno]
+      sign_params = { oid_partner: params[:oid_partner],
+                      sign_type: params[:sign_type],
+                      no_refund: params[:no_refund],
+                      dt_refund: params[:dt_refund],
+                      oid_refundno: params[:oid_refundno]
                     }
 
-      params[:sign] = LlPay::Sign.generate(sign_params)
+      params[:sign] = LlPay::Sign.generate(sign_params, options)
 
-      request(:post, 'https://queryapi.lianlianpay.com/refundquery.htm', params)
+      request(:post, 'https://queryapi.lianlianpay.com/refundquery.htm', params, options)
     end
   end
 end

data/lib/ll_pay/service.rb

@@ -5,35 +5,27 @@ module LlPay
 
     SECURITY_PAY_REQUIRED_PARAMS = %w(busi_partner dt_order info_order money_order name_goods no_order notify_url oid_partner risk_item sign_type valid_order)
     def securitypay_pay_json(params, options = {})
-      # params = LlPay::Utils.stringify_keys(params)
-      # options = LlPay::Utils.stringify_keys(options)
-
-      check_required_params(params, SECURITY_PAY_REQUIRED_PARAMS)
-
-      params['sign_type'] = params['sign_type'] || LlPay.sign_type
-
-      params = { 'oid_partner' => LlPay.oid_partner }.merge(params)
-
-      sign_params = { 'busi_partner' => params['busi_partner'],
-                      'dt_order' => params['dt_order'],
-                      'money_order' => params['money_order'],
-                      'no_order' => params['no_order'],
-                      'notify_url' => params['notify_url'],
-                      'oid_partner' => params['oid_partner'],
-                      'risk_item' => params['risk_item'],
-                      'sign_type' => params['sign_type'],
-                      'valid_order' => params['valid_order']
+      LlPay::Utils.check_required_params(params, SECURITY_PAY_REQUIRED_PARAMS)
+      params = LlPay::Utils.stringify_keys(params)
+      options = LlPay::Utils.stringify_keys(options)
+
+      params[:sign_type] = params[:sign_type] || options[:sign_type] || LlPay.sign_type
+      params[:oid_partner] = params[:oid_partner] || options[:oid_partner] || LlPay.oid_partner
+
+      sign_params = { busi_partner: params[:busi_partner],
+                      dt_order: params[:dt_order],
+                      money_order: params[:money_order],
+                      no_order: params[:no_order],
+                      notify_url: params[:notify_url],
+                      oid_partner: params[:oid_partner],
+                      risk_item: params[:risk_item],
+                      sign_type: params[:sign_type],
+                      valid_order: params[:valid_order]
                     }
 
-      params['sign'] = LlPay::Sign.generate(sign_params)
+      params[:sign] = LlPay::Sign.generate(sign_params, options)
 
       params.to_json
     end
-
-    def check_required_params(params, names)
-      names.each do |name|
-        warn("ll_pay Warn: missing required option: #{name}") unless params.has_key?(name)
-      end
-    end
   end
 end

data/lib/ll_pay/sign/rsa.rb

@@ -11,7 +11,7 @@ module LlPay
 
       def self.verify?(pubkey, string, sign)
         rsa = OpenSSL::PKey::RSA.new(pubkey)
-        rsa.verify('md5', Base64.strict_decode64(sign), string.force_encoding('utf-8'))
+        rsa.verify('md5', Base64.decode64(sign), string.force_encoding('utf-8'))
       end
     end
   end

data/lib/ll_pay/utils.rb

@@ -7,5 +7,12 @@ module LlPay
       end
       new_hash
     end
+
+    def self.check_required_params(params, names)
+      params_keys = params.keys.map(&:to_s)
+      names.each do |name|
+        warn("ll_pay Warn: missing required option: #{name}") unless params_keys.include?(name)
+      end
+    end
   end
 end

data/lib/ll_pay/version.rb

@@ -1,3 +1,3 @@
 module LlPay
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/ll_pay.rb

@@ -32,7 +32,7 @@ kPE0FtaoMP3gYfh+OwI+fIRrpW3ySn3mScnc6Z700nU/VYrRkfcSCbSnRwIDAQAB
     include Notify
   end
 
-  def self.request(verb, url, params = {})
+  def self.request(verb, url, params = {}, options = {})
     case verb.to_sym
     when :post
       @http_response = HTTP.post(url, json: params)
@@ -42,8 +42,8 @@ kPE0FtaoMP3gYfh+OwI+fIRrpW3ySn3mScnc6Z700nU/VYrRkfcSCbSnRwIDAQAB
     response_hash = JSON.parse(@http_response.body.to_s)
 
     if @http_response.code == 200
-      if response_hash['ret_code'] == 0000
-        if LlPay::Sign.verify?(response_hash)
+      if response_hash['ret_code'] == '0000'
+        if LlPay::Sign.verify?(response_hash, options)
           return response_hash
         else
           return { ret_msg: '签名验证错误' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ll_pay
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - houdelin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: An unofficial lianlian (for apple pay) pay gem.