baidu-sdk 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3af6ada389f6a63f94e817ce4a13d344b73461f5
-  data.tar.gz: c769fddcdea66b5cb027fd123f7e366e17bae183
+  metadata.gz: fd923023cb20bb234f9baf2e88e3195666872466
+  data.tar.gz: 7cb2233114d45ea5fd5dd63547a327ce19c20e9c
 SHA512:
-  metadata.gz: 3f354a1ae052d10dacc1160c23f94f90c2eeea602dd437e134383e4771d5bc43e1ece0e168445f7c9c6ce74518855e47175911e825bac7f45a1f157e1b078abb
-  data.tar.gz: 613e6c1f4b7ab7a2b0bdc5c72c9f8382cf26fdc0e2006922ac85cd9cedc02d920f57cfa1066df76b516154c5847d87bd34496810a9b22fb0b5c4ee085fe9ee14
+  metadata.gz: 288ed76d45973ac06e749b69be34fb18cb912249817b8bd09b56a0f716088c9fb5ccf884e8d9057ab0f514f818c4a92a3109712b6ba3497ef6857e9be901abe3
+  data.tar.gz: 9fd6f960f649373f8d448ded8cf30c39c45c1ae7e55fc74a287ede131109f3037d54571efa64fe80dbe41ff6ffbb48443295a0665e665d0f8150c9d8d6d5e0e4

data/.travis.yml

@@ -4,8 +4,8 @@ script: 'bundle exec rake spec'
 
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
   - rbx-2
   - jruby-19mode
   - ruby-head

data/Gemfile

@@ -7,7 +7,7 @@ end
 
 group :test, :development do
   gem 'rake'
-  gem 'rspec'
+  gem 'rspec', '~> 2.14.1'
   gem 'webmock'
 end
 

data/HISTORY.md

@@ -1,3 +1,6 @@
+## 0.0.4 (2014-06-22)
+* **OAuth** token_info 验证的 access token 过期或无效返回 nil
+
 ## 0.0.3 (2013-12-30)
 * 添加部分 REST API, `Baidu::OAuth::RESTClient`
   * get_logged_in_user

data/lib/baidu/oauth/client.rb

@@ -97,12 +97,18 @@ module Baidu
       #   :expires_in  Access Token剩余的有效时间，以秒为单位
       #
       # @param [String] access_token 授权之后应用得到的Access Token
-      # @return [Hash]
+      # @return [Hash] 如上描述
+      # @return [nil]  若参数中传递的 Access Token 已经过期或者无效，则返回 nil
       # @see http://developer.baidu.com/wiki/index.php?title=docs/oauth/tokeninfo 校验Access Token
       # @see http://developer.baidu.com/wiki/index.php?title=docs/oauth/list 权限列表
       def token_info(access_token)
         body = { access_token: access_token }
-        return post Baidu::OAuth::TOKEN_INFO_ENDPOINT, nil, body
+        begin
+          post Baidu::OAuth::TOKEN_INFO_ENDPOINT, nil, body
+        rescue Baidu::Errors::ClientError => e
+          return nil if e.code == 'invalid_grant'
+          raise e
+        end
       end
     end
   end

data/lib/baidu/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Baidu
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/baidu/oauth/client_spec.rb

@@ -237,10 +237,18 @@ describe Baidu::OAuth::Client do
   context '#token_info' do
     it 'requests token info' do
       stub = stub_post(:oauth, '/oauth/2.0/tokeninfo', access_token: 'xxxx').
-          to_return(status: 200, body: ft('token_info.json'))
+               to_return(status: 200, body: ft('token_info.json'))
       rest = @client.token_info('xxxx')
       stub.should have_been_requested
       expect(rest).to be_instance_of(Hash)
     end
+
+    it 'requests token info with expired or invalid access token' do
+      stub = stub_post(:oauth, '/oauth/2.0/tokeninfo', access_token: 'expired_or_invalid_access_token').
+               to_return(status: 400, body: ft('token_info_400.json'))
+      rest = @client.token_info('expired_or_invalid_access_token')
+      stub.should have_been_requested
+      expect(rest).to be_nil
+    end
   end
 end

data/spec/fixtures/token_info_400.json

@@ -0,0 +1,4 @@
+{
+  "error": "invalid_grant",
+  "error_description": "Invalid Access Token: xxx..."
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baidu-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lonre Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -110,6 +110,7 @@ files:
 - spec/fixtures/stream_list.json
 - spec/fixtures/streaming.m3u8
 - spec/fixtures/token_info.json
+- spec/fixtures/token_info_400.json
 - spec/fixtures/upload.json
 - spec/fixtures/upload_block.json
 - spec/fixtures/user_and_device_code.json
@@ -134,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Unofficial Baidu REST API SDK for Ruby.
@@ -175,8 +176,8 @@ test_files:
 - spec/fixtures/stream_list.json
 - spec/fixtures/streaming.m3u8
 - spec/fixtures/token_info.json
+- spec/fixtures/token_info_400.json
 - spec/fixtures/upload.json
 - spec/fixtures/upload_block.json
 - spec/fixtures/user_and_device_code.json
 - spec/spec_helper.rb
-has_rdoc: