wechat 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62ec874b95597f2ea1e8678e2903b591dae48c60
-  data.tar.gz: 35725116ed22adb68f8002bc670d5d450daa4d69
+  metadata.gz: d7ee715ed77e318662731915d4b04d1a3ddf57fd
+  data.tar.gz: 5fba117fd1a11174d5453b16e7bfb800d6ce1fad
 SHA512:
-  metadata.gz: 25b8b447ff7bdd05a2269a2c830b880074ec11d84ffeac07b46e797213e8d26f170531da2e859384876556f9c88255829a54d163441cc220eb5a88c45119bc6b
-  data.tar.gz: 80300468b803ca0b035177a88df2b7f9cd06adad810bed9e721c48326aa7f72bc2c0452e0863e3d3be544d59ec5af1002f5611909fc67bc2959fd7b070905aab
+  metadata.gz: 465dcca90573b199673602e8797ab078d27ff285b6639db1a923b377fafca9d98cf8244b78b33f07c07699d821c45639869fe97956943de38096779b8c215701
+  data.tar.gz: 5efd883e21fc35ed05a225b30a08f83af1927f3989c302fce72432ec4e8a4a93a09c64a703171c26885cc6dd74dd318f4824a6e2531fbe7b372f0adf02d6d68a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.8.7 (released at 4/23/2017)
+
+* Support new wxa_get_wxacode API for miniapp.
+* Add InvalidCredentialError, support audio/amr, voice/speex as file and text/plain as json. by @acenqiu #184
+
 ## v0.8.6 (released at 3/17/2017)
 
 * Support Rails 5.1 officially.
@@ -17,17 +22,17 @@
 
 ## v0.8.4 (released at 1/12/2017)
 
-# Support Ruby 2.4.0 
-# Add support of Enterprise RedPacket API, by @zhangbin #169
+* Support Ruby 2.4.0
+* Add support of Enterprise RedPacket API, by @zhangbin #169
 
 ## v0.8.3 (released at 11/26/2016)
 
-# Fix wechat template key has camelCase problem, by @RyanChenDji #159
-# Fix long time of oauth2_state bug for wechat_oauth2 methods, by @IvanChou #162
+* Fix wechat template key has camelCase problem, by @RyanChenDji #159
+* Fix long time of oauth2_state bug for wechat_oauth2 methods, by @IvanChou #162
 
 ## v0.8.2 (released at 11/2/2016)
 
-# Bug which if not using multi-account but using web login.
+* Bug which if not using multi-account but using web login.
 
 ## v0.8.1 (released at 11/2/2016)
 
@@ -57,7 +62,7 @@
 
 ## v0.7.17 (released at 8/18/2016)
 
-* Allow declare wechat_api at ApplicationController, but using wechat at sub controller. #104 
+* Allow declare wechat_api at ApplicationController, but using wechat at sub controller. #104
 
 ## v0.7.16 (released at 7/27/2016)
 
@@ -135,9 +140,9 @@
 * Optional session support by @zfben #81, #88, #91
 * Replace after_wechat_response with Rails Nofications facility, by @zfben, original issue is #79
 * New user_batchget API. #89
-* Support Rails 3.2 again after support Rails 5.0. by @guange2015 #87 
+* Support Rails 3.2 again after support Rails 5.0. by @guange2015 #87
 * Fetch setting from RAILS_ENV first, then fetch default. by @kikyous #85
-* Warning not support on :scan with regular expression, reason see #84 
+* Warning not support on :scan with regular expression, reason see #84
 
 ## v0.7.1 (released at 1/11/2016)
 
@@ -151,9 +156,9 @@
 
 ## v0.6.10 (released at 1/17/2016)
 
-* Support Rails 3.2 again after support Rails 5.0. by @guange2015 #87 
+* Support Rails 3.2 again after support Rails 5.0. by @guange2015 #87
 * Fetch setting from RAILS_ENV first, then fetch default. by @kikyous #85
-* Warning not support on :scan with regular expression. by @kikyous #84 
+* Warning not support on :scan with regular expression. by @kikyous #84
 
 ## v0.6.9 (released at 1/6/2016)
 
@@ -213,7 +218,7 @@
 * Scan 2D barcode using new syntax `on :scan, with: 'BINDING_QR_CODE' ` instead of `on :event, with: 'BINDING_QR_CODE' ` in previous version #55
   Which will fix can not using `on :event, with: "scan" ` problem
 * Batch job using new syntax `on :batch_job, with: 'replace_user' `
-instead of previous `on :event, with: 'replace_user' `. 
+instead of previous `on :event, with: 'replace_user' `.
 * Click menu support new syntax `on :click, with: 'BOOK_LUNCH' `, but `on :event, with: 'BOOK_LUNCH' ` still supported. perfer `on :click` because it running faster and more nature expression.
 * Wechat::Responder using Hash for new :client and :batch_job event, avoid time consuming Array match responder
 * Fix refresh token not working problem under ruby 2.0.0 #54
@@ -232,7 +237,7 @@ instead of previous `on :event, with: 'replace_user' `.
 
 * 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. 
+* Fix skip_verify_ssl parameter error.
 
 ## v0.4.1 (released at 9/6/2015)
 

data/README-CN.md

@@ -339,6 +339,7 @@ Wechat Public Account commands:
   wechat user_group [OPEN_ID]                              # 查询用户所在分组
   wechat user_update_remark [OPEN_ID, REMARK]              # 设置备注名
   wechat users                                             # 关注者列表
+  wechat wxacode_download [WXA_CODE_PIC_PATH, PATH, WIDTH] # 下载小程序码
 ```
 
 #### 企业号命令行

data/README.md

@@ -354,6 +354,7 @@ Wechat Public Account commands:
   wechat user_group [OPEN_ID]                              # 查询用户所在分组
   wechat user_update_remark [OPEN_ID, REMARK]              # 设置备注名
   wechat users                                             # 关注者列表
+  wechat wxacode_download [WXA_CODE_PIC_PATH, PATH, WIDTH] # 下载小程序码
 ```
 
 #### Enterprise account command line

data/bin/wechat

@@ -199,6 +199,13 @@ class App < Thor
     end
   else
     package_name 'Wechat Public Account'
+    desc 'wxacode_download [WXA_CODE_PIC_PATH, PATH, WIDTH]', '下载小程序码'
+    def wxacode_download(wxa_code_pic_path, path = 'pages/index/index', width = 430)
+      tmp_file = wechat_api.wxa_get_wxacode(path, width)
+      FileUtils.mv(tmp_file.path, wxa_code_pic_path)
+      puts 'WXA Code File downloaded'
+    end
+
     desc 'media_uploadnews [MPNEWS_YAML_PATH]', '上传图文消息素材'
     def media_uploadnews(mpnews_yaml_path)
       mpnew = YAML.load(File.read(mpnews_yaml_path))

data/lib/generators/wechat/templates/app/controllers/wechats_controller.rb

@@ -3,7 +3,7 @@ class WechatsController < ApplicationController
 <% else -%>
 class WechatsController < ActionController::Base
 <% end -%>
-  # For details on the DSL available within this file, see https://github.com/Eric-Guo/wechat#rails-responder-controller-dsl
+  # For details on the DSL available within this file, see https://github.com/Eric-Guo/wechat#wechat_responder---rails-responder-controller-dsl
   wechat_responder
 
   on :text do |request, content|

data/lib/wechat.rb

@@ -11,6 +11,7 @@ module Wechat
   autoload :ControllerApi, 'wechat/controller_api'
 
   class AccessTokenExpiredError < StandardError; end
+  class InvalidCredentialError < StandardError; end
   class ResponseError < StandardError
     attr_reader :error_code
     def initialize(errcode, errmsg)

data/lib/wechat/api.rb

@@ -6,6 +6,7 @@ require 'wechat/ticket/public_jsapi_ticket'
 module Wechat
   class Api < ApiBase
     API_BASE = 'https://api.weixin.qq.com/cgi-bin/'.freeze
+    WXA_BASE = 'https://api.weixin.qq.com/wxa/'.freeze
 
     def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
       @client = HttpClient.new(API_BASE, timeout, skip_verify_ssl)
@@ -91,6 +92,10 @@ module Wechat
       post 'message/mass/get', JSON.generate(msg_id: msg_id)
     end
 
+    def wxa_get_wxacode(path, width = 430)
+      post 'getwxacode', JSON.generate(path: path, width: width), base: WXA_BASE
+    end
+
     def wxa_create_qrcode(path, width = 430)
       post 'wxaapp/createwxaqrcode', JSON.generate(path: path, width: width)
     end

data/lib/wechat/http_client.rb

@@ -70,9 +70,22 @@ module Wechat
       parse_as = {
         %r{^application\/json} => :json,
         %r{^image\/.*}         => :file,
-        %r{^text\/html}        => :xml
+        %r{^audio\/.*}         => :file,
+        %r{^voice\/.*}         => :file,
+        %r{^text\/html}        => :xml,
+        %r{^text\/plain}       => :probably_json
       }.each_with_object([]) { |match, memo| memo << match[1] if content_type =~ match[0] }.first || as || :text
 
+      # try to parse response as json, fallback to user-specified format or text if failed
+      if parse_as == :probably_json
+        data = JSON.parse response.body.to_s.gsub(/[\u0000-\u001f]+/, '') rescue nil
+        if data
+          return yield(:json, data)
+        else
+          parse_as = as || :text
+        end
+      end
+
       case parse_as
       when :file
         file = Tempfile.new('tmp')

data/lib/wechat/token/access_token_base.rb

@@ -30,6 +30,8 @@ module Wechat
       end
 
       def write_token_to_store(token_hash)
+        raise InvalidCredentialError unless token_hash.is_a?(Hash) && token_hash['access_token']
+
         token_hash['got_token_at'.freeze] = Time.now.to_i
         token_hash['token_expires_in'.freeze] = token_hash.delete('expires_in')
         write_token(token_hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Skinnyworm
@@ -31,7 +31,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: DSL for wechat message handling and API