wechat-api 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1da7465e7436ff9a4d1f959f198a63ffc3e028
-  data.tar.gz: 4bfc9ba3e18733fe9146679b32b295665934d2d8
+  metadata.gz: 6d5004c2f463eb0b4f3bdbdc7011e9bc1424c8de
+  data.tar.gz: 7e1e9ff5632c305ee2e3589085c7a0912b44dbff
 SHA512:
-  metadata.gz: d79b3b01a2fbb922ea6019af273d12244cdda7e15bc250e30f648a2c9c7a94c76f8759619304edb91f911563a5c5e4e47ff62c035e70bab10bdd00abaaab2bf7
-  data.tar.gz: 4a7aba85ce5c46fb22b8101c25b97c28330b9795db8cbeaf5acb2fc1da5fd2526ae3fbef4279bf7b520c0454ca1392ca76ff1aae4f024bfcff5d1fdc3fe36ec4
+  metadata.gz: ecf554acceb4735dd74191f9b461b84c8314a7b3401d43e6e481af9dd3e4707099551725421f354013e2afd0ac1c0a16d9e192a4180b956063779329aead4529
+  data.tar.gz: 5cd2529274cac2084aa95c2de52f01d36411d103d3cf38c80b3572929105d562b3617ef9bd825e6300da6168f6ef6424968d7cfded809ac15e082bde14b6f4a8

data/README.md

@@ -21,6 +21,12 @@ https://github.com/lazing/wechat-api
 * 不够简单，特别是用于多账号管理的时候
 * 微信 api 更新频繁，需要易于使用新功能
 
+## 主要功能清单
+* 支持微信服务号和订阅号API
+* 支持微信js_ticket获取
+* 支持微信红包API
+* 支持微信企业号主动调用API
+
 ## 使用方式
 
 ````ruby
@@ -30,15 +36,25 @@ gem 'wechat-api'
 ````ruby
 require 'wechat-api'
 
-client = Wechat::Api::Client.new 'appid', 'appsecret'
+api = Wechat::Api::Client.new 'appid', 'appsecret'
 
-client.get 'user/info', nextopenid: 'xxx'
+api.get 'user/info', nextopenid: 'xxx'
 # 当使用 get 方式时，hash 参数将做个 query params 附在请求后
 
-client.post 'user/info/updateremark', openid；'xxxx', remark: '我是注释'
+api.post 'user/info/updateremark', openid；'xxxx', remark: '我是注释'
 # 当使用 post 方法时，hash 参数将转换为 json，因此可以支持嵌套的结构
 ````
 
+微信企业号主动调用API
+
+````ruby
+require 'wechat-api'
+
+qy = Wechat::Qy::Client.new 'corpid', 'corpsecret'
+qy.text_send 'agentid', 'message', touser: 'UserId1|UserId2' #提供的预定义方法
+qy.post 'api/uri', { key: :value} #未提供预定义方法时调用
+````
+
 ## 一些预定义方法
 
 预定义接口方法可以方便使用。
@@ -47,13 +63,13 @@ client.post 'user/info/updateremark', openid；'xxxx', remark: '我是注释'
 
 ````ruby
 # 创建固定二维码
-client.create_qrcode(scene_str)
+api.create_qrcode(scene_str)
 
 # 创建临时二维码
-client.create_qrcode_temp(scene_id)
+api.create_qrcode_temp(scene_id)
 
 # 发送模板消息
-client.send_template(template_id, openid, url, data = {})
+api.send_template(template_id, openid, url, data = {})
 ````
 
 以上接口返回微信文档定义的 json 数据转换后的ruby的 hash 对象

data/lib/wechat-api.rb

@@ -1,2 +1,3 @@
 require 'wechat/api'
 require 'wechat/pay'
+require 'wechat/qy'

data/lib/wechat/api/version.rb

@@ -2,6 +2,6 @@
 module Wechat
   #
   module Api
-    VERSION = '0.1.3'
+    VERSION = '0.2.0'
   end
 end

data/lib/wechat/qy.rb

@@ -0,0 +1,10 @@
+module Wechat
+  #
+  module Qy
+  end
+end
+
+require 'wechat/qy/client'
+require 'wechat/qy/message'
+
+::Wechat::Qy::Client.send :include, ::Wechat::Qy::Message

data/lib/wechat/qy/client.rb

@@ -0,0 +1,117 @@
+require 'multi_json'
+require 'faraday'
+require 'logger'
+
+module Wechat
+  module Qy
+    #
+    class ResponseError < StandardError; end
+    class AccessTokenExpiredError < ResponseError; end
+    #
+    class Client
+
+      API_BASE = 'https://qyapi.weixin.qq.com/cgi-bin/'
+
+      attr_reader :corp_id, :corp_secret
+      attr_accessor :logger
+
+      def initialize(corp_id, corp_secret)
+        @corp_id, @corp_secret = corp_id, corp_secret
+        @logger = Logger.new(STDOUT)
+        @token_file = File.join('/tmp', "wechat-api-#{corp_id}")
+      end
+
+      def access_token
+        @access_token ||= begin
+          token = MultiJson.load(File.read(@token_file))
+          token['access_token']
+        rescue
+          refresh
+        end
+      end
+
+      def refresh
+        url = format('%sgettoken', API_BASE)
+        resp = connection.get(url, token_params)
+        response = MultiJson.load(resp.body)
+        return handle_error(response) if response['errcode']
+        @access_token = response['access_token']
+        File.open(@token_file, 'w') { |f| f.write(resp.body) } if @access_token
+        @access_token
+      end
+
+      def get(uri, params = {})
+        with_access_token(uri, params) do |url, params_with_token|
+          debug_request do
+            connection.get do |req|
+              req.url url, params_with_token
+              req.headers[:accept] = 'application/json'
+              req.headers[:content_type] = 'application/json'
+            end
+          end
+        end
+      end
+
+      def post(uri, data = {})
+        with_access_token(uri, {}) do |url, params|
+          logger.debug { [:data, data] }
+          debug_request do
+            connection.post do |req|
+              req.url url, params
+              req.headers[:accept] = 'application/json'
+              req.headers[:content_type] = 'application/json'
+              req.body = MultiJson.dump(data)
+            end
+          end
+        end
+      end
+
+      def with_access_token(uri, params, tried = 2)
+        url = format('%s%s', API_BASE, uri)
+        begin
+          resp = yield(url, params.merge(access_token: access_token))
+          response = MultiJson.load(resp.body)
+          handle_error(response)
+        rescue AccessTokenExpiredError => e
+          refresh
+          retry unless (tried -= 1).zero?
+          raise e
+        end
+      end
+
+      private
+
+      def debug_request
+        response = yield
+        logger.debug { response }
+        response
+      end
+
+      def handle_error(response)
+        case response['errcode']
+        when 0, nil
+          response
+        when 40_001, 42_001, 40_014
+          fail AccessTokenExpiredError, response
+        else
+          fail ResponseError, response
+        end
+      end
+
+      def token_params
+        {
+          corpid: corp_id,
+          corpsecret: corp_secret
+        }
+      end
+
+      def connection
+        @connection ||= begin
+          Faraday.new do |faraday|
+            faraday.adapter Faraday.default_adapter
+          end
+        end
+      end
+    end
+  end
+end

data/lib/wechat/qy/message.rb

@@ -0,0 +1,16 @@
+module Wechat
+  module Qy
+    module Message
+      # text_send('appid', 'hello', touser: 'User1|User2')
+      def text_send(agent_id, content, data = {})
+        params = {
+          msgtype: :text,
+          agentid: agent_id,
+          safe: 0,
+          text: { content: content }
+        }.merge(data)
+        post 'message/send', params
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat-api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -174,6 +174,9 @@ files:
 - lib/wechat/pay.rb
 - lib/wechat/pay/client.rb
 - lib/wechat/pay/redpack.rb
+- lib/wechat/qy.rb
+- lib/wechat/qy/client.rb
+- lib/wechat/qy/message.rb
 - spec/spec_helper.rb
 - spec/wechat/api/client_spec.rb
 - spec/wechat/pay/client_spec.rb