dschn-tweetsy 0.1.4 → 0.1.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 0
 :minor: 1

data/lib/tweetsy.rb

@@ -6,6 +6,7 @@ module Tweetsy
   class Unauthorized < CantConnect; end
   class BadRequest < CantConnect; end
   class NotFound < CantConnect; end
+  class Forbidden < CantConnect; end
 end
 
 require File.dirname(__FILE__) + '/tweetsy/user'

data/lib/tweetsy/client.rb

@@ -1,9 +1,11 @@
 module Tweetsy
   class Client
     API_HOST = "http://twitter.com"
-  
+    attr_reader :rate_limits
+    
     def initialize(login, password, options = {})
       @config = options.merge(:auth => [login, password].join(':'))
+      @rate_limits = {}
     end
 
     def authenticate_as(login, password)
@@ -105,12 +107,47 @@ module Tweetsy
         path
       end
     end
+    
+    def parse(response)
+      Hpricot.XML(response.body_str)
+    end
+    
+    def parse_error(response)
+      (parse(response)/:hash/:error).inner_text
+    end
+    
+    def parse_rate_limit(response)
+      response.header_str.scan(/^X-RateLimit-([a-zA-Z]+): (\d+)/) do |match|
+        @rate_limits[match.first.downcase.to_sym] = match.last.to_i
+      end
+    end
+    
+    def raise_errors(response)
+      case response.response_code
+      when 400
+        error_msg = parse_error(response)
+        raise BadRequest.new(error_msg)
+      when 401
+        error_msg = parse_error(response)
+        raise Unauthorized.new(error_msg)
+      when 403
+        error_msg = parse_error(response)
+        raise Forbidden.new(error_msg)
+      when 404
+        error_msg = parse_error(response)
+        raise NotFound.new(error_msg)
+      when 503
+        raise CantConnect, "Service unavailable"
+      else
+        raise CantConnect, "#{response.response_code}"
+      end
+    end
 
     def request(method, endpoint, options = {})
       raise ArgumentError, "#{method} is not a valid request method" unless [:get, :post].include?(method)
 
       begin      
-        result = case method
+        response = case method
         when :get
           Curl::Easy.perform("#{API_HOST}/#{endpoint}") do |curl|
             default_curl_options(curl)
@@ -128,19 +165,12 @@ module Tweetsy
       rescue => e
         raise CantConnect, "#{e.message}"
       end
-      
-      if [200, 304].include?(result.response_code)
-        Hpricot(result.body_str)
-      elsif result.response_code == 401
-        raise Unauthorized
-      elsif result.response_code == 403
-        raise BadRequest
-      elsif result.response_code == 404
-        raise NotFound
-      elsif result.response_code == 503
-        raise CantConnect, "Service unavailable"
+
+      if [200, 304].include?(response.response_code)
+        parse_rate_limit(response)
+        parse(response)
       else
-        raise CantConnect, "#{result.response_code}"
+        raise_errors(response)
       end
     end
     

data/spec/client_spec.rb

@@ -4,6 +4,12 @@ describe "Tweetsy::Client" do
   before do
     @base = Tweetsy::Client.new('foo', 'bar')
   end
+  
+  describe "on initialization" do
+    it "should have empty rate_limit hash" do
+      @base.rate_limits.should == {}
+    end
+  end
     
   describe "authenticated?" do
     it "should return true on successful authentication (200)" do
@@ -54,6 +60,16 @@ describe "Tweetsy::Client" do
     end
   end
   
+  def create_error_response(message)
+    "
+    <?xml version=\"1.0\" encoding=\"UTF-8\"?>
+    <hash>
+      <request>/users/show/genevate.xml</request>
+      <error>#{message}</error>
+    </hash>
+    "
+  end
+  
   describe "request" do   
     it "should raise ArgumentError on bad arguments" do
       lambda { 
@@ -62,7 +78,7 @@ describe "Tweetsy::Client" do
     end
 
     it "should raise Unauthorized on 401" do
-      response = mock(:response, :response_code => 401)
+      response = mock(:response, :response_code => 401, :header_str => "", :body_str => create_error_response("test"))
       Curl::Easy.stub!(:perform).and_return(response)
       
       lambda {
@@ -73,10 +89,36 @@ describe "Tweetsy::Client" do
         @base.request(:get, 'blah')        
       }.should raise_error(Tweetsy::CantConnect)
     end
+    
+    it "should raise BadRequest on 400" do
+      response = mock(:response, :response_code => 400, :header_str => "", :body_str => create_error_response("test"))
+      Curl::Easy.stub!(:perform).and_return(response)
+      
+      lambda {
+        @base.request(:get, 'blah')
+      }.should raise_error(Tweetsy::BadRequest)
+      
+      lambda {
+        @base.request(:get, 'blah')        
+      }.should raise_error(Tweetsy::CantConnect)      
+    end
+    
+    it "should raise Forbidden on 403" do
+      response = mock(:response, :response_code => 403, :header_str => "", :body_str => create_error_response("test"))
+      Curl::Easy.stub!(:perform).and_return(response)
+      
+      lambda {
+        @base.request(:get, 'blah')
+      }.should raise_error(Tweetsy::Forbidden)
+      
+      lambda {
+        @base.request(:get, 'blah')        
+      }.should raise_error(Tweetsy::CantConnect)
+    end
 
     it "should raise CantConnect on anything that isn't 200 or 304 response" do
       [401, 503, 504, 505, nil].each do |code|
-        response = mock(:response, :response_code => code)
+        response = mock(:response, :response_code => code, :header_str => "", :body_str => create_error_response("test"))
         Curl::Easy.stub!(:perform).and_return(response)
         
         lambda {
@@ -84,5 +126,18 @@ describe "Tweetsy::Client" do
         }.should raise_error(Tweetsy::CantConnect)
       end
     end
+    
+    it "should return rate limit status" do
+      response = mock(:response, 
+        :body_str => "Hello World",
+        :response_code => 200, 
+        :header_str => "X-RateLimit-Limit: 100\r\nX-RateLimit-Remaining: 98\r\nX-RateLimit-Reset: 12345678")
+      Curl::Easy.stub!(:perform).and_return(response)
+      
+      @base.request(:get, 'blah')
+      @base.rate_limits[:limit].should == 100
+      @base.rate_limits[:remaining].should == 98
+      @base.rate_limits[:reset].should == 12345678
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dschn-tweetsy
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Dustin Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-09 00:00:00 -07:00
+date: 2009-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: []