wxpay 0.1.0.alpha → 0.1.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d08ccd36a9d140b1db257fcae477f104f7e14a45
-  data.tar.gz: 39d73461f4caf4ea8b912d6dc6f24660cca07351
+  metadata.gz: d7d722dfe9cd3843e79b5acdff3a68f092f7be27
+  data.tar.gz: 1a4937d2dc7642074bdb638bc9174658d4290618
 SHA512:
-  metadata.gz: 75c3d8b58ecf4ec153d1ecc5c8265fe90442ec84314ea1224c608c73962015f540cce7e305c8d2b5a483bbd9c1cdd2829aedd7b9a59a58d9d3277a998286a8ef
-  data.tar.gz: ac7e5c195ee0a657e88c7fa9b1417e381c6dbb2404da85290cf975f4f6c5644d7780ade9cc1667e99015a06157d12fa0dd4f559f4146fdaf19331dafc4769bed
+  metadata.gz: 24049c62991342c475eb2489e0819ec9d7fa74592228adad918ae1fa5f77ed655532e455b28ea04389ca7f70ab7fcfc662d4a1d0cbdae54ec6398eb6f4497905
+  data.tar.gz: 59e5f6e8cf1972b04a978d8236e199532e1fdb5c3a5f03c6b6247515447aff02936ce55933ce6a7ebba173439f9ac6663b152b9521fcf1f1e0a3a79ae467cda1

data/README.md

@@ -16,10 +16,39 @@ Or install it yourself as:
 
     $ gem install wxpay
 
+## Configuration
+
+These 4 configurations are for NATIVE and JSAPI pay
+```ruby
+Wxpay.app_id = 'YOUR_APP_ID',
+Wxpay.app_secret = 'YOUR_APP_SECRET'
+Wxpay.merchant_id = 'YOUR_MERCHANT_ID'
+Wxpay.api_key = 'YOUR_API_KEY'
+```
+These 4 configurations are for APP pay
+```ruby
+Wxpay.app_app_id = 'YOUR_APP_APP_ID'
+Wxpay.app_app_secret = 'YOUR_APP_APP_SECRET'
+Wxpay.app_merchant_id = 'YOUR_APP_MERCHANT_ID'
+Wxpay.app_api_key = 'YOUR_APP_API_KEY'
+```
+
+If want use debug mode, set this to true
+```ruby
+Wxpay.debug = true
+
+# then you can print debug info to your stderr log
+
+Wxpay.debug_info request.body.inspect
+```
+
 ## Usage
 
-Support there is a action named 'wxpay'
+1, NATIVE pay
+
+Example code:
 
+In your controller
 ```ruby
   def wxpay
     @order = Order.find params[:id]
@@ -28,19 +57,135 @@ Support there is a action named 'wxpay'
                                 spbill_create_ip: request_ip,
                                 notify_url: your_notify_url,
                                 out_trade_no: @order.wxpay_trade_no,
-                                trade_type: 'NATIVE', # Or 'APP', 'JSAPI'
-                                openid: user_wechat_openid
+                                trade_type: 'NATIVE',
+                                product_id: @order.product_id   # 'product_id' is need for NATIVE pay
     resp = @wxorder.pay!
 
     if resp[:status] == "success"
       @code_url = resp[:code_url] # qrcode from wechat, you need to create qrcode image with this value
+      render json: {state: 'success', code_url: @code_url}
+    else
+      @error_message = resp[:err_msg]
+      render json: {state: 'failure', message: @error_message}
+    end
+  end
+```
+
+2, JSAPI pay
+
+**Notice**
+
+Compare to NATIVE pay, you need more settings to make jsapi works.
+you need to set a url of the web page which the JSAPI pay launch,
+and you need set permission to get base user info, e.g. **openid**, from wechat server.
+
+Example code:
+in your controller:
+```ruby
+  def wxpay_jsapi
+    @order = Order.find params[:id]
+
+    # if you do not get user's openid, JUST COMMENT THIS LINE
+    # wxpay_openid
+
+    @wxorder = Wxpay::Order.new body: @order.subject,
+                                total_fee: @order.total_fee,
+                                spbill_create_ip: request_ip,
+                                notify_url: your_notify_url,
+                                out_trade_no: @order.wxpay_trade_no,
+                                trade_type: 'JSAPI',
+                                openid: session[:wxpay_openid]
+
+    resp = @wxorder.pay!
+
+    if resp[:status] == "success"
+      @prepay_id = resp[:prepay_id]
+      signature_params
     else
       @error_message = resp[:err_msg]
     end
   end
 ```
-Notice: 'openid' is need for JSAPI pay, 'product_id' is need for NATIVE pay
+**wxpay_openid** is convenient for you to get current_user's openid, you can call method directly within your action, or you can put it into before_action.
+**signature_params** is another method to set params for wechat javascript api for payment
+```ruby
+  protected
+
+  def signature_params
+    @timestamp = Time.current.to_i
+    @nonce_str = SecureRandom.hex(16)
+    @package = "prepay_id=#{@prepay_id}"
+
+    param = {
+      'appId' => Wxpay.app_id,
+      'timeStamp' => @timestamp,
+      'nonceStr' => @nonce_str,
+      'package' => @package,
+      'signType' => 'MD5'
+    }
+
+    @pay_sign = Wxpay::Sign.sign_package param
 
+    # success_url is a url the wechat will redirect when the payment succeed
+    @success_url = YOUR_SUCCESS_URL
+  end
+```
+
+
+in your view:
+```ruby
+= render_jsapi_script(timestamp: @timestamp, nonce_str: @nonce_str, package: @package, pay_sign: @pay_sign, success_url: @success_url)
+```
+this helper method will generate some javascript into the view, and launch the wechat jsapi payment
+
+3, APP pay
+
+Example code:
+```ruby
+def wxpay_app
+  @order = Order.find params[:id]
+  Wxpay::Order.new body: @order.subject,
+                  total_fee: @order.total_fee,
+                  spbill_create_ip: request_ip,
+                  notify_url: your_notify_url,
+                  out_trade_no: @order.wxpay_trade_no,
+                  trade_type: 'APP',
+                  openid: session[:wxpay_openid]
+
+  resp = @wxorder.pay!
+
+  if resp[:status] == "success"
+    @prepay_id = resp[:prepay_id]
+  else
+    @error_message = resp[:err_msg]
+  end
+
+  @timestamp = Time.current.to_i
+  @nonce_str = SecureRandom.hex(16)
+  @package = "Sign=WXPay"
+
+  param = {
+    'appid' => Wxpay.app_app_id,
+    'partnerid' => Wxpay.app_merchant_id,
+    'trade_type' => 'APP',
+    'prepayid' => @prepay_id,
+    'package' => @package,
+    'noncestr' => @nonce_str,
+    'timestamp' => @timestamp
+  }
+
+  @pay_sign = WxSign.sign_package param
+  # return the hash to your app
+  return json: { appid: APP_APP_ID,
+                 partner_id: APP_MERCHANT_ID,
+                 prepay_id: @prepay_id,
+                 package_value: @package,
+                 nonce_str: @nonce_str.to_s,
+                 time_stamp: @timestamp,
+                 sign: @pay_sign
+                }
+end
+```
 
 ## Contributing
 

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
-task :default => :spec
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task :default => :test

data/lib/wxpay.rb

@@ -3,6 +3,8 @@ require "wxpay/version"
 require "wxpay/sign"
 require "wxpay/api"
 require "wxpay/order"
+require "wxpay/helpers"
+require "wxpay/controllers"
 
 module Wxpay
   class << self
@@ -23,3 +25,5 @@ module Wxpay
     end
   end
 end
+
+ActionView::Base.send :include, Wxpay::Helpers if defined? ActionView::Base

data/lib/wxpay/api/orderquery.rb

@@ -1,3 +1,4 @@
+require 'builder'
 require 'faraday'
 
 module Wxpay
@@ -11,8 +12,8 @@ module Wxpay
           nonce_str: random_str,
           out_trade_no: order.wxpay_trade_no
         }
-        sort_str = Wxpay::Sign.create_sign_str param
-        sign = Wxpay::Sign.sign_package sort_str
+
+        sign = Wxpay::Sign.sign_package param
 
         _xm = Builder::XmlMarkup.new
         request_str = _xm.xml {

data/lib/wxpay/api/unifiedorder.rb

@@ -1,3 +1,4 @@
+require 'builder'
 require 'faraday'
 
 module Wxpay
@@ -7,15 +8,14 @@ module Wxpay
         random_str = SecureRandom.hex(10)
 
         defaults = {
-          appid:            Wxpay.app_id,
-          mch_id:           Wxpay.merchant_id,
+          appid:            order.app_id,
+          mch_id:           order.merchant_id,
           nonce_str:        random_str
         }
 
         param = defaults.merge(order.attributes).merge(options)
 
-        sort_str = Wxpay::Sign.create_sign_str param
-        sign = Wxpay::Sign.sign_package sort_str
+        sign = Wxpay::Sign.sign_package param
 
         _xm = Builder::XmlMarkup.new
         request_str = _xm.xml {

data/lib/wxpay/controllers.rb

@@ -0,0 +1,29 @@
+module Wxpay
+  module Controllers
+
+    AUTHORIZE_URL = 'https://open.weixin.qq.com/connect/oauth2/authorize'
+    ACCESS_TOKEN_URL = 'https://api.weixin.qq.com/sns/oauth2/access_token'
+
+    def wxpay_openid
+      return if session[:wxpay_openid]
+      code = request.parameters[:code]
+      # 如果code参数为空，则为认证第一步，重定向到微信认证
+      if code.nil?
+        url = URI.encode(request.url, /\W/)
+        redirect_to "#{AUTHORIZE_URL}?appid=#{Wxpay.app_id}&redirect_uri=#{url}&response_type=code&scope=snsapi_base&state=WXPAY#wechat_redirect"
+        return
+      end
+
+      #如果code参数不为空，则认证到第二步，通过code获取openid，并保存到session中
+      begin
+        url = "#{ACCESS_TOKEN_URL}?appid=#{Wxpay.app_id}&secret=#{Wxpay.app_secret}&code=#{code}&grant_type=authorization_code"
+        openid = JSON.parse(URI.parse(url).read)["openid"]
+        session[:wxpay_openid] = openid
+        return openid
+      rescue Exception => e
+        warn "Wechat openid Exception::::::"
+        warn e.message
+      end
+    end
+  end
+end

data/lib/wxpay/helpers.rb

@@ -0,0 +1,35 @@
+module Wxpay
+  module Helpers
+    def render_jsapi_script options={}
+      javascript_tag <<-SCRIPT
+function onBridgeReady(){
+  WeixinJSBridge.invoke(
+    'getBrandWCPayRequest', {
+      "appId"    : "#{Wxpay.app_id}",
+      "timeStamp": "#{options[:timestamp]}",
+      "nonceStr" : "#{options[:nonce_str]}",
+      "package"  : "#{options[:package]}",
+      "signType" : "MD5",
+      "paySign"  : "#{options[:pay_sign]}"
+    },
+    function(res){
+      if(res.err_msg == "get_brand_wcpay_request:ok" ) {
+        window.location = "#{options[:success_url]}";
+      }
+    }
+  );
+}
+if (typeof WeixinJSBridge == "undefined"){
+  if( document.addEventListener ){
+    document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+  }else if (document.attachEvent){
+    document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+    document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+  }
+}else{
+  onBridgeReady();
+}
+SCRIPT
+    end
+  end
+end

data/lib/wxpay/order.rb

@@ -52,10 +52,6 @@ module Wxpay
         raise OrderIllegal, "trade_type must be one of ['NATIVE', 'APP', 'JSAPI']"
       end
 
-      if @trade_type == 'JSAPI' && @openid.blank?
-        raise OrderIllegal, "openid is needed"
-      end
-
       if @trade_type == 'NATIVE' && @product_id.blank?
         raise OrderIllegal, "product_id is needed"
       end

data/lib/wxpay/order/pay.rb

@@ -23,11 +23,12 @@ module Wxpay
 
         Wxpay.debug_info resp.body
 
-        if xml.at('code_url').present?
-          code_url = xml.at('code_url').text
-          return {status: 'success', code_url: code_url}
-        else
+        if xml.at('return_code').text == 'SUCCESS' && xml.at('result_code').text == 'SUCCESS'
+          return {status: 'success', prepay_id: xml.at('prepay_id').text}
+        elsif xml.at('return_code').text == 'SUCCESS'
           return {status: 'failure', err_msg: xml.at('err_code_des').text}
+        else
+          return {status: 'failure', err_msg: xml.at('return_msg').text}
         end
       end
 
@@ -54,11 +55,12 @@ module Wxpay
 
         Wxpay.debug_info resp.body
 
-        if xml.at('code_url').present?
-          code_url = xml.at('code_url').text
-          return {status: 'success', code_url: code_url}
+        if xml.at('return_code').text == 'SUCCESS' && xml.at('result_code').text == 'SUCCESS'
+          return {status: 'success', prepay_id: xml.at('prepay_id').text}
+        elsif xml.at('return_code').text == 'SUCCESS'
+          return {status: 'failure', err_msg: xml.at('err_code_des').text}
         else
-          return {status: 'error', err_msg: xml.at('return_msg').text}
+          return {status: 'failure', err_msg: xml.at('return_msg').text}
         end
       end
     end

data/lib/wxpay/sign.rb

@@ -2,21 +2,32 @@ module Wxpay
   module Sign
     extend self
 
-    def sign_package params_str, options={}
-      if params_str =~ /trade_type=APP/ || options[:trade_type] == 'APP'
+    # used in wechat pay api
+    def sign_package params
+      params_str = create_sign_str params
+
+      if params_str =~ /trade_type=APP/
         key = Wxpay.app_api_key
       else
         key = Wxpay.api_key
       end
-      Rails.logger.info "sign_package:::::: #{params_str}"
       Digest::MD5.hexdigest(params_str+"&key=#{key}").upcase
     end
 
-    def sign_pay params_str
-      Rails.logger.info "sign_pay:::::: #{params_str}"
+    # used in wechat jssdk ,
+    def sign_jssdk params
+      params_str = create_sign_str params
+
       Digest::SHA1.hexdigest params_str
     end
 
+    # used in wechat pay notify
+    def verify params
+      params['sign'] == sign_package(params.except('sign'))
+    end
+
+    private
+
     def create_sign_str options={}, sort=true
       unsigned_str = ''
       if sort
@@ -28,9 +39,5 @@ module Wxpay
       unsigned_str = unsigned_str[0, unsigned_str.length - 1]
     end
 
-    def verify params
-      sign_str = create_sign_str(params.except('sign'))
-      params['sign'] == sign_package(sign_str)
-    end
   end
 end

data/lib/wxpay/version.rb

@@ -1,3 +1,3 @@
 module Wxpay
-  VERSION = "0.1.0.alpha"
+  VERSION = "0.1.0.beta"
 end

data/wxpay.gemspec

@@ -16,10 +16,14 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "fakeweb"
+  spec.add_dependency             "builder", "~> 3.2"
   spec.add_dependency             "nokogiri", "~> 1.6"
   spec.add_dependency             "faraday", "~> 0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxpay
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.1.0.beta
 platform: ruby
 authors:
 - lifeixiong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,58 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +127,8 @@ files:
 - lib/wxpay/api.rb
 - lib/wxpay/api/orderquery.rb
 - lib/wxpay/api/unifiedorder.rb
-- lib/wxpay/openid.rb
+- lib/wxpay/controllers.rb
+- lib/wxpay/helpers.rb
 - lib/wxpay/order.rb
 - lib/wxpay/order/pay.rb
 - lib/wxpay/sign.rb

data/lib/wxpay/openid.rb

@@ -1,24 +0,0 @@
-module Wxpay
-  module Openid
-    AUTHORIZE_URL = 'https://open.weixin.qq.com/connect/oauth2/authorize'
-    ACCESS_TOKEN_URL = 'https://api.weixin.qq.com/sns/oauth2/access_token'
-    def get_openid
-      code = params[:code]
-      Rails.logger.info "code: #{code}"
-      # 如果code参数为空，则为认证第一步，重定向到微信认证
-      if code.nil?
-        url = URI.encode(request.url.gsub('www.tangpin.me', 'tangpin.me'), /\W/)
-        redirect_to "#{AUTHORIZE_URL}?appid=#{WEIXIN_ID}&redirect_uri=#{url}&response_type=code&scope=snsapi_base&state=tangpin#wechat_redirect"
-        return
-      end
-
-      #如果code参数不为空，则认证到第二步，通过code获取openid，并保存到session中
-      begin
-        url = "#{ACCESS_TOKEN_URL}?appid=#{WEIXIN_ID}&secret=#{WEIXIN_SECRET}&code=#{code}&grant_type=authorization_code"
-        session[:weixin_openid] = JSON.parse(URI.parse(url).read)["openid"]
-      rescue Exception => e
-        # ...
-      end
-    end
-  end
-end