wechat 0.11.10 → 0.13.1

data/lib/wechat/helpers.rb

@@ -24,7 +24,7 @@ module Wechat
                  else
                    controller.request.original_url
                  end
-      page_url = page_url.split('#').first if ios?
+      page_url = page_url.split('#').first
       js_hash = api.jsapi_ticket.signature(page_url)
 
       config_js = <<~WECHAT_CONFIG_JS
@@ -39,11 +39,5 @@ module Wechat
       WECHAT_CONFIG_JS
       javascript_tag config_js, type: 'application/javascript'
     end
-
-    private
-
-    def ios?
-      controller.request.user_agent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)
-    end
   end
 end

data/lib/wechat/http_client.rb

@@ -14,7 +14,7 @@ module Wechat
                   HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
                 end
       @ssl_context = OpenSSL::SSL::SSLContext.new
-      @ssl_context.ssl_version = :TLSv1_2
+      @ssl_context.ssl_version = 'TLSv1_2'
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl
     end
 
@@ -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 = []
@@ -40,14 +41,14 @@ module Wechat
 
     class NewsArticleBuilder < ArticleBuilder
       def item(title: 'title', description: nil, pic_url: nil, url: nil)
-        items << { Title: title, Description: description, PicUrl: pic_url, Url: url }.reject { |_k, v| v.nil? }
+        items << { Title: title, Description: description, PicUrl: pic_url, Url: url }.compact
       end
     end
 
     class MpNewsArticleBuilder < ArticleBuilder
       def item(thumb_media_id:, title:, content:, author: nil, content_source_url: nil, digest: nil, show_cover_pic: '0')
         items << { Thumb_Media_ID: thumb_media_id, Author: author, Title: title, ContentSourceUrl: content_source_url,
-                   Content: content, Digest: digest, ShowCoverPic: show_cover_pic }.reject { |_k, v| v.nil? }
+                   Content: content, Digest: digest, ShowCoverPic: show_cover_pic }.compact
       end
     end
 
@@ -168,7 +169,7 @@ module Wechat
         items = article.items
       else
         items = collection.collect do |item|
-          camelize_hash_keys(item.symbolize_keys.slice(:title, :description, :pic_url, :url).reject { |_k, v| v.nil? })
+          camelize_hash_keys(item.symbolize_keys.slice(:title, :description, :pic_url, :url).compact)
         end
       end
 
@@ -183,7 +184,7 @@ module Wechat
         items = article.items
       else
         items = collection.collect do |item|
-          camelize_hash_keys(item.symbolize_keys.slice(:thumb_media_id, :title, :content, :author, :content_source_url, :digest, :show_cover_pic).reject { |_k, v| v.nil? })
+          camelize_hash_keys(item.symbolize_keys.slice(:thumb_media_id, :title, :content, :author, :content_source_url, :digest, :show_cover_pic).compact)
         end
       end
 

data/lib/wechat/mp_api.rb

@@ -1,14 +1,17 @@
 # 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 MpApi < ApiBase
+    def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file, qcloud_env, qcloud_token_file, qcloud_token_lifespan)
+      super()
+      @client = HttpClient.new(Wechat::Api::API_BASE, timeout, skip_verify_ssl)
+      @access_token = Token::PublicAccessToken.new(@client, appid, secret, token_file)
+      @jsapi_ticket = Ticket::PublicJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
+      @qcloud = Qcloud::Token.new(@client, @access_token, qcloud_env, qcloud_token_file, qcloud_token_lifespan)
+    end
+
     include Concern::Common
+    include Concern::Qcloud
 
     def template_message_send(message)
       post 'message/wxopen/template/send', message.to_json, content_type: :json

data/lib/wechat/qcloud/token.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Wechat
+  module Qcloud
+    FILE_TYPE_JSON = 1
+    FILE_TYPE_CSV = 2
+    CONFLICT_MODE_INSERT = 1
+    CONFLICT_MODE_UPSERT = 2
+
+    class Token
+      attr_reader :client, :access_token, :qcloud_env, :qcloud_token_file, :qcloud_token_lifespan, :qcloud_token, :qcloud_token_expired_time
+
+      def initialize(client, access_token, qcloud_env, qcloud_token_file, lifespan)
+        @client = client
+        @access_token = access_token
+        @qcloud_env = qcloud_env
+        @qcloud_token_file = qcloud_token_file
+        @qcloud_token_lifespan = lifespan
+        @random_generator = Random.new
+      end
+
+      def token(tries = 2)
+        # Possible two worker running, one worker refresh ticket, other unaware, so must read every time
+        read_qcloud_token_from_store
+        refresh if remain_life_seconds < @random_generator.rand(30..3 * 60)
+        qcloud_token
+      rescue AccessTokenExpiredError
+        access_token.refresh
+        retry unless (tries -= 1).zero?
+      end
+
+      def refresh
+        data = client.post('getqcloudtoken', JSON.generate(lifespan: qcloud_token_lifespan), base: ::Wechat::ApiBase::TCB_BASE, params: { access_token: access_token.token })
+        write_qcloud_token_to_store(data)
+        read_qcloud_token_from_store
+      end
+
+      protected
+
+      def read_qcloud_token_from_store
+        td = read_qcloud_token
+        @qcloud_token_expired_time = td.fetch('qcloud_token_expired_time').to_i
+        @qcloud_token = td.fetch('token') # return qcloud_token same time
+      rescue JSON::ParserError, Errno::ENOENT, KeyError, TypeError
+        refresh
+      end
+
+      def write_qcloud_token_to_store(qcloud_token_hash)
+        qcloud_token_hash['qcloud_token_expired_time'] = qcloud_token_hash.delete('expired_time')
+        write_qcloud_token(qcloud_token_hash)
+      end
+
+      def read_qcloud_token
+        JSON.parse(File.read(qcloud_token_file))
+      end
+
+      def write_qcloud_token(qcloud_token_hash)
+        File.write(qcloud_token_file, qcloud_token_hash.to_json)
+      end
+
+      def remain_life_seconds
+        qcloud_token_expired_time - Time.now.to_i
+      end
+    end
+  end
+end

data/lib/wechat/responder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'English'
-require 'wechat/signature'
+require 'rexml/document'
 
 module Wechat
   module Responder
@@ -10,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
@@ -145,9 +130,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
@@ -178,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
 
@@ -195,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
@@ -246,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.11.10
+  version: 0.13.1
 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: 2021-03-15 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'
@@ -105,34 +105,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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: '0.74'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        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
@@ -195,12 +223,14 @@ files:
 - lib/wechat/api_loader.rb
 - lib/wechat/cipher.rb
 - lib/wechat/concern/common.rb
+- lib/wechat/concern/qcloud.rb
 - lib/wechat/controller_api.rb
 - lib/wechat/corp_api.rb
 - lib/wechat/helpers.rb
 - lib/wechat/http_client.rb
 - lib/wechat/message.rb
 - lib/wechat/mp_api.rb
+- lib/wechat/qcloud/token.rb
 - lib/wechat/responder.rb
 - lib/wechat/signature.rb
 - lib/wechat/ticket/corp_jsapi_ticket.rb
@@ -219,16 +249,16 @@ require_paths:
 - lib
 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.1.4
+rubygems_version: 3.2.14
 signing_key:
 specification_version: 4
 summary: DSL for wechat message handling and API