wechat 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66ecda4306d9d5a9fde71ae0477d99682fd443a0
-  data.tar.gz: 13b71709c26cc139d1be233a0449741eb404adbc
+  metadata.gz: 9e173474b91515c5b98160ebcf2e88c307b7a0c7
+  data.tar.gz: 24e1eeb02200389eb39fe1aa89a0e6dd87cfeda8
 SHA512:
-  metadata.gz: 85fb0b5a0745542d5c9e9ec09095125c393192da41335592c58561353c6e5d91cc7eeb112a61c2456ac68cda0768391ae33a65a98aa7f05292abd2cfad78a2fc
-  data.tar.gz: 09d88487602a96a6bc1d9b3c7dad3a5f9199c1d8df1f40e96d7b5a5ec6692cc894b4fb071de20ac27a1df42f6536cb17fe691651a044c876c4c117bc80602f17
+  metadata.gz: deff7d137bfcf8e9ff9c9e5102fae2639289edb58c5a3d426d32190df1e1e860d83a9a9faec2e858cdb7258580408dd0d38824416735ea7ce22ae7fb0d0ea9fa
+  data.tar.gz: 88485947385312824105e5d4a1a444fb45b8ddfdb377d24283ef463d848c96e0c9dda87c1998f57dea91ca934c4fd70ff2f3f2826d1c35d9554279987842be5d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.6.5 (released at 11/24/2015)
+
+* Handle 48001 error if token is expire/not valid, close #71
+* ApiLoader will do config reading and initialize the api instead of spreading the logic.
+
 ## v0.6.4 (released at 11/16/2015)
 
 * Command mode now display different command set based on enterprise/public account setting

data/bin/wechat

@@ -249,6 +249,16 @@ class App < Thor
     def users
       puts wechat_api.users
     end
+
+    desc 'qrcode_create_scene [SCENE_ID, EXPIRE_SECONDS]', '请求临时二维码'
+    def qrcode_create_scene(scene_id, expire_seconds = 604800)
+      puts wechat_api.qrcode_create_scene(scene_id, expire_seconds)
+    end
+
+    desc 'qrcode_create_limit_scene [SCENE_ID_OR_STR]', '请求永久二维码'
+    def qrcode_create_limit_scene(scene_id_or_str)
+      puts wechat_api.qrcode_create_limit_scene(scene_id_or_str)
+    end
   end
 
   desc 'user [OPEN_ID]', '获取用户基本信息'
@@ -261,16 +271,6 @@ class App < Thor
     puts wechat_api.user_update_remark(openid, remark)
   end
 
-  desc 'qrcode_create_scene [SCENE_ID, EXPIRE_SECONDS]', '请求临时二维码'
-  def qrcode_create_scene(scene_id, expire_seconds = 604800)
-    puts wechat_api.qrcode_create_scene(scene_id, expire_seconds)
-  end
-
-  desc 'qrcode_create_limit_scene [SCENE_ID_OR_STR]', '请求永久二维码'
-  def qrcode_create_limit_scene(scene_id_or_str)
-    puts wechat_api.qrcode_create_limit_scene(scene_id_or_str)
-  end
-
   desc 'menu', '当前菜单'
   def menu
     puts wechat_api.menu

data/lib/wechat.rb

@@ -17,17 +17,11 @@ module Wechat
     end
   end
 
-  attr_reader :config
-
   def self.config
-    @config ||= ApiLoader.loading_config
+    ApiLoader.config
   end
 
   def self.api
-    if config.corpid.present?
-      @api ||= CorpApi.new(config.corpid, config.corpsecret, config.access_token, config.agentid, config.skip_verify_ssl)
-    else
-      @api ||= Api.new(config.appid, config.secret, config.access_token, config.skip_verify_ssl, config.jsapi_ticket)
-    end
+    ApiLoader.api
   end
 end

data/lib/wechat/api_loader.rb

@@ -1,7 +1,16 @@
 module Wechat
-  class ApiLoader
+  module ApiLoader
+    def self.api
+      c = ApiLoader.config
+      if c.corpid.present?
+        @api ||= CorpApi.new(c.corpid, c.corpsecret, c.access_token, c.agentid, c.skip_verify_ssl)
+      else
+        @api ||= Api.new(c.appid, c.secret, c.access_token, c.skip_verify_ssl, c.jsapi_ticket)
+      end
+    end
+
     def self.with(options)
-      c = loading_config
+      c = config
 
       token_file = options[:toke_file] || c.access_token || '/var/tmp/wechat_access_token'
 
@@ -18,35 +27,44 @@ HELP
       end
     end
 
-    def self.loading_config
+    @config = nil
+
+    def self.config
+      return @config unless @config.nil?
+      @config ||= loading_config!
+    end
+
+    private
+
+    def self.loading_config!
+      config ||= config_from_file || config_from_environment
+
+      if defined?(::Rails)
+        config[:access_token] ||= Rails.root.join('tmp/access_token').to_s
+        config[:jsapi_ticket] ||= Rails.root.join('tmp/jsapi_ticket').to_s
+      end
+      config.symbolize_keys!
+      @config = OpenStruct.new(config)
+    end
+
+    def self.config_from_file
       if defined?(::Rails)
         config_file = Rails.root.join('config/wechat.yml')
-        config = YAML.load(ERB.new(File.read(config_file)).result)[Rails.env] if File.exist?(config_file)
+        return YAML.load(ERB.new(File.read(config_file)).result)[Rails.env] if File.exist?(config_file)
       else
         rails_config_file = File.join(Dir.getwd, 'config/wechat.yml')
         home_config_file = File.join(Dir.home, '.wechat.yml')
-
         if File.exist?(rails_config_file)
           config = YAML.load(ERB.new(File.read(rails_config_file)).result)['default']
           if config.present? && (config['appid'] || config['corpid'])
             puts 'Using rails project config/wechat.yml default setting...'
-          else
-            config = {}
+            return config
           end
         end
-
-        if config.blank? && File.exist?(home_config_file)
-          config = YAML.load ERB.new(File.read(home_config_file)).result
+        if File.exist?(home_config_file)
+          return YAML.load ERB.new(File.read(home_config_file)).result
         end
       end
-
-      config ||= config_from_environment
-      if defined?(::Rails)
-        config[:access_token] ||= Rails.root.join('tmp/access_token').to_s
-        config[:jsapi_ticket] ||= Rails.root.join('tmp/jsapi_ticket').to_s
-      end
-      config.symbolize_keys!
-      OpenStruct.new(config)
     end
 
     def self.config_from_environment

data/lib/wechat/client.rb

@@ -45,7 +45,8 @@ module Wechat
         # 42001: access_token超时
         # 40014: 不合法的access_token
         # 40001, invalid credential, access_token is invalid or not latest hint
-        when 42001, 40014, 40001
+        # 48001, api unauthorized hint, for qrcode creation # 71
+        when 42001, 40014, 40001, 48001
           fail AccessTokenExpiredError
         else
           fail ResponseError.new(data['errcode'], data['errmsg'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport