douban_api 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 85c52bbf4cb09831305e2d3f901fdc8e7efa87ec
+  data.tar.gz: 61c660a6fd0af1a79707bdd7c0973865befbec94
+SHA512:
+  metadata.gz: caf1e81fc3f88c462cf5ae5cbf0ba0030e21bf2a7a9a5a6d98ac4909ba24b11b21b07b1156a19ccf1f8269060193e3cece127f6196043e68e134d052e4e94aa9
+  data.tar.gz: 5a5d1882acdc77224d0daa4696965dd9e55a8c4ad5f981893262cee8f18ef0fe564bd4ed47b86ec2a788e3738f62d7a97396b1c05d984c3b0d951d88914f1f38

data/lib/douban_api/api.rb

@@ -17,6 +17,10 @@ module Douban
       end
     end
 
+    def get_rate_limit_info
+      @rate_limit_info || {}
+    end
+
     include Connection
     include Request
     include OAuth

data/lib/douban_api/client/movie.rb

@@ -81,7 +81,7 @@ module Douban
       #   Douban.search_movies("伍迪·艾伦")
       def search_movies(q, options={})
         response = get "v2/movie/search", options.merge(:q => q)
-        response["movies"]
+        response["subjects"]
       end
 
       # 搜索电影(通过标签)

data/lib/douban_api/connection.rb

@@ -16,10 +16,12 @@ module Douban
       }
 
       Faraday::Connection.new(options) do |connection|
+        # requests
         connection.use FaradayMiddleware::OAuth2, client_id, access_token
-        connection.use FaradayMiddleware::Mashify unless raw
         connection.use Faraday::Request::Multipart
         connection.use Faraday::Request::UrlEncoded
+
+        # responses
         connection.use FaradayMiddleware::Mashify unless raw
         unless raw
           case format.to_s.downcase
@@ -27,6 +29,9 @@ module Douban
           end
         end
         connection.use FaradayMiddleware::RaiseHttpException
+        # connection.use Faraday::Response::Logger
+
+        # adapter
         connection.adapter(adapter)
       end
     end

data/lib/douban_api/error.rb

@@ -4,10 +4,30 @@ module Douban
   class Error < StandardError; end
 
   # Raised when Douban returns the HTTP status code 400
-  class BadRequest < Error; end
+  class BadRequest < Error
+    attr_reader :code, :msg
+
+    def initialize(body)
+      @code, @msg = 0, ""
+      parse_error_body(body)
+    end
+
+    private
+    def parse_error_body(body)
+      # body gets passed as a string, not sure if it is passed as something else from other spots?
+      if not body.nil? and not body.empty? and body.kind_of?(String)
+        # removed multi_json thanks to wesnolte's commit
+        body = ::JSON.parse(body)
+
+        if body['code'] and body['msg']
+          @code, @msg = body['code'], body['msg']
+        end
+      end
+    end
+  end
 
   # Raised when Douban returns the HTTP status code 404
-  class NotFound < Error; end
+  class NotFound < BadRequest; end
 
   # Raised when Douban returns the HTTP status code 500
   class InternalServerError < Error; end

data/lib/douban_api/request.rb

@@ -35,7 +35,20 @@ module Douban
           request.body = options unless options.empty?
         end
       end
+
+      @rate_limit_info = extract_rate_limit_info(response.headers)
+
       raw ? response : response.body
     end
+
+    def extract_rate_limit_info(headers)
+      headers.reject do |k, v|
+        !['x-ratelimit-limit',
+          'x-ratelimit-limit2',
+          'x-ratelimit-remaining',
+          'x-ratelimit-remaining2'
+        ].include?(k)
+      end
+    end
   end
 end

data/lib/douban_api/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Douban
-  VERSION = '0.1.5'.freeze unless defined?(::Douban::VERSION)
+  VERSION = '0.1.6'.freeze unless defined?(::Douban::VERSION)
 end

data/lib/faraday/raise_http_exception.rb

@@ -9,9 +9,9 @@ module FaradayMiddleware
       @app.call(env).on_complete do |response|
         case response[:status].to_i
         when 400
-          raise Douban::BadRequest, error_message_400(response)
+          raise Douban::BadRequest.new(response[:body]), error_message_400(response)
         when 404
-          raise Douban::NotFound, error_message_400(response)
+          raise Douban::NotFound.new(response[:body]), error_message_400(response)
         when 500
           raise Douban::InternalServerError, error_message_500(response, "Something is technically wrong.")
         when 503
@@ -28,21 +28,7 @@ module FaradayMiddleware
     private
 
     def error_message_400(response)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{error_body(response[:body])}"
-    end
-
-    def error_body(body)
-      # body gets passed as a string, not sure if it is passed as something else from other spots?
-      if not body.nil? and not body.empty? and body.kind_of?(String)
-        # removed multi_json thanks to wesnolte's commit
-        body = ::JSON.parse(body)
-      end
-
-      if body.nil?
-        nil
-      elsif body['meta'] and body['meta']['error_message'] and not body['meta']['error_message'].empty?
-        ": #{body['meta']['error_message']}"
-      end
+      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}"
     end
 
     def error_message_500(response, body=nil)

metadata

@@ -1,22 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: douban_api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Sean Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
     - - <
@@ -25,9 +23,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
     - - <
@@ -36,7 +33,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,7 +40,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,9 +47,8 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
     - - ~>
@@ -63,9 +57,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
     - - ~>
@@ -74,23 +67,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,7 +88,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,7 +95,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,7 +102,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -122,7 +109,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -130,7 +116,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -138,7 +123,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,7 +130,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -154,49 +137,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby wrapper for the Douban API v2 based on instagram's official ruby
@@ -241,30 +218,26 @@ files:
 - lib/faraday/raise_http_exception.rb
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2295320559761503597
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby wrapper for the Douban API v2
 test_files: []
 has_rdoc: