twitter4r 0.2.2 → 0.2.3

data/lib/twitter/client/messaging.rb

@@ -36,7 +36,7 @@ class Twitter::Client
   # * <tt>Integer</tt> or <tt>Twitter::Message</tt> object when action is <tt>:delete</tt>.  Will refer to the unique message ID to delete.  When passing in an instance of <tt>Twitter::Message</tt> that Status will be 
   # 
   # <tt>user</tt> should be:
-  # * <tt>Twitter::User</tt> or <tt>Integer</tt> object when <tt>action</tt> is <tt>:post</tt>.
+  # * <tt>Twitter::User</tt>, <tt>Integer</tt> or <tt>String</tt> object when <tt>action</tt> is <tt>:post</tt>.  The <tt>Integer</tt> must be the unique ID of the Twitter user you wish to send the direct message to and any <tt>String</tt>s passed in must be the screen name of the user you wish to send the direct message to.
   # * totally ignore when <tt>action</tt> is <tt>:delete</tt>.  It has no purpose in this use case scenario.
   # 
   # Examples:
@@ -59,12 +59,17 @@ class Twitter::Client
   # is given.  Valid actions are:
   # * +:post+
   # * +:delete+
+  # 
+  # An <tt>ArgumentError</tt> is also raised when no user argument is 
+  # supplied when <tt>action</tt> is +:post+.
   def message(action, value, user = nil)
     raise ArgumentError, "Invalid messaging action: #{action}" unless [:post, :delete].member?(action)
+    raise ArgumentError, "User argument must be supplied for :post case" if action.eql?(:post) and user.nil?
     uri = @@MESSAGING_URIS[action]
+    user = user.to_i if user and user.is_a?(Twitter::User)
     case action
     when :post
-      response = http_connect({:text => value, :user => user.to_i, :source => @@config.source}.to_http_str) {|conn| create_http_post_request(uri) }
+      response = http_connect({:text => value, :user => user, :source => @@config.source}.to_http_str) {|conn| create_http_post_request(uri) }
     when :delete
       response = http_connect {|conn| create_http_delete_request(uri, :id => value.to_i) }
     end

data/lib/twitter/client/user.rb

@@ -18,8 +18,17 @@ class Twitter::Client
   # is given.  Valid actions are:
   # * +:info+
   # * +:friends+
+  # 
+  # +Note:+ You should not use this method to attempt to retrieve the 
+  # authenticated user's followers.  Please use any of the following 
+  # ways of accessing this list:
+  #  followers = client.my(:followers)
+  # OR
+  #  followers = client.my(:info).followers
   def user(id, action = :info)
-    raise ArgumentError, "Invalid user action: #{action}" unless @@USER_URIS.member?(action)
+    raise ArgumentError, "Invalid user action: #{action}" unless @@USER_URIS.keys.member?(action)
+    raise ArgumentError, "Unable to retrieve followers for user: #{id}" if action.eql?(:followers) and not id.eql?(@login)
+    id = id.to_i if id.is_a?(Twitter::User)
   	response = http_connect {|conn| create_http_get_request(@@USER_URIS[action], :id => id) }
   	bless_models(Twitter::User.unmarshal(response.body))
   end
@@ -39,8 +48,7 @@ class Twitter::Client
   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)
+  	users = Twitter::User.unmarshal(response.body)
   	bless_models(users)
   end
 end

data/lib/twitter/model.rb

@@ -83,7 +83,7 @@ module Twitter
       # If a model class doesn't have a @text attribute defined 
       # the default Object#to_s will be returned as the result.
       def to_s
-        self.respond_to(:text) ? @text : super.to_s
+        self.respond_to?(:text) ? @text : super.to_s
       end
       
       # Returns hash representation of model object instance.
@@ -132,7 +132,7 @@ module Twitter
       # Returns an Array of user objects that represents the authenticated
       # user's friends on Twitter.
       def followers
-        @client.user(@id, :followers)
+        @client.my(:followers)
       end
       
       # Adds given user as a friend.  Returns user object as given by 

data/lib/twitter/version.rb

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

data/spec/twitter/client/messaging_spec.rb

@@ -100,6 +100,18 @@ describe Twitter::Client, "#message" do
     }.should raise_error(ArgumentError)
   end
   
+  it "should raise an ArgumentError for :post case if user argument is not supplied" do
+    lambda {
+      @twitter.message(:post, @message)
+    }.should raise_error(ArgumentError)
+  end
+  
+  it "should raise an ArgumentError for :post case if user argument is nil" do
+    lambda {
+      @twitter.message(:post, @message, nil)
+    }.should raise_error(ArgumentError)
+  end
+
   after(:each) do
     nilize(@twitter, @uris, @request, @response, @connection, @sender, @recipient, @message, @attributes)
   end

data/spec/twitter/client/user_spec.rb

@@ -48,12 +48,12 @@ describe Twitter::Client, "#user(id, :info)" do
   end
   
   it "should bless model returned when giving numeric user id" do
-    @twitter.should_receive(:bless_model).with(@user).and_return(@model)
+    @twitter.should_receive(:bless_model).with(@user).and_return(@user)
     @twitter.user(@id)
   end
   
   it "should bless model returned when giving screen name" do
-    @twitter.should_receive(:bless_model).with(@user).and_return(@model)
+    @twitter.should_receive(:bless_model).with(@user).and_return(@user)
     @twitter.user(@screen_name)
   end
 
@@ -67,14 +67,60 @@ end
 describe Twitter::Client, "#user(id, :friends)" do
   before(:each) do
     @twitter = client_context
+    @id = 395784
+    @screen_name = 'cafe_paradiso'
+    @user = Twitter::User.new(
+      :id => @id,
+      :screen_name => @screen_name,
+      :location => 'Urbana, IL'
+    )
+    @json = JSON.unparse(@user.to_hash)
+    @request = mas_net_http_get(:basic_auth => nil)
+    @response = mas_net_http_response(:success, @json)
+    @connection = mas_net_http(@response)
+    @uris = Twitter::Client.class_eval("@@USER_URIS")
+    @twitter.stub!(:create_http_get_request).and_return(@request)
+    Twitter::User.stub!(:unmarshal).and_return(@user)
+    Net::HTTP.stub!(:new).and_return(@connection)
   end
   
-  it "should " do
-    
+  it "should create expected HTTP GET request when giving numeric user id" do
+    @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:id => @id}).and_return(@request)
+    @twitter.user(@id, :friends)
+  end
+  
+  it "should invoke #to_i on Twitter::User objecct given" do
+    @user.should_receive(:to_i).and_return(@id)
+    @twitter.user(@user, :friends)
+  end
+  
+  it "should create expected HTTP GET request when giving Twitter::User object" do
+    @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:id => @user.to_i}).and_return(@request)
+    @twitter.user(@user, :friends)
+  end
+  
+  it "should create expected HTTP GET request when giving screen name" do
+    @twitter.should_receive(:create_http_get_request).with(@uris[:friends], {:id => @screen_name}).and_return(@request)
+    @twitter.user(@screen_name, :friends)
+  end
+  
+  it "should bless model returned when giving numeric id" do
+    @twitter.should_receive(:bless_model).with(@user).and_return(@user)
+    @twitter.user(@id, :friends)
+  end
+  
+  it "should bless model returned when giving Twitter::User object" do
+    @twitter.should_receive(:bless_model).with(@user).and_return(@user)
+    @twitter.user(@user, :friends)    
+  end
+  
+  it "should bless model returned when giving screen name" do
+    @twitter.should_receive(:bless_model).with(@user).and_return(@user)
+    @twitter.user(@screen_name, :friends)
   end
   
   after(:each) do
-    
+    nilize(@request, @response, @connection, @twitter, @id, @screen_name, @user)
   end
 end
 

data/spec/twitter/model_spec.rb

@@ -244,8 +244,8 @@ describe Twitter::User, "#followers" do
     @user.bless(@twitter)
   end
   
-  it "should delegate to @client.user(@id, :followers)" do
-    @twitter.should_receive(:user).with(@id, :followers)
+  it "should delegate to @client.my(:followers)" do
+    @twitter.should_receive(:my).with(:followers)
     @user.followers
   end
   
@@ -456,3 +456,33 @@ describe Twitter::User, "#defriend" do
     nilize(@twitter, @user, @friend)
   end
 end
+
+describe Twitter::Status, "#to_s" do
+  before(:each) do
+	  @text = 'Aloha'
+    @status = Twitter::Status.new(:text => @text)
+  end
+  
+  it "should render text attribute" do
+    @status.to_s.should be(@text)
+  end
+  
+  after(:each) do
+    nilize(@text, @status)
+  end
+end
+
+describe Twitter::Message, "#to_s" do
+  before(:each) do
+	  @text = 'Aloha'
+    @message = Twitter::Message.new(:text => @text)
+  end
+  
+  it "should render text attribute" do
+    @message.to_s.should be(@text)
+  end
+  
+  after(:each) do
+    nilize(@text, @message)
+  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.2
-date: 2007-07-18 00:00:00 -05:00
+  version: 0.2.3
+date: 2007-07-22 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
@@ -55,7 +55,6 @@ files:
 - spec/twitter/console_spec.rb
 - spec/twitter/meta_spec.rb
 - spec/twitter/config_spec.rb
-- spec/twitter/deprecated_spec.rb
 - spec/twitter/client/timeline_spec.rb
 - spec/twitter/client/base_spec.rb
 - spec/twitter/client/status_spec.rb

data/spec/twitter/deprecated_spec.rb

@@ -1,177 +0,0 @@
-#describe "Twitter::Client#public_timeline" do
-#  before(:each) do
-#    @request = mas_net_http_get(:basic_auth => nil)
-#    @response = mas_net_http_response
-#    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#  end
-#  
-#  it "should delegate work to Twitter::Client#public(:public)" do
-#    @client.should_receive(:timeline).with(:public).once
-#    @client.public_timeline
-#  end
-#end
-
-#describe "Twitter::Client#friend_timeline" do
-#  before(:each) do
-#    @request = mas_net_http_get(:basic_auth => nil)
-#    @response = mas_net_http_response
-#    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#  end
-#  
-#  it "should delegate work to Twitter::Client#public(:friends)" do
-#    @client.should_receive(:timeline).with(:friends).once
-#    @client.friend_timeline
-#  end
-#end
-
-#describe "Twitter::Client#friend_statuses" do
-#  before(:each) do
-#    @request = mas_net_http_get(:basic_auth => nil)
-#    @response = mas_net_http_response
-#    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#  end
-#  
-#  it "should delegate work to Twitter::Client#public(:friends_statuses)" do
-#    @client.should_receive(:timeline).with(:friends_statuses).once
-#    @client.friend_statuses
-#  end
-#end
-
-#describe "Twitter::Client#follower_statuses" do
-#  before(:each) do
-#    @request = mas_net_http_get(:basic_auth => nil)
-#    @response = mas_net_http_response
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#  end
-#  
-#  it "should delegate work to Twitter::Client#public(:followers)" do
-#    @client.should_receive(:timeline).with(:followers).once
-#    @client.follower_statuses
-#  end
-#end
-
-#describe "Twitter::Client#timeline_request upon 200 HTTP response" do
-#  before(:each) do
-#    @request = mas_net_http_get :basic_auth => nil
-#    @response = mas_net_http_response # defaults to :success
-#    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#    @header = @client.send(:http_header)
-#    @uris = Twitter::Client.class_eval("@@URIS")
-#    
-#    JSON.stub!(:parse).and_return({})
-#  end
-#  
-#  it "should make GET HTTP request to appropriate URL" do
-#    @uris.keys.each do |type|
-#      Net::HTTP::Get.should_receive(:new).with(@uris[type], @header).and_return(@request)
-#      @client.send(:timeline, type)
-#    end
-#  end
-#end
-
-#describe "Twitter::Client#timeline_request upon 403 HTTP response" do
-#  before(:each) do
-#    @request = mas_net_http_get :basic_auth => nil
-#    @response = mas_net_http_response :not_authorized
-#    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#    @header = @client.send(:http_header)
-#    @uris = Twitter::Client.class_eval("@@URIS")
-#  end
-#  
-#  it "should make GET HTTP request to appropriate URL" do
-#    @uris.keys.each do |type|
-#      lambda {
-#        Net::HTTP::Get.should_receive(:new).with(@uris[type], @header).and_return(@request)
-#        @client.send(:timeline, type)
-#      }.should raise_error(Twitter::RESTError)
-#    end
-#  end
-#end
-
-#describe "Twitter::Client#timeline_request upon 500 HTTP response" do
-#  before(:each) do
-#    @request = mas_net_http_get(:basic_auth => nil)
-#    @response = mas_net_http_response(:server_error)
-#    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#    @header = @client.send(:http_header)
-#    @uris = Twitter::Client.class_eval("@@URIS")
-#  end
-  
-#  it "should make GET HTTP request to appropriate URL" do
-#    @uris.keys.each do |type|
-#      lambda do
-#        Net::HTTP::Get.should_receive(:new).with(@uris[type], @header).and_return(@request)
-#        @client.send(:timeline, type)
-#      end.should raise_error(Twitter::RESTError)
-#    end
-#  end
-#end
-
-#describe "Twitter::Client#timeline_request upon 404 HTTP response" do
-#  before(:each) do
-#    @request = mas_net_http_get(:basic_auth => nil)
-#    @response = mas_net_http_response(:file_not_found)    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#    @header = @client.send(:http_header)
-#    @uris = Twitter::Client.class_eval("@@URIS")
-#  end
-#  
-#  it "should make GET HTTP request to appropriate URL" do
-#    @uris.keys.each do |type|
-#      lambda {
-#        Net::HTTP::Get.should_receive(:new).with(@uris[type], @header).and_return(@request)
-#        @client.send(:timeline, type)
-#      }.should raise_error(Twitter::RESTError)
-#    end
-#  end
-#end
-
-#describe "Twitter::Client#timeline(:public)" do
-#  before(:each) do
-#    @host = 'twitter.com'
-#    @port = 443
-#    @protocol = :http
-#    @proxy_host = 'myproxy.host'
-#    @proxy_port = 8080
-#    
-#    Twitter::Client.configure do |conf|
-#      conf.host = @host
-#      conf.port = @port
-#      conf.protocol = @protocol
-#      conf.proxy_host = @proxy_host
-#      conf.proxy_port = @proxy_port
-#    end
-#
-#    @request = mas_net_http_get(:basic_auth => nil)
-#    @response = mas_net_http_response(:success, '[]')
-#    
-#    @http = mas_net_http(@response)
-#    @client = Twitter::Client.from_config 'config/twitter.yml'
-#    @login = @client.instance_eval("@login")
-#    @password = @client.instance_eval("@password")
-#  end
-# 
-#  it "should connect to the Twitter service via HTTP connection" do
-#    Net::HTTP.should_receive(:new).with(@host, @port, @proxy_host, @proxy_port).once.and_return(@http)
-#  	@client.timeline(:public)
-#  end
-#  
-#  it " should send HTTP Basic Authentication credentials" do
-#    @request.should_receive(:basic_auth).with(@login, @password).once
-#    @client.timeline(:public)
-#  end
-#end