qihu360 0.3.16 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608d937acd6b11c607f50bb6bcce140037aa298d
-  data.tar.gz: abbf0b233894ab66a411c38e0d2f276e3335b51a
+  metadata.gz: 243732175d9fe1d94ad688e68f6a7f3aa3dce2a7
+  data.tar.gz: 70378a3818685183d66012403677b5eb9c6ebeb7
 SHA512:
-  metadata.gz: 9891b3eb7aa54f240deb0e2e3cceaa2f55877d67c395ed10c3d13edfe96abc6a1fb16fb1857543f9149290b406d5b32b0388508b1429dec9f4422f3b706f15f9
-  data.tar.gz: dc90d8905e6c8398e7967c7db4e73798dd329dcbd90206cf390aedca1ec21c6c36329213cff80e0a22ca750d3944789aeba86a89b2d5dcbc3b9852fff7a0bcca
+  metadata.gz: b8a7121f6da926a1e75a50ba50190a374e79b13ba88ac19915bef748dc1c822cabbae995899e45065f1d172f35761750f7a17c2b5181188cea12816994e06773
+  data.tar.gz: 9bf63cfc46700ee442b0ea0bacbf65557d169e342360d151598f7b6a310bf9cdff8661876ddedf747f1384d9389c024e425b94b37833d384f1a4ede6fa730a0d

data/README.md

@@ -23,6 +23,10 @@
 
 ## 代码实例
 
+### 导入
+
+    require 'qihu'
+
 ### 验证 OAuth 2
 
     # 处理 oauth2
@@ -35,7 +39,21 @@
     auth_url = auth.authorize_url(redirect_uri:'http://icyleaf.com', display:'desktop')
 
     # 获取的 access token
-    auth.get_token('code')
+    token = auth.get_token('code')
+
+### 使用用户名和密码获得 access token
+
+    # 处理 oauth2
+    auth = Qihu::Auth.new(id:'xxx', secret:'yyy')
+
+    # 默认 redirect_uri 是 oob
+    code = auth.get_code_from_account('username', 'password')
+
+    # 获取的 access token
+    token = auth.get_token(code)
+    
+    # 或者直接一步到位
+    token = auth.get_token_from_account('username', 'password')
 
 
 #### 使用 access token 初始化
@@ -74,7 +92,12 @@
     response = client.campign.add(name:'Beijing', budget:10000)
     
     # 更改提交的方法
-    response = client.campign.add(name:'Beijing', bugget:20000, method:'get')
+    begin
+        response = client.campign.add(name:'Beijing', bugget:20000, method:'get')
+    resure Qihu::FailuresError => e
+        # 捕获 API 接口返回的异常
+        puts e.message
+    end
 
     # 获得返回信息
     status = response.status
@@ -82,6 +105,8 @@
     body = response.body
     
 
+
+
 ## 贡献代码
 
 1. Fork 本仓库

data/lib/qihu/auth.rb

@@ -1,4 +1,6 @@
 require 'oauth2'
+require 'uri'
+
 
 module Qihu
   class Auth
@@ -39,6 +41,25 @@ module Qihu
       return self
     end
 
+    def get_code_from_account(username, password, options={})
+      @redirect_uri = options[:redirect_uri] if options[:redirect_uri]
+      conn = Faraday.new(@oauth2.site)
+      res = conn.post(@oauth2.authorize_url, {
+        :client_id => @oauth2.id,
+        :redirect_uri => @redirect_uri, 
+        :response_type => 'code',
+        :username => username,
+        :password => password,
+        })
+
+      query = CGI.parse(URI(res.headers[:location]).query)
+      query["code"].pop
+    end
+
+    def get_token_from_account(username, password, options={})
+      self.get_token(self.get_code_from_account(username, password, options))
+    end
+
     def get_token_from_hash(token={})
       @token = OAuth2::AccessToken.from_hash(@oauth2, token)
       return self

data/lib/qihu/version.rb

@@ -1,3 +1,3 @@
 module Qihu
-  VERSION = "0.3.16"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qihu360
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.4.0
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Qihu 360.cn OAuth2 & Dianjing API wrapper