wechat 0.12.3 → 0.13.3

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,8 +395,9 @@ 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,6 +408,12 @@ 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

@@ -64,15 +64,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.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

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/concern/common.rb

@@ -148,8 +148,15 @@ module Wechat
         post 'material/batchget_material', JSON.generate(type: type, offset: offset, count: count)
       end
 
-      def material_add(type, file)
-        post_file 'material/add_material', file, params: { type: type }
+      def material_add(type, file, opts = {})
+        params = { type: type }
+        params.merge!(description: opts.slice(:title, :introduction).to_json) if type == 'video'
+
+        post_file 'material/add_material', file, params: params
+      end
+
+      def material_add_news(mpnews_message)
+        post 'material/add_news', mpnews_message.to_json
       end
 
       def material_delete(media_id)

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,7 +34,8 @@ module Wechat
           timestamp: "#{js_hash[:timestamp]}",
           nonceStr: "#{js_hash[:noncestr]}",
           signature: "#{js_hash[:signature]}",
-          jsApiList: ['#{config_options[:api].join("','")}']
+          jsApiList: ['#{config_options[:api]&.join("','")}'],
+          openTagList: ['#{config_options[:open_tags]&.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.3
 platform: ruby
 authors:
 - Skinnyworm
@@ -35,7 +35,7 @@ cert_chain:
   spvOK5/LPXWX6ZGc2SR8SH/s7ftYH2EkeM1VUbtemow08NdgCwJ4IG+fRQ9dcrJ+
   L9TbpLHvVrCe1w8duMqNeUmqj+M1iC/5Zst2vIe14QcOTuAh
   -----END CERTIFICATE-----
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-06-18 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'
@@ -66,7 +66,7 @@ dependencies:
         version: 1.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: 1.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -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: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.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.14
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: DSL for wechat message handling and API