weixin_authorize 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 194d7f3905340f75447ec9401d845af02eedf8a8
-  data.tar.gz: 448c9b7656d7100801514abf18f5213456f28b01
+  metadata.gz: 6bd5cb5899a192d80fe3b410c4a15540146603bb
+  data.tar.gz: 1a59ba515e57a12e9181c550aed3bbfbb838ee50
 SHA512:
-  metadata.gz: aa2e813b5c406da0bf28e9987db44318ab369fc41401b3e12158cdce540f04d8e827f5cf777123a40a3c6a6ab246749aa6143c55e859f1ba2dee8d4c51665737
-  data.tar.gz: e7eac68aec0577c93f10dd5e1634d9a58d5bca61d667c6fcfbbe5dd50975e5d7e6aa5b15d3085ec42bcb1ba122da9d13327c701196d230f3a6b10c71b99d78ea
+  metadata.gz: 7a88ff15ed28e94b9338fcdaf000d4cfb7e6cb5db78a8cb644cab435ab454961d3505851d3d146bd62407a2fe8a88fca6c312ce7ca63cddc811b150e83e6ae4b
+  data.tar.gz: ea555c6636e1b7ea42e1dca10ccd1d5fb15a4f95b3d59d98d279bcb1d02ff70b45e591d4cb04145cf70488015cde62182ed1db6db94c938f9ca453435884e78b

data/README.md

@@ -28,7 +28,11 @@ Or install it yourself as:
 
 ```ruby
 
+# new a client
 $client ||= WeixinAuthorize::Client.new(ENV["APPID"], ENV["APPSECRET"])
+
+# valid app_id and app_secret
+$client.is_valid? # return true or false
 ```
 
 ### Option: use [Redis](http://redis.io) to store your access_token (Recommend)

data/lib/weixin_authorize/client.rb

@@ -34,13 +34,14 @@ module WeixinAuthorize
       @access_token
     end
 
-    # authenticate access_token
-    def authenticate
-      if is_weixin_redis_blank?
-        http_get_access_token
-      else
-        authenticate_with_redis
-      end
+    # 检查appid和app_secret是否有效。
+    def is_valid?
+      valid_result = http_get_access_token
+      if valid_result.keys.include?("access_token")
+        set_access_token_for_client(valid_result)
+        return true
+      end
+      false
     end
 
     def token_expired?
@@ -54,16 +55,31 @@ module WeixinAuthorize
 
     private
 
+      # authenticate access_token
+      def authenticate
+        raise "APPID or APPSECRET is invalid" if !is_valid?
+        if is_weixin_redis_blank?
+          set_access_token_for_client
+        else
+          authenticate_with_redis
+        end
+      end
+
       def authenticate_with_redis
-        http_get_access_token
+        set_access_token_for_client
         weixin_redis.hmset(redis_key, :access_token, access_token, :expired_at, expired_at)
         weixin_redis.expireat(redis_key, expired_at.to_i-10) # 提前10秒超时
       end
 
+      def set_access_token_for_client(access_token_infos=nil)
+        token_infos = access_token_infos || http_get_access_token
+        self.access_token = token_infos["access_token"]
+        self.expired_at   = Time.now.to_i + token_infos["expires_in"]
+      end
+
       def http_get_access_token
-        hash_infos        = http_get_without_token("/token", authenticate_options)
-        self.access_token = hash_infos["access_token"]
-        self.expired_at   = Time.now.to_i + hash_infos["expires_in"]
+        hash_infos = http_get_without_token("/token", authenticate_options)
+        hash_infos
       end
 
       def authenticate_options

data/lib/weixin_authorize/version.rb

@@ -1,3 +1,3 @@
 module WeixinAuthorize
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/1_fetch_access_token_spec.rb

@@ -6,9 +6,9 @@ describe WeixinAuthorize::Client do
       expect($client.access_token).to eq(nil)
     end
 
-    it "return access_token after authenticate" do
-      $client.authenticate
-      expect($client.access_token).not_to eq(nil)
+    it "appid and appsecret shoud be valid" do
+      valid_info = $client.is_valid?
+      expect(valid_info).to eq(true)
     end
 
     it "return the same access_token in the same thing twice" do
@@ -17,5 +17,16 @@ describe WeixinAuthorize::Client do
       access_token_2 = $client.get_access_token
       expect(access_token_1).to eq(access_token_2)
     end
+
+    it "return errorcode and errormsg when appid or appsecret is invalid" do
+      $client_1  = WeixinAuthorize::Client.new("appid", "app_secret")
+      valid_info = $client_1.is_valid?
+      expect(valid_info).to eq(false)
+    end
+
+    it "#get_access_token should raise error if app_secret or appid is invalid" do
+      $client_2 = WeixinAuthorize::Client.new("appid_2", "app_secret_2")
+      expect{$client_2.get_access_token}.to raise_error(RuntimeError)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -23,13 +23,19 @@ require "pry-rails"
 
 redis = Redis.new(:host => "127.0.0.1",:port => "6379")
 
-redis_with_ns = Redis::Namespace.new("weixin_#{Time.now.to_i}:weixin_authorize", :redis => redis)
+namespace = "weixin_test:weixin_authorize"
+
+# cleanup keys in the current namespace when restart server everytime.
+exist_keys = redis.keys("#{namespace}:*")
+exist_keys.each{|key|redis.del(key)}
+
+redis_with_ns = Redis::Namespace.new("#{namespace}", :redis => redis)
+
 WeixinAuthorize.configure do |config|
   config.redis = redis_with_ns
 end
 
 $client = WeixinAuthorize::Client.new(ENV["APPID"], ENV["APPSECRET"])
-
 RSpec.configure do |config|
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client