qihu360 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 243732175d9fe1d94ad688e68f6a7f3aa3dce2a7
-  data.tar.gz: 70378a3818685183d66012403677b5eb9c6ebeb7
+  metadata.gz: 0bad2c629ac3dfc34186ce48b0df371db3316eea
+  data.tar.gz: b038c401fcf5caf2bf190c17ffdd85e2f4874b82
 SHA512:
-  metadata.gz: b8a7121f6da926a1e75a50ba50190a374e79b13ba88ac19915bef748dc1c822cabbae995899e45065f1d172f35761750f7a17c2b5181188cea12816994e06773
-  data.tar.gz: 9bf63cfc46700ee442b0ea0bacbf65557d169e342360d151598f7b6a310bf9cdff8661876ddedf747f1384d9389c024e425b94b37833d384f1a4ede6fa730a0d
+  metadata.gz: 8ac100ff02a864f36cbff21e0fe504aece47d0b1d2d108c71922c4fe32f90d58c3c355eff5d44849f0e0c74e2d6fc2388ce91634fddeda3e5d8f9c07ad845cb6
+  data.tar.gz: 415e8f083074eb16fd3e0bd0add4fe46e2e5a39cd4ecc52a588f98585a3393c411916ab273b66919b578be5ae1eb830ef871ac7e93ef067c58d2367cf004e8b5

data/README.md

@@ -41,7 +41,16 @@
     # 获取的 access token
     token = auth.get_token('code')
 
-### 使用用户名和密码获得 access token
+#### 使用 access token 初始化
+  
+    auth = Qihu::Auth.new(id:'xxx', secret:'yyy', token:{
+        :access_token => 'zzz', :refresh_token => 'qqq', :expires_at => 36000
+    })
+
+    // 或者这样传递 access token
+    auth.get_token_from_hash(:access_token => 'zzz', :refresh_token => 'qqq', :expires_at => 36000)
+
+#### 使用用户名和密码获得 access token
 
     # 处理 oauth2
     auth = Qihu::Auth.new(id:'xxx', secret:'yyy')
@@ -55,16 +64,6 @@
     # 或者直接一步到位
     token = auth.get_token_from_account('username', 'password')
 
-
-#### 使用 access token 初始化
-  
-    auth = Qihu::Auth.new(id:'xxx', secret:'yyy', token:{
-        :access_token => 'zzz', :refresh_token => 'qqq', :expires_at => 36000
-    })
-
-    // 或者这样传递 access token
-    auth.get_token_from_hash(:access_token => 'zzz', :refresh_token => 'qqq', :expires_at => 36000)
-
 #### 如何刷新 access token
 
     auth = Qihu::Auth.new('xxx', 'yyy', token:{

data/lib/qihu/dianjing/api/base.rb

@@ -26,8 +26,11 @@ module Qihu
             end
 
             uri_path = uri_path(name)
-            r = @client.auth.token.request(method, uri_path, :headers => client_headers, :params => params)
-
+            if method == :get
+              r = @client.auth.token.request(method, uri_path, :headers => client_headers, :params => params)
+            else
+              r = @client.auth.token.request(method, uri_path, :headers => client_headers, :body => params)
+            end
             if self.json?(r.headers)
               data = self.to_json(r.body)
             elsif self.xml?(r.headers)

data/lib/qihu/version.rb

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: qihu360
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 description: Qihu 360.cn OAuth2 & Dianjing(Advertising system) API wrapper
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Qihu 360.cn OAuth2 & Dianjing API wrapper