wechat 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15c91eb2d65ed9645ca79ace9245f8b37951dd04
-  data.tar.gz: ce52424a06ecbd344c18f4a2113dbf7af9507a9f
+  metadata.gz: 0ff11a10da8e6a405f646702fc63e4b72e778ace
+  data.tar.gz: 5269fd75b8a4044d6b140fdb197f3dd8381fc868
 SHA512:
-  metadata.gz: 7d7c44d220b7467482271b757dddc50e71f19df8a2d2bde28d6e2d3a3c8f9eaf2cebb70adaa6df73ad9b86c34314f013c0803d3def5cd47dd933e82d1d86408b
-  data.tar.gz: 988540c451e81e64e44c2959d46197e420bfe1ed32756e4a15b33b68ad523abf9a32afb50fd9ddeb3e117c98fd6bf16c83eb77b750161976fec40b0dec0f309a
+  metadata.gz: 03775bee616b1c070efefaff727330ea8ce3411232ea3dffb3f8da2cd21d309b1aa8e86a07831711f198da5dbb5460bc71fa831900eba27c29ac291badad7548
+  data.tar.gz: 6e1001ea2b328e4c69fd6960bb8c7b50a0b178950c2c922ed482b37eacabdcc5c0b4cf7ec213490a80de6530695d79b428becf61d72c33f462dfc22586145433

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.4.2 (released at 9/7/2015)
+
+* Fix wrong number of arguments at Wechat::Responder.on by using arity #47
+* Fix can not access wechat method after using instance level context.
+* Fix skip_verify_ssl parameter error. 
+
 ## v0.4.1 (released at 9/6/2015)
 
 * Limit news articles collection to 10, close #5

data/README.md

@@ -147,6 +147,7 @@ Wechat commands:
   wechat custom_video [OPENID, VIDEO_PATH]                 # 发送视频客服消息
   wechat custom_voice [OPENID, VOICE_PATH]                 # 发送语音客服消息
   wechat department [DEPARTMENT_ID]                        # 获取部门列表
+  wechat department_create [NAME, PARENT_ID]               # 创建部门
   wechat group_create [GROUP_NAME]                         # 创建分组
   wechat group_delete [GROUP_ID]                           # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]           # 修改分组名
@@ -352,14 +353,16 @@ class WechatsController < ApplicationController
     end
   end
 
-  # 当收到 EventKey 为 mykey 的事件时
-  on :event, with: "mykey" do |request, key|
-    request.reply.text "收到来自#{request[:FromUserName]} 的EventKey 为 #{key} 的事件"
+  # 当收到EventKey 为二维码扫描结果事件时
+  on :event, with: 'BINDING_QR_CODE' do |request, scan_result, scan_type|
+    request.reply.text "User #{request[:FromUserName]} ScanResult #{scan_result} ScanType #{scan_type}"
   end
 
-  # 当收到EventKey 为二维码扫描结果事件时
-  on :event, with: 'BINDING_QR_CODE' do |request, scan_type, scan_result|
-    request.reply.text "User #{request[:FromUserName]} ScanType #{scan_type} ScanResult #{scan_result}"
+  # 当收到EventKey 为CODE 39码扫描结果事件时
+  on :event, with: 'BINDING_BARCODE' do |message, scan_result|
+    if scan_result.start_with? 'CODE_39,'
+      message.reply.text "User: #{message[:FromUserName]} scan barcode, result is #{scan_result.split(',')[1]}"
+    end
   end
 
   # 处理图片信息
@@ -384,12 +387,12 @@ class WechatsController < ApplicationController
   end
 
   # 当用户加关注
-  on :event, with: 'subscribe' do |request, key|
-    request.reply.text "#{request[:FromUserName]} #{key} now"
+  on :event, with: 'subscribe' do |request|
+    request.reply.text "#{request[:FromUserName]} subscribe now"
   end
 
   # 当用户取消关注订阅
-  on :event, with: 'unsubscribe' do |request, key|
+  on :event, with: 'unsubscribe' do |request|
     request.reply.text "#{request[:FromUserName]}无法收到这条消息。"
   end
 

data/bin/wechat

@@ -88,6 +88,13 @@ HELP
     puts Helper.with(options).group_delete(groupid)
   end
 
+  desc 'department_create [NAME, PARENT_ID]', '创建部门'
+  method_option :parentid, aliases: '-p', desc: '父亲部门id。根部门id为1'
+  def department_create(name)
+    api_opts = options.slice(:parentid)
+    puts Helper.with(options).department_create(name, api_opts[:parentid] || '1')
+  end
+
   desc 'department [DEPARTMENT_ID]', '获取部门列表'
   def department(departmentid)
     puts Helper.with(options).department(departmentid)

data/lib/wechat.rb

@@ -25,16 +25,7 @@ module Wechat
         config = YAML.load(ERB.new(File.new(config_file).read).result)[Rails.env] if File.exist?(config_file)
       end
 
-      config ||= { appid: ENV['WECHAT_APPID'],
-                   secret: ENV['WECHAT_SECRET'],
-                   corpid: ENV['WECHAT_CORPID'],
-                   corpsecret: ENV['WECHAT_CORPSECRET'],
-                   agentid: ENV['WECHAT_AGENTID'],
-                   token: ENV['WECHAT_TOKEN'],
-                   access_token: ENV['WECHAT_ACCESS_TOKEN'],
-                   encrypt_mode: ENV['WECHAT_ENCRYPT_MODE'],
-                   skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
-                   encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'] }
+      config ||= config_from_environment
       config.symbolize_keys!
       config[:access_token] ||= Rails.root.join('tmp/access_token').to_s
       config[:jsapi_ticket] ||= Rails.root.join('tmp/jsapi_ticket').to_s
@@ -46,7 +37,22 @@ module Wechat
     if config.corpid.present?
       @api ||= CorpApi.new(config.corpid, config.corpsecret, config.access_token, config.agentid, config.skip_verify_ssl)
     else
-      @api ||= Api.new(config.appid, config.secret, config.access_token, config.jsapi_ticket, config.skip_verify_ssl)
+      @api ||= Api.new(config.appid, config.secret, config.access_token, config.skip_verify_ssl, config.jsapi_ticket)
     end
   end
+
+  private
+
+  def self.config_from_environment
+    { appid: ENV['WECHAT_APPID'],
+      secret: ENV['WECHAT_SECRET'],
+      corpid: ENV['WECHAT_CORPID'],
+      corpsecret: ENV['WECHAT_CORPSECRET'],
+      agentid: ENV['WECHAT_AGENTID'],
+      token: ENV['WECHAT_TOKEN'],
+      access_token: ENV['WECHAT_ACCESS_TOKEN'],
+      encrypt_mode: ENV['WECHAT_ENCRYPT_MODE'],
+      skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
+      encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'] }
+  end
 end

data/lib/wechat/corp_api.rb

@@ -39,6 +39,10 @@ module Wechat
       get('user/delete', params: { userid: userid })
     end
 
+    def department_create(name, parentid)
+      post('department/create', JSON.generate(name: name, parentid: parentid))
+    end
+
     def department(departmentid = 1)
       get('department/list', params: { id: departmentid })
     end

data/lib/wechat/responder.rb

@@ -71,7 +71,7 @@ module Wechat
           if condition.is_a? Regexp
             memo[:scoped] ||= [responder] + $LAST_MATCH_INFO.captures if value =~ condition
           elsif value.is_a? Hash
-            memo[:scoped] ||= [responder, value[:scan_type], value[:scan_result]] if value[:event_key] == condition
+            memo[:scoped] ||= [responder, value[:scan_result], value[:scan_type]] if value[:event_key] == condition
           else
             memo[:scoped] ||= [responder, value] if value == condition
           end
@@ -80,6 +80,10 @@ module Wechat
       end
     end
 
+    def wechat
+      self.class.wechat # Make sure user can continue access wechat at instance level similar to class level
+    end
+
     def show
       if self.class.corpid.present?
         echostr, _corp_id = unpack(decrypt(Base64.decode64(params[:echostr]), self.class.encoding_aes_key))
@@ -106,7 +110,6 @@ module Wechat
       signature = params[:signature] || params[:msg_signature]
 
       msg_encrypt = params[:echostr] if self.class.corpid.present?
-
       msg_encrypt ||= request_encrypt_content if self.class.encrypt_mode
 
       render text: 'Forbidden', status: 403 if signature != Signature.hexdigest(self.class.token,
@@ -138,7 +141,8 @@ module Wechat
           request.reply.text responder[:respond]
         when responder[:proc]
           define_singleton_method :process, responder[:proc]
-          send(:process, *args.unshift(request))
+          number_of_block_parameter = responder[:proc].arity
+          send(:process, *args.unshift(request).take(number_of_block_parameter))
         else
           next
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails