wechat 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df10ca6f78d2d0546495b798889545656fe4e40f8f06cd8267b60ce26a1d1d9a
-  data.tar.gz: c78e07d9b619a950887bd2de8e6e751f5d280db52f9458aa78456aa9aa305cc5
+  metadata.gz: 332ed5cc2f20211d70e994fc4549534748c9400074ece51debd7e4d147b4a1fd
+  data.tar.gz: 6cb347a738b602628c6dadae3ef2d90cddb9c1baff68e7e66b9bc88cc14a8643
 SHA512:
-  metadata.gz: b528307cd3d452bd6e0733aa6a1663eae1ac4569b3e1d64f98dac8174a14276bfb7125476da1d219a02893287a693143c45bafa8ba5f164a1eaec6139f9d64ae
-  data.tar.gz: d1205df3d31f15261fcde43b734d7abd79c99059c0a5339d9b98bbe69709ba814b7e7cbb14bd320c898b0f3c82235055dc7fde5d1cad33f5f0792b67e2a6872c
+  metadata.gz: 3b293b5f93fcc0f304af98f7664c73469595028b4bc38d14c60bf2506243c288d59964e17acaea563c7922493b39e67bc56ede37e638fecaf4f83c332dbb60ca
+  data.tar.gz: 640d2a2b5fc743189f03f680c03404cc991ff6b5e50f84f802c520eed10d7df1690080ae11ac9f1b22ada9b4f45a5f1c6a8ba5e8f01a9043026ce20ed39569ee

checksums.yaml.gz.sig

@@ -1 +1,5 @@
-}�(�nFS�e�n�9{��S!�<��C�p>t��t��I�ǔ���I@�nK�:��m���K^a�\j���P{:���0�>��1�^�[SSi�=z[�}Z�e.G��M�Ð���sΔ
+�o����6�TK

+[|%��)��֜��xʰJ���.�����"9?
+�m�БF�XBq���:�D^��w���v|����ͿO�pn�+���a�����껅�h"�����)��1��p�A��5��C0����AWp��u�ˑ�\�x��u
b�X�_S{N�F$%�a\�ZU��۟-�N
+�曵.���k�
����X�PI�ج��P�q�WT{ɷHRK�=q#��
+� BKT$'��ck�V�6	Ѧ̈́*
��Cl�[f�,,�v����8��#HD���P��|��C�	�j�Dz�_

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 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

data/lib/action_controller/wechat_responder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionController
   module WechatResponder
     def wechat_api(opts = {})
@@ -36,11 +38,11 @@ module ActionController
       self.trusted_domain_fullname = opts[:trusted_domain_fullname] || cfg.trusted_domain_fullname
       self.oauth2_cookie_duration = opts[:oauth2_cookie_duration] || cfg.oauth2_cookie_duration.to_i.seconds
       self.timeout = opts[:timeout] || cfg.timeout
-      if opts.key?(:skip_verify_ssl)
-        self.skip_verify_ssl = opts[:skip_verify_ssl]
-      else
-        self.skip_verify_ssl = cfg.skip_verify_ssl
-      end
+      self.skip_verify_ssl = if opts.key?(:skip_verify_ssl)
+                               opts[:skip_verify_ssl]
+                             else
+                               cfg.skip_verify_ssl
+                             end
 
       return Wechat.api if account == :default && opts.empty?
 

data/lib/generators/wechat/config_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/active_record'
 
 module Wechat
@@ -6,13 +8,13 @@ module Wechat
       include ::Rails::Generators::Migration
 
       desc 'Generate wechat configs in database'
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_wechat_config_migration
         migration_template(
-            'db/config_migration.rb.erb',
-            'db/migrate/create_wechat_configs.rb',
-            {migration_version: migration_version}
+          'db/config_migration.rb.erb',
+          'db/migrate/create_wechat_configs.rb',
+          migration_version: migration_version
         )
       end
 
@@ -20,16 +22,18 @@ module Wechat
         template 'app/models/wechat_config.rb'
       end
 
-      private
+      class << self
+        private
 
-      def self.next_migration_number(dirname)
-        ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+        def next_migration_number(dirname)
+          ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+        end
       end
 
+      private
+
       def migration_version
-        if Rails.version >= '5.0.0'
-          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        end
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version >= '5.0.0'
       end
     end
   end

data/lib/generators/wechat/install_generator.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Wechat
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc 'Install Wechat support files'
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_config
         template 'config/wechat.yml'

data/lib/generators/wechat/menu_generator.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Wechat
   module Generators
     class MenuGenerator < Rails::Generators::Base
       desc 'Generate wechat menu'
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
       class_option :conditional, desc: 'Generate conditional menu', type: :boolean, default: false
 
       def copy_menu

data/lib/generators/wechat/redis_store_generator.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Wechat
   module Generators
     class RedisStoreGenerator < Rails::Generators::Base
       desc 'Using redis as token/ticket store'
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_wechat_redis_initializer
         template 'config/initializers/wechat_redis_store.rb'

data/lib/generators/wechat/session_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/active_record'
 
 module Wechat
@@ -6,13 +8,13 @@ module Wechat
       include ::Rails::Generators::Migration
 
       desc 'Enable wechat session support'
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_wechat_sessions_migration
         migration_template(
-            'db/session_migration.rb.erb',
-            'db/migrate/create_wechat_sessions.rb',
-            {migration_version: migration_version}
+          'db/session_migration.rb.erb',
+          'db/migrate/create_wechat_sessions.rb',
+          migration_version: migration_version
         )
       end
 
@@ -20,16 +22,18 @@ module Wechat
         template 'app/models/wechat_session.rb'
       end
 
-      private
+      class << self
+        private
 
-      def self.next_migration_number(dirname)
-        ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+        def next_migration_number(dirname)
+          ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+        end
       end
 
+      private
+
       def migration_version
-        if Rails.version >= '5.0.0'
-          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        end
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version >= '5.0.0'
       end
     end
   end

data/lib/generators/wechat/templates/app/models/wechat_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Used by wechat gems, do not rename WechatConfig to other name,
 # Feel free to inherit from other class like ActiveModel::Model
 class WechatConfig < ActiveRecord::Base
@@ -10,17 +12,16 @@ class WechatConfig < ActiveRecord::Base
 
   validate :app_config_is_valid
 
-  ATTRIBUTES_TO_REMOVE = %w(environment account created_at updated_at enabled)
+  ATTRIBUTES_TO_REMOVE = %w[environment account created_at updated_at enabled].freeze
 
   def self.get_all_configs(environment)
-    WechatConfig.where(environment: environment, enabled: true).inject({}) do |hash, config|
+    WechatConfig.where(environment: environment, enabled: true).each_with_object({}) do |config, hash|
       hash[config.account] = config.build_config_hash
-      hash
     end
   end
 
   def build_config_hash
-    self.as_json(except: ATTRIBUTES_TO_REMOVE)
+    as_json(except: ATTRIBUTES_TO_REMOVE)
   end
 
   private
@@ -28,17 +29,11 @@ class WechatConfig < ActiveRecord::Base
   def app_config_is_valid
     if self[:appid].present?
       # public account
-      if self[:secret].blank?
-        errors.add(:secret, 'cannot be nil when appid is set')
-      end
+      errors.add(:secret, 'cannot be nil when appid is set') if self[:secret].blank?
     elsif self[:corpid].present?
       # corp account
-      if self[:corpsecret].blank?
-        errors.add(:corpsecret, 'cannot be nil when corpid is set')
-      end
-      if self[:agentid].blank?
-        errors.add(:agentid, 'cannot be nil when corpid is set')
-      end
+      errors.add(:corpsecret, 'cannot be nil when corpid is set') if self[:corpsecret].blank?
+      errors.add(:agentid, 'cannot be nil when corpid is set') if self[:agentid].blank?
     else
       errors[:base] << 'Either appid or corpid must be set'
     end

data/lib/generators/wechat/templates/app/models/wechat_session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Used by wechat gems, do not rename WechatSession to other name,
 # Feel free to inherit from other class like ActiveModel::Model
 class WechatSession < ActiveRecord::Base

data/lib/generators/wechat/templates/config/initializers/wechat_redis_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   def self.redis
     # You can reuse existing redis connection and remove this method if require
@@ -17,7 +19,7 @@ module Wechat
       private
 
       def redis_key
-        "my_app_wechat_token_#{self.secret}"
+        "my_app_wechat_token_#{secret}"
       end
     end
   end
@@ -25,7 +27,7 @@ module Wechat
   module Ticket
     class JsapiBase
       def read_ticket
-        JSON.parse(Wechat.redis.get(redis_key))  || {}
+        JSON.parse(Wechat.redis.get(redis_key)) || {}
       end
 
       def write_ticket(ticket_hash)
@@ -35,7 +37,7 @@ module Wechat
       private
 
       def redis_key
-        "my_app_wechat_ticket_#{self.access_token.secret}"
+        "my_app_wechat_ticket_#{access_token.secret}"
       end
     end
   end

data/lib/wechat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'openssl/cipher'
 require 'wechat/api_loader'
@@ -36,15 +38,15 @@ module Wechat
     ApiLoader.reload_config!
   end
 
-  def self.decrypt(encrypted_data, session_key, iv)
+  def self.decrypt(encrypted_data, session_key, ivector)
     cipher = OpenSSL::Cipher.new('AES-128-CBC')
     cipher.decrypt
 
     cipher.key     = Base64.decode64(session_key)
-    cipher.iv      = Base64.decode64(iv)
+    cipher.iv      = Base64.decode64(ivector)
     decrypted_data = Base64.decode64(encrypted_data)
     JSON.parse(cipher.update(decrypted_data) + cipher.final)
-  rescue Exception => e
+  rescue StandardError => e
     { 'errcode': 41003, 'errmsg': e.message }
   end
 end

data/lib/wechat/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wechat/api_base'
 require 'wechat/http_client'
 require 'wechat/token/public_access_token'

data/lib/wechat/api_base.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module Wechat
   class ApiBase
     attr_reader :access_token, :client, :jsapi_ticket
 
-    API_BASE    = 'https://api.weixin.qq.com/cgi-bin/'.freeze
-    MP_BASE = 'https://mp.weixin.qq.com/cgi-bin/'.freeze
-    WXA_BASE    = 'https://api.weixin.qq.com/wxa/'.freeze
-    OAUTH2_BASE = 'https://api.weixin.qq.com/sns/'.freeze
-    DATACUBE_BASE = 'https://api.weixin.qq.com/datacube/'.freeze
-    QYAPI_BASE = 'https://qyapi.weixin.qq.com/cgi-bin/'.freeze
+    API_BASE = 'https://api.weixin.qq.com/cgi-bin/'
+    MP_BASE = 'https://mp.weixin.qq.com/cgi-bin/'
+    WXA_BASE    = 'https://api.weixin.qq.com/wxa/'
+    OAUTH2_BASE = 'https://api.weixin.qq.com/sns/'
+    DATACUBE_BASE = 'https://api.weixin.qq.com/datacube/'
+    QYAPI_BASE = 'https://qyapi.weixin.qq.com/cgi-bin/'
 
     def callbackip
       get 'getcallbackip'

data/lib/wechat/api_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   module ApiLoader
     def self.with(options)
@@ -8,12 +10,12 @@ module Wechat
       js_token_file = options[:js_token_file] || c.jsapi_ticket.presence || '/var/tmp/wechat_jsapi_ticket'
       type = options[:type] || c.type
       if c.appid && c.secret && token_file.present?
-        wx_class = (type == 'mp') ? Wechat::MpApi : Wechat::Api
+        wx_class = type == 'mp' ? Wechat::MpApi : Wechat::Api
         wx_class.new(c.appid, c.secret, token_file, c.timeout, c.skip_verify_ssl, js_token_file)
       elsif c.corpid && c.corpsecret && token_file.present?
         Wechat::CorpApi.new(c.corpid, c.corpsecret, token_file, c.agentid, c.timeout, c.skip_verify_ssl, js_token_file)
       else
-        raise "Need create ~/.wechat.yml with wechat appid and secret or running at rails root folder so wechat can read config/wechat.yml"
+        raise 'Need create ~/.wechat.yml with wechat appid and secret or running at rails root folder so wechat can read config/wechat.yml'
       end
     end
 
@@ -35,11 +37,9 @@ module Wechat
 
       configs.symbolize_keys!
       configs.each do |key, cfg|
-        if cfg.is_a?(Hash)
-          cfg.symbolize_keys!
-        else
-          raise "wrong wechat configuration format for #{key}"
-        end
+        raise "wrong wechat configuration format for #{key}" unless cfg.is_a?(Hash)
+
+        cfg.symbolize_keys!
       end
 
       if defined?(::Rails)
@@ -64,9 +64,7 @@ module Wechat
     end
 
     private_class_method def self.config_from_db
-      unless class_exists?('WechatConfig')
-        return {}
-      end
+      return {} unless class_exists?('WechatConfig')
 
       environment = defined?(::Rails) ? Rails.env.to_s : ENV['RAILS_ENV'] || 'development'
       WechatConfig.get_all_configs(environment)
@@ -74,11 +72,11 @@ module Wechat
 
     private_class_method def self.config_from_file
       if defined?(::Rails)
-        config_file = ENV['WECHAT_CONF_FILE'] || Rails.root.join('config/wechat.yml')
-        return resovle_config_file(config_file, Rails.env.to_s)
+        config_file = ENV['WECHAT_CONF_FILE'] || Rails.root.join('config', 'wechat.yml')
+        resolve_config_file(config_file, Rails.env.to_s)
       else
-        rails_config_file = ENV['WECHAT_CONF_FILE'] || File.join(Dir.getwd, 'config/wechat.yml')
-        application_config_file = File.join(Dir.getwd, 'config/application.yml')
+        rails_config_file = ENV['WECHAT_CONF_FILE'] || File.join(Dir.getwd, 'config', 'wechat.yml')
+        application_config_file = File.join(Dir.getwd, 'config', 'application.yml')
         home_config_file = File.join(Dir.home, '.wechat.yml')
         if File.exist?(rails_config_file)
           rails_env = ENV['RAILS_ENV'] || 'development'
@@ -86,54 +84,55 @@ module Wechat
             require 'figaro'
             Figaro::Application.new(path: application_config_file, environment: rails_env).load
           end
-          config = resovle_config_file(rails_config_file, rails_env)
-          if config.present? && (default = config[:default])  && (default['appid'] || default['corpid'])
-            puts "Using rails project #{ENV['WECHAT_CONF_FILE'] || "config/wechat.yml"} #{rails_env} setting..."
+          config = resolve_config_file(rails_config_file, rails_env)
+          if config.present? && (default = config[:default]) && (default['appid'] || default['corpid'])
+            puts "Using rails project #{ENV['WECHAT_CONF_FILE'] || 'config/wechat.yml'} #{rails_env} setting..."
             return config
           end
         end
-        if File.exist?(home_config_file)
-          return resovle_config_file(home_config_file, nil)
-        end
+        return resolve_config_file(home_config_file, nil) if File.exist?(home_config_file)
       end
     end
 
-    private_class_method def self.resovle_config_file(config_file, env)
-      if File.exist?(config_file)
-        raw_data = YAML.load(ERB.new(File.read(config_file)).result)
-        configs = {}
-        if env
-          # Process multiple accounts when env is given
-          raw_data.each do |key, value|
-            if key == env
-              configs[:default] = value
-            elsif m = /(.*?)_#{env}$/.match(key)
-              configs[m[1].to_sym] = value
-            end
+    private_class_method def self.resolve_config_file(config_file, env)
+      return unless File.exist?(config_file)
+
+      # rubocop:disable Security/YAMLLoad
+      raw_data = YAML.load(ERB.new(File.read(config_file)).result)
+      # rubocop:enable Security/YAMLLoad
+      configs = {}
+      if env
+        # Process multiple accounts when env is given
+        raw_data.each do |key, value|
+          if key == env
+            configs[:default] = value
+          else
+            m = /(.*?)_#{env}$/.match(key)
+            configs[m[1].to_sym] = value if m
           end
-        else
-          # Treat is as one account when env is omitted
-          configs[:default] = raw_data
         end
-        configs
+      else
+        # Treat is as one account when env is omitted
+        configs[:default] = raw_data
       end
+      configs
     end
 
     private_class_method def self.config_from_environment
       value = { appid: ENV['WECHAT_APPID'],
-        secret: ENV['WECHAT_SECRET'],
-        corpid: ENV['WECHAT_CORPID'],
-        corpsecret: ENV['WECHAT_CORPSECRET'],
-        agentid: ENV['WECHAT_AGENTID'],
-        token: ENV['WECHAT_TOKEN'],
-        access_token: ENV['WECHAT_ACCESS_TOKEN'],
-        encrypt_mode: ENV['WECHAT_ENCRYPT_MODE'],
-        timeout: ENV['WECHAT_TIMEOUT'],
-        skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
-        encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'],
-        jsapi_ticket: ENV['WECHAT_JSAPI_TICKET'],
-        trusted_domain_fullname: ENV['WECHAT_TRUSTED_DOMAIN_FULLNAME'] }
-      {default: value}
+                secret: ENV['WECHAT_SECRET'],
+                corpid: ENV['WECHAT_CORPID'],
+                corpsecret: ENV['WECHAT_CORPSECRET'],
+                agentid: ENV['WECHAT_AGENTID'],
+                token: ENV['WECHAT_TOKEN'],
+                access_token: ENV['WECHAT_ACCESS_TOKEN'],
+                encrypt_mode: ENV['WECHAT_ENCRYPT_MODE'],
+                timeout: ENV['WECHAT_TIMEOUT'],
+                skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
+                encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'],
+                jsapi_ticket: ENV['WECHAT_JSAPI_TICKET'],
+                trusted_domain_fullname: ENV['WECHAT_TRUSTED_DOMAIN_FULLNAME'] }
+      { default: value }
     end
 
     private_class_method def self.class_exists?(class_name)

data/lib/wechat/cipher.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Wechat
   module Cipher
     BLOCK_SIZE = 32
-    CIPHER = 'AES-256-CBC'.freeze
+    CIPHER = 'AES-256-CBC'
 
     def encrypt(plain, encoding_aes_key)
       cipher = OpenSSL::Cipher.new(CIPHER)
@@ -51,7 +53,7 @@ module Wechat
     def encode_padding(data)
       length = data.bytes.length
       amount_to_pad = BLOCK_SIZE - (length % BLOCK_SIZE)
-      amount_to_pad = BLOCK_SIZE if amount_to_pad == 0
+      amount_to_pad = BLOCK_SIZE if amount_to_pad.zero?
       padding = ([amount_to_pad].pack('c') * amount_to_pad)
       data + padding
     end

data/lib/wechat/concern/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   module Concern
     module Common

data/lib/wechat/controller_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   module ControllerApi
     extend ActiveSupport::Concern
@@ -20,10 +22,10 @@ module Wechat
       if account
         config = Wechat.config(account)
         appid = config.corpid || config.appid
-        is_crop_account = !!config.corpid
+        is_crop_account = config.corpid.present?
       else
         appid = self.class.corpid || self.class.appid
-        is_crop_account = !!self.class.corpid
+        is_crop_account = self.class.corpid.present?
       end
 
       raise 'Can not get corpid or appid, so please configure it first to using wechat_oauth2' if appid.blank?
@@ -37,6 +39,7 @@ module Wechat
       }
 
       return generate_oauth2_url(oauth2_params) unless block_given?
+
       is_crop_account ? wechat_corp_oauth2(oauth2_params, account, &block) : wechat_public_oauth2(oauth2_params, account, &block)
     end
 
@@ -47,7 +50,7 @@ module Wechat
       unionid = cookies.signed_or_encrypted[:we_unionid]
       we_token = cookies.signed_or_encrypted[:we_access_token]
       if openid.present?
-        yield openid, { 'openid' => openid, 'unionid' => unionid, 'access_token' => we_token}
+        yield openid, { 'openid' => openid, 'unionid' => unionid, 'access_token' => we_token }
       elsif params[:code].present? && params[:state] == oauth2_params[:state]
         access_info = wechat(account).web_access_token(params[:code])
         cookies.signed_or_encrypted[:we_openid] = { value: access_info['openid'], expires: self.class.oauth2_cookie_duration.from_now }
@@ -55,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))
+        Rails::VERSION::MAJOR >= 6 ? (redirect_to generate_oauth2_url(oauth2_params), allow_other_host: true) : (redirect_to generate_oauth2_url(oauth2_params))
       end
     end
 
@@ -70,18 +73,18 @@ 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))
+        Rails::VERSION::MAJOR >= 6 ? (redirect_to generate_oauth2_url(oauth2_params), allow_other_host: true) : (redirect_to generate_oauth2_url(oauth2_params))
       end
     end
 
     def generate_redirect_uri(account = nil)
       domain_name = if account
-        Wechat.config(account).trusted_domain_fullname
-      else
-        self.class.trusted_domain_fullname
-      end
+                      Wechat.config(account).trusted_domain_fullname
+                    else
+                      self.class.trusted_domain_fullname
+                    end
       page_url = domain_name ? "#{domain_name}#{request.original_fullpath}" : request.original_url
-      safe_query = request.query_parameters.reject { |k, _| %w(code state access_token).include? k }.to_query
+      safe_query = request.query_parameters.reject { |k, _| %w[code state access_token].include? k }.to_query
       page_url.sub(request.query_string, safe_query)
     end
 

data/lib/wechat/corp_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wechat/api_base'
 require 'wechat/http_client'
 require 'wechat/token/corp_access_token'

data/lib/wechat/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   module Helpers
     def wechat_config_js(config_options = {})
@@ -22,25 +24,25 @@ module Wechat
                  else
                    controller.request.original_url
                  end
-      page_url = page_url.split('#').first if is_ios? 
+      page_url = page_url.split('#').first if ios?
       js_hash = api.jsapi_ticket.signature(page_url)
 
-      config_js = <<-WECHAT_CONFIG_JS
-wx.config({
-  debug: #{config_options[:debug]},
-  appId: "#{app_id}",
-  timestamp: "#{js_hash[:timestamp]}",
-  nonceStr: "#{js_hash[:noncestr]}",
-  signature: "#{js_hash[:signature]}",
-  jsApiList: ['#{config_options[:api].join("','")}']
-});
-WECHAT_CONFIG_JS
+      config_js = <<~WECHAT_CONFIG_JS
+        wx.config({
+          debug: #{config_options[:debug]},
+          appId: "#{app_id}",
+          timestamp: "#{js_hash[:timestamp]}",
+          nonceStr: "#{js_hash[:noncestr]}",
+          signature: "#{js_hash[:signature]}",
+          jsApiList: ['#{config_options[:api].join("','")}']
+        });
+      WECHAT_CONFIG_JS
       javascript_tag config_js, type: 'application/javascript'
     end
 
     private
 
-    def is_ios?
+    def ios?
       controller.request.user_agent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)
     end
   end

data/lib/wechat/http_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'http'
 
 module Wechat
@@ -35,10 +37,10 @@ module Wechat
         params = header.delete(:params)
         form_file = file.is_a?(HTTP::FormData::File) ? file : HTTP::FormData::File.new(file)
         httprb.headers(header)
-          .post(url, params: params,
-                     form: { media: form_file,
-                             hack: 'X' }, # Existing here for http-form_data 1.0.1 handle single param improperly
-                     ssl_context: ssl_context)
+              .post(url, params: params,
+                         form: { media: form_file,
+                                 hack: 'X' }, # Existing here for http-form_data 1.0.1 handle single param improperly
+                         ssl_context: ssl_context)
       end
     end
 
@@ -51,6 +53,7 @@ module Wechat
       response = yield("#{url_base}#{path}", header)
 
       raise "Request not OK, response status #{response.status}" if response.status != 200
+
       parse_response(response, as || :json) do |parse_as, data|
         break data unless parse_as == :json && data['errcode'].present?
 
@@ -71,25 +74,27 @@ module Wechat
       end
     end
 
-    def parse_response(response, as)
+    def parse_response(response, as_type)
       content_type = response.headers[:content_type]
       parse_as = {
         %r{^application\/json} => :json,
-        %r{^image\/.*}         => :file,
-        %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
+        %r{^image\/.*} => :file,
+        %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_type || :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
+        begin
+          data = JSON.parse response.body.to_s.gsub(/[\u0000-\u001f]+/, '')
+        rescue StandardError
+          nil
         end
+        return yield(:json, data) if data
+
+        parse_as = as_type || :text
       end
 
       case parse_as

data/lib/wechat/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   class Message
     class << self
@@ -70,6 +72,7 @@ module Wechat
 
     def session
       return nil unless Wechat.config.have_session_class
+
       @message_hash[:WechatSession] ||= WechatSession.find_or_initialize_session(underscore_hash_keys(message_hash))
     end
 
@@ -120,8 +123,8 @@ module Wechat
 
     def markdown(content)
       update(MsgType: 'markdown', Markdown: {
-        content: content
-      })
+               content: content
+             })
     end
 
     def transfer_customer_service(kf_account = nil)
@@ -207,25 +210,25 @@ module Wechat
     end
 
     TO_JSON_KEY_MAP = {
-      'TextCard'         => 'textcard',
-      'Markdown'         => 'markdown',
-      'ToUserName'       => 'touser',
-      'ToPartyName'     => 'toparty',
-      'ToWxName'         => 'towxname',
-      'MediaId'          => 'media_id',
-      'MpNews'           => 'mpnews',
-      'ThumbMediaId'     => 'thumb_media_id',
-      'TemplateId'       => 'template_id',
-      'FormId'           => 'form_id',
+      'TextCard' => 'textcard',
+      'Markdown' => 'markdown',
+      'ToUserName' => 'touser',
+      'ToPartyName' => 'toparty',
+      'ToWxName' => 'towxname',
+      'MediaId' => 'media_id',
+      'MpNews' => 'mpnews',
+      'ThumbMediaId' => 'thumb_media_id',
+      'TemplateId' => 'template_id',
+      'FormId' => 'form_id',
       'ContentSourceUrl' => 'content_source_url',
-      'ShowCoverPic'     => 'show_cover_pic'
+      'ShowCoverPic' => 'show_cover_pic'
     }.freeze
 
     TO_JSON_ALLOWED = %w[touser toparty msgtype content image voice video file textcard markdown
                          music news articles template agentid filter
                          send_ignore_reprint mpnews towxname].freeze
 
-    def to_json
+    def to_json(*_args)
       keep_camel_case_key = message_hash[:MsgType] == 'template'
       json_hash = deep_recursive(message_hash) do |key, value|
         key = key.to_s

data/lib/wechat/mp_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wechat/api_base'
 require 'wechat/http_client'
 require 'wechat/token/public_access_token'

data/lib/wechat/responder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'English'
 require 'wechat/signature'
 
@@ -19,12 +21,12 @@ module Wechat
           skip_before_action :verify_authenticity_token, raise: false
         end
 
-        before_action :config_account, only: [:show, :create]
-        before_action :verify_signature, only: [:show, :create]
+        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: [:show, :create]
-        before_filter :verify_signature, only: [:show, :create]
+        before_filter :config_account, only: %i[show create]
+        before_filter :verify_signature, only: %i[show create]
       end
     end
 
@@ -32,22 +34,22 @@ module Wechat
       attr_accessor :account_from_request
 
       def on(message_type, with: nil, respond: nil, &block)
-        raise 'Unknow message type' unless [:text, :image, :voice, :video, :shortvideo, :link, :event, :click, :view, :scan, :batch_job, :location, :label_location, :fallback].include?(message_type)
+        raise 'Unknow message type' unless %i[text image voice video shortvideo link event click view scan batch_job location label_location fallback].include?(message_type)
+
         config = respond.nil? ? {} : { respond: respond }
         config[:proc] = block if block_given?
 
         if with.present?
-          raise 'Only text, event, click, view, scan and batch_job can having :with parameters' unless [:text, :event, :click, :view, :scan, :batch_job].include?(message_type)
+          raise 'Only text, event, click, view, scan and batch_job can having :with parameters' unless %i[text event click view scan batch_job].include?(message_type)
+
           config[:with] = with
           if message_type == :scan
-            if with.is_a?(String)
-              self.known_scan_key_lists = with
-            else
-              raise 'on :scan only support string in parameter with, detail see https://github.com/Eric-Guo/wechat/issues/84'
-            end
+            raise 'on :scan only support string in parameter with, detail see https://github.com/Eric-Guo/wechat/issues/84' unless with.is_a?(String)
+
+            self.known_scan_key_lists = with
           end
-        else
-          raise 'Message type click, view, scan and batch_job must specify :with parameters' if [:click, :view, :scan, :batch_job].include?(message_type)
+        elsif %i[click view scan batch_job].include?(message_type)
+          raise 'Message type click, view, scan and batch_job must specify :with parameters'
         end
 
         case message_type
@@ -86,15 +88,15 @@ module Wechat
       end
 
       def user_defined_scan_responders
-        @scan_responders ||= []
+        @user_defined_scan_responders ||= []
       end
 
       def user_defined_location_responders
-        @location_responders ||= []
+        @user_defined_location_responders ||= []
       end
 
       def user_defined_label_location_responders
-        @label_location_responders ||= []
+        @user_defined_label_location_responders ||= []
       end
 
       def user_defined_responders(type)
@@ -110,17 +112,17 @@ module Wechat
         when :text
           yield(* match_responders(responders, message[:Content]))
         when :event
-          if 'click' == message[:Event] && !user_defined_click_responders(message[:EventKey]).empty?
+          if message[:Event] == 'click' && !user_defined_click_responders(message[:EventKey]).empty?
             yield(* user_defined_click_responders(message[:EventKey]), message[:EventKey])
-          elsif 'view' == message[:Event] && !user_defined_view_responders(message[:EventKey]).empty?
+          elsif message[:Event] == 'view' && !user_defined_view_responders(message[:EventKey]).empty?
             yield(* user_defined_view_responders(message[:EventKey]), message[:EventKey])
-          elsif 'click' == message[:Event]
+          elsif message[:Event] == 'click'
             yield(* match_responders(responders, message[:EventKey]))
-          elsif known_scan_key_lists.include?(message[:EventKey]) && %w(scan subscribe scancode_push scancode_waitmsg).freeze.include?(message[:Event])
+          elsif known_scan_key_lists.include?(message[:EventKey]) && %w[scan subscribe scancode_push scancode_waitmsg].freeze.include?(message[:Event])
             yield(* known_scan_with_match_responders(user_defined_scan_responders, message))
-          elsif 'batch_job_result' == message[:Event]
+          elsif message[:Event] == 'batch_job_result'
             yield(* user_defined_batch_job_responders(message[:BatchJob][:JobType]), message[:BatchJob])
-          elsif 'location' == message[:Event]
+          elsif message[:Event] == 'location'
             yield(* user_defined_location_responders, message)
           else
             yield(* match_responders(responders, message[:Event]))
@@ -145,8 +147,8 @@ module Wechat
 
           if condition.is_a? Regexp
             memo[:scoped] ||= [responder] + $LAST_MATCH_INFO.captures if value =~ condition
-          else
-            memo[:scoped] ||= [responder, value] if value == condition
+          elsif value == condition
+            memo[:scoped] ||= [responder, value]
           end
         end
         matched[:scoped] || matched[:general]
@@ -154,9 +156,9 @@ module Wechat
 
       def known_scan_with_match_responders(responders, message)
         matched = responders.each_with_object({}) do |responder, memo|
-          if %w(scan subscribe).freeze.include?(message[:Event]) && message[:EventKey] == responder[:with]
+          if %w[scan subscribe].freeze.include?(message[:Event]) && message[:EventKey] == responder[:with]
             memo[:scaned] ||= [responder, message[:Ticket]]
-          elsif %w(scancode_push scancode_waitmsg).freeze.include?(message[:Event]) && message[:EventKey] == responder[:with]
+          elsif %w[scancode_push scancode_waitmsg].freeze.include?(message[:Event]) && message[:EventKey] == responder[:with]
             memo[:scaned] ||= [responder, message[:ScanCodeInfo][:ScanResult], message[:ScanCodeInfo][:ScanType]]
           end
         end
@@ -181,12 +183,10 @@ module Wechat
         else
           render text: echostr
         end
+      elsif Rails::VERSION::MAJOR >= 4
+        render plain: params[:echostr]
       else
-        if Rails::VERSION::MAJOR >= 4
-          render plain: params[:echostr]
-        else
-          render text: params[:echostr]
-        end
+        render text: params[:echostr]
       end
     end
 
@@ -249,11 +249,11 @@ module Wechat
       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! if msg[:Event]
+          msg[:Event]&.downcase!
         end
       else
         HashWithIndifferentAccess.new_from_hash_copying_default(data_hash).tap do |msg|
-          msg[:Event].downcase! if msg[:Event]
+          msg[:Event]&.downcase!
         end
       end
     end
@@ -263,10 +263,10 @@ module Wechat
         responder ||= self.class.user_defined_responders(:fallback).first
 
         next if responder.nil?
-        case
-        when responder[:respond]
+
+        if responder[:respond]
           request.reply.text responder[:respond]
-        when responder[:proc]
+        elsif responder[:proc]
           define_singleton_method :process, responder[:proc]
           number_of_block_parameter = responder[:proc].arity
           send(:process, *args.unshift(request).take(number_of_block_parameter))
@@ -293,8 +293,7 @@ module Wechat
       { Encrypt: encrypt,
         MsgSignature: msg_sign,
         TimeStamp: timestamp,
-        Nonce: nonce
-      }.to_xml(root: 'xml', children: 'item', skip_instruct: true, skip_types: true)
+        Nonce: nonce }.to_xml(root: 'xml', children: 'item', skip_instruct: true, skip_types: true)
     end
 
     def request_encrypt_content

data/lib/wechat/signature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   module Signature
     def self.hexdigest(token, timestamp, nonce, msg_encrypt)

data/lib/wechat/ticket/corp_jsapi_ticket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wechat/ticket/jsapi_base'
 
 module Wechat

data/lib/wechat/ticket/jsapi_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest/sha1'
 require 'securerandom'
 
@@ -63,8 +65,8 @@ module Wechat
       end
 
       def write_ticket_to_store(ticket_hash)
-        ticket_hash['got_ticket_at'.freeze] = Time.now.to_i
-        ticket_hash['ticket_expires_in'.freeze] = ticket_hash.delete('expires_in')
+        ticket_hash['got_ticket_at'] = Time.now.to_i
+        ticket_hash['ticket_expires_in'] = ticket_hash.delete('expires_in')
         write_ticket(ticket_hash)
       end
 

data/lib/wechat/ticket/public_jsapi_ticket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wechat/ticket/jsapi_base'
 
 module Wechat

data/lib/wechat/token/access_token_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wechat
   module Token
     class AccessTokenBase
@@ -32,8 +34,8 @@ module Wechat
       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')
+        token_hash['got_token_at'] = Time.now.to_i
+        token_hash['token_expires_in'] = token_hash.delete('expires_in')
         write_token(token_hash)
       end
 

data/lib/wechat/token/corp_access_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wechat/token/access_token_base'
 
 module Wechat

data/lib/wechat/token/public_access_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wechat/token/access_token_base'
 
 module Wechat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Skinnyworm
@@ -12,30 +12,30 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  Lmd1b2N6QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAp7iNDlqk1L5zrTmD
-  E0QAEYo0wiKZ/x29kaXuG3j0hUkkwKFbhUHjsTEl307sO8yQRg/6DuVrQhUBwS9G
-  g749ybsn7pfOL+lCVUGGxWFJ8qsICQ4ECjtnKVXdQowDUzSeb5/IPaeN+RB4Rh7D
-  2msnkJhsf0IQbNNUt53tkE5KhwAkHGdY5solSLPwtUmmdW1kNt7OfGBTi5CjXwFg
-  Jh+lbxasy+KwHA6+9O5b8Qm2QSBN5bJGd2a63QE5p8cjRBnaRuiKn4wkmqMj/C0Z
-  OyM5lSs5iGML+eVE/dCsV+YFmSr6Ue8vokmKdrBDjtAkHwmVA0TpqHVmT+9bVUPn
-  Jl+EzvEfsjriqcj9+WGPo4R7XDQQnseHqzlXNedkrLFX/nTnEs5RKBZ6Ter1KRU6
-  ivoox98/nhOs6bHcSFPsxXdxUihcCfCzj+zcaHNEqpvTI/36Bnl2XW6dUJNaFQDc
-  oWOyq5ZkxqnYrYXactjW0+vcPv6WHoHXmjv4dF7iFp8r0mvK
+  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
   -----END CERTIFICATE-----
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,7 +46,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.74'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.74'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -139,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.4'
 description: API, command and message handling for WeChat in Rails
 email: eric.guocz@gmail.com
 executables:
@@ -214,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: DSL for wechat message handling and API