dambalah-twitter4r 0.3.2 → 0.3.3

data/CHANGES

@@ -3,6 +3,11 @@
 Catalog(ue) of changes for Twitter4R 0.1.x releases including Retrospectiva ticket cross-reference numbers.  Refer to http://retro.tautology.net/projects/twitter4r/tickets for more information.
 
 == 0.3.1 Changes
+
+* Added specs for Twitter::Client#profile (:info, :colors and :device cases)
+* Added Twitter4R shell
+* Improved code coverage for twitter/ext/stdlib code and removed hard coded extension in GET request path for retrieving account information
+* Changed Twitter::RESTError super class to be RuntimeError instead of Exception
 * Added URI.encode => CGI.escape fix
 * Added block methods
 * Added Twitter::Client#inspect method to XXXX out passwords

data/README

@@ -7,10 +7,15 @@
 * {Susan Potter}[http://SusanPotter.NET] <me at susanpotter dot net>
 
 == Contributors
+Code:
 * Kaiichi Matsunaga <ma2 at lifemedia dot co dot jp> - proxy code suggestion
 * Sergio Santos <> - message paging code suggestion
 * Adam Stiles <adam at stilesoft dot com> - URI.encode => CGI.escape fix
 * Carl Crawley <cwcrawley at gmail dot com> - Friendship get => post fix
+* Christian Johansen <christian at cjohansen dot no> - in_reply_to attributes in Twitter::Status
+
+Design Suggestions:
+* Bosco So <rubymeetup at boscoso dot com> - making Twitter::Error a RuntimeError instead of an Exception to prevent irb from crashing out.
 
 == Description
 Twitter4R provides an object based API to query or update your Twitter account via pure Ruby.  It hides the ugly HTTP/REST code from your code.

data/TODO

@@ -1,9 +1,7 @@
 
 0.3.1 TODO:
 * Add specs for :page, :lite and :since options support in Twitter::Client#my(...), Twitter::Client#user(....) and Twitter::User#followers calls
-* Add specs for Kernel#gem_present? extension
-* Add spec to test that warning is given to Rails 2.0+ users requiring 'twitter/rails'
 * Add specs for :replies support in Twitter::Client#status(...) and Twitter::Client#timeline_for(...)
 * Add RDoc for :replies support
 * Add better RDoc for Twitter::Client.account_info(:rate_limit_status)
-* Add specs for Twitter::Client.account_info(:rate_limit_status)
+* Add specs for Twitter::Client.account_info(:rate_limit_status)

data/bin/t4rsh

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+ 
+require("irb")
+require("irb/completion")
+require("rubygems")
+ 
+begin
+  gem('twitter4r', '>0.3.0')
+  require("twitter")
+  require("twitter/console")
+rescue Gem::LoadError
+  begin
+    gem("mbbx6spp-twitter4r", '>=0.3.1')
+    require("twitter")
+    require("twitter/console")
+  rescue Gem::LoadError
+    abort("Error: You must install either twitter4r gem from Rubyforge with version 0.3.1 or greater or the mbbx6spp-twitter4r gem from GitHub's servers with version 0.3.1 or greater (and make sure it is a recent version of the gem).")
+  end
+end
+ 
+module Twitter
+  class Console
+    class << self
+      @@OPTIONS = { :debugger => false, :config => "~/.twitter4r/accounts.yml" }
+      def parse_options
+        OptionParser.new do |opt|
+          opt.banner = "Usage: t4rsh [environment] [options]"
+          opt.on("--config=[~/.twitter4r/accounts.yml]", 'Use a specific config file.') { |v| @@OPTIONS[:config] = v }
+          opt.parse!(ARGV)
+        end
+      end
+ 
+      def config_file
+        result = ENV["T4R_CONFIG"]
+        file_name = File.expand_path('twitter.yml')
+        result ||= file_name if File.exists?(file_name)
+        file_name = File.expand_path('twitter.yml', 'config')
+        result ||= file_name if File.exists?(file_name)
+        file_name = File.expand_path('~/.twitter.yml')
+        result ||= file_name if File.exists?(file_name)
+        result
+      end
+ 
+      def account
+        ENV["T4R_ENV"] || ENV["MERB_ENV"] || ENV["RAILS_ENV"]
+      end
+ 
+      def run(file)
+        IRB.init_config(nil)
+        # configuration...
+        IRB.conf[:IRB_NAME] = "t4rsh"
+        IRB.conf[:VERSION] = Twitter::Version.to_version
+        IRB.conf[:USE_READLINE] = true
+        IRB.conf[:PROMPT_MODE] = :T4RSH
+        IRB.conf[:PROMPT][:T4RSH] = {
+          :PROMPT_I => "%N[%3n:%i]> ", # top level prompt
+          :PROMPT_C => "%N[%3n:%i]* ", # after conditional like "if"
+          :PROMPT_S => "%N[%3n:%i]* ", # during continuing string
+          :RETURN => "=> %s\n", # return value
+        }
+        IRB.start(file)
+      end
+    end
+  end
+end
+ 
+#if __FILE__ == $0
+  @twitter = nil
+  config_file = Twitter::Console.config_file
+  account = Twitter::Console.account
+ 
+  if config_file && account
+    @twitter = Twitter::Client.from_config(config_file, account)
+    puts "Used #{config_file} to create client for #{account} account."
+    puts "Access @twitter for instantiated client."
+    Twitter::Console.run(__FILE__)
+  else
+    abort("Please make sure #{config_file} exists and contains your Twitter credentials (separated by account/environment) and that you specify the account/environment to use, e.g. if you have a 'test' section in your configuration file that you want to use set/export T4R_ENV=test as an environment variable or RAILS_ENV=test or MERB_ENV=test")
+  end
+#end

data/lib/twitter.rb

@@ -1,4 +1,5 @@
-# 
+#
+require('rubygems')
 
 module Twitter; end
 
@@ -6,9 +7,11 @@ def require_local(suffix)
   require(File.expand_path(File.join(File.dirname(__FILE__), suffix)))
 end
 
-# For better unicode support
-$KCODE = 'u'
-require 'jcode'
+# For better unicode support in 1.8
+if RUBY_VERSION < '1.9'
+  $KCODE = 'u'
+  require 'jcode'
+end
 
 # External requires
 require('yaml')

data/lib/twitter/client.rb

@@ -9,13 +9,16 @@ class Twitter::Client
   include Twitter::ClassUtilMixin
 end
 
-require('twitter/client/base.rb')
-require('twitter/client/timeline.rb')
-require('twitter/client/status.rb')
-require('twitter/client/friendship.rb')
-require('twitter/client/messaging.rb')
-require('twitter/client/user.rb')
-require('twitter/client/auth.rb')
-require('twitter/client/favorites.rb')
-require('twitter/client/blocks.rb')
-require('twitter/client/account.rb')
+require('twitter/client/base')
+require('twitter/client/timeline')
+require('twitter/client/status')
+require('twitter/client/friendship')
+require('twitter/client/messaging')
+require('twitter/client/user')
+require('twitter/client/auth')
+require('twitter/client/favorites')
+require('twitter/client/blocks')
+require('twitter/client/account')
+require('twitter/client/graph')
+require('twitter/client/profile')
+require('twitter/client/search')

data/lib/twitter/client/account.rb

@@ -3,22 +3,22 @@ class Twitter::Client
     :rate_limit_status => '/account/rate_limit_status',
   }
   
-	# Provides access to the Twitter rate limit status API.
-	# 
-	# You can find out information about your account status.  Currently the only 
-	# supported type of account status is the <tt>:rate_limit_status</tt> which 
-	# returns a <tt>Twitter::RateLimitStatus</tt> object.
+  # Provides access to the Twitter rate limit status API.
   # 
-	# Example:
-	#  account_status = client.account_info
-	#  puts account_status.remaining_hits
-	def account_info(type = :rate_limit_status)
-  	connection = create_http_connection
-  	connection.start do |connection|
-  	  response = http_connect do |conn|
-  	    create_http_get_request("#{@@ACCOUNT_URIS[type]}.json")
-  	  end
-  		bless_models(Twitter::RateLimitStatus.unmarshal(response.body))
+  # You can find out information about your account status.  Currently the only 
+  # supported type of account status is the <tt>:rate_limit_status</tt> which 
+  # returns a <tt>Twitter::RateLimitStatus</tt> object.
+  # 
+  # Example:
+  #  account_status = client.account_info
+  #  puts account_status.remaining_hits
+  def account_info(type = :rate_limit_status)
+    connection = create_http_connection
+    connection.start do |connection|
+      response = http_connect do |conn|
+        create_http_get_request(@@ACCOUNT_URIS[type])
+      end
+      bless_models(Twitter::RateLimitStatus.unmarshal(response.body))
     end
-	end
+  end
 end

data/lib/twitter/client/base.rb

@@ -8,9 +8,9 @@ class Twitter::Client
     attr_accessor :login, :password
     
     # Returns the response of the HTTP connection.  
-    def http_connect(body = nil, require_auth = true, &block)
+    def http_connect(body = nil, require_auth = true, service = :rest, &block)
     	require_block(block_given?)
-    	connection = create_http_connection
+    	connection = create_http_connection(service)
     	connection.start do |connection|
     		request = yield connection if block_given?
     		request.basic_auth(@login, @password) if require_auth
@@ -45,11 +45,17 @@ class Twitter::Client
       end
     end
     
-    def create_http_connection
-      conn = Net::HTTP.new(@@config.host, @@config.port, 
+    def create_http_connection(service = :rest)
+      case service
+      when :rest
+        protocol, host, port = @@config.protocol, @@config.host, @@config.port
+      when :search
+        protocol, host, port = @@config.search_protocol, @@config.search_host, @@config.search_port
+      end
+      conn = Net::HTTP.new(host, port, 
                             @@config.proxy_host, @@config.proxy_port,
                             @@config.proxy_user, @@config.proxy_pass)
-      if @@config.protocol == :ssl
+      if protocol == :ssl
         conn.use_ssl = true
         conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end

data/lib/twitter/client/favorites.rb

@@ -1,9 +1,9 @@
 class Twitter::Client
   # Why Twitter.com developers can't correctly document their API, I do not know!
-	@@FAVORITES_URIS = {
-		:add => '/favourings/create',
-		:remove => '/favourings/destroy',
-	}
+  @@FAVORITES_URIS = {
+    :add => '/favourings/create',
+    :remove => '/favourings/destroy',
+  }
 
   # Provides access to the Twitter list favorites API.
   # 
@@ -13,41 +13,41 @@ class Twitter::Client
   # To get a previous page you can provide options to this method.  For example,
   #  statuses = client.favorites(:page => 2)
   # The above one-liner will get the second page of favorites for the authenticated user.
-	def favorites(options = nil)
-	  def uri_suffix(opts); opts && opts[:page] ? "?page=#{opts[:page]}" : ""; end
+  def favorites(options = nil)
+    def uri_suffix(opts); opts && opts[:page] ? "?page=#{opts[:page]}" : ""; end
     uri = '/favorites.json' + uri_suffix(options)
     response = http_connect {|conn|	create_http_get_request(uri) }
     bless_models(Twitter::Status.unmarshal(response.body))
-	end
+  end
 	
-	# Provides access to the Twitter add/remove favorite API.
-	# 
-	# You can add and remove favorite status using this method.
-	# 
-	# <tt>action</tt> can be any of the following values:
-	# * <tt>:add</tt> - to add a status to your favorites, you would use this <tt>action</tt> value
-	# * <tt>:remove</tt> - to remove an status from your existing favorites list use this.
-	# 
-	# The <tt>value</tt> must be either the status object to add or remove or 
-	# the integer unique status ID.
-	# 
-	# Examples:
-	#  id = 126006103423
-	#  client.favorite(:add, id)
-	#  client.favorite(:remove, id)
-	#  status = Twitter::Status.find(id, client)
-	#  client.favorite(:add, status)
-	#  client.favorite(:remove, status)
-	def favorite(action, value)
-	  raise ArgumentError, "Invalid favorite action provided: #{action}" unless @@FAVORITES_URIS.keys.member?(action)
-		value = value.to_i.to_s unless value.is_a?(String)
-		uri = "#{@@FAVORITES_URIS[action]}/#{value}.json"
-		case action
-		when :add
-		  response = http_connect {|conn| create_http_post_request(uri) }
-		when :remove
-		  response = http_connect {|conn| create_http_delete_request(uri) }
-		end
-		bless_model(Twitter::Status.unmarshal(response.body))
-	end
+  # Provides access to the Twitter add/remove favorite API.
+  # 
+  # You can add and remove favorite status using this method.
+  # 
+  # <tt>action</tt> can be any of the following values:
+  # * <tt>:add</tt> - to add a status to your favorites, you would use this <tt>action</tt> value
+  # * <tt>:remove</tt> - to remove an status from your existing favorites list use this.
+  # 
+  # The <tt>value</tt> must be either the status object to add or remove or 
+  # the integer unique status ID.
+  # 
+  # Examples:
+  #  id = 126006103423
+  #  client.favorite(:add, id)
+  #  client.favorite(:remove, id)
+  #  status = Twitter::Status.find(id, client)
+  #  client.favorite(:add, status)
+  #  client.favorite(:remove, status)
+  def favorite(action, value)
+    raise ArgumentError, "Invalid favorite action provided: #{action}" unless @@FAVORITES_URIS.keys.member?(action)
+    value = value.to_i.to_s unless value.is_a?(String)
+    uri = "#{@@FAVORITES_URIS[action]}/#{value}.json"
+    case action
+    when :add
+      response = http_connect {|conn| create_http_post_request(uri) }
+    when :remove
+      response = http_connect {|conn| create_http_delete_request(uri) }
+    end
+    bless_model(Twitter::Status.unmarshal(response.body))
+  end
 end

data/lib/twitter/client/graph.rb

@@ -0,0 +1,37 @@
+class Twitter::Client
+  @@GRAPH_URIS = {
+    :friends => '/friends/ids',
+    :followers => '/followers/ids',
+  }
+	
+  # Provides access to the Twitter Social Graphing API.
+  # 
+  # You can retrieve the full graph of a user's friends or followers in one method call.
+  # 
+  # <tt>action</tt> can be any of the following values:
+  # * <tt>:friends</tt> - retrieves ids of all friends of a given user.
+  # * <tt>:followers</tt> - retrieves ids of all followers of a given user.
+  # 
+  # The <tt>value</tt> must be either the user screen name, integer unique user ID or Twitter::User 
+  # object representation.
+  # 
+  # Examples:
+  #  screen_name = 'dictionary'
+  #  client.graph(:friends, 'dictionary')
+  #  client.graph(:followers, 'dictionary')
+  #  id = 1260061
+  #  client.graph(:friends, id)
+  #  client.graph(:followers, id)
+  #  user = Twitter::User.find(id, client)
+  #  client.graph(:friends, user)
+  #  client.graph(:followers, user)
+  def graph(action, value = nil)
+    raise ArgumentError, "Invalid friend action provided: #{action}" unless @@GRAPH_URIS.keys.member?(action)
+    id = value.to_i unless value.nil? || value.is_a?(String)
+    id ||= value
+    id ||= @login
+    uri = "#{@@GRAPH_URIS[action]}.json"
+    response = http_connect {|conn| create_http_get_request(uri, :id => id) }
+    JSON.parse(response.body)
+  end
+end

data/lib/twitter/client/profile.rb

@@ -0,0 +1,29 @@
+class Twitter::Client
+  @@PROFILE_URIS = {
+    :info => '/account/update_profile',
+    :colors => '/account/update_profile_colors',
+    :device => '/account/update_delivery_device',
+  }
+  
+  # Provides access to the Twitter Profile API.
+  # 
+  # You can update profile information.  You can update the types of profile 
+  # information:
+  # * :info (name, email, url, location, description)
+  # * :colors (background_color, text_color, link_color, sidebar_fill_color, 
+  # sidebar_border_color)
+  # * :device (set device to either "sms", "im" or "none")
+  # 
+  # Example:
+  #  user = client.profile(:info, :location => "University Library")
+  #  puts user.inspect
+  def profile(action, attributes)
+    connection = create_http_connection
+    connection.start do |connection|
+      response = http_connect(attributes.to_http_str) do |conn|
+        create_http_post_request(@@PROFILE_URIS[action])
+      end
+      bless_models(Twitter::User.unmarshal(response.body))
+    end
+  end
+end

data/lib/twitter/client/search.rb

@@ -0,0 +1,27 @@
+class Twitter::Client
+
+  @@SEARCH_URIS = {
+    :basic => "/search.json",
+  }
+
+  # Provides access to Twitter's Search API.
+  # 
+  # Example:
+  #  # For keyword search
+  #  iterator = @twitter.search(:q => "coworking")
+  #  while (tweet = iterator.next)
+  #    puts tweet.text
+  #  end
+  # 
+  # An <tt>ArgumentError</tt> will be raised if an invalid <tt>action</tt> 
+  # is given.  Valid actions are:
+  # * +:received+
+  # * +:sent+
+  def search(options = {})
+#    raise ArgumentError, "Invalid messaging action: #{action}"
+    uri = @@SEARCH_URIS[:basic]
+    response = http_connect(nil, false, :search) {|conn|	create_http_get_request(uri, options) }
+    json = JSON.parse(response.body)
+    bless_models(Twitter::Status.unmarshal(JSON.dump(json["results"])))
+  end
+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,7 +99,7 @@ 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

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]
+    @@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
@@ -260,6 +268,10 @@ module Twitter
       	client.status(:post, text)
       end
     end
+
+    def reply?
+      !!@in_reply_to_status_id
+    end
     
     protected
       # Constructor callback

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,24 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe :rest_api_request, :shared => true do
+  before(:each) do
+    
+  end
+  it "should invoke #http_connect with expected arguments"
+  it "should create HTTP request of expected method"
+  it "should bless returned model of expected type"
+end
+
+describe Twitter::Client, "#end" do
+  describe "keywords case" do
+    def expected_http_method; :get; end
+    def expected_model; Twitter::Status; end
+    def expected_model_in_array?; true; end
+    def expected_http_connect_arguments; {}; end
+#    should_behave_like :rest_api_request
+  end
+  
+  describe "invalid" do
+    it "should raise an ArgumentError when giving an invalid search action"
+  end
+end

data/spec/twitter/ext/stdlib_spec.rb

@@ -40,3 +40,20 @@ describe Time, "#to_s" do
     nilize(@time, @expected_string)
   end
 end
+
+# TODO: figure out how to stub the gem method to do what we want rather than this monstrousity.  It is dependent on the system installation, which is always a bad thing.  For now it will do so we can ship with 100% C0 coverage.
+describe Kernel, "#gem_present?" do
+  before(:each) do
+    @present_gem = "rake"
+    @uninstalled_gem = "uninstalled-gem-crap"
+  end
+  
+  it "should return true when a gem isn't present on system" do
+    gem_present?(@present_gem).should eql(true)
+  end
+  
+  it "should return false when a gem isn't present on system" do
+    gem_present?(@uninstalled_gem).should eql(false)
+  end
+end
+

data/spec/twitter/model_spec.rb

@@ -433,9 +433,32 @@ describe Twitter::User, "#defriend" do
   end
 end
 
+describe Twitter::Status, "#reply?" do
+  before(:each) do
+    @status = Twitter::Status.new(
+      :id => 123456789,
+      :text => "Wazzup?", 
+      :user => mock(Twitter::User)
+    )
+    @reply = Twitter::Status.new(
+      :text => "No much bro.  You?",
+      :user => mock(Twitter::User),
+      :in_reply_to_status_id => @status.id
+    )
+  end
+
+  it "should return false for the original status" do
+    @status.reply?.should be(false)
+  end
+
+  it "should return true for the reply to the original status" do
+    @reply.reply?.should be(true)
+  end
+end
+
 describe Twitter::Status, "#to_s" do
   before(:each) do
-	  @text = 'Aloha'
+    @text = 'Aloha'
     @status = Twitter::Status.new(:text => @text)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dambalah-twitter4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Susan Potter
@@ -24,8 +24,8 @@ dependencies:
     version: 
 description: 
 email: twitter4r-users@googlegroups.com
-executables: []
-
+executables: 
+- t4rsh
 extensions: []
 
 extra_rdoc_files: 
@@ -34,47 +34,52 @@ extra_rdoc_files:
 - TODO
 - MIT-LICENSE
 files: 
+- lib/twitter.rb
 - lib/twitter/extras.rb
-- lib/twitter/config.rb
-- lib/twitter/core.rb
-- lib/twitter/client/blocks.rb
+- lib/twitter/ext/stdlib.rb
+- lib/twitter/console.rb
+- lib/twitter/meta.rb
+- lib/twitter/version.rb
+- lib/twitter/client/graph.rb
 - lib/twitter/client/account.rb
-- lib/twitter/client/timeline.rb
 - lib/twitter/client/messaging.rb
-- lib/twitter/client/base.rb
-- lib/twitter/client/favorites.rb
 - lib/twitter/client/status.rb
-- lib/twitter/client/friendship.rb
+- lib/twitter/client/timeline.rb
+- lib/twitter/client/favorites.rb
 - lib/twitter/client/auth.rb
+- lib/twitter/client/friendship.rb
+- lib/twitter/client/search.rb
+- lib/twitter/client/profile.rb
+- lib/twitter/client/blocks.rb
 - lib/twitter/client/user.rb
-- lib/twitter/rails.rb
+- lib/twitter/client/base.rb
+- lib/twitter/core.rb
 - lib/twitter/client.rb
-- lib/twitter/console.rb
-- lib/twitter/version.rb
 - lib/twitter/model.rb
-- lib/twitter/meta.rb
 - lib/twitter/ext.rb
-- lib/twitter/ext/stdlib.rb
-- lib/twitter.rb
-- spec/twitter/config_spec.rb
+- lib/twitter/config.rb
+- spec/twitter/ext/stdlib_spec.rb
 - spec/twitter/core_spec.rb
-- spec/twitter/model_spec.rb
+- spec/twitter/meta_spec.rb
+- spec/twitter/version_spec.rb
 - spec/twitter/client/status_spec.rb
-- spec/twitter/client/timeline_spec.rb
+- spec/twitter/client/graph_spec.rb
+- spec/twitter/client/favorites_spec.rb
+- spec/twitter/client/blocks_spec.rb
 - spec/twitter/client/auth_spec.rb
-- spec/twitter/client/user_spec.rb
+- spec/twitter/client/profile_spec.rb
+- spec/twitter/client/timeline_spec.rb
+- spec/twitter/client/account_spec.rb
+- spec/twitter/client/friendship_spec.rb
+- spec/twitter/client/search_spec.rb
 - spec/twitter/client/messaging_spec.rb
 - spec/twitter/client/base_spec.rb
-- spec/twitter/client/favorites_spec.rb
-- spec/twitter/client/friendship_spec.rb
-- spec/twitter/client/blocks_spec.rb
-- spec/twitter/version_spec.rb
-- spec/twitter/rails_spec.rb
+- spec/twitter/client/user_spec.rb
 - spec/twitter/client_spec.rb
-- spec/twitter/meta_spec.rb
 - spec/twitter/console_spec.rb
+- spec/twitter/config_spec.rb
 - spec/twitter/extras_spec.rb
-- spec/twitter/ext/stdlib_spec.rb
+- spec/twitter/model_spec.rb
 - README
 - CHANGES
 - TODO
@@ -104,6 +109,6 @@ rubyforge_project: twitter4r
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A clean Twitter client API in pure Ruby. Will include Twitter add-ons also in Ruby. (This version has changes made by Luc Castera)
+summary: A clean Twitter client API in pure Ruby. Will include Twitter add-ons also in Ruby.
 test_files: []
 

data/lib/twitter/rails.rb

@@ -1,92 +0,0 @@
-# File that contains extensions to the Twitter4R library directly related to providing
-# seamless Rails integration.
-
-if gem_present?('rails', '<= 1.2.6')
-
-require('active_record/xml_serialization')
-require('active_support')
-
-# Extend +String+ with +#xmlize+ method for convenience.
-class String
-  def xmlize
-    # Forget module/namespace for now as this is totally broken in Rails 1.2.x 
-    # (search for namespaced models on the Rails Trac site)
-    cls = self.split('::').pop
-    cls.dasherize.downcase
-  end
-end
-
-# Parent mixin module that defines +InstanceMethods+ for Twitter4R model classes.
-# 
-# Defines/overrides the following methods for:
-# * Twitter::RailsPatch::InstanceMethods#to_param
-# * Twitter::RailsPatch::InstanceMethods#to_xml
-# * Twitter::RailsPatch::InstanceMethods#to_json
-module Twitter::RailsPatch
-  class << self
-    def included(base)
-      base.send(:include, InstanceMethods)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      # Dummy method to satisfy ActiveRecord's XmlSerializer.
-      def inheritance_column
-        nil
-      end
-      
-      # Returns Hash of name-column pairs
-      def columns_hash
-        {}
-      end      
-    end
-    
-    module InstanceMethods
-      # Returns an Array of attribute names of the model
-      def attribute_names
-        self.class.class_eval("@@ATTRIBUTES").collect {|att| att.to_s }
-      end
-      
-      # Override default +#to_param+ implementation.
-      def to_param
-        self.id.to_s
-      end
-
-      # Returns XML representation of model.      
-      def to_xml(options = {})
-        ActiveRecord::XmlSerializer.new(self, options.merge(:root => self.class.name.xmlize)).to_s
-      end
-      
-      # Returns JSON representation of model.
-      # 
-      # The current implementation basically ignoring +options+, so reopen and override 
-      # this implementation or live with it for the moment:)
-      def to_json(options = {})
-        JSON.unparse(self.to_hash)
-      end
-    end
-  end
-end
-
-class Twitter::User
-  include Twitter::RailsPatch
-end
-
-class Twitter::Status
-  include Twitter::RailsPatch
-end
-
-class Twitter::Message
-  include Twitter::RailsPatch
-end
-
-class Twitter::RESTError
-  include Twitter::RailsPatch
-  alias :id :code
-  def to_hash
-    { :code => @code, :message => @message, :uri => @uri }
-  end
-end
-else
-  warn("WARNING: Twiter4R patch for ActiveRecord defects only supported for Rails 1.2.x currently")
-end

data/spec/twitter/rails_spec.rb

@@ -1,110 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-
-describe String, "representing a class name" do
-
-  before(:each) do
-    @class_name = Twitter::User.class.name
-    @xmlized_name = @class_name.downcase # simple case for the moment...since Rails' support for namespaced models sucks!
-  end
-
-  it "should be downcased (minus module namespaces) when xmlized" do
-    @class_name.xmlize.should eql(@xmlized_name)
-  end
-
-  after(:each) do
-    nilize(@class_name, @xmlized_name)
-  end  
-end
-
-describe "Rails model extensions for model classes", :shared => true do
-
-  before(:each) do
-    @id = 3242334
-    @id_s = @id.to_s
-    @model = model(@id)
-    @model_hash = @model.to_hash
-    @json = JSON.unparse(@model_hash)
-    @serializer = ActiveRecord::XmlSerializer.new(@model, {:root => @model.class.name.downcase})
-    @xml = @serializer.to_s
-  end
-
-  it "should invoke #to_param as expected" do
-    @model.should_receive(:id).and_return(@id)
-    @model.to_param
-  end
-  
-  it "should return string representation for id for #to_param" do
-    @model.to_param.class.should eql(String)
-  end
-  
-  it "should return output from JSON.unparse for #to_json" do
-    @model.should_receive(:to_hash).and_return(@model_hash)
-    JSON.should_receive(:unparse).and_return(@json)
-    @model.to_json
-  end
-  
-  it "should return XmlSerializer string output for #to_xml" do
-    ActiveRecord::XmlSerializer.should_receive(:new).and_return(@serializer)
-    @serializer.should_receive(:to_s).and_return(@xml)
-    @model.to_xml
-  end
-  
-  after(:each) do
-    nilize(@id, @model)
-  end
-end
-
-describe Twitter::User, "Rails extensions" do
-
-  def model(id)
-    Twitter::User.new(:id => id)
-  end
-
-  it_should_behave_like "Rails model extensions for model classes"
-end
-
-describe Twitter::Status, "Rails extensions" do
-
-  def model(id)
-    Twitter::Status.new(:id => id)
-  end
-
-  it_should_behave_like "Rails model extensions for model classes"
-end
-
-describe Twitter::Message, "Rails extensions" do
-
-  def model(id)
-    Twitter::Message.new(:id => id)
-  end
-
-  it_should_behave_like "Rails model extensions for model classes"
-end
-
-describe Twitter::RESTError, "Rails extensions" do
-  
-  before(:each) do
-    @attributes = { :code => 200, :message => 'Success', :uri => 'http://twitter.com/statuses' }
-    @model = Twitter::RESTError.new(@attributes)
-    @json = "JSON" # doesn't really matter what the value is
-  end
-  
-  it "should return a Hash of attribute name-value pairs for #to_hash" do
-    @model.to_hash.should === @attributes
-  end
-
-  it "should invoke XmlSerializer for #to_xml" do
-    
-    @model.to_xml
-  end
-
-  it "should return expected JSON for #to_json" do
-    @model.to_hash
-    JSON.should_receive(:unparse).and_return(@json)
-    @model.to_json
-  end
-
-  after(:each) do
-    nilize(@attributes, @model)
-  end  
-end