mbbx6spp-twitter4r 0.3.1 → 0.4.0

data/lib/twitter/client/status.rb

@@ -3,6 +3,7 @@ class Twitter::Client
   	:get => '/statuses/show.json',
   	:post => '/statuses/update.json',
   	:delete => '/statuses/destroy.json',
+  	:reply => '/statuses/update.json',
   }
   
   # Provides access to individual statuses via Twitter's Status APIs
@@ -11,6 +12,7 @@ class Twitter::Client
   # * <tt>:get</tt> to retrieve status content.  Assumes <tt>value</tt> given responds to :to_i message in meaningful way to yield intended status id.
   # * <tt>:post</tt> to publish a new status
   # * <tt>:delete</tt> to remove an existing status.  Assumes <tt>value</tt> given responds to :to_i message in meaningful way to yield intended status id.
+  # * <tt>:reply</tt> to reply to an existing status.  Assumes <tt>value</tt> given is <tt>Hash</tt> which contains <tt>:in_reply_to_status_id</tt> and <tt>:status</tt>
   # 
   # <tt>value</tt> should be set to:
   # * the status identifier for <tt>:get</tt> case
@@ -31,8 +33,8 @@ class Twitter::Client
     return self.timeline_for(action, value || {}) if :replies == action
     raise ArgumentError, "Invalid status action: #{action}" unless @@STATUS_URIS.keys.member?(action)
     return nil unless value
-  	uri = @@STATUS_URIS[action]
-  	response = nil
+    uri = @@STATUS_URIS[action]
+    response = nil
     case action
     when :get
     	response = http_connect {|conn|	create_http_get_request(uri, :id => value.to_i) }
@@ -40,6 +42,9 @@ class Twitter::Client
     	response = http_connect({:status => value, :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) }
+    when :reply
+      return nil if (!value.is_a?(Hash) || !value[:status] || !value[:in_reply_to_status_id])
+      response = http_connect(value.merge(:source => @@config.source).to_http_str) {|conn| create_http_post_request(uri) }
     end
     bless_model(Twitter::Status.unmarshal(response.body))
   end

data/lib/twitter/config.rb

@@ -22,6 +22,9 @@ module Twitter
       :protocol, 
       :host, 
       :port, 
+      :search_protocol,
+      :search_host,
+      :search_port,
       :proxy_host, 
       :proxy_port, 
       :proxy_user, 
@@ -49,6 +52,9 @@ module Twitter
     @@defaults = { :host => 'twitter.com', 
                    :port => 443, 
                    :protocol => :ssl,
+                   :search_host => 'search.twitter.com',
+                   :search_port => 80,
+                   :search_protocol => :http,
                    :proxy_host => nil,
                    :proxy_port => nil,
                    :user_agent => "default",

data/lib/twitter/console.rb

@@ -1,5 +1,7 @@
 # Contains hooks for the twitter console
 
+require('optparse')
+
 module Twitter
   class Client
     class << self
@@ -26,3 +28,4 @@ module Twitter
     end # class << self
   end
 end
+

data/lib/twitter/core.rb

@@ -99,10 +99,10 @@ module Twitter
   #  404
   #  Resource Not Found
   #  /i_am_crap.json
-  class RESTError < Exception
+  class RESTError < RuntimeError 
     include ClassUtilMixin
-    @@ATTRIBUTES = [:code, :message, :uri]
-    attr_accessor :code, :message, :uri
+    @@ATTRIBUTES = [:code, :message, :uri, :error]
+    attr_accessor :code, :message, :uri, :error
     
     # Returns string in following format:
     #  "HTTP #{@code}: #{@message} at #{@uri}"

data/lib/twitter/ext/stdlib.rb

@@ -42,9 +42,10 @@ module Kernel
   def gem_present?(gem_name, version = nil)
     present = false
     begin
-      present = gem(gem_name, version)
+      present = !!(version ? gem(gem_name, version) : gem(gem_name))
     rescue Gem::LoadError => le
-      warn("Gem load error: Couldn't load #{gem_name} with version requirement #{version}: #{le.to_s}")
+      present = false
+      warn("Gem load error: Couldn't load #{gem_name} #{version ? "with version requirement #{version}: #{le.to_s}": ""}")
     end
     present
   end

data/lib/twitter/model.rb

@@ -158,7 +158,13 @@ module Twitter
   # Represents a <tt>Twitter</tt> user
   class User
     include ModelMixin
-    @@ATTRIBUTES = [:id, :name, :description, :location, :screen_name, :url, :profile_image_url, :protected]
+    @@ATTRIBUTES = [:id, :name, :description, :location, :screen_name, :url, 
+      :protected, :profile_image_url, :profile_background_color, 
+      :profile_text_color, :profile_link_color, :profile_sidebar_fill_color, 
+      :profile_sidebar_border_color, :profile_background_image_url, 
+      :profile_background_tile, :utc_offset, :time_zone, 
+      :following, :notifications, :favourites_count, :followers_count, 
+      :friends_count, :statuses_count, :created_at,  ]
     attr_accessor *@@ATTRIBUTES
 
     class << self
@@ -219,7 +225,9 @@ module Twitter
   # Represents a status posted to <tt>Twitter</tt> by a <tt>Twitter</tt> user.
   class Status
     include ModelMixin
-    @@ATTRIBUTES = [:id, :text, :created_at, :user, :in_reply_to_status_id]
+    @@ATTRIBUTES = [:id, :text, :source, :truncated, :created_at, :user, 
+                    :favorited, :in_reply_to_status_id, :in_reply_to_user_id,
+                    :in_reply_to_screen_name]
     attr_accessor *@@ATTRIBUTES
 
     class << self
@@ -264,6 +272,10 @@ module Twitter
     def reply?
       !!@in_reply_to_status_id
     end
+
+    def reply(status)
+      client.status(:reply, :status => status, :in_reply_to_status_id => @id)
+    end
     
     protected
       # Constructor callback

data/lib/twitter/version.rb

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

data/spec/twitter/client/account_spec.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Twitter::Client, "#account_info" do
+  before(:each) do
+    @uri = Twitter::Client.class_eval("@@ACCOUNT_URIS[:rate_limit_status]")
+    @request = mas_net_http_get(:basic_auth => nil)
+    @twitter = client_context
+    @default_header = @twitter.send(:http_header)
+    @response = mas_net_http_response(:success)
+    @connection = mas_net_http(@response)
+    @response.stub!(:body).and_return("{}")
+    Net::HTTP.stub!(:new).and_return(@connection)
+    @rate_limit_status = mock(Twitter::RateLimitStatus)
+    @twitter.stub!(:bless_models).and_return({})
+  end
+
+  it "should create expected HTTP GET request" do
+    @twitter.should_receive(:create_http_get_request).with(@uri).and_return(@request)
+    @twitter.account_info
+  end
+
+  it "should raise Twitter::RESTError when 500 HTTP response received when giving page options" do
+    @connection = mas_net_http(mas_net_http_response(:server_error))
+    lambda {
+      @twitter.account_info
+    }.should raise_error(Twitter::RESTError)
+  end
+end

data/spec/twitter/client/graph_spec.rb

@@ -0,0 +1,67 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Twitter::Client, "#graph(:friends...)" do
+  before(:each) do
+    @twitter = client_context
+    @id = 1234567
+    @screen_name = 'dummylogin'
+    @friend = Twitter::User.new(:id => @id, :screen_name => @screen_name)
+    @uris = Twitter::Client.class_eval("@@GRAPH_URIS")
+    @request = mas_net_http_get(:basic_auth => nil)
+    @response = mas_net_http_response(:success)
+    @response.stub!(:body).and_return("[1, 2, 3, 4, 5, 6]")
+    @connection = mas_net_http(@response)
+    Net::HTTP.stub!(:new).and_return(@connection)
+    Twitter::User.stub!(:unmarshal).and_return(@friend)
+  end
+  
+  def create_uri(action)
+    "#{@uris[action]}.json"
+  end
+  
+  it "should create expected HTTP GET request for :friends case using integer user ID" do
+  	# the integer user ID scenario...
+    @twitter.should_receive(:create_http_get_request).with(create_uri(:friends), :id => @id).and_return(@request)
+    @twitter.graph(:friends, @id)
+  end
+  
+  it "should create expected HTTP GET request for :friends case using screen name" do
+    # the screen name scenario...
+    @twitter.should_receive(:create_http_get_request).with(create_uri(:friends), :id => @screen_name).and_return(@request)
+    @twitter.graph(:friends, @screen_name)
+  end
+
+  it "should create expected HTTP GET request for :friends case using Twitter::User object" do
+    # the Twitter::User object scenario...
+    @twitter.should_receive(:create_http_get_request).with(create_uri(:friends), :id => @friend.to_i).and_return(@request)
+    @twitter.graph(:friends, @friend)
+  end
+  
+  it "should create expected HTTP GET request for :followers case using integer user ID" do
+    # the integer user ID scenario...
+    @twitter.should_receive(:create_http_get_request).with(create_uri(:followers), :id => @id).and_return(@request)
+    @twitter.graph(:followers, @id)
+  end
+
+  it "should create expected HTTP GET request for :followers case using screen name" do
+    # the screen name scenario...
+    @twitter.should_receive(:create_http_get_request).with(create_uri(:followers), :id => @screen_name).and_return(@request)
+    @twitter.graph(:followers, @screen_name)
+  end
+
+  it "should create expected HTTP GET request for :followers case using Twitter::User object" do
+    # the Twitter::User object scenario...
+    @twitter.should_receive(:create_http_get_request).with(create_uri(:followers), :id => @friend.to_i).and_return(@request)
+    @twitter.graph(:followers, @friend)
+  end
+  
+  it "should raise ArgumentError if action given is not valid" do
+    lambda {
+      @twitter.graph(:crap, @friend)
+    }.should raise_error(ArgumentError)
+  end
+  
+  after(:each) do
+    nilize(@twitter, @id, @uris, @request, @response, @connection)
+  end
+end

data/spec/twitter/client/profile_spec.rb

@@ -0,0 +1,91 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Twitter::Client, "#profile" do
+  before(:each) do
+    @twitter = client_context
+    @user_attrs = {
+      :id => "JaneEyre",
+      :login => "Jane Eyre",
+      :url => "http://janeeyrerocks.co.uk",
+      :location => "Thornfield Manor",
+    }
+    # name, email, url, location, description
+    @info_attrs = {
+      :name => "Jane Eyre", 
+      :email => "jane.eyre@gmail.co.uk", 
+      :url => "http://janeeyrerocks.co.uk",
+      :location => "Thornfield Manor",
+      :description => "Governess who falls for slave-trade aristocrat with French lovechild he doesn't acknowledge & wife locked in damp attic with keeper.",
+    }
+    # background_color, text_color, link_color, sidebar_fill_color, sidebar_border_color
+    @colors_attrs = {
+      :background_color => "#ffffff",
+      :text_color => "#101010",
+      :link_color => "#990000",
+    }
+    # value
+    @device_attrs = {
+      :value => "sms",
+    }
+    @user = Twitter::User.new
+    @uris = Twitter::Client.class_eval("@@PROFILE_URIS")
+    @request = mas_net_http_get(:basic_auth => nil)
+    @json = JSON.unparse(@user_attrs)
+    @response = mas_net_http_response(:success, @json)
+    @connection = mas_net_http(@response)
+
+    Net::HTTP.stub!(:new).and_return(@connection)
+    Twitter::User.stub!(:unmarshal).and_return(@user)
+  end
+  
+  it "should invoke #http_connect with expected arguments for :info case" do
+  	@twitter.should_receive(:http_connect).with(@info_attrs.to_http_str).and_return(@response)
+    @twitter.profile(:info, @info_attrs)
+  end
+
+  it "should invoke #http_connect with expected arguments for :colors case" do
+  	@twitter.should_receive(:http_connect).with(@colors_attrs.to_http_str).and_return(@response)
+    @twitter.profile(:colors, @colors_attrs)
+  end
+  
+  it "should invoke #http_connect with expected arguments for :device case" do
+  	@twitter.should_receive(:http_connect).with(@device_attrs.to_http_str).and_return(@response)
+    @twitter.profile(:info, @device_attrs)
+  end
+  
+  it "should create expected HTTP POST request for :info case" do
+    @twitter.should_receive(:create_http_post_request).with(@uris[:info]).and_return(@request)
+    @twitter.profile(:info, @info_attrs)
+  end
+  
+  it "should create expected HTTP POST request for :colors case" do
+    @twitter.should_receive(:create_http_post_request).with(@uris[:colors]).and_return(@request)
+    @twitter.profile(:colors, @colors_attrs)
+  end
+  
+  it "should create expected HTTP POST request for :device case" do
+    @twitter.should_receive(:create_http_post_request).with(@uris[:device]).and_return(@request)
+    @twitter.profile(:device, @device_attrs)
+  end
+
+  it "should bless returned Twitter::User object for :info case" do
+    @twitter.should_receive(:bless_model).with(@user)
+    @twitter.profile(:info, @info_attrs)
+  end
+
+  it "should bless returned Twitter::User object for :colors case" do
+    @twitter.should_receive(:bless_model).with(@user)
+    @twitter.profile(:colors, @colors_attrs)
+  end
+
+  it "should bless returned Twitter::User object for :device case" do
+    @twitter.should_receive(:bless_model).with(@user)
+    @twitter.profile(:device, @device_attrs)
+  end
+  
+  it "should raise an ArgumentError when giving an invalid profile action"
+  
+  after(:each) do
+    nilize(@twitter, @uris, @request, @response, @connection, @sender, @recipient, @user, @attributes)
+  end
+end

data/spec/twitter/client/search_spec.rb

@@ -0,0 +1,68 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Twitter::Client, "#search" do
+  before(:each) do
+    @twitter = client_context
+    @uris = Twitter::Client.class_eval("@@SEARCH_URIS")
+    @request = mas_net_http_get(:basic_auth => nil)
+    @response = mas_net_http_response(:success, "{\"results\": [], \"refresh_url\":\"?since_id=1768746401&q=blabla\"}")
+    @connection = mas_net_http(@response)
+    Net::HTTP.stub!(:new).and_return(@connection)
+    @statuses = []
+    Twitter::Status.stub!(:unmarshal).and_return(@statuses)
+    @page = 2
+    @keywords = "twitter4r"
+    @to = "SusanPotter"
+    @from = "twitter4r"
+  end
+  
+  it "should create expected HTTP GET request using :to" do
+    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:to => @to}).and_return(@request)
+    @twitter.search(:to => @to)
+  end
+  
+  it "should bless the Array returned from Twitter for :to case" do
+    @twitter.should_receive(:bless_models).with(@statuses).and_return(@statuses)
+    @twitter.search(:to => @to)
+  end
+  
+  it "should create expected HTTP GET request using :from" do
+    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:from => @from}).and_return(@request)
+    @twitter.search(:from => @from)
+  end
+  
+  it "should bless the Array returned from Twitter for :to case" do
+    @twitter.should_receive(:bless_models).with(@statuses).and_return(@statuses)
+    @twitter.search(:from => @from)
+  end
+  
+  it "should create expected HTTP GET request using :keywords" do
+    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:keywords => @keywords}).and_return(@request)
+    @twitter.search(:keywords => @keywords)
+  end
+  
+  it "should bless the Array returned from Twitter for :keywords case" do
+    @twitter.should_receive(:bless_models).with(@statuses).and_return(@statuses)
+    @twitter.search(:keywords => @keywords)
+  end
+  
+  it "should accept paging option" do
+    lambda {
+      @twitter.search(:keywords => @keywords, :page => @page)
+    }.should_not raise_error(Exception)
+  end
+
+  it "should generate expected GET HTTP request for paging case" do
+    @twitter.should_receive(:create_http_get_request).with(@uris[:basic], {:page => @page}).and_return(@request)
+    @twitter.search(:page => @page)
+  end
+
+  it "should bless models for paging case" do
+    @twitter.should_receive(:bless_models).with(@statuses).and_return(@statuses)
+    @twitter.search(:page => @page)
+  end
+  
+  after(:each) do
+    nilize(@twitter, @uris, @request, @response, @connection, @statuses)
+  end
+end

data/spec/twitter/client/status_spec.rb

@@ -11,6 +11,7 @@ describe Twitter::Client, "#status" do
     @connection = mas_net_http(@response)
     @float = 43.3434
     @status = Twitter::Status.new(:id => 2349343)
+    @reply_to_status_id = 3495293
     @source = Twitter::Client.class_eval("@@defaults[:source]")
   end
 
@@ -55,6 +56,32 @@ describe Twitter::Client, "#status" do
     @twitter.status(:post, @message)
   end
   
+  it "should return nil if no :status key-value given in the value argument for :reply case" do
+    status = @twitter.status(:reply, {})
+    status.should be_nil
+  end
+  
+  it "should return nil if nil is passed as value argument for :reply case" do
+    status = @twitter.status(:reply, nil)
+    status.should be_nil
+  end
+  
+  it "should not call @twitter#http_connect when passing a value Hash argument that has no :status key-value in :reply case" do
+    @twitter.should_not_receive(:http_connect)
+    @twitter.status(:reply, {})
+  end
+  
+  it "should not call @twitter#http_connect when passing nil for value argument in :reply case" do
+    @twitter.should_not_receive(:http_connect)
+    @twitter.status(:reply, nil)
+  end
+  
+  it "should create expected HTTP POST request for :reply case" do
+    @twitter.should_receive(:create_http_post_request).with(@uris[:reply]).and_return(@request)
+    @connection.should_receive(:request).with(@request, {:status => @message, :source => @source, :in_reply_to_status_id => @reply_to_status_id}.to_http_str).and_return(@response)
+    @twitter.status(:reply, :status => @message, :in_reply_to_status_id => @reply_to_status_id)
+  end
+  
   it "should return nil if nil is passed as value argument for :delete case" do
     status = @twitter.status(:delete, nil)
     status.should be_nil