xi_wechat_corp 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a668aecce2c27bf2ecf30019fe33a0a7e03778a9
-  data.tar.gz: 99ea5c52fe837b0e3dc317de78325a6e01566ba6
+  metadata.gz: f43b1974370248c09d051e2e6892767be0991916
+  data.tar.gz: 3597d0baf0dee464ddae6ac9a6124694607cbff3
 SHA512:
-  metadata.gz: 3257dd7d6467d516ba196d8be07f635bf826d6dacfd6d77c17ad21c038b67fdc12c9804ac4d53cd9323f23eb57108d0406788151ea23cc0cd815d43c7f46d059
-  data.tar.gz: 4496688d3f9aa96234d5f538e1d6b69013e44995a924bb8eb1d037109b77292900822f9d04b5da4ec885376d8a27dc92c73a1ce540549c1f9de5a27153c32f64
+  metadata.gz: 7bae479c83066ae4b2950a44804aec6ef600731f4bd36e9dbdfe3242f9c89df8e611c094d4596463b293ba18941fb185f3c112130d3c4c80c2155646ae2d8df7
+  data.tar.gz: c0fc91b01d1f986e8589a8cd6cc9a8e696319d92bfee9c6f83c48274b6df0d8c0e3c160723b73a51a94ba83ed9a73058988b7e65193496794affc1efe99558fb

data/lib/xi_wechat_corp/api/connection.rb

@@ -59,9 +59,10 @@ module XiWechatCorp
       def get_access_token(corp_id = nil, secret = nil)
         @corp_id = corp_id unless corp_id.nil?
         @secret = secret unless secret.nil?
-        resp = get('gettoken', corpid: @corp_id, corpsecret: @secret)
-        @access_token.assign(resp.body['access_token'])
-        @access_token
+        @access_token = maybe_cache do
+          resp = get('gettoken', corpid: @corp_id, corpsecret: @secret)
+          resp.body['access_token']
+        end
       end
 
       alias_method :auth, :get_access_token
@@ -72,6 +73,27 @@ module XiWechatCorp
       end
 
       private
+      def maybe_cache
+        if XiWechatCorp.cache.nil?
+          AccessToken.new(yield)
+        else
+          expired_at = 0
+          key = ['xi_wechat_corp', SHA1Signer.new(@secret).sign(@corp_id)].join('/')
+          cached = XiWechatCorp.cache.read(key)
+          if cached && cached =~ /\A\d+:/
+            expired_at, token = cached.split(':', 2)
+            expired_at = expired_at.to_i
+          end
+          if token && expired_at != 0 && expired_at > Time.now.to_i
+            AccessToken.new(token, expired_at)
+          else
+            ret = AccessToken.new(yield)
+            XiWechatCorp.cache.write(key, [ret.expired_at, ret.token].join(':'))
+            ret
+          end
+        end
+      end
+
       def can_get_access_token?
         !@corp_id.nil? && !@secret.nil?
       end

data/lib/xi_wechat_corp/callback/grape_xml_parser.rb.rb

@@ -0,0 +1,18 @@
+module XiWechatCorp
+  module Callback
+    # Ensure that XiWechatCorp::Callback::Rack middleware has bee added.
+    #
+    #     parser :xml, XiWechatCorp::Callback::GrapeXmlParser     
+    module GrapeXmlParser
+      class << self
+        def call(object, env)
+          if env['xi_wechat_corp.params']
+            env['xi_wechat_corp.params']
+          else
+            Grape::Parser::Xml.call(object, env)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xi_wechat_corp/version.rb

@@ -1,3 +1,3 @@
 module XiWechatCorp
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/xi_wechat_corp.rb

@@ -7,6 +7,20 @@ module XiWechatCorp
   autoload :AesCrypt, 'xi_wechat_corp/aes_crypt'
 
   class << self
-    attr_accessor :logger
+    # logger must support method `error(string)`
+    attr_reader :logger
+    # value = cache.read(key)
+    # cache.write(key, value)
+    attr_reader :cache
+
+    def logger=(logger)
+      raise ArgumentError if logger && !logger.respond_to?(:error)
+      @logger = logger
+    end
+
+    def cache=(cache)
+      raise ArgumentError if cache && (!cache.respond_to?(:read) || !cache.respond_to?(:write))
+      @cache = cache
+    end
   end
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'minitest/unit'
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'webmock/minitest'
+require 'pry'
 
 class << Minitest::Test
   def test(name, &block)

data/test/xi_wechat_corp/api/connection_test.rb

@@ -4,8 +4,20 @@ require 'xi_wechat_corp/api/access_token'
 module XiWechatCorp
   module API
     class ConnectionTest < Minitest::Test
+      class Cache < Hash
+        alias_method :read, :[]
+        alias_method :write, :[]=
+      end
+
       def setup
+        WebMock.reset!
         stub_request(:any, %r{https://qyapi.weixin.qq.com/cgi-bin/.*}).to_return(body: '{"access_token":"at"}')
+        @remember_cache = XiWechatCorp.cache
+        XiWechatCorp.cache = Cache.new
+      end
+
+      def teardown
+        XiWechatCorp.cache = @remember_cache
       end
 
       def conn
@@ -31,6 +43,16 @@ module XiWechatCorp
         assert_requested :get, 'https://qyapi.weixin.qq.com/cgi-bin/test',
           query: { 'access_token' => 'at' }
       end
+
+      test 'access token cache' do
+        conn = Connection.new corp_id: 'corptest', secret: 'secret'
+        conn.get_access_token
+
+        conn = Connection.new corp_id: 'corptest', secret: 'secret'
+        conn.get_access_token
+
+        assert_requested :get, 'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=corptest&corpsecret=secret', times: 1
+      end
     end
   end
 end

data/xi_wechat_corp.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.5.1'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xi_wechat_corp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ian Yang
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wechat Corp development toolkits
 email:
 - ian@3pjgames.com
@@ -169,6 +183,7 @@ files:
 - lib/xi_wechat_corp/api/connection.rb
 - lib/xi_wechat_corp/callback.rb
 - lib/xi_wechat_corp/callback/config.rb
+- lib/xi_wechat_corp/callback/grape_xml_parser.rb.rb
 - lib/xi_wechat_corp/callback/rack.rb
 - lib/xi_wechat_corp/callback/request.rb
 - lib/xi_wechat_corp/callback/response.rb