wechat 0.11.10 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae019a8d3da8b0f78aba677ba633a46ecebdf975be517f09b5ec82050b2aee9
-  data.tar.gz: 1bdb9f6dd87d72071071e3ff36d4d6334c0ddb0825d2ef5abe243b6298983ee2
+  metadata.gz: 0f0bb39391f507bdd4855e02eb9d56a1e7b110c6c9fd8c16b65a984af1d376f1
+  data.tar.gz: 673b26d9e77bf7d652fd0bfa30fdddf9516fc7b0a15bdf8b53e471fdb4db606c
 SHA512:
-  metadata.gz: 0c87ecd9b34fc0c34538bd754e6b35e20cc6e87f138b7434fabf92c3f0ec2a0cfbbc44a7d0e7c88fa52237b293f1744408697043c3f7e624e5eba9c871ba2153
-  data.tar.gz: 8a431320b86e529acd98de9482070052fbeb4dcf80538dc9e0d5c2e6a7507460fa848a0bb0c3692c68c89ef8b7dbd0243ef537442680a678b3e871ff4f4ec40f
+  metadata.gz: 841297efa8f80c68801a9348c253b7666b501f0cec535f39e42d268d6e5188c9c0f551c3d1af72282194cc97e9c65bcb1e30a9359b208d345a8a5e237c46858e
+  data.tar.gz: 31a0a90843b8ca7357563fc9cbf53cf795a1ef58d7292bae725caaf4b5868997975176b0cf26b9b2259c5378d04eee28053d3e91d6d26a057bdab5aaf29b39f9

data/CHANGELOG.md

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

data/lib/action_controller/wechat_responder.rb

@@ -54,9 +54,11 @@ module ActionController
         Wechat::CorpApi.new(corpid, corpsecret, access_token, \
                             agentid, timeout, skip_verify_ssl, jsapi_ticket)
       else
+        type = opts[:type] || cfg.type
         secret = opts[:secret] || cfg.secret
-        Wechat::Api.new(appid, secret, access_token, \
-                        timeout, skip_verify_ssl, jsapi_ticket)
+        wechat_api_class = (type && type.to_sym == :mp ? Wechat::MpApi : Wechat::Api)
+        wechat_api_class.new(appid, secret, access_token, \
+                             timeout, skip_verify_ssl, jsapi_ticket)
       end
     end
   end

data/lib/wechat.rb

@@ -19,6 +19,7 @@ module Wechat
   class InvalidCredentialError < StandardError; end
   class ResponseError < StandardError
     attr_reader :error_code
+
     def initialize(errcode, errmsg)
       @error_code = errcode
       super "#{errmsg}(#{error_code})"

data/lib/wechat/cipher.rb

@@ -10,7 +10,7 @@ module Wechat
       cipher.encrypt
 
       cipher.padding = 0
-      key_data = Base64.decode64(encoding_aes_key + '=')
+      key_data = Base64.decode64("#{encoding_aes_key}=")
       cipher.key = key_data
       cipher.iv = [key_data].pack('H*')
 
@@ -22,7 +22,7 @@ module Wechat
       cipher.decrypt
 
       cipher.padding = 0
-      key_data = Base64.decode64(encoding_aes_key + '=')
+      key_data = Base64.decode64("#{encoding_aes_key}=")
       cipher.key = key_data
       cipher.iv = [key_data].pack('H*')
 

data/lib/wechat/corp_api.rb

@@ -10,6 +10,7 @@ module Wechat
     attr_reader :agentid
 
     def initialize(appid, secret, token_file, agentid, timeout, skip_verify_ssl, jsapi_ticket_file)
+      super()
       @client = HttpClient.new(QYAPI_BASE, timeout, skip_verify_ssl)
       @access_token = Token::CorpAccessToken.new(@client, appid, secret, token_file)
       @agentid = agentid

data/lib/wechat/http_client.rb

@@ -77,12 +77,12 @@ module Wechat
     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
+        %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_type || :text
 
       # try to parse response as json, fallback to user-specified format or text if failed

data/lib/wechat/message.rb

@@ -32,6 +32,7 @@ module Wechat
 
     class ArticleBuilder
       attr_reader :items
+
       delegate :count, to: :items
       def initialize
         @items = []

data/lib/wechat/responder.rb

@@ -145,9 +145,10 @@ module Wechat
             next
           end
 
-          if condition.is_a? Regexp
+          case condition
+          when Regexp
             memo[:scoped] ||= [responder] + $LAST_MATCH_INFO.captures if value =~ condition
-          elsif value == condition
+          when value
             memo[:scoped] ||= [responder, value]
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors:
 - Skinnyworm
@@ -35,7 +35,7 @@ cert_chain:
   spvOK5/LPXWX6ZGc2SR8SH/s7ftYH2EkeM1VUbtemow08NdgCwJ4IG+fRQ9dcrJ+
   L9TbpLHvVrCe1w8duMqNeUmqj+M1iC/5Zst2vIe14QcOTuAh
   -----END CERTIFICATE-----
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport