wechat 0.12.4 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761a53485d1170176263ef051a032606c7ae1c5533c6ec9c3f4808a4aeb5cd66
-  data.tar.gz: be822b26ee8bc46bcc548190d8f7082e0424d9214ed88a26e3846be39c7fcde2
+  metadata.gz: 983ca9ebf1007ad2f68e079d7ed625c59a10e78198992abf84a5b9718592ff26
+  data.tar.gz: 976751bb11aba9a0fa30674a39eaef432eb39c177a315b396d95c458c0afde45
 SHA512:
-  metadata.gz: 261f379c71351cf41d93e4bc3953c66f62d11c2f136111f2642379e78cde736e2e2667817c71f3001fec80d4432f83dcde2f4ac5d6f380b67daa55d6477252e4
-  data.tar.gz: b57190737963d214a9e644334ead4af99e68b774b3973f49ae652f6576b8aeb248407062e0ffc0fbb3ac86347b81b6b90942b632090eef6729ce6dc98504f4fe
+  metadata.gz: aeee17ba746530fbab18470172d83df90ff995ebdfa9ec92866361bbeacda03848e11a8ea278db6544ea57774513754b2dd914e7891154ca1344a03f8c5c4288
+  data.tar.gz: c22640b41f4d4d2d2cc01b7dd3568c76d6896f976d79f3d65c2ffb9dff975cb7ed6e0463b62b1f2991b6ec80494f96e263a3d330ee5661446dec7a075e063fc7

data/CHANGELOG.md

@@ -1,405 +1,8 @@
 # Changelog
 
-## v0.12.4 (released at 4/21/2021)
+## v0.13.0 (released at 3/3/2021)
 
-* New material_add_news API, by @zlei1 #300
-* Support open_tag, by @xiajian2019 #299
+* Support zeitwerk only and Rails 6+ only.
+* Support Ruby 2.6+ only.
 
-## v0.12.3 (released at 3/15/2021)
-
-* Fix MpApi initialize bug, by @hardywu #296
-
-## v0.12.2 (released at 3/3/2021)
-
-* New convert_to_userid API
-
-## v0.12.1 (released at 28/12/2020)
-
-* Support Ruby 3.0.
-* Qcloud_token support.
-* CRUD of tencent cloud DB for miniapp
-* TCB storage API support.
-* Set default branch to *main*.
-
-## v0.11.11 (released at 09/13/2020)
-
-* FIX: fix_load_controller_wechat not support MP type, by @Msms-NJ #281
-
-## v0.11.10 (released at 09/02/2020)
-
-* ADD: Wechat::MpApi.wxa_msg_sec_check.
-
-## v0.11.9 (released at 04/29/2020)
-
-* CHG: upgrade ssl_version to 1.2 by @paicha #276
-
-## v0.11.8 (released at 03/09/2020)
-
-* ADD: Wechat::CorpApi.news_message_send
-* FIX: Wechat API Change material/get_material. reported by @0000sir #275
-
-## v0.11.7 (released at 11/15/2019)
-
-* ADD: Wechat::MpApi.subscribe_message_send. by @paicha #271
-* FIX: FrozenError: can't modify frozen String. by @paicha #272
-* New translatecontent support.
-
-## v0.11.6 (released at 09/02/2019)
-
-* Fix private method `next_migration_number` introduced at #267, by @zpdsky #270
-* Give more clear warning about missing Rails in console. by @emtfe #268
-
-## v0.11.5 (released at 08/30/2019)
-
-* Add rubocop check in CI by @hophacker #267
-* Support Rails 6 and Windows at #266
-
-## v0.11.4 (released at 08/15/2019)
-
-* rails 6 redirect_to use allow_other_host: true by @Chen-George-Zhen #263
-
-## v0.11.3 (released at 07/02/2019)
-
-* New addvoicetorecofortext and queryrecoresultfortext support.
-* improve existing class detect by @3014zhangshuo #261
-* new wxa_get_wxacode_unlimit API for miniapp by @paicha #260
-
-## v0.11.2 (released at 05/08/2019)
-
-* bugfix short_url to shorturl in wechat console tool by @yuanxinyu #259
-* allow a message to be sent to a party (department) by @hophacker #256
-
-## v0.11.1 (released at 03/01/2019)
-
-* Let Message support markdown, text included; allow textcard btntxt to be omitted by @hophacker #251
-* Enterprise account add checkin api by @hophacker #254
-* Suggest use secret to differentiate different acces_tokens and tickets in Enterprise account by @hophacker #255
-
-
-## 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
-
-## v0.10.2 (released at 8/27/2018)
-
-* Fix incompatible with Rails 5.2.1 by @chloerei #239
-
-## v0.10.1 (released at 7/1/2018)
-
-* Allow custom_message_send using Hash as message, previous only allow Wechat::Message. by @zuoliang0 and @fogisland #234
-
-## v0.10.0 (released at 5/31/2018)
-
-* Support multi wechat account at wechat_responder. by @tuliren #223
-* Support wechat mini program apis & signature check. by @oiahoon #225
-* Support sent template message with miniprogram. by @falm #228
-* Fix request_content could be nil. by @paicha #229
-
-## v0.9.0 (released at 4/15/2018)
-
-* Support multi wechat account dynamically loading from DB. by @tuliren #222
-* user_create API for enterprise account. #206
-* Will ignore template_message_send error 43004 by @insub #214
-* using template with version if the migration version available by @killernova #220
-* Remove Deprecation oauth2_url
-* Remove Ruby 2.2 support, add Rails 5.2 and http v3 support
-
-## v0.8.12 (released at 9/13/2017)
-
-* Read oauth2_state from ticket store every time to avoid invalid oauth2_state by @xiewenwei #196
-
-## v0.8.11 (released at 7/25/2017)
-
-* oauth2 state code not refresh at the same time of jsapi tickets refresh bug, many thanks @xiewenwei #192
-* Add string type scene support for qrcode_create_scene. by @libuchao #191
-
-## v0.8.10 (released at 6/19/2017)
-
-* fix material_delete correctly.
-
-## v0.8.9 (released at 6/18/2017)
-
-* wechat material_delete failed to work, thanks @Victorialice report #78
-
-## v0.8.8 (released at 5/18/2017)
-
-* Better support multiple account. by @xiewenwei #187
-* Allow load figaro via RAILS_ENV. by @goofansu #186
-
-## 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.
-* make sure the formfile can be created outside. by @mechiland #181
-
-## v0.8.5 (released at 3/14/2017)
-
-* Support mass send API #176
-* Support new media_hq API
-* Support new createwxaqrcode API for miniapp
-* Fix wechat_responder not proper injected in rails 5 API #165
-* parse response support XML return, by @zhangbin #167
-* WeChat only allow 8 article per one news, by @kikyous #175
-* Store token at cookies, by @jstdoit #174
-
-## v0.8.4 (released at 1/12/2017)
-
-* 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
-
-## v0.8.2 (released at 11/2/2016)
-
-* Bug which if not using multi-account but using web login.
-
-## v0.8.1 (released at 11/2/2016)
-
-* After allow sub controller using wechat_api, it's possible not initialise at first time. by @IvanChou #155
-* Support web application login scope snsapi_login.
-* Add unionid support for public account.
-* Remove OpenId in Enterprise OAuth2 as it's not supported by Tecent.
-
-## v0.8.0 (released at 10/24/2016)
-
-* Complete support multi-wechat public account. by @xiewenwei #150
-* Support loading configure value from Figaro if application.yml exist.
-
-## v0.7.20 (released at 8/29/2016)
-
-* Apply opt and config together when loading controller_wechat, to simplify wechat_responder params. by @bzhang443 #147
-
-## v0.7.19 (released at 8/25/2016)
-
-* Enterprise account now custom_image/voice/file works now. by @zymiboxpay #145
-* Fix timeout setting no effective since introduct HTTP. found by @hsluo #74
-
-## v0.7.18 (released at 8/21/2016)
-
-* Support label_location message, similar to location event, but sent by user with Label. #144
-* Add gem signature as additional security methods.
-
-## v0.7.17 (released at 8/18/2016)
-
-* Allow declare wechat_api at ApplicationController, but using wechat at sub controller. #104
-
-## v0.7.16 (released at 7/27/2016)
-
-* FIX: consider '' in params as equal with nil, in ControllerApi#wechat_public_oauth2, by @snow #135
-* New tag API for public account, by @pynixwang #127
-* fix SSLv3 error by use TLSv1_client, by @IvanChou #133
-
-## v0.7.15 (released at 7/03/2016)
-
-* RSpec testing case on Rails 5 now.
-* Resolve Rails 5 ActionController::Parameters issue.
-
-## v0.7.14 (released at 5/29/2016)
-
-* Fix when access_token failed lead ticket can not refresh problem.
-* Default duration should be 1 hours instead of 0 seconds for wechat_oauth2.
-* New shorturl allowing convert from long URL to short.
-
-## v0.7.13 (released at 5/14/2016)
-
-* Wechat.config.oauth2_cookie_duration need convert to secondes, found by @gabrieltong #111
-
-## v0.7.12 (released at 5/12/2016)
-
-* Fix web_userinfo wrong URL, found by @gabrieltong #110
-
-## v0.7.11 (released at 4/18/2016)
-
-* To cover wrong release 0.7.10, nothing change
-
-## v0.7.10 (released at 4/18/2016) (yanked)
-
-## v0.7.9 (released at 4/12/2016)
-
-* wechat_oauth2 support public account now.
-* Refresh and store state on jsapi ticket, using it on oauth2_url to more secure.
-* Remove extra sending payload in message template send json
-* Allow setting oauth2_cookie_duration in config
-
-## v0.7.8 (released at 3/31/2016)
-
-* New wechat_api, similar to wechat_responder, but without messange handle DSL, support web page only wechat application
-* New media_uploadimg API.
-* New file type of Message.
-* Improved multi account support per different controller.
-
-## v0.7.7 (released at 3/18/2016)
-
-* New wechat_oauth2, only support enterprise account still.
-* fix 'skip_before_action :verify_authenticity_token' bug for v5.0.0.beta3 by @vkill #97
-* Support Rails 3.2 again after support Rails 5.0, by @guange2015 #96
-
-## v0.7.6 (released at 3/05/2016)
-
-* Support wechat public account conditional menu. #95
-
-## v0.7.5 (released at 2/21/2016)
-
-* New wechat_config_js to simplify the Wechat jsapi config.
-* Support sent shortvideo.
-
-## v0.7.4 (released at 1/23/2016)
-
-* Add Redis store token/ticket support, close #76, #60
-* Rails 5 support without deprecate warning or other not necessory call. #82
-
-## v0.7.3 (released at 1/19/2016)
-
-* Allow transfer_customer_service to specific account.
-* New customservice_getonlinekflist API.
-* session support class WechatSession no need table_exists? methods exist.
-
-## v0.7.2 (released at 1/18/2016)
-
-* 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
-* Fetch setting from RAILS_ENV first, then fetch default. by @kikyous #85
-* Warning not support on :scan with regular expression, reason see #84
-
-## v0.7.1 (released at 1/11/2016)
-
-* Fix after using http, upload file function break. #78
-* Add callback function after_wechat_response support. by @zfben #79
-* Should using department_id instead of departmentid at enterprise api: user_simplelist/user_list.
-
-## v0.7.0 (released at 1/1/2016)
-
-* Using [http](https://github.com/httprb/http) instead of rest-client for performance reason. (not support upload file yet)
-
-## v0.6.10 (released at 1/17/2016)
-
-* 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
-
-## v0.6.9 (released at 1/6/2016)
-
-* Fix token refresh bug on multi worker. #76
-* Rewrite the token relative code to add more storage support in future.
-
-## v0.6.8 (released at 12/25/2015)
-
-* Support Rails 5.0.0.beta1.
-* English README available
-* Fix oauth2_url calling error, fix #75
-
-## v0.6.7 (released at 12/18/2015)
-
-* Add timeout configuration option, close #74
-* New getuserinfo and oauth2_url to support getting FromUserName from web page.
-
-## v0.6.6 (released at 12/15/2015)
-
-* Add jsapi_ticket support for Enterprise Account
-* Default generated WechatsController < ActionController::Base, as many Rails application may having #authenticate_user or #set_current_user in ApplicationController, so easily affect the first time using experience.
-* New syntax `on :view, with: 'VIEW_URL'` support.
-* New command `upload_replaceparty` which combine three sub command to make uploading department easier.
-* New command `upload_replaceuser` which combine three sub command to make uploading user easier.
-
-## v0.6.5 (released at 11/24/2015)
-
-* Handle 48001 error if token is expire/not valid, close #71
-* ApiLoader will do config reading and initialize the api instead of spreading the logic.
-
-## v0.6.4 (released at 11/16/2015)
-
-* Command mode now display different command set based on enterprise/public account setting
-* Move config logic in command/wechat to ApiLoader class
-* Unsubscribe can only reply plain text 'success' #68
-* Fix 404 qrcode download problem, by @huangxiangdan #69
-
-## v0.6.3 (released at 11/14/2015)
-
-* Official testing and support public encrypt mode, also fix one cipher bug, many thanks to @hlltc #67
-* hlltc report public account FILE_BASE no longer needs, clean code #67
-* Media command line reflect recent Tecent json schema change. #67
-
-## v0.6.2 (released at 11/05/2015)
-
-* Tecent report location API changed, so change wechat gems also. #64
-
-## v0.6.1 (released at 10/20/2015)
-
-* Handle 40001, invalid credential, access_token is invalid or not latest hint # 57
-* Support at Rails 4.2.1 wechat can not run #58
-
-## v0.6.0 (released at 10/08/2015)
-
-### Scan and Batch job are BREAK CHANGE!
-
-* 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' `.
-* 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
-* New department_update, user_batchdelete, convert_to_openid API
-
-## v0.5.0 (released at 9/25/2015)
-
-* Only relay on activesupport on run time, so will greatly improve wechat cli startup time
-* Add rails generator support `rails g wechat:install`
-* Add batch job support for enterprise account like batch create user/department, both API, callback responder and CLI
-* Add material management API and CLI
-* Add tag API and CLI for enterprise account
-* Add QR code scene function for public account
-
-## 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
-* Resolve the conflict with gem "responders" by @seamon #45
-
-## 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
-* Allow transfer to customer service on fallback. #42
-* Read and write access_token properly using file locking, #43
-
-## v0.2.0 (released at 8/27/2015)
-
-* Add wechat enterprise account support
-* Make responder execute in action context, by @lazing #15
-* jsapi_ticket support, by @feitian124 #27
-* Rename gems to wechat and ambitious to being #1 gems about development wechat. thanks Xiaoning transfer this gem name.
-* Original gem `wechat-rails` author skinnyworm trasfer to Eric-Guo as maintainer
-
-## v0.1.1
-
-* Initial release from [wechat-rails](https://github.com/skinnyworm/wechat-rails).
+Previous changelog see https://github.com/Eric-Guo/wechat/blob/master/CHANGELOG_OLD.md

data/README-CN.md

@@ -27,12 +27,16 @@ WeChat gem帮助开发者方便地在Rails环境中集成[微信公众平台](ht
 
 ```
 gem install "wechat"
+# 如果使用 Ruby 版本小于 2.6
+# gem install wechat -v 0.12.2
 ```
 
 或者添加下面这行到 `Gemfile`:
 
 ```
 gem 'wechat'
+# 如果使用 Rails 版本小于 6
+# gem 'wechat', '~> 0.12.2'
 ```
 
 运行下面这行代码来安装:
@@ -362,7 +366,6 @@ Wechat Public Account commands:
   wechat groups                                                 # 查询所有分组
   wechat material_get [MEDIA_ID, PATH]                              # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
-  wechat material_add_news [MPNEWS_YAML_PATH]                   # 永久图文素材上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
   wechat material_list [TYPE, OFFSET, COUNT]                    # 获取永久素材列表

data/README.md

@@ -34,12 +34,16 @@ Use `gem install`
 
 ```
 gem install "wechat"
+# If your ruby version < 2.6
+# gem install wechat -v 0.12.2
 ```
 
 Or add it to your app's `Gemfile`:
 
 ```
 gem 'wechat'
+# If your rails version < 6.0
+# gem 'wechat', '~> 0.12.2'
 ```
 
 Run the following command to install it:
@@ -391,9 +395,8 @@ Wechat Public Account commands:
   wechat group_delete [GROUP_ID]                                # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]                # 修改分组名
   wechat groups                                                 # 查询所有分组
-  wechat material_get [MEDIA_ID, PATH]                          # 永久媒体下载
+  wechat material_get [MEDIA_ID, PATH]                              # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
-  wechat material_add_news [MPNEWS_YAML_PATH]                   # 永久图文素材上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
   wechat material_list [TYPE, OFFSET, COUNT]                    # 获取永久素材列表

data/bin/wechat

@@ -6,13 +6,10 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 require 'thor'
 require 'wechat'
 require 'json'
-require 'active_support' # To support Rails 4.2.1, see #17936
-require 'active_support/dependencies/autoload'
 require 'active_support/core_ext'
 require 'active_support/json'
 require 'fileutils'
 require 'yaml'
-require 'wechat/api_loader'
 require 'cgi'
 
 class App < Thor
@@ -411,12 +408,6 @@ class App < Thor
     puts wechat_api.material_add(type, path)
   end
 
-  desc 'material_add_news [MPNEWS_YAML_PATH]', '永久图文素材上传'
-  def material_add_news(mpnews_yaml_path)
-    new = YAML.load(File.read(mpnews_yaml_path))
-    puts wechat_api.material_add_news(Wechat::Message.new(MsgType: 'mpnews').mpnews(new['articles']))
-  end
-
   desc 'material_delete [MEDIA_ID]', '删除永久素材'
   def material_delete(media_id)
     puts wechat_api.material_delete(media_id)

data/lib/action_controller/wechat_responder.rb

@@ -45,18 +45,17 @@ module ActionController
 
       access_token = opts[:access_token] || cfg.access_token
       jsapi_ticket = opts[:jsapi_ticket] || cfg.jsapi_ticket
-      qcloud_env = opts[:qcloud_env] || cfg.qcloud_env
       qcloud_token = opts[:qcloud_token] || cfg.qcloud_token
 
       api_type = opts[:type] || cfg.type
       secret = corpid.present? ? opts[:corpsecret] || cfg.corpsecret : opts[:secret] || cfg.secret
 
-      get_wechat_api(api_type, corpid, appid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket, qcloud_env, qcloud_token, qcloud_token_lifespan)
+      get_wechat_api(api_type, corpid, appid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket, qcloud_token, qcloud_token_lifespan)
     end
 
-    def get_wechat_api(api_type, corpid, appid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket, qcloud_env, qcloud_token, qcloud_token_lifespan)
+    def get_wechat_api(api_type, corpid, appid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket, qcloud_token, qcloud_token_lifespan)
       if api_type && api_type.to_sym == :mp
-        Wechat::MpApi.new(appid, secret, access_token, timeout, skip_verify_ssl, jsapi_ticket, qcloud_env, qcloud_token, qcloud_token_lifespan)
+        Wechat::MpApi.new(appid, secret, access_token, timeout, skip_verify_ssl, jsapi_ticket, qcloud_token, qcloud_token_lifespan)
       elsif corpid.present?
         Wechat::CorpApi.new(corpid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket)
       else
@@ -64,15 +63,4 @@ module ActionController
       end
     end
   end
-
-  if defined? Base
-    class << Base
-      include WechatResponder
-    end
-  end
-  if defined? API
-    class << API
-      include WechatResponder
-    end
-  end
 end

data/lib/generators/wechat/config_generator.rb

@@ -31,7 +31,7 @@ module Wechat
       private
 
       def migration_version
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version >= '5.0.0'
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
     end
   end

data/lib/generators/wechat/session_generator.rb

@@ -31,7 +31,7 @@ module Wechat
       private
 
       def migration_version
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version >= '5.0.0'
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
     end
   end

data/lib/wechat/api.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'wechat/api_base'
-require 'wechat/http_client'
-require 'wechat/token/public_access_token'
-require 'wechat/ticket/public_jsapi_ticket'
-require 'wechat/concern/common'
-
 module Wechat
   class Api < ApiBase
     def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)

data/lib/wechat/cipher.rb

@@ -43,7 +43,7 @@ module Wechat
       msg = decode_padding(msg)
       msg_len = msg[16, 4].reverse.unpack1('V')
       content = msg[20, msg_len]
-      app_id = msg[(msg_len + 20)..-1]
+      app_id = msg[(msg_len + 20)..]
 
       [content, app_id]
     end

data/lib/wechat/concern/common.rb

@@ -152,10 +152,6 @@ module Wechat
         post_file 'material/add_material', file, params: { type: type }
       end
 
-      def material_add_news(mpnews_message)
-        post 'material/add_news', mpnews_message.to_json
-      end
-
       def material_delete(media_id)
         post 'material/del_material', JSON.generate(media_id: media_id)
       end

data/lib/wechat/controller_api.rb

@@ -58,7 +58,7 @@ module Wechat
         cookies.signed_or_encrypted[:we_access_token] = { value: access_info['access_token'], expires: self.class.oauth2_cookie_duration.from_now }
         yield access_info['openid'], access_info
       else
-        Rails::VERSION::MAJOR >= 6 ? (redirect_to generate_oauth2_url(oauth2_params), allow_other_host: true) : (redirect_to generate_oauth2_url(oauth2_params))
+        redirect_to generate_oauth2_url(oauth2_params), allow_other_host: true
       end
     end
 
@@ -73,7 +73,7 @@ module Wechat
         cookies.signed_or_encrypted[:we_deviceid] = { value: userinfo['DeviceId'], expires: self.class.oauth2_cookie_duration.from_now }
         yield userinfo['UserId'], userinfo
       else
-        Rails::VERSION::MAJOR >= 6 ? (redirect_to generate_oauth2_url(oauth2_params), allow_other_host: true) : (redirect_to generate_oauth2_url(oauth2_params))
+        redirect_to generate_oauth2_url(oauth2_params), allow_other_host: true
       end
     end
 

data/lib/wechat/corp_api.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'wechat/api_base'
-require 'wechat/http_client'
-require 'wechat/token/corp_access_token'
-require 'wechat/ticket/corp_jsapi_ticket'
-
 module Wechat
   class CorpApi < ApiBase
     attr_reader :agentid

data/lib/wechat/helpers.rb

@@ -34,8 +34,7 @@ module Wechat
           timestamp: "#{js_hash[:timestamp]}",
           nonceStr: "#{js_hash[:noncestr]}",
           signature: "#{js_hash[:signature]}",
-          jsApiList: ['#{config_options[:api]&.join("','")}'],
-          openTagList: ['#{config_options[:open_tags]&.join("','")}']
+          jsApiList: ['#{config_options[:api].join("','")}']
         });
       WECHAT_CONFIG_JS
       javascript_tag config_js, type: 'application/javascript'

data/lib/wechat/mp_api.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'wechat/api_base'
-require 'wechat/http_client'
-require 'wechat/token/public_access_token'
-require 'wechat/ticket/public_jsapi_ticket'
-require 'wechat/qcloud/token'
-require 'wechat/concern/common'
-require 'wechat/concern/qcloud'
-
 module Wechat
   class MpApi < ApiBase
     def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file, qcloud_env, qcloud_token_file, qcloud_token_lifespan)

data/lib/wechat/responder.rb

@@ -2,7 +2,6 @@
 
 require 'English'
 require 'rexml/document'
-require 'wechat/signature'
 
 module Wechat
   module Responder
@@ -11,24 +10,9 @@ module Wechat
     include Cipher
 
     included do
-      # Rails 5 remove before_filter and skip_before_filter
-      if respond_to?(:skip_before_action)
-        if respond_to?(:verify_authenticity_token)
-          skip_before_action :verify_authenticity_token
-        else
-          # Rails 5 API mode won't define verify_authenticity_token
-          # https://github.com/rails/rails/blob/v5.0.0.beta3/actionpack/lib/abstract_controller/callbacks.rb#L66
-          # https://github.com/rails/rails/blob/v5.0.0.beta3/activesupport/lib/active_support/callbacks.rb#L640
-          skip_before_action :verify_authenticity_token, raise: false
-        end
-
-        before_action :config_account, only: %i[show create]
-        before_action :verify_signature, only: %i[show create]
-      else
-        skip_before_filter :verify_authenticity_token
-        before_filter :config_account, only: %i[show create]
-        before_filter :verify_signature, only: %i[show create]
-      end
+      skip_before_action :verify_authenticity_token, raise: false
+      before_action :config_account, only: %i[show create]
+      before_action :verify_signature, only: %i[show create]
     end
 
     module ClassMethods
@@ -180,15 +164,9 @@ module Wechat
     def show
       if @we_corpid.present?
         echostr, _corp_id = unpack(decrypt(Base64.decode64(params[:echostr]), @we_encoding_aes_key))
-        if Rails::VERSION::MAJOR >= 4
-          render plain: echostr
-        else
-          render text: echostr
-        end
-      elsif Rails::VERSION::MAJOR >= 4
-        render plain: params[:echostr]
+        render plain: echostr
       else
-        render text: params[:echostr]
+        render plain: params[:echostr]
       end
     end
 
@@ -197,11 +175,7 @@ module Wechat
       response_msg = run_responder(request_msg)
 
       if response_msg.respond_to? :to_xml
-        if Rails::VERSION::MAJOR >= 4
-          render plain: process_response(response_msg)
-        else
-          render text: process_response(response_msg)
-        end
+        render plain: process_response(response_msg)
       else
         head :ok, content_type: 'text/html'
       end
@@ -248,15 +222,9 @@ module Wechat
       end
 
       data_hash = data.fetch('xml', {})
-      if Rails::VERSION::MAJOR >= 5
-        data_hash = data_hash.to_unsafe_hash if data_hash.instance_of?(ActionController::Parameters)
-        HashWithIndifferentAccess.new(data_hash).tap do |msg|
-          msg[:Event]&.downcase!
-        end
-      else
-        HashWithIndifferentAccess.new_from_hash_copying_default(data_hash).tap do |msg|
-          msg[:Event]&.downcase!
-        end
+      data_hash = data_hash.to_unsafe_hash if data_hash.instance_of?(ActionController::Parameters)
+      HashWithIndifferentAccess.new(data_hash).tap do |msg|
+        msg[:Event]&.downcase!
       end
     end
 

data/lib/wechat/ticket/corp_jsapi_ticket.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'wechat/ticket/jsapi_base'
-
 module Wechat
   module Ticket
     class CorpJsapiTicket < JsapiBase

data/lib/wechat/ticket/public_jsapi_ticket.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'wechat/ticket/jsapi_base'
-
 module Wechat
   module Ticket
     class PublicJsapiTicket < JsapiBase

data/lib/wechat/token/corp_access_token.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'wechat/token/access_token_base'
-
 module Wechat
   module Token
     class CorpAccessToken < AccessTokenBase

data/lib/wechat/token/public_access_token.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'wechat/token/access_token_base'
-
 module Wechat
   module Token
     class PublicAccessToken < AccessTokenBase

data/lib/wechat.rb

@@ -1,20 +1,14 @@
 # frozen_string_literal: true
 
+require 'zeitwerk'
+loader = Zeitwerk::Loader.for_gem
+loader.ignore("#{__dir__}/generators/**/*.rb")
+loader.setup
+
 require 'base64'
 require 'openssl/cipher'
-require 'wechat/api_loader'
-require 'wechat/api'
-require 'wechat/mp_api'
-require 'wechat/corp_api'
-require 'wechat/helpers'
-require 'action_controller/wechat_responder'
 
 module Wechat
-  autoload :Message, 'wechat/message'
-  autoload :Responder, 'wechat/responder'
-  autoload :Cipher, 'wechat/cipher'
-  autoload :ControllerApi, 'wechat/controller_api'
-
   class AccessTokenExpiredError < StandardError; end
 
   class InvalidCredentialError < StandardError; end
@@ -55,3 +49,21 @@ module Wechat
 end
 
 ActionView::Base.include Wechat::Helpers if defined? ActionView::Base
+require 'action_controller/wechat_responder' # To make wechat_api and wechat_responder available
+
+module ActionController
+  if defined? Base
+    ActiveSupport.on_load(:action_controller_base) do
+      class << Base
+        include WechatResponder
+      end
+    end
+  end
+  if defined? API
+    ActiveSupport.on_load(:action_controller_api) do
+      class << API
+        include WechatResponder
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
 platform: ruby
 authors:
 - Skinnyworm
@@ -35,7 +35,7 @@ cert_chain:
   spvOK5/LPXWX6ZGc2SR8SH/s7ftYH2EkeM1VUbtemow08NdgCwJ4IG+fRQ9dcrJ+
   L9TbpLHvVrCe1w8duMqNeUmqj+M1iC/5Zst2vIe14QcOTuAh
   -----END CERTIFICATE-----
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -119,48 +119,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -237,14 +251,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.12
 signing_key:
 specification_version: 4
 summary: DSL for wechat message handling and API