wechat 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5cd591fc682b68e722f2165b51277c3ce058fa76425c10a5877cd27eda299af
-  data.tar.gz: 85e89b104e7bc1c5e67a901fce9bb643d1c7c5a3975e88058ca7a215daf3d808
+  metadata.gz: 7b383f8c031c63e1314dc28869389f1f69e0bad4f1dd7821bc1a0169fdf28905
+  data.tar.gz: 9f62ed282adbd93ab022974ac5650e70349768480613ba429c7f528d6805a7ff
 SHA512:
-  metadata.gz: 101123019a776b83934b8744193a430360ef1ad8c3dfd85df155c631f0182b0e5bdd5fefc0bbb0ff183b1559ac6ce063a0614cfbaaf68db28d5c6144eefb75f9
-  data.tar.gz: dd94b2d99ab0b3babfb72ce7069311765f49b84707fa465a7337f85d74898568794cf96ea97f1f501a4683102b19830fd2f5df0875818d23a99243465e68545d
+  metadata.gz: 55258c585033c225b36962c9520642ca72c5e84ef75be0b14d0243f0f4dfa973b97760dcc3ef8a1c69ac1c3dd2074b46ffe90b393c016ca26757369f463897b5
+  data.tar.gz: bcfc4f5ae3f3e135f7254705b9deb28ac7fada1401b77301a1a37beba2e0bd32d3fa7d8ea09c73399715d7b90d259ce81ef547d587b624ae4ad55d9c3ab9f64c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.11.0 (released at 01/22/2019)
+
+* Support Ruby 2.6.0 official
+* Bump http gem to 4.0
+* New clear quota API by @3014zhangshuo #244
+* Wechat::Message support textcard by @hophacker #249
+* New getusersummary and getusercumulate API #247
+
 ## v0.10.3 (released at 10/07/2018)
 
 * Fix new share problem in iOS by @killernova #242

data/README-CN.md

@@ -407,6 +407,8 @@ Wechat Enterprise Account commands:
   wechat department_create [NAME, PARENT_ID]                    # 创建部门
   wechat department_delete [DEPARTMENT_ID]                      # 删除部门
   wechat department_update [DEPARTMENT_ID, NAME]                # 更新部门
+  wechat getusercumulate [BEGIN_DATE, END_DATE]                 # 获取累计用户数据
+  wechat getusersummary [BEGIN_DATE, END_DATE]                  # 获取用户增减数据
   wechat invite_user [USER_ID]                                  # 邀请成员关注
   wechat material [MEDIA_ID, PATH]                              # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传

data/README.md

@@ -217,7 +217,7 @@ For wechat mini program, can specified by the item `type`:
     appid: "my_appid"
     secret: "my_secret"
     # `mp` is short for **mini program**
-    type: 'mp' 
+    type: 'mp'
 ```
 
 #### Database wechat account configuration
@@ -412,6 +412,7 @@ Wechat Public Account commands:
   wechat user_update_remark [OPEN_ID, REMARK]                   # 设置备注名
   wechat users                                                  # 关注者列表
   wechat wxacode_download [WXA_CODE_PIC_PATH, PATH, WIDTH]      # 下载小程序码
+  wechat clear_quota                                            # 接口调用次数清零
 ```
 
 #### Enterprise account command line
@@ -436,6 +437,8 @@ Wechat Enterprise Account commands:
   wechat department_create [NAME, PARENT_ID]                    # 创建部门
   wechat department_delete [DEPARTMENT_ID]                      # 删除部门
   wechat department_update [DEPARTMENT_ID, NAME]                # 更新部门
+  wechat getusercumulate [BEGIN_DATE, END_DATE]                 # 获取累计用户数据
+  wechat getusersummary [BEGIN_DATE, END_DATE]                  # 获取用户增减数据
   wechat invite_user [USER_ID]                                  # 邀请成员关注
   wechat material [MEDIA_ID, PATH]                              # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传

data/bin/wechat

@@ -515,6 +515,21 @@ class App < Thor
   def tag(tagid)
     puts wechat_api.tag tagid
   end
+
+  desc 'getusersummary [BEGIN_DATE, END_DATE]', '获取用户增减数据'
+  def getusersummary(begin_date, end_date)
+    puts wechat_api.getusersummary(begin_date, end_date)
+  end
+
+  desc 'getusercumulate [BEGIN_DATE, END_DATE]', '获取累计用户数据'
+  def getusercumulate(begin_date, end_date)
+    puts wechat_api.getusercumulate(begin_date, end_date)
+  end
+
+  desc 'clear_quota', '接口调用次数清零'
+  def clear_quota
+    puts wechat_api.clear_quota
+  end
 end
 
 App.start

data/lib/wechat/api_base.rb

@@ -32,6 +32,10 @@ module Wechat
       post 'media/uploadnews', mpnews_message.to_json
     end
 
+    def clear_quota
+      post 'clear_quota', JSON.generate(appid: Wechat.config[:appid])
+    end
+
     protected
 
     def get(path, headers = {})

data/lib/wechat/concern/common.rb

@@ -4,6 +4,7 @@ module Wechat
       WXA_BASE    = 'https://api.weixin.qq.com/wxa/'.freeze
       API_BASE    = 'https://api.weixin.qq.com/cgi-bin/'.freeze
       OAUTH2_BASE = 'https://api.weixin.qq.com/sns/'.freeze
+      DATACUBE_BASE = 'https://api.weixin.qq.com/datacube/'.freeze
 
       def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
         @client = HttpClient.new(API_BASE, timeout, skip_verify_ssl)
@@ -186,6 +187,14 @@ module Wechat
         post 'user/tag/get', JSON.generate(tagid: tagid, next_openid: next_openid)
       end
 
+      def getusersummary(begin_date, end_date)
+        post 'getusersummary', JSON.generate(begin_date: begin_date, end_date: end_date), base: DATACUBE_BASE
+      end
+
+      def getusercumulate(begin_date, end_date)
+        post 'getusercumulate', JSON.generate(begin_date: begin_date, end_date: end_date), base: DATACUBE_BASE
+      end
+
       def web_access_token(code)
         params = {
           appid: access_token.appid,

data/lib/wechat/http_client.rb

@@ -6,7 +6,11 @@ module Wechat
 
     def initialize(base, timeout, skip_verify_ssl)
       @base = base
-      @httprb = HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
+      @httprb = if HTTP::VERSION.to_i >= 4
+                  HTTP.timeout(write: timeout, connect: timeout, read: timeout)
+                else
+                  HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
+                end
       @ssl_context = OpenSSL::SSL::SSLContext.new
       @ssl_context.ssl_version = :TLSv1
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl

data/lib/wechat/message.rb

@@ -104,6 +104,15 @@ module Wechat
       update(MsgType: 'text', Content: content)
     end
 
+    def textcard(title, description, url, btntxt)
+      update(MsgType: 'textcard', TextCard: {
+        title: title,
+        description: description,
+        url: url,
+        btntxt: btntxt
+      })
+    end
+
     def transfer_customer_service(kf_account = nil)
       if kf_account
         update(MsgType: 'transfer_customer_service', TransInfo: { KfAccount: kf_account })
@@ -187,6 +196,7 @@ module Wechat
     end
 
     TO_JSON_KEY_MAP = {
+      'TextCard'         => 'textcard',
       'ToUserName'       => 'touser',
       'ToWxName'         => 'towxname',
       'MediaId'          => 'media_id',
@@ -198,7 +208,7 @@ module Wechat
       'ShowCoverPic'     => 'show_cover_pic'
     }.freeze
 
-    TO_JSON_ALLOWED = %w[touser msgtype content image voice video file
+    TO_JSON_ALLOWED = %w[touser msgtype content image voice video file textcard
                          music news articles template agentid filter
                          send_ignore_reprint mpnews towxname].freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Skinnyworm
@@ -35,7 +35,7 @@ cert_chain:
   ivoox98/nhOs6bHcSFPsxXdxUihcCfCzj+zcaHNEqpvTI/36Bnl2XW6dUJNaFQDc
   oWOyq5ZkxqnYrYXactjW0+vcPv6WHoHXmjv4dF7iFp8r0mvK
   -----END CERTIFICATE-----
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,7 +66,7 @@ dependencies:
         version: 1.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: 1.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -214,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: DSL for wechat message handling and API