qihu360 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd5017488ec22ca95132048253c31b8c012a742
-  data.tar.gz: 5b4292e94a7403b5e430c54468129ceff799bbda
+  metadata.gz: 608d937acd6b11c607f50bb6bcce140037aa298d
+  data.tar.gz: abbf0b233894ab66a411c38e0d2f276e3335b51a
 SHA512:
-  metadata.gz: c086d2c1376c8f850cf5986e98146aea176b9b4a5f5ae4cadbf67229d3e590f362833a8c292f77f82bc30ead02ffbe6ade839ad21552681c64e1296999273651
-  data.tar.gz: d810eb3044043deb3751d84fdb9fa7c930b8be455fcc6445db07e3bdd873ad77b7c1bb5b9d06666b3999709b8acdffc6dc208ac3967bc34f070a84cd8752b91c
+  metadata.gz: 9891b3eb7aa54f240deb0e2e3cceaa2f55877d67c395ed10c3d13edfe96abc6a1fb16fb1857543f9149290b406d5b32b0388508b1429dec9f4422f3b706f15f9
+  data.tar.gz: dc90d8905e6c8398e7967c7db4e73798dd329dcbd90206cf390aedca1ec21c6c36329213cff80e0a22ca750d3944789aeba86a89b2d5dcbc3b9852fff7a0bcca

data/lib/qihu.rb

@@ -1,3 +1,4 @@
 require "qihu/version"
 require "qihu/auth"
+require "qihu/error"
 require "qihu/dianjing"

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

@@ -26,13 +26,61 @@ module Qihu
             end
 
             uri_path = uri_path(name)
-            @client.auth.token.request(method, uri_path, :headers => client_headers, :params => params)
+            r = @client.auth.token.request(method, uri_path, :headers => client_headers, :params => params)
+
+            if self.json?(r.headers)
+              data = self.to_json(r.body)
+            elsif self.xml?(r.headers)
+              root = "#{self.url_section}_#{name}_response"
+              data = self.to_xml(r.body)
+              data = data[root]
+            end
+
+            if data.has_key?('failures')
+              key = data['failures'].kind_of?(Hash) ? 'item' : 0
+              code = data['failures'][key]['code'].to_i
+              error = data['failures'][key]['message']
+
+              raise Qihu::FailuresError.new(code, error)
+            end
+
+            return r
           rescue OAuth2::Error => e
-            raise "Invaild API: '#{@client.site}/#{uri_path}' with message:\n#{e.message}"
+            raise Qihu::InvailAPIError.new("#{@client.site}/#{uri_path}", e.message)
           end
         end
 
         protected
+          # Convert response content to JSON format
+          #
+          # @return [Hash]
+          def to_json(body)
+            MultiJson.load(body)
+          end
+
+          # Convert response content to XML format
+          #
+          # @return [Hash]
+          def to_xml(body, parser=nil)
+            MultiXml.parser = p if parser and [:ox, :libxml, :nokogiri, :rexml].include?parser.to_sym
+            MultiXml.parse(body)
+          end
+
+          # Whether or not the content is json content type
+          #
+          # @return [Boolean]
+          def json?(headers)
+            (headers[:content_type].include?'json') ? true : false
+          end
+
+          # Whether or not the content is xml content type
+          #
+          # @return [Boolean]
+          def xml?(headers)
+            (['xml', 'html'].any? { |word| headers[:content_type].include?(word) }) ? true : false
+          end
+
+
           def client_headers
             {
               :apiKey => @client.auth.token.client.id,
@@ -41,8 +89,12 @@ module Qihu
             }
           end
 
+          def url_section
+            self.class.name.split("::")[-1].downcase
+          end
+
           def uri_path(uri)
-            class_name = self.class.name.split("::")[-1].downcase
+            class_name = self.url_section
             "#{@client.version}/#{class_name}/#{uri}"
           end
       end

data/lib/qihu/error.rb

@@ -0,0 +1,25 @@
+module Qihu
+  class Error < StandardError
+  end
+
+  class InvailAPIError < Qihu::Error
+    attr_reader :url, :error
+
+    def initialize(url, error)
+      @url = url
+      @error = error
+      
+      super "Invaild API: [#{@url}]"
+    end
+  end
+
+  class FailuresError < Qihu::Error
+    attr_reader :code, :error
+    def initialize(code, error)
+      @code = code
+      @error = error
+
+      super "[#{@code}] #{@error}"
+    end
+  end
+end

data/lib/qihu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qihu360
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - lib/qihu/dianjing/api/report.rb
 - lib/qihu/dianjing/api/tool.rb
 - lib/qihu/dianjing/client.rb
+- lib/qihu/error.rb
 - lib/qihu/version.rb
 - qihu360.gemspec
 - spec/qihu/auth_spec.rb
@@ -130,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Qihu 360.cn OAuth2 & Dianjing API wrapper