wechat 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a9041e7d411063724f87e3a8393a120542e1bf
-  data.tar.gz: 1dfa35792fa8f41f9872b00e645196115658308c
+  metadata.gz: d8fc6b062fba978416473332b7eeb0ebe89a6bfd
+  data.tar.gz: 5b7c50450e9ca878520825678580aec7f2e7b4f0
 SHA512:
-  metadata.gz: 14df5df5f86412bbb4076095903884c26a8a7942927d3afa5bdb34d2b0d4c65ff330f41fed0bdf38f970f80893117429efd48e531b6a8f9f566b169314cbfc3d
-  data.tar.gz: 7daf46b7df72eb76dc8508a6bbc6f575acd44e2beb214d9c81d6cb51bf551591ec0c1a172d942e89e0b65fe92fc5bd713454ccd7a4b93add0a40059500a9fc36
+  metadata.gz: 0131981fbcfa43e241ec4151a004ec702185f41641e9a67ad8cf45adf59f9372586409ee0a34f5cc9f3141dd3c44a056fd6c13d906ae3abe8bdb5c171d08bda5
+  data.tar.gz: 40b6edfe0146f00d27cb41ce14c5dc612892d59569fc1469355ce52245e560893c936ec43b0a159e0838435968720f4f6b00750259c6b940c9b7c998f7383dca

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.4.0 (released at 9/5/2015)
+
+* Enable the verify SSL for enterprise mode by default, as security is more importent than speed, but still can switch off by configure
+* Support scancode_push/scancode_waitmsg event.
+* New API method can get wechat server IP list
+* New API to query/create department/media/material
+* Fix can not read token_file in mingw bug, which introduce at #43
+
 ## v0.3.0 (released at 8/30/2015)
 
 * New user group management API

data/README.md

@@ -83,7 +83,6 @@ default: &default
   corpsecret: "corpsecret"
   agentid:  "1"
   access_token: "C:/Users/[user_name]/wechat_access_token"
-  encrypt_mode: true
   token:    ""
   encoding_aes_key:  ""
 
@@ -92,8 +91,8 @@ production:
   corpsecret: <%= ENV['WECHAT_CORPSECRET'] %>
   agentid:    <%= ENV['WECHAT_AGENTID'] %>
   access_token:  <%= ENV['WECHAT_ACCESS_TOKEN'] %>
-  encrypt_mode:  <%= ENV['WECHAT_ENCRYPT_MODE'] %>
   token:      <%= ENV['WECHAT_TOKEN'] %>
+  skip_verify_ssl: false
   encoding_aes_key:  <%= ENV['WECHAT_ENCODING_AES_KEY'] %>
 
 development:
@@ -103,8 +102,14 @@ test:
   <<: *default
 ```
 
+##### 配置优先级
+
 注意在Rails项目根目录下运行`wechat`命令行工具会优先使用`config/wechat.yml`中的`default`配置，如果失败则使用`~\.wechat.yml`中的配置，以便于在生产环境下管理多个微信账号应用。
 
+##### 配置跳过SSL认证
+
+Wechat服务器有报道曾出现[RestClient::SSLCertificateNotVerified](http://qydev.weixin.qq.com/qa/index.php?qa=11037)错误，此时可以选择关闭SSL验证（skip_verify_ssl）。
+
 #### 为每个Responder配置不同的appid和secret
 
 在个别情况下，单个Rails应用可能需要处理来自多个账号的消息，此时可以配置多个responder controller。
@@ -134,16 +139,21 @@ wechat gems 内部不会检查权限。但因公众号类型不同，和微信
 ```
 $ wechat
 Wechat commands:
+  wechat callbackip                                        # 获取微信服务器IP地址
   wechat custom_image [OPENID, IMAGE_PATH]                 # 发送图片客服消息
   wechat custom_music [OPENID, THUMBNAIL_PATH, MUSIC_URL]  # 发送音乐客服消息
   wechat custom_news [OPENID, NEWS_YAML_PATH]              # 发送图文客服消息
   wechat custom_text [OPENID, TEXT_MESSAGE]                # 发送文字客服消息
   wechat custom_video [OPENID, VIDEO_PATH]                 # 发送视频客服消息
   wechat custom_voice [OPENID, VOICE_PATH]                 # 发送语音客服消息
+  wechat department [DEPARTMENT_ID]                        # 获取部门列表
   wechat group_create [GROUP_NAME]                         # 创建分组
   wechat group_delete [GROUP_ID]                           # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]           # 修改分组名
   wechat groups                                            # 所有用户分组列表
+  wechat invite_user [USER_ID]                             # 邀请成员关注
+  wechat material [MEDIA_ID, PATH]                         # 永久媒体下载
+  wechat material_add [MEDIA_TYPE, PATH]                   # 永久媒体上传
   wechat media [MEDIA_ID, PATH]                            # 媒体下载
   wechat media_create [MEDIA_TYPE, PATH]                   # 媒体上传
   wechat menu                                              # 当前菜单
@@ -151,8 +161,9 @@ Wechat commands:
   wechat menu_delete                                       # 删除菜单
   wechat message_send [OPENID, TEXT_MESSAGE]               # 发送文字消息(仅企业号)
   wechat template_message [OPENID, TEMPLATE_YAML_PATH]     # 模板消息接口
-  wechat user [OPEN_ID]                                    # 查找关注者
+  wechat user [OPEN_ID]                                    # 获取用户基本信息
   wechat user_change_group [OPEN_ID, TO_GROUP_ID]          # 移动用户分组
+  wechat user_delete [USER_ID]                             # 删除成员
   wechat user_group [OPEN_ID]                              # 查询用户所在分组
   wechat users                                             # 关注者列表
 ```
@@ -203,6 +214,12 @@ button:
  -
   name: "我要"
   sub_button:
+   -
+    type: "scancode_waitmsg"
+    name: "绑定用餐二维码"
+    key: "BINDING_QR_CODE"
+    sub_button:
+     -
    -
     type: "click"
     name: "预订午餐"
@@ -215,12 +232,6 @@ button:
     key:  "BOOK_DINNER"
     sub_button:
      -
-   -
-    type: "click"
-    name: "预订半夜餐"
-    key:  "BOOK_NIGHT_SNACK"
-    sub_button:
-     -
  -
   name: "查询"
   sub_button:
@@ -343,6 +354,11 @@ class WechatsController < ApplicationController
     request.reply.text "收到来自#{request[:FromUserName]} 的EventKey 为 #{key} 的事件"
   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}"
+  end
+
   # 处理图片信息
   on :image do |request|
     request.reply.image(request[:MediaId]) #直接将图片返回给用户
@@ -406,7 +422,7 @@ end
 ```ruby
 class WechatsController < ApplicationController
   # 当无任何responder处理用户信息时，转发至客服处理。
-  on :fallback, respond: nil do |message|
+  on :fallback do |message|
 	message.reply.transfer_customer_service
   end 
 end

data/Rakefile

@@ -20,10 +20,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
 require File.join('bundler', 'gem_tasks')
 require File.join('rspec', 'core', 'rake_task')
 RSpec::Core::RakeTask.new(:spec)
 
-
-task :default => :spec
+task default: :spec

data/bin/wechat

@@ -23,11 +23,12 @@ class App < Thor
       corpsecret = config['corpsecret']
       token_file = options[:toke_file] || config['access_token'] || '/var/tmp/wechat_access_token'
       agentid = config['agentid']
+      skip_verify_ssl = config['skip_verify_ssl']
 
       if appid.present? && secret.present? && token_file.present?
-        Wechat::Api.new(appid, secret, token_file)
+        Wechat::Api.new(appid, secret, token_file, skip_verify_ssl)
       elsif corpid.present? && corpsecret.present? && token_file.present?
-        Wechat::CorpApi.new(corpid, corpsecret, token_file, agentid)
+        Wechat::CorpApi.new(corpid, corpsecret, token_file, agentid, skip_verify_ssl)
       else
         puts <<-HELP
 Need create ~/.wechat.yml with wechat appid and secret
@@ -62,6 +63,11 @@ HELP
   package_name 'Wechat'
   option :toke_file, aliases: '-t', desc: 'File to store access token'
 
+  desc 'callbackip', '获取微信服务器IP地址'
+  def callbackip
+    puts Helper.with(options).callbackip
+  end
+
   desc 'groups', '所有用户分组列表'
   def groups
     puts Helper.with(options).groups
@@ -82,16 +88,31 @@ HELP
     puts Helper.with(options).group_delete(groupid)
   end
 
+  desc 'department [DEPARTMENT_ID]', '获取部门列表'
+  def department(departmentid)
+    puts Helper.with(options).department(departmentid)
+  end
+
   desc 'users', '关注者列表'
   def users
     puts Helper.with(options).users
   end
 
-  desc 'user [OPEN_ID]', '查找关注者'
+  desc 'user [OPEN_ID]', '获取用户基本信息'
   def user(open_id)
     puts Helper.with(options).user(open_id)
   end
 
+  desc 'invite_user [USER_ID]', '邀请成员关注'
+  def invite_user(userid)
+    puts Helper.with(options).invite_user(userid)
+  end
+
+  desc 'user_delete [USER_ID]', '删除成员'
+  def user_delete(userid)
+    puts Helper.with(options).user_delete(userid)
+  end
+
   desc 'user_group [OPEN_ID]', '查询用户所在分组'
   def user_group(openid)
     puts Helper.with(options).user_group(openid)
@@ -131,9 +152,22 @@ HELP
     puts Helper.with(options).media_create(type, file)
   end
 
+  desc 'material [MEDIA_ID, PATH]', '永久媒体下载'
+  def material(media_id, path)
+    tmp_file = Helper.with(options).material(media_id)
+    FileUtils.mv(tmp_file.path, path)
+    puts 'File downloaded'
+  end
+
+  desc 'material_add [MEDIA_TYPE, PATH]', '永久媒体上传'
+  def material_add(type, path)
+    file = File.new(path)
+    puts Helper.with(options).material_add(type, file)
+  end
+
   desc 'message_send [OPENID, TEXT_MESSAGE]', '发送文字消息(仅企业号)'
   def message_send(openid, text_message)
-    puts Helper.with(options).message_send Wechat::Message.to(openid).text(text_message)
+    puts Helper.with(options).message_send openid, text_message
   end
 
   desc 'custom_text [OPENID, TEXT_MESSAGE]', '发送文字客服消息'

data/lib/{wechat → action_controller}/responder.rb

@@ -8,19 +8,18 @@ module Wechat
     included do
       skip_before_filter :verify_authenticity_token
       before_filter :verify_signature, only: [:show, :create]
-      #delegate :wechat, to: :class
     end
 
     module ClassMethods
-      attr_accessor :wechat, :token, :corpid, :agentid, :encrypt_mode, :encoding_aes_key
+      attr_accessor :wechat, :token, :corpid, :agentid, :encrypt_mode, :skip_verify_ssl, :encoding_aes_key
 
       def on(message_type, with: nil, respond: nil, &block)
-        raise 'Unknow message type' unless message_type.in? [:text, :image, :voice, :video, :location, :link, :event, :fallback]
+        fail 'Unknow message type' unless message_type.in? [:text, :image, :voice, :video, :location, :link, :event, :fallback]
         config = respond.nil? ? {} : { respond: respond }
         config.merge!(proc: block) if block_given?
 
         if with.present? && !message_type.in?([:text, :event])
-          raise 'Only text and event message can take :with parameters'
+          fail 'Only text and event message can take :with parameters'
         else
           config.merge!(with: with) if with.present?
         end
@@ -43,8 +42,12 @@ module Wechat
           yield(* match_responders(responders, message[:Content]))
 
         when :event
-          if message[:Event] == 'click'
+          if 'click' == message[:Event]
             yield(* match_responders(responders, message[:EventKey]))
+          elsif %w(scancode_push scancode_waitmsg).include? message[:Event]
+            yield(* match_responders(responders, event_key: message[:EventKey],
+                                                 scan_type: message[:ScanCodeInfo][:ScanType],
+                                                 scan_result: message[:ScanCodeInfo][:ScanResult]))
           else
             yield(* match_responders(responders, message[:Event]))
           end
@@ -66,6 +69,8 @@ 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
           else
             memo[:scoped] ||= [responder, value] if value == condition
           end
@@ -85,20 +90,7 @@ module Wechat
 
     def create
       request = Wechat::Message.from_hash(post_xml)
-      response = self.class.responder_for(request) do |responder, *args|
-        responder ||= self.class.responders(:fallback).first
-
-        next if responder.nil?
-        case
-        when responder[:respond]
-          request.reply.text responder[:respond]
-        when responder[:proc]
-          define_singleton_method :process, responder[:proc]
-          send(:process, *args.unshift(request))
-        else
-          next
-        end
-      end
+      response = run_responder(request)
 
       if response.respond_to? :to_xml
         render xml: process_response(response)
@@ -110,33 +102,32 @@ module Wechat
     private
 
     def verify_signature
+      signature = params[:signature] || params[:msg_signature]
+
+      render text: 'Forbidden', status: 403 if signature != Digest::SHA1.hexdigest(content_to_verify)
+    end
+
+    def content_to_verify
       array = [self.class.token, params[:timestamp], params[:nonce]]
-      signature = params[:signature]
 
       # 默认使用明文方式验证, 企业号验证加密签名
       if params[:signature].blank? && params[:msg_signature]
-        signature = params[:msg_signature]
-        if params[:echostr]
+        if params[:echostr].present?
           array << params[:echostr]
         else
-          array << request_content['xml']['Encrypt']
+          array << request_encrypt_content
         end
       end
 
-      str = array.compact.collect(&:to_s).sort.join
-      render text: 'Forbidden', status: 403 if signature != Digest::SHA1.hexdigest(str)
+      array.compact.collect(&:to_s).sort.join
     end
 
     def post_xml
       data = request_content
 
-      # 如果是加密模式解密
-      if self.class.encrypt_mode || self.class.corpid.present?
-        encrypt_msg = data['xml']['Encrypt']
-        if encrypt_msg.present?
-          content, @app_id = unpack(decrypt(Base64.decode64(encrypt_msg), self.class.encoding_aes_key))
-          data = Hash.from_xml(content)
-        end
+      if self.class.encrypt_mode && request_encrypt_content.present?
+        content, @app_id = unpack(decrypt(Base64.decode64(request_encrypt_content), self.class.encoding_aes_key))
+        data = Hash.from_xml(content)
       end
 
       HashWithIndifferentAccess.new_from_hash_copying_default(data.fetch('xml', {})).tap do |msg|
@@ -144,16 +135,29 @@ module Wechat
       end
     end
 
+    def run_responder(request)
+      self.class.responder_for(request) do |responder, *args|
+        responder ||= self.class.responders(:fallback).first
+
+        next if responder.nil?
+        case
+        when responder[:respond]
+          request.reply.text responder[:respond]
+        when responder[:proc]
+          define_singleton_method :process, responder[:proc]
+          send(:process, *args.unshift(request))
+        else
+          next
+        end
+      end
+    end
+
     def process_response(response)
       msg = response.to_xml
 
-      # 返回加密消息
-      if self.class.encrypt_mode || self.class.corpid.present?
-        data = request_content
-        if data['xml']['Encrypt']
-          encrypt = Base64.strict_encode64 encrypt(pack(msg, @app_id), self.class.encoding_aes_key)
-          msg = gen_msg(encrypt, params[:timestamp], params[:nonce])
-        end
+      if self.class.encrypt_mode && request_encrypt_content.present?
+        encrypt = Base64.strict_encode64(encrypt(pack(msg, @app_id), self.class.encoding_aes_key))
+        msg = gen_msg(encrypt, params[:timestamp], params[:nonce])
       end
 
       msg
@@ -169,6 +173,10 @@ module Wechat
       }.to_xml(root: 'xml', children: 'item', skip_instruct: true, skip_types: true)
     end
 
+    def request_encrypt_content
+      request_content['xml']['Encrypt']
+    end
+
     def request_content
       params[:xml].nil? ? Hash.from_xml(request.raw_post) : { 'xml' => params[:xml] }
     end

data/lib/action_controller/wechat_responder.rb

@@ -0,0 +1,36 @@
+module ActionController
+  module WechatResponder
+    def wechat_responder(opts = {})
+      include Wechat::Responder
+
+      self.corpid = opts[:corpid] || Wechat.config.corpid
+      self.agentid = opts[:agentid] || Wechat.config.agentid
+      self.encrypt_mode = opts[:encrypt_mode] || Wechat.config.encrypt_mode || corpid.present?
+      self.skip_verify_ssl = opts[:skip_verify_ssl]
+      self.token = opts[:token] || Wechat.config.token
+      self.encoding_aes_key = opts[:encoding_aes_key] || Wechat.config.encoding_aes_key
+
+      if opts.empty?
+        self.wechat = Wechat.api
+      else
+        if corpid.present?
+          self.wechat = Wechat::CorpApi.new(corpid, opts[:corpsecret], opts[:access_token], agentid, skip_verify_ssl)
+        else
+          self.wechat = Wechat::Api.new(opts[:appid], opts[:secret], opts[:access_token], skip_verify_ssl, opts[:jsapi_ticket])
+        end
+      end
+    end
+  end
+
+  if defined? Base
+    class << Base
+      include WechatResponder
+    end
+  end
+
+  if defined? API
+    class << API
+      include WechatResponder
+    end
+  end
+end

data/lib/wechat.rb

@@ -1,9 +1,10 @@
 require 'wechat/api'
 require 'wechat/corp_api'
+require 'action_controller/wechat_responder'
 
 module Wechat
   autoload :Message, 'wechat/message'
-  autoload :Responder, 'wechat/responder'
+  autoload :Responder, 'action_controller/responder'
   autoload :Cipher, 'wechat/cipher'
 
   class AccessTokenExpiredError < StandardError; end
@@ -32,6 +33,7 @@ module Wechat
                    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.symbolize_keys!
       config[:access_token] ||= Rails.root.join('tmp/access_token').to_s
@@ -42,63 +44,9 @@ module Wechat
 
   def self.api
     if config.corpid.present?
-      @api ||= Wechat::CorpApi.new(config.corpid, config.corpsecret, config.access_token, config.agentid)
+      @api ||= CorpApi.new(config.corpid, config.corpsecret, config.access_token, config.agentid, config.skip_verify_ssl)
     else
-      @api ||= Wechat::Api.new(config.appid, config.secret, config.access_token, config.jsapi_ticket)
-    end
-  end
-end
-
-if defined? ActionController::Base
-  class ActionController::Base
-    def self.wechat_responder(opts = {})
-      send(:include, Wechat::Responder)
-      if opts.empty?
-        self.corpid = Wechat.config.corpid
-        self.wechat = Wechat.api
-        self.agentid = Wechat.config.agentid
-        self.token = Wechat.config.token
-        self.encrypt_mode = Wechat.config.encrypt_mode
-        self.encoding_aes_key = Wechat.config.encoding_aes_key
-      else
-        self.corpid = opts[:corpid]
-        if corpid.present?
-          self.wechat = Wechat::CorpApi.new(opts[:corpid], opts[:corpsecret], opts[:access_token], opts[:agentid])
-        else
-          self.wechat = Wechat::Api.new(opts[:appid], opts[:secret], opts[:access_token], opts[:jsapi_ticket])
-        end
-        self.agentid = opts[:agentid]
-        self.token = opts[:token]
-        self.encrypt_mode = opts[:encrypt_mode]
-        self.encoding_aes_key = opts[:encoding_aes_key]
-      end
-    end
-  end
-end
-
-if defined? ActionController::API
-  class ActionController::API
-    def self.wechat_responder(opts = {})
-      send(:include, Wechat::Responder)
-      if opts.empty?
-        self.corpid = Wechat.config.corpid
-        self.wechat = Wechat.api
-        self.agentid = Wechat.config.agentid
-        self.token = Wechat.config.token
-        self.encrypt_mode = Wechat.config.encrypt_mode
-        self.encoding_aes_key = Wechat.config.encoding_aes_key
-      else
-        self.corpid = opts[:corpid]
-        if corpid.present?
-          self.wechat = Wechat::CorpApi.new(opts[:corpid], opts[:corpsecret], opts[:access_token], opts[:agentid])
-        else
-          self.wechat = Wechat::Api.new(opts[:appid], opts[:secret], opts[:access_token], opts[:jsapi_ticket])
-        end
-        self.agentid = opts[:agentid]
-        self.token = opts[:token]
-        self.encrypt_mode = opts[:encrypt_mode]
-        self.encoding_aes_key = opts[:encoding_aes_key]
-      end
+      @api ||= Api.new(config.appid, config.secret, config.access_token, config.jsapi_ticket, config.skip_verify_ssl)
     end
   end
 end

data/lib/wechat/access_token.rb

@@ -11,12 +11,10 @@ module Wechat
 
     def token
       begin
-        @token_data ||= JSON.parse(File.read(token_file, open_args: File::LOCK_SH))
+        @token_data ||= JSON.parse(File.read(token_file))
         created_at = token_data['created_at'].to_i
         expires_in = token_data['expires_in'].to_i
-        if Time.now.to_i - created_at >= expires_in - 3 * 60
-          raise 'token_data may be expired'
-        end
+        fail 'token_data may be expired' if Time.now.to_i - created_at >= expires_in - 3 * 60
       rescue
         refresh
       end
@@ -34,7 +32,7 @@ module Wechat
 
     def valid_token(token_data)
       access_token = token_data['access_token']
-      raise "Response didn't have access_token" if access_token.blank?
+      fail "Response didn't have access_token" if access_token.blank?
       access_token
     end
   end

data/lib/wechat/api.rb

@@ -1,109 +1,102 @@
+require 'wechat/api_base'
 require 'wechat/client'
 require 'wechat/access_token'
 require 'wechat/jsapi_ticket'
 
-class Wechat::Api
-  attr_reader :access_token, :client, :jsapi_ticket
-
-  API_BASE = 'https://api.weixin.qq.com/cgi-bin/'
-  FILE_BASE = 'http://file.api.weixin.qq.com/cgi-bin/'
-  OAUTH2_BASE = 'https://api.weixin.qq.com/sns/oauth2/'
-
-  def initialize(appid, secret, token_file, jsapi_ticket_file = '/var/tmp/wechat_jsapi_ticket')
-    @client = Wechat::Client.new(API_BASE)
-    @access_token = Wechat::AccessToken.new(@client, appid, secret, token_file)
-    @jsapi_ticket = Wechat::JsapiTicket.new(@client, @access_token, jsapi_ticket_file)
-  end
-
-  def groups
-    get('groups/get')
-  end
-
-  def group_create(group_name)
-    post 'groups/create', JSON.generate(group: { name: group_name })
-  end
-
-  def group_update(groupid, new_group_name)
-    post 'groups/update', JSON.generate(group: { id: groupid, name: new_group_name })
-  end
-
-  def group_delete(groupid)
-    post 'groups/delete', JSON.generate(group: { id: groupid })
-  end
-
-  def users(nextid = nil)
-    params = { params: { next_openid: nextid } } if nextid.present?
-    get('user/get', params || {})
-  end
-
-  def user(openid)
-    get('user/info', params: { openid: openid })
-  end
-
-  def user_group(openid)
-    post 'groups/getid', JSON.generate(openid: openid)
-  end
-
-  def user_change_group(openid, to_groupid)
-    post 'groups/members/update', JSON.generate(openid: openid, to_groupid: to_groupid)
-  end
-
-  def menu
-    get('menu/get')
-  end
-
-  def menu_delete
-    get('menu/delete')
-  end
-
-  def menu_create(menu)
-    # 微信不接受7bit escaped json(eg \uxxxx), 中文必须UTF-8编码, 这可能是个安全漏洞
-    post('menu/create', JSON.generate(menu))
-  end
-
-  def media(media_id)
-    get 'media/get', params: { media_id: media_id }, base: FILE_BASE, as: :file
-  end
-
-  def media_create(type, file)
-    post 'media/upload', { upload: { media: file } }, params: { type: type }, base: FILE_BASE
-  end
-
-  def custom_message_send(message)
-    post 'message/custom/send', message.to_json, content_type: :json
-  end
-
-  def template_message_send(message)
-    post 'message/template/send', message.to_json, content_type: :json
-  end
-
-  # http://mp.weixin.qq.com/wiki/17/c0f37d5704f0b64713d5d2c37b468d75.html
-  # 第二步：通过code换取网页授权access_token
-  def web_access_token(code)
-    params = {
-      appid: access_token.appid,
-      secret: access_token.secret,
-      code: code,
-      grant_type: 'authorization_code'
-    }
-    get 'access_token', params: params, base: OAUTH2_BASE
-  end
-
-  protected
-
-  def get(path, headers = {})
-    with_access_token(headers[:params]) { |params| client.get path, headers.merge(params: params) }
-  end
-
-  def post(path, payload, headers = {})
-    with_access_token(headers[:params]) { |params| client.post path, payload, headers.merge(params: params) }
-  end
-
-  def with_access_token(params = {}, tries = 2)
-    params ||= {}
-    yield(params.merge(access_token: access_token.token))
-  rescue Wechat::AccessTokenExpiredError
-    access_token.refresh
-    retry unless (tries -= 1).zero?
+module Wechat
+  class Api < ApiBase
+    attr_reader :jsapi_ticket
+
+    API_BASE = 'https://api.weixin.qq.com/cgi-bin/'
+    FILE_BASE = 'http://file.api.weixin.qq.com/cgi-bin/'
+    OAUTH2_BASE = 'https://api.weixin.qq.com/sns/oauth2/'
+
+    def initialize(appid, secret, token_file, skip_verify_ssl, jsapi_ticket_file = '/var/tmp/wechat_jsapi_ticket')
+      @client = Client.new(API_BASE, skip_verify_ssl)
+      @access_token = AccessToken.new(@client, appid, secret, token_file)
+      @jsapi_ticket = JsapiTicket.new(@client, @access_token, jsapi_ticket_file)
+    end
+
+    def groups
+      get('groups/get')
+    end
+
+    def group_create(group_name)
+      post 'groups/create', JSON.generate(group: { name: group_name })
+    end
+
+    def group_update(groupid, new_group_name)
+      post 'groups/update', JSON.generate(group: { id: groupid, name: new_group_name })
+    end
+
+    def group_delete(groupid)
+      post 'groups/delete', JSON.generate(group: { id: groupid })
+    end
+
+    def users(nextid = nil)
+      params = { params: { next_openid: nextid } } if nextid.present?
+      get('user/get', params || {})
+    end
+
+    def user(openid)
+      get('user/info', params: { openid: openid })
+    end
+
+    def user_group(openid)
+      post 'groups/getid', JSON.generate(openid: openid)
+    end
+
+    def user_change_group(openid, to_groupid)
+      post 'groups/members/update', JSON.generate(openid: openid, to_groupid: to_groupid)
+    end
+
+    def menu
+      get('menu/get')
+    end
+
+    def menu_delete
+      get('menu/delete')
+    end
+
+    def menu_create(menu)
+      # 微信不接受7bit escaped json(eg \uxxxx), 中文必须UTF-8编码, 这可能是个安全漏洞
+      post('menu/create', JSON.generate(menu))
+    end
+
+    def media(media_id)
+      get 'media/get', params: { media_id: media_id }, base: FILE_BASE, as: :file
+    end
+
+    def media_create(type, file)
+      post 'media/upload', { upload: { media: file } }, params: { type: type }, base: FILE_BASE
+    end
+
+    def material(media_id)
+      get 'material/get', params: { media_id: media_id }, base: FILE_BASE, as: :file
+    end
+
+    def material_add(type, file)
+      post 'material/add_material', { upload: { media: file } }, params: { type: type }, base: FILE_BASE
+    end
+
+    def custom_message_send(message)
+      post 'message/custom/send', message.to_json, content_type: :json
+    end
+
+    def template_message_send(message)
+      post 'message/template/send', message.to_json, content_type: :json
+    end
+
+    # http://mp.weixin.qq.com/wiki/17/c0f37d5704f0b64713d5d2c37b468d75.html
+    # 第二步：通过code换取网页授权access_token
+    def web_access_token(code)
+      params = {
+        appid: access_token.appid,
+        secret: access_token.secret,
+        code: code,
+        grant_type: 'authorization_code'
+      }
+      get 'access_token', params: params, base: OAUTH2_BASE
+    end
   end
 end

data/lib/wechat/api_base.rb

@@ -0,0 +1,31 @@
+module Wechat
+  class ApiBase
+    attr_reader :access_token, :client
+
+    def callbackip
+      get('getcallbackip')
+    end
+
+    protected
+
+    def get(path, headers = {})
+      with_access_token(headers[:params]) do |params|
+        client.get path, headers.merge(params: params)
+      end
+    end
+
+    def post(path, payload, headers = {})
+      with_access_token(headers[:params]) do |params|
+        client.post path, payload, headers.merge(params: params)
+      end
+    end
+
+    def with_access_token(params = {}, tries = 2)
+      params ||= {}
+      yield(params.merge(access_token: access_token.token))
+    rescue AccessTokenExpiredError
+      access_token.refresh
+      retry unless (tries -= 1).zero?
+    end
+  end
+end

data/lib/wechat/client.rb

@@ -2,13 +2,14 @@ require 'rest_client'
 
 module Wechat
   class Client
-    attr_reader :base
+    attr_reader :base, :verify_ssl
 
-    def initialize(base)
+    def initialize(base, skip_verify_ssl)
       @base = base
+      @verify_ssl = !skip_verify_ssl
     end
 
-    def get(path, header = {}, verify_ssl = true)
+    def get(path, header = {})
       request(path, header) do |url, header|
         if verify_ssl
           RestClient.get(url, header)
@@ -18,7 +19,7 @@ module Wechat
       end
     end
 
-    def post(path, payload, header = {}, verify_ssl = true)
+    def post(path, payload, header = {})
       request(path, header) do |url, header|
         if verify_ssl
           RestClient.post(url, payload, header)
@@ -29,22 +30,22 @@ module Wechat
     end
 
     def request(path, header = {}, &block)
-      url = "#{header.delete(:base) || self.base}#{path}"
+      url = "#{header.delete(:base) || base}#{path}"
       as = header.delete(:as)
-      header.merge!(:accept => :json)
+      header.merge!(accept: :json)
       response = yield(url, header)
 
-      raise "Request not OK, response code #{response.code}" if response.code != 200
+      fail "Request not OK, response code #{response.code}" if response.code != 200
       parse_response(response, as || :json) do |parse_as, data|
         break data unless parse_as == :json && data['errcode'].present?
 
         case data['errcode']
         when 0 # for request didn't expect results
           data
-        when 42_001, 40_014 # 42001: access_token超时, 40014:不合法的access_token
-          raise AccessTokenExpiredError
+        when 42001, 40014 # 42001: access_token超时, 40014:不合法的access_token
+          fail AccessTokenExpiredError
         else
-          raise ResponseError.new(data['errcode'], data['errmsg'])
+          fail ResponseError.new(data['errcode'], data['errmsg'])
         end
       end
     end
@@ -54,9 +55,9 @@ module Wechat
     def parse_response(response, as)
       content_type = response.headers[:content_type]
       parse_as = {
-        /^application\/json/ => :json,
-        /^image\/.*/ => :file
-      }.inject([]){ |memo, match| memo << match[1] if content_type =~ match[0]; memo }.first || as || :text
+        %r{^application\/json} => :json,
+        %r{^image\/.*} => :file
+      }.each_with_object([]) { |match, memo| memo << match[1] if content_type =~ match[0] }.first || as || :text
 
       case parse_as
       when :file
@@ -68,7 +69,6 @@ module Wechat
 
       when :json
         data = JSON.parse(response.body.gsub /[\u0000-\u001f]+/, '')
-
       else
         data = response.body
       end

data/lib/wechat/corp_api.rb

@@ -1,66 +1,79 @@
+require 'wechat/api_base'
 require 'wechat/client'
 require 'wechat/access_token'
 
-class Wechat::CorpAccessToken < Wechat::AccessToken
-  def refresh
-    data = client.get('gettoken', { params: { corpid: appid, corpsecret: secret }}, false)
-    data.merge!(created_at: Time.now.to_i)
-    File.open(token_file, 'w') { |f| f.write(data.to_json) } if valid_token(data)
-    @token_data = data
+module Wechat
+  class CorpAccessToken < AccessToken
+    def refresh
+      data = client.get('gettoken', params: { corpid: appid, corpsecret: secret })
+      data.merge!(created_at: Time.now.to_i)
+      File.write(token_file, data.to_json) if valid_token(data)
+      @token_data = data
+    end
   end
-end
 
-class Wechat::CorpApi
-  attr_reader :access_token, :client, :agentid
+  class CorpApi < ApiBase
+    attr_reader :agentid
 
-  API_BASE = 'https://qyapi.weixin.qq.com/cgi-bin/'
+    API_BASE = 'https://qyapi.weixin.qq.com/cgi-bin/'
 
-  def initialize(appid, secret, token_file, agentid)
-    @client = Wechat::Client.new(API_BASE)
-    @access_token = Wechat::CorpAccessToken.new(@client, appid, secret, token_file)
-    @agentid = agentid
-  end
+    def initialize(appid, secret, token_file, agentid, skip_verify_ssl)
+      @client = Client.new(API_BASE, skip_verify_ssl)
+      @access_token = CorpAccessToken.new(@client, appid, secret, token_file)
+      @agentid = agentid
+    end
 
-  def user(userid)
-    get('user/get', params: { userid: userid })
-  end
+    def user(userid)
+      get('user/get', params: { userid: userid })
+    end
 
-  def menu
-    get('menu/get', params: { agentid: agentid })
-  end
+    def invite_user(userid)
+      post 'invite/send', JSON.generate(userid: userid)
+    end
 
-  def menu_delete
-    get('menu/delete', params: { agentid: agentid })
-  end
+    def user_auth_success(userid)
+      get('user/authsucc', params: { userid: userid })
+    end
 
-  def menu_create(menu)
-    # 微信不接受7bit escaped json(eg \uxxxx), 中文必须UTF-8编码, 这可能是个安全漏洞
-    post 'menu/create', JSON.generate(menu), { params: { agentid: agentid } }
-  end
+    def user_delete(userid)
+      get('user/delete', params: { userid: userid })
+    end
 
-  def message_send(message)
-    post 'message/send', message.agent_id(agentid).to_json, content_type: :json
-  end
+    def department(departmentid = 1)
+      get('department/list', params: { id: departmentid })
+    end
 
-  protected
+    def menu
+      get('menu/get', params: { agentid: agentid })
+    end
 
-  def get(path, headers = {})
-    with_access_token(headers[:params]) do |params|
-      client.get path, headers.merge(params: params), false
+    def menu_delete
+      get('menu/delete', params: { agentid: agentid })
     end
-  end
 
-  def post(path, payload, headers = {})
-    with_access_token(headers[:params]) do |params|
-      client.post path, payload, headers.merge(params: params), false
+    def menu_create(menu)
+      # 微信不接受7bit escaped json(eg \uxxxx), 中文必须UTF-8编码, 这可能是个安全漏洞
+      post 'menu/create', JSON.generate(menu), params: { agentid: agentid }
     end
-  end
 
-  def with_access_token(params = {}, tries = 2)
-    params ||= {}
-    yield(params.merge(access_token: access_token.token))
-  rescue Wechat::AccessTokenExpiredError
-    access_token.refresh
-    retry unless (tries -= 1).zero?
+    def media(media_id)
+      get 'media/get', params: { media_id: media_id }, as: :file
+    end
+
+    def media_create(type, file)
+      post 'media/upload', { upload: { media: file } }, params: { type: type }
+    end
+
+    def material(media_id)
+      get 'material/get', params: { media_id: media_id, agentid: agentid }, as: :file
+    end
+
+    def material_add(type, file)
+      post 'material/add_material', { upload: { media: file } }, params: { type: type, agentid: agentid }
+    end
+
+    def message_send(openid, message)
+      post 'message/send', Message.to(openid).text(message).agent_id(agentid).to_json, content_type: :json
+    end
   end
 end

data/lib/wechat/jsapi_ticket.rb

@@ -23,7 +23,7 @@ module Wechat
         created_at = jsapi_ticket_data['created_at'].to_i
         expires_in = jsapi_ticket_data['expires_in'].to_i
         if Time.now.to_i - created_at >= expires_in - 3 * 60
-          raise 'jsapi_ticket may be expired'
+          fail 'jsapi_ticket may be expired'
         end
       rescue
         refresh
@@ -67,7 +67,7 @@ module Wechat
 
     def valid_ticket(jsapi_ticket_data)
       ticket = jsapi_ticket_data['ticket'] || jsapi_ticket_data[:ticket]
-      raise "Response didn't have ticket" if  ticket.blank?
+      fail "Response didn't have ticket" if ticket.blank?
       ticket
     end
   end

data/lib/wechat/message.rb

@@ -53,7 +53,7 @@ module Wechat
           results[value[0].to_s.underscore.to_sym] = value[1]
         end
       else
-        raise "Don't know how to parse message as #{type}"
+        fail "Don't know how to parse message as #{type}"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,15 +79,17 @@ files:
 - README.md
 - Rakefile
 - bin/wechat
+- lib/action_controller/responder.rb
+- lib/action_controller/wechat_responder.rb
 - lib/wechat.rb
 - lib/wechat/access_token.rb
 - lib/wechat/api.rb
+- lib/wechat/api_base.rb
 - lib/wechat/cipher.rb
 - lib/wechat/client.rb
 - lib/wechat/corp_api.rb
 - lib/wechat/jsapi_ticket.rb
 - lib/wechat/message.rb
-- lib/wechat/responder.rb
 homepage: https://github.com/Eric-Guo/wechat
 licenses:
 - MIT