rest-core 0.3.0.pre.0 → 0.3.0.pre.1

data/CHANGES.md

@@ -6,6 +6,7 @@
 * [facebook] Facebook::RailsUtil is imported from [rest-graph][]
 * [facebook] Use json_decode instead of auto_decode as rest-graph
 * [twitter] Fixed opts in Twitter#tweet
+* [twitter] Introduced Twitter::Error instead of RuntimeError!
 * [rest-core] We no longer explicitly depends on Rack
 * [rest-core] Added a shorthand RC to access RestCore
 * [cache] All clients no longer have default hash cache

data/lib/rest-core/client/twitter.rb

@@ -11,16 +11,11 @@ RestCore::Twitter = RestCore::Builder.client(:data) do
   use s::Oauth1Header  ,
     'oauth/request_token', 'oauth/access_token', 'oauth/authorize'
 
-  use s::CommonLogger  , method(:puts)
+  use s::CommonLogger  , lambda{|obj|obj}
 
   use s::Cache         , nil, 3600 do
     use s::ErrorHandler  , lambda{ |env|
-      if (body = env[s::RESPONSE_BODY]).kind_of?(Hash)
-        raise body['error']
-      else
-        raise body
-      end
-    }
+                             raise ::RestCore::Twitter::Error.call(env) }
     use s::ErrorDetectorHttp
     use s::JsonDecode    , true
     run s::Ask
@@ -31,6 +26,45 @@ RestCore::Twitter = RestCore::Builder.client(:data) do
   run s::RestClient
 end
 
+class RestCore::Twitter::Error < RuntimeError
+  include RestCore
+  class ServerError         < Twitter::Error; end
+
+  class BadRequest          < Twitter::Error; end
+  class Unauthorized        < Twitter::Error; end
+  class Forbidden           < Twitter::Error; end
+  class NotFound            < Twitter::Error; end
+  class NotAcceptable       < Twitter::Error; end
+  class EnhanceYourCalm     < Twitter::Error; end
+
+  class InternalServerError < Twitter::Error::ServerError; end
+  class BadGateway          < Twitter::Error::ServerError; end
+  class ServiceUnavailable  < Twitter::Error::ServerError; end
+
+  attr_reader :error, :url
+  def initialize error, url=''
+    @error, @url = error, url
+    super("#{error.inspect} from #{url}")
+  end
+
+  def self.call env
+    error, url = env[RESPONSE_BODY], Middleware.request_uri(env)
+    return new(env[FAIL], url) unless error.kind_of?(Hash)
+    case env[RESPONSE_STATUS]
+      when 400; BadRequest
+      when 401; Unauthorized
+      when 403; Forbidden
+      when 404; NotFound
+      when 406; NotAcceptable
+      when 420; EnhanceYourCalm
+      when 500; InternalServerError
+      when 502; BadGateway
+      when 503; ServiceUnavailable
+      else    ; self
+    end.new(error, url)
+  end
+end
+
 module RestCore::Twitter::Client
   include RestCore
 

data/lib/rest-core/middleware/error_detector_http.rb

@@ -6,6 +6,6 @@ class RestCore::ErrorDetectorHttp < RestCore::ErrorDetector
   include RestCore::Middleware
 
   def initialize app
-    super(app, lambda{ |env| (env[RESPONSE_STATUS] || 200) / 100 != 2 })
+    super(app, lambda{ |env| (env[RESPONSE_STATUS] || 200) / 100 >= 4 })
   end
 end

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '0.3.0.pre.0'
+  VERSION = '0.3.0.pre.1'
 end

data/rest-core.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "0.3.0.pre.0"
+  s.version = "0.3.0.pre.1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = [
@@ -117,6 +117,7 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_parse.rb",
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
+  "test/client/twitter/test_api.rb",
   "test/test_oauth1_header.rb"]
   s.homepage = "https://github.com/cardinalblue/rest-core"
   s.require_paths = ["lib"]
@@ -136,6 +137,7 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_parse.rb",
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
+  "test/client/twitter/test_api.rb",
   "test/test_oauth1_header.rb"]
 
   if s.respond_to? :specification_version then

data/test/client/twitter/test_api.rb

@@ -0,0 +1,37 @@
+
+require 'rest-core/test'
+
+describe RestCore::Twitter do
+  after do
+    WebMock.reset!
+    RR.verify
+  end
+
+  should 'get right' do
+    stub_request(:get, 'https://api.twitter.com/me').
+      to_return(:body => '{"status": "OK"}')
+
+    RestCore::Twitter.new.get('me').should.eq({'status' => 'OK'})
+  end
+
+  def check status, klass
+    stub_request(:delete, 'https://api.twitter.com/123').to_return(
+      :body => '{}', :status => status)
+
+    lambda{
+      RestCore::Twitter.new.delete('123')
+    }.should.raise(klass)
+
+    WebMock.reset!
+  end
+
+  should 'raise exception when encountering error' do
+    [401, 402, 403].each{ |status|
+      check(status, RestCore::Twitter::Error)
+    }
+
+    [500, 502, 503].each{ |status|
+      check(status, RestCore::Twitter::Error::ServerError)
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.0
+  version: 0.3.0.pre.1
   prerelease: 6
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2154406600 !ruby/object:Gem::Requirement
+  requirement: &2166688360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154406600
+  version_requirements: *2166688360
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2154405920 !ruby/object:Gem::Requirement
+  requirement: &2166687880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154405920
+  version_requirements: *2166687880
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2154399520 !ruby/object:Gem::Requirement
+  requirement: &2166687280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154399520
+  version_requirements: *2166687280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2154398840 !ruby/object:Gem::Requirement
+  requirement: &2166686760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154398840
+  version_requirements: *2166686760
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2154398100 !ruby/object:Gem::Requirement
+  requirement: &2166686180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154398100
+  version_requirements: *2166686180
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &2154397380 !ruby/object:Gem::Requirement
+  requirement: &2166685580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154397380
+  version_requirements: *2166685580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2154396860 !ruby/object:Gem::Requirement
+  requirement: &2166678200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154396860
+  version_requirements: *2166678200
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2154396080 !ruby/object:Gem::Requirement
+  requirement: &2166677280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154396080
+  version_requirements: *2166677280
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2154395380 !ruby/object:Gem::Requirement
+  requirement: &2166676540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154395380
+  version_requirements: *2166676540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154394440 !ruby/object:Gem::Requirement
+  requirement: &2166675740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154394440
+  version_requirements: *2166675740
 description: ! 'A modular Ruby REST client collection/infrastructure.
 
 
@@ -259,6 +259,7 @@ files:
 - test/client/facebook/test_parse.rb
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
+- test/client/twitter/test_api.rb
 - test/test_oauth1_header.rb
 homepage: https://github.com/cardinalblue/rest-core
 licenses: []
@@ -298,4 +299,5 @@ test_files:
 - test/client/facebook/test_parse.rb
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
+- test/client/twitter/test_api.rb
 - test/test_oauth1_header.rb