twitter4r 0.2.1 → 0.2.2

data/lib/twitter/client/friendship.rb

@@ -1,7 +1,7 @@
 class Twitter::Client
 	@@FRIENDSHIP_URIS = {
-		:add => 'http://twitter.com/friendships/create',
-		:remove => 'http://twitter.com/friendships/destroy',
+		:add => '/friendships/create',
+		:remove => '/friendships/destroy',
 	}
 	
 	# Provides access to the Twitter Friendship API.
@@ -26,6 +26,7 @@ class Twitter::Client
 	#  client.friend(:add, user)
 	#  client.friend(:remove, user)
 	def friend(action, value)
+	  raise ArgumentError, "Invalid friend action provided: #{action}" unless @@FRIENDSHIP_URIS.keys.member?(action)
 		value = value.to_i unless value.is_a?(String)
 		uri = "#{@@FRIENDSHIP_URIS[action]}/#{value}.json"
 		response = http_connect {|conn| create_http_get_request(uri) }

data/lib/twitter/client/messaging.rb

@@ -1,17 +1,24 @@
 class Twitter::Client
 
   @@MESSAGING_URIS = {
-    :received => 'http://twitter.com/direct_messages.json',
-    :sent => 'http://twitter.com/direct_messages/sent.json',
-    :post => 'http://twitter.com/direct_messages/new.json',
-    :delete => 'http://twitter.com/direct_messages/destroy',
+    :received => '/direct_messages.json',
+    :sent => '/direct_messages/sent.json',
+    :post => '/direct_messages/new.json',
+    :delete => '/direct_messages/destroy',
   }
 
   # Provides access to Twitter's Messaging API for received and 
   # sent direct messages.
   # 
+  # Example:
+  #  received_messages = @twitter.messages(:received)
   # 
+  # An <tt>ArgumentError</tt> will be raised if an invalid <tt>action</tt> 
+  # is given.  Valid actions are:
+  # * +:received+
+  # * +:sent+
   def messages(action)
+    raise ArgumentError, "Invalid messaging action: #{action}" unless [:sent, :received].member?(action)
     uri = @@MESSAGING_URIS[action]
   	response = http_connect {|conn|	create_http_get_request(uri) }
   	bless_models(Twitter::Message.unmarshal(response.body))
@@ -47,7 +54,13 @@ class Twitter::Client
   # In both scenarios (<tt>action</tt> is <tt>:post</tt> or 
   # <tt>:delete</tt>) a blessed <tt>Twitter::Message</tt> object is 
   # returned that represents the newly posted or newly deleted message.
+  # 
+  # An <tt>ArgumentError</tt> will be raised if an invalid <tt>action</tt> 
+  # is given.  Valid actions are:
+  # * +:post+
+  # * +:delete+
   def message(action, value, user = nil)
+    raise ArgumentError, "Invalid messaging action: #{action}" unless [:post, :delete].member?(action)
     uri = @@MESSAGING_URIS[action]
     case action
     when :post

data/lib/twitter/client/status.rb

@@ -22,7 +22,13 @@ class Twitter::Client
   #  twitter.status(:post, "New Ruby open source project Twitter4R version 0.2.0 released.")
   #  twitter.status(:delete, 107790712)
   # 
+  # An <tt>ArgumentError</tt> will be raised if an invalid <tt>action</tt> 
+  # is given.  Valid actions are:
+  # * +:get+
+  # * +:post+
+  # * +:delete+
   def status(action, value)
+    raise ArgumentError, "Invalid status action: #{action}" unless @@STATUS_URIS.keys.member?(action)
     return nil unless value
   	uri = @@STATUS_URIS[action]
   	response = nil

data/lib/twitter/client/timeline.rb

@@ -5,7 +5,7 @@ class Twitter::Client
     :friend => '/statuses/friends_timeline.json',
     :user => '/statuses/user_timeline.json',
     :me => '/statuses/user_timeline.json',
-  }  
+  }
 
   # Provides access to Twitter's Timeline APIs
   # 
@@ -52,7 +52,16 @@ class Twitter::Client
   #  timeline = twitter.timeline_for(:me) do |status|
   #    puts status.text
   #  end
+  # 
+  # An <tt>ArgumentError</tt> will be raised if an invalid <tt>type</tt> 
+  # is given.  Valid types are:
+  # * +:public+
+  # * +:friends+
+  # * +:friend+
+  # * +:user+
+  # * +:me+
   def timeline_for(type, options = {}, &block)
+    raise ArgumentError, "Invalid timeline type: #{type}" unless @@TIMELINE_URIS.keys.member?(type)
     uri = @@TIMELINE_URIS[type]
     response = http_connect {|conn| create_http_get_request(uri, options) }
     timeline = Twitter::Status.unmarshal(response.body)

data/lib/twitter/client/user.rb

@@ -1,8 +1,8 @@
 class Twitter::Client
   @@USER_URIS = {
-  	:info => 'http://twitter.com/users/show',
-  	:friends => 'http://twitter.com/statuses/friends.json',
-  	:followers => 'http://twitter.com/statuses/followers.json',
+  	:info => '/users/show',
+  	:friends => '/statuses/friends.json',
+  	:followers => '/statuses/followers.json',
   }
   
   # Provides access to Twitter's User APIs
@@ -13,7 +13,13 @@ class Twitter::Client
   # For example,
   #  @twitter.user(234943) #=> Twitter::User object instance for user with numeric id of 234943
   #  @twitter.user('mylogin') #=> Twitter::User object instance for user with screen name 'mylogin'
+  # 
+  # An <tt>ArgumentError</tt> will be raised if an invalid <tt>action</tt> 
+  # is given.  Valid actions are:
+  # * +:info+
+  # * +:friends+
   def user(id, action = :info)
+    raise ArgumentError, "Invalid user action: #{action}" unless @@USER_URIS.member?(action)
   	response = http_connect {|conn| create_http_get_request(@@USER_URIS[action], :id => id) }
   	bless_models(Twitter::User.unmarshal(response.body))
   end
@@ -24,7 +30,14 @@ class Twitter::Client
   # * <tt>:info</tt> - Returns user instance for the authenticated user.
   # * <tt>:friends</tt> - Returns Array of users that are authenticated user's friends
   # * <tt>:followers</tt> - Returns Array of users that are authenticated user's followers
+  # 
+  # An <tt>ArgumentError</tt> will be raised if an invalid <tt>action</tt> 
+  # is given.  Valid actions are:
+  # * +:info+
+  # * +:friends+
+  # * +:followers+
   def my(action)
+    raise ArgumentError, "Invalid user action: #{action}" unless @@USER_URIS.keys.member?(action)
   	response = http_connect {|conn| create_http_get_request(@@USER_URIS[action], :id => @login) }
   	json = response.body
   	users = Twitter::User.unmarshal(json)

data/lib/twitter/config.rb

@@ -15,7 +15,7 @@ module Twitter
   # * <tt>application_name</tt> - name of your client application.  Defaults to 'Twitter4R'
   # * <tt>application_version</tt> - version of your client application.  Defaults to current <tt>Twitter::Version.to_version</tt>.
   # * <tt>application_url</tt> - URL of your client application.  Defaults to http://twitter4r.rubyforge.org.
-  
+  # * <tt>source</tt> - the source id given to you by Twitter to identify your application in their web interface.  Note: you must contact Twitter.com developer directly so they can configure their servers appropriately.
   class Config
     include ClassUtilMixin
     @@ATTRIBUTES = [

data/lib/twitter/model.rb

@@ -158,7 +158,7 @@ module Twitter
   # Represents a <tt>Twitter</tt> user
   class User
     include ModelMixin
-    @@ATTRIBUTES = [:id, :name, :description, :location, :screen_name, :url]
+    @@ATTRIBUTES = [:id, :name, :description, :location, :screen_name, :url, :profile_image_url, :protected]
     attr_accessor *@@ATTRIBUTES
 
     class << self
@@ -213,7 +213,7 @@ module Twitter
     # user's friends on Twitter.
     def friends
       @client.user(@id, :friends)
-    end    
+    end
   end # User
   
   # Represents a status posted to <tt>Twitter</tt> by a <tt>Twitter</tt> user.

data/lib/twitter/version.rb

@@ -4,7 +4,7 @@
 module Twitter::Version #:nodoc:
   MAJOR = 0
   MINOR = 2
-  REVISION = 1
+  REVISION = 2
   class << self
     # Returns X.Y.Z formatted version string
     def to_version

data/spec/twitter/client/friendship_spec.rb

@@ -64,6 +64,12 @@ describe Twitter::Client, "#friend" do
     @twitter.friend(:remove, @friend)
   end
   
+  it "should raise ArgumentError if action given is not valid" do
+    lambda {
+      @twitter.friend(:crap, @friend)
+    }.should raise_error(ArgumentError)
+  end
+  
   after(:each) do
     nilize(@twitter, @id, @uris, @request, @response, @connection)
   end

data/spec/twitter/client/messaging_spec.rb

@@ -32,6 +32,12 @@ describe Twitter::Client, "#messages" do
     @twitter.messages(:sent)
   end
   
+  it "should raise an ArgumentError when giving an invalid messaging action" do
+    lambda {
+      @twitter.messages(:crap)
+    }.should raise_error(ArgumentError)
+  end
+  
   after(:each) do
     nilize(@twitter, @uris, @request, @response, @connection, @messages)
   end
@@ -88,6 +94,12 @@ describe Twitter::Client, "#message" do
     @twitter.message(:delete, @message)
   end
   
+  it "should raise an ArgumentError when giving an invalid messaging action" do
+    lambda {
+      @twitter.message(:crap, @message)
+    }.should raise_error(ArgumentError)
+  end
+  
   after(:each) do
     nilize(@twitter, @uris, @request, @response, @connection, @sender, @recipient, @message, @attributes)
   end

data/spec/twitter/client/status_spec.rb

@@ -79,6 +79,12 @@ describe Twitter::Client, "#status" do
     @twitter.should_receive(:create_http_delete_request).with(@uris[:delete], {:id => @status.to_i}).and_return(@request)
     @twitter.status(:delete, @status)
   end
+  
+  it "should raise an ArgumentError when given an invalid status action" do
+    lambda {
+      @twitter.status(:crap, nil)
+    }.should raise_error(ArgumentError)
+  end
     
   after(:each) do
     nilize(@twitter)

data/spec/twitter/client/timeline_spec.rb

@@ -63,6 +63,16 @@ describe Twitter::Client, "Timeline API" do
     timeline.should eql(@timeline)
   end
   
+  it "should raise an ArgumentError if type given is not valid" do
+    lambda {
+      @client.timeline_for(:crap)
+    }.should raise_error(ArgumentError)
+    
+    lambda { 
+      @client.timeline_for(:crap, @params[:friends])
+    }.should raise_error(ArgumentError)
+  end
+  
   after(:each) do
     nilize(@client)
   end

data/spec/twitter/client/user_spec.rb

@@ -1,5 +1,22 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 
+describe Twitter::Client, "#user(id, :followers)" do
+  before(:each) do
+    @twitter = client_context    
+    @id = 395783
+  end
+  
+  it "should raise ArgumentError" do
+    lambda {
+      @twitter.user(@id, :followers)
+    }.should raise_error(ArgumentError)
+  end
+  
+  after(:each) do
+    nilize(@twitter, @id)
+  end
+end
+
 describe Twitter::Client, "#user(id, :info)" do
   before(:each) do
     @twitter = client_context
@@ -139,3 +156,19 @@ describe Twitter::Client, "#my(:friends)" do
     nilize(@request, @response, @connection, @twitter, @friends, @screen_name)
   end
 end
+
+describe Twitter::Client, "#my(:invalid_action)" do
+  before(:each) do
+    @twitter = client_context
+  end
+  
+  it "should raise ArgumentError for invalid user action" do
+    lambda {
+      @twitter.my(:crap)
+    }.should raise_error(ArgumentError)
+  end
+  
+  after(:each) do
+    nilize(@twitter)
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: twitter4r
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-07-17 00:00:00 -05:00
+  version: 0.2.2
+date: 2007-07-18 00:00:00 -05:00
 summary: A clean Twitter client API in pure Ruby. Will include Twitter add-ons also in Ruby.
 require_paths: 
 - lib