twitter4r 0.1.0 → 0.1.1

data/lib/twitter/core.rb

@@ -40,8 +40,9 @@ module Twitter
     def eql?(obj)
       [:id, :name, :description, :location, 
       :screen_name, :url].each do |att|
-        return false if self.send(att).eql?(obj.send(att))
-      end or true
+        return false unless self.send(att).eql?(obj.send(att))
+      end
+      true
     end
   end # User
   
@@ -52,8 +53,9 @@ module Twitter
 
     def eql?(obj)
       [:id, :text, :created_at, :user].each do |att|
-        return false if self.send(att).eql?(obj.send(att))
-      end or true
+        return false unless self.send(att).eql?(obj.send(att))
+      end
+      true
     end
   end # Status
 
@@ -62,9 +64,11 @@ module Twitter
     include ClassUtilMixin
     attr_accessor :login, :password
     
-    @@HOST = 'twitter.com'
-    @@PORT = 80
-    @@SSL = false
+    @@CONF = {
+    	:host => 'twitter.com',
+    	:port => 80,
+    	:ssl => false,
+    }
     @@URIS = {:public => '/statuses/public_timeline.json',
               :friends => '/statuses/friends_timeline.json',
               :friends_statues => '/statuses/friends.json',
@@ -73,10 +77,16 @@ module Twitter
               :send_direct_message => '/direct_messages/new.json', }
 
     class << self
+    	# The following configuration options can be passed in a hash to this method:
+    	# * <tt>host</tt> - host of the REST server, defaults to twitter.com.  Should only be changed for integration testing.
+    	# * <tt>port</tt> - port of the REST server, defaults to 443.
+    	# * <tt>ssl</tt> - SSL flag, defaults to false.  Do not use :use_ssl anymore.
+    	# * <tt>proxy_host</tt> - proxy host.  No default.
+    	# * <tt>proxy_port</tt> - proxy port.  No default.
+    	# * <tt>proxy_user</tt> - proxy username.  No default.
+    	# * <tt>proxy_pass</tt> - proxy password.  No default.
       def config(conf)
-        @@HOST = conf[:host] if conf[:host]
-        @@PORT = conf[:port] if conf[:port]
-        @@SSL = conf[:use_ssl] if conf[:use_ssl] # getting ready for SSL support
+      	@@CONF.merge!(conf)
       end
       
       # Mostly helper method for irb shell prototyping
@@ -88,7 +98,7 @@ module Twitter
     end # class << self
 
     def timeline(type = :public)
-      http = Net::HTTP.new(@@HOST, @@PORT)
+      http = create_http_connection
       http.start do |http|
         timeline_request(type, http)
       end # http.start block
@@ -112,7 +122,7 @@ module Twitter
 
     def update(message)
       uri = @@URIS[:update]
-      http = Net::HTTP.new(@@HOST, @@PORT)
+      http = create_http_connection
       http.start do |http|
         request = Net::HTTP::Post.new(uri)
         request.basic_auth(@login, @password)
@@ -124,7 +134,7 @@ module Twitter
     def send_direct_message(user, message)
       login = user.respond_to?(:screen_name) ? user.screen_name : user
       uri = @@URIS[:send_direct_message]
-      http = Net::HTTP.new(@@HOST, @@PORT)
+      http = create_http_connection
       http.start do |http|
         request = Net::HTTP::Post.new(uri)
         request.basic_auth(@login, @password)
@@ -164,6 +174,15 @@ module Twitter
         unmarshall_statuses(JSON.parse(response.body))
       end
       
+      def create_http_connection
+      	conn = Net::HTTP.new(@@CONF[:host], @@CONF[:port], 
+      								       @@CONF[:proxy_host], @@CONF[:proxy_port], 
+                             @@CONF[:proxy_user], @@CONF[:proxy_pass])
+        conn.use_ssl = @@CONF[:ssl]
+        conn.verify_mode = OpenSSL::SSL::VERIFY_NONE if @@CONF[:ssl]
+        conn
+      end
+      
       def raise_rest_error(response, uri = nil)
         raise RESTError.new(:code => response.code, 
                             :message => response.message,

data/lib/twitter/meta.rb

@@ -3,7 +3,7 @@ require('erb')
 
 class Twitter::Meta #:nodoc:
   attr_accessor :root_dir
-  attr_reader :pkg_info, :gem_spec, :project_files, :spec_files
+  attr_reader :gem_spec, :project_files, :spec_files
 
   def initialize(root_dir)
     @root_dir = root_dir
@@ -39,4 +39,3 @@ class Twitter::Meta #:nodoc:
     @gem_spec
   end
 end
-

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter::Version #:nodoc:
   MAJOR = 0
   MINOR = 1
-  REVISION = 0
+  REVISION = 1
   class << self
     def to_version
       "#{MAJOR}.#{MINOR}.#{REVISION}"

data/spec/spec_helper.rb

@@ -16,6 +16,8 @@ def stubbed_net_http(response, obj_stubs = {}, host = 'twitter.com', port = 80)
   http = Net::HTTP.new(host, port)
   Net::HTTP.stub!(:new).and_return(http)
   http.stub!(:request).and_return(response)
+  http.stub!(:use_ssl=)
+  http.stub!(:verify_mode=)
   http
 end
 
@@ -27,6 +29,8 @@ def mas_net_http(response)
   Net::HTTP.stub!(:new).and_return(http)
   http.stub!(:request).and_return(response)
   http.stub!(:start).and_yield(http)
+  http.stub!(:use_ssl=)
+  http.stub!(:verify_mode=)
   http
 end
 

data/spec/twitter/core_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-context "Twitter::ClassUtilMixin mixed-in class" do
-  setup do
+describe "Twitter::ClassUtilMixin mixed-in class" do
+  before(:each) do
     class TestClass
       include Twitter::ClassUtilMixin
       attr_accessor :var1, :var2, :var3
@@ -9,78 +9,96 @@ context "Twitter::ClassUtilMixin mixed-in class" do
     @init_hash = { :var1 => 'val1', :var2 => 'val2', :var3 => 'val3' }
   end
   
-  specify "should have Twitter::ClassUtilMixin as an included module" do
-    TestClass.included_modules.member?(Twitter::ClassUtilMixin).should.eql true
+  it "should have Twitter::ClassUtilMixin as an included module" do
+    TestClass.included_modules.member?(Twitter::ClassUtilMixin).should be(true)
   end
 
-  specify "should set attributes passed in the hash to TestClass.new" do
+  it "should set attributes passed in the hash to TestClass.new" do
     test = TestClass.new(@init_hash)
     @init_hash.each do |key, val|
-      test.send(key).should.eql val
+      test.send(key).should eql(val)
     end
   end
   
-  specify "should not set attributes passed in the hash that are not attributes in TestClass.new" do
+  it "should not set attributes passed in the hash that are not attributes in TestClass.new" do
     test = nil
-    lambda { test = TestClass.new(@init_hash.merge(:var4 => 'val4')) }.should_not_raise
-    test.respond_to?(:var4).should.eql false
+    lambda { test = TestClass.new(@init_hash.merge(:var4 => 'val4')) }.should_not raise_error
+    test.respond_to?(:var4).should be(false)
   end
 end
 
-context "Twitter::RESTError#to_s" do
-  setup do
+describe "Twitter::RESTError#to_s" do
+  before(:each) do
     @hash = { :code => 200, :message => 'OK', :uri => 'http://test.host/bla' }
     @error = Twitter::RESTError.new(@hash)
     @expected_message = "HTTP #{@hash[:code]}: #{@hash[:message]} at #{@hash[:uri]}"
   end
   
-  specify "should return @expected_message" do
-    @error.to_s.should.eql @expected_message
+  it "should return @expected_message" do
+    @error.to_s.should eql(@expected_message)
   end
 end
 
-context "Twitter::Client" do
-  setup do
+describe "Twitter::Client" do
+  before(:each) do
     @init_hash = { :login => 'user', :password => 'pass' }
   end
 
-  specify ".new should accept login and password as initializer hash keys and set the values to instance values" do
+  it ".new should accept login and password as initializer hash keys and set the values to instance values" do
     client = nil
     lambda do
       client = Twitter::Client.new(@init_hash)
-    end.should_not_raise
-    client.send(:login).should.eql @init_hash[:login]
-    client.send(:password).should.eql @init_hash[:password]
+    end.should_not raise_error
+    client.send(:login).should eql(@init_hash[:login])
+    client.send(:password).should eql(@init_hash[:password])
   end  
 end
 
-context "Twitter::Client.config" do
-  setup do
+describe "Twitter::Client.config" do
+  before(:each) do
     @config_hash = { :host => 'test.host',
                      :port => 443,
-                     :use_ssl => true, }
+                     :ssl => true, 
+                     :proxy_host => 'myproxy.host',
+                     :proxy_port => 8080,
+                     :proxy_user => 'myproxyuser',
+                     :proxy_pass => 'myproxypass',
+                   }
   end
   
-  specify "should override @@HOST and @@PORT if supplied" do
+  it "should override @@CONF values if supplied" do
     Twitter::Client.config @config_hash
-    host = Twitter::Client.class_eval("@@HOST")
-    host.should.eql @config_hash[:host]
-    port = Twitter::Client.class_eval("@@PORT")
-    port.should.eql @config_hash[:port]
-    ssl = Twitter::Client.class_eval("@@SSL")
-    ssl.should.eql @config_hash[:use_ssl]
+    host = Twitter::Client.class_eval("@@CONF[:host]")
+    host.should eql(@config_hash[:host])
+    port = Twitter::Client.class_eval("@@CONF[:port]")
+    port.should eql(@config_hash[:port])
+    ssl = Twitter::Client.class_eval("@@CONF[:ssl]")
+    ssl.should eql(@config_hash[:ssl])
+    proxy_host = Twitter::Client.class_eval("@@CONF[:proxy_host]")
+    proxy_host.should eql(@config_hash[:proxy_host])
+    proxy_port = Twitter::Client.class_eval("@@CONF[:proxy_port]")
+    proxy_port.should eql(@config_hash[:proxy_port])
+    proxy_user = Twitter::Client.class_eval("@@CONF[:proxy_user]")
+    proxy_user.should eql(@config_hash[:proxy_user])
+    proxy_pass = Twitter::Client.class_eval("@@CONF[:proxy_pass]")
+    proxy_pass.should eql(@config_hash[:proxy_pass])
+    
   end
   
-  teardown do
+  after(:each) do
     Twitter::Client.config :host => 'twitter.com', :port => 80, :use_ssl => false
   end
 end
 
-context "Twitter::Client#timeline(:public)" do
-  setup do
+describe "Twitter::Client#timeline(:public)" do
+  before(:each) do
     Twitter::Client.config(:port => 443, :use_ssl => false)
-    @host = Twitter::Client.class_eval("@@HOST")
-    @port = Twitter::Client.class_eval("@@PORT")
+    @host = Twitter::Client.class_eval("@@CONF[:host]")
+    @port = Twitter::Client.class_eval("@@CONF[:port]")
+    @proxy_host = Twitter::Client.class_eval("@@CONF[:proxy_host]")
+    @proxy_port = Twitter::Client.class_eval("@@CONF[:proxy_port]")
+    @proxy_user = Twitter::Client.class_eval("@@CONF[:proxy_user]")
+    @proxy_pass = Twitter::Client.class_eval("@@CONF[:proxy_pass]")
 
     @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response(:success, '[]')
@@ -91,19 +109,19 @@ context "Twitter::Client#timeline(:public)" do
     @password = @client.instance_eval("@password")
   end
  
-  specify "should connect to the Twitter service via HTTP connection" do
-    Net::HTTP.should_receive(:new).with(@host, @port).once.and_return(@http)
+  it "should connect to the Twitter service via HTTP connection" do
+    Net::HTTP.should_receive(:new).with(@host, @port, @proxy_host, @proxy_port, @proxy_user, @proxy_pass).once.and_return(@http)
   	@client.timeline(:public)
   end
   
-  specify " should send HTTP Basic Authentication credentials" do
+  it " should send HTTP Basic Authentication credentials" do
     @request.should_receive(:basic_auth).with(@login, @password).once
     @client.timeline(:public)
   end
 end
 
-context "Twitter::Client#unmarshall_statuses" do
-  setup do
+describe "Twitter::Client#unmarshall_statuses" do
+  before(:each) do
     @json_hash = { "text" => "Thinking Zipcar is lame...",
                    "id" => 46672912,
                    "user" => {"name" => "Angie",
@@ -121,15 +139,15 @@ context "Twitter::Client#unmarshall_statuses" do
     @client = Twitter::Client.from_config 'config/twitter.yml'
   end
   
-  specify "should return expected populated Twitter::Status object values in an Array" do
+  it "should return expected populated Twitter::Status object values in an Array" do
     statuses = @client.send(:unmarshall_statuses, [@json_hash])
-    statuses.should.have(1)
+    statuses.should have(1).entries
     statuses.first.should.eql? @status
   end
 end
 
-context "Twitter::Client#unmarshall_user" do
-  setup do
+describe "Twitter::Client#unmarshall_user" do
+  before(:each) do
     @json_hash = { "name" => "Lucy Snowe",
                    "description" => "School Mistress Entrepreneur",
                    "location" => "Villette",
@@ -141,14 +159,14 @@ context "Twitter::Client#unmarshall_user" do
     @client = Twitter::Client.from_config 'config/twitter.yml'
   end
   
-  specify "should return expected populated Twitter::User object value" do
+  it "should return expected populated Twitter::User object value" do
     user = @client.send(:unmarshall_user, @json_hash)
     user.should.eql? @user
   end
 end
 
-context "Twitter::Client#timeline_request upon 200 HTTP response" do
-  setup do
+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
     
@@ -159,7 +177,7 @@ context "Twitter::Client#timeline_request upon 200 HTTP response" do
     JSON.stub!(:parse).and_return({})
   end
   
-  specify "should make GET HTTP request to appropriate URL" do
+  it "should make GET HTTP request to appropriate URL" do
     @uris.keys.each do |type|
       Net::HTTP::Get.should_receive(:new).with(@uris[type]).and_return(@request)
       @client.send(:timeline_request, type, @http)
@@ -167,8 +185,8 @@ context "Twitter::Client#timeline_request upon 200 HTTP response" do
   end
 end
 
-context "Twitter::Client#timeline_request upon 403 HTTP response" do
-  setup do
+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
     
@@ -177,18 +195,18 @@ context "Twitter::Client#timeline_request upon 403 HTTP response" do
     @uris = Twitter::Client.class_eval("@@URIS")
   end
   
-  specify "should make GET HTTP request to appropriate URL" do
+  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]).and_return(@request)
         @client.send(:timeline_request, type, @http)
-      end.should_raise(Twitter::RESTError)
+      end.should raise_error(Twitter::RESTError)
     end
   end
 end
 
-context "Twitter::Client#timeline_request upon 500 HTTP response" do
-  setup do
+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)
     
@@ -197,18 +215,18 @@ context "Twitter::Client#timeline_request upon 500 HTTP response" do
     @uris = Twitter::Client.class_eval("@@URIS")
   end
   
-  specify "should make GET HTTP request to appropriate URL" do
+  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]).and_return(@request)
         @client.send(:timeline_request, type, @http)
-      end.should_raise(Twitter::RESTError)
+      end.should raise_error(Twitter::RESTError)
     end
   end
 end
 
-context "Twitter::Client#timeline_request upon 404 HTTP response" do
-  setup do
+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)
     
@@ -217,18 +235,18 @@ context "Twitter::Client#timeline_request upon 404 HTTP response" do
     @uris = Twitter::Client.class_eval("@@URIS")
   end
   
-  specify "should make GET HTTP request to appropriate URL" do
+  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]).and_return(@request)
         @client.send(:timeline_request, type, @http)
-      end.should_raise(Twitter::RESTError)
+      end.should raise_error(Twitter::RESTError)
     end
   end
 end
 
-context "Twitter::Client#update(msg) upon 200 HTTP response" do
-  setup do
+describe "Twitter::Client#update(msg) upon 200 HTTP response" do
+  before(:each) do
     @request = mas_net_http_post(:basic_auth => nil)
     @response = mas_net_http_response
     
@@ -239,14 +257,14 @@ context "Twitter::Client#update(msg) upon 200 HTTP response" do
     @message = "We love Jodhi May!"
   end
   
-  specify "should make POST HTTP request to appropriate URL" do
+  it "should make POST HTTP request to appropriate URL" do
     Net::HTTP::Post.should_receive(:new).with(@expected_uri).and_return(@request)
     @client.update(@message)
   end
 end
 
-context "Twitter::Client#update(msg) upon 500 HTTP response" do
-  setup do
+describe "Twitter::Client#update(msg) upon 500 HTTP response" do
+  before(:each) do
     @request = mas_net_http_post(:basic_auth => nil)
     @response = mas_net_http_response(:server_error)
     
@@ -257,16 +275,16 @@ context "Twitter::Client#update(msg) upon 500 HTTP response" do
     @message = "We love Jodhi May!"
   end
   
-  specify "should make POST HTTP request to appropriate URL" do
+  it "should make POST HTTP request to appropriate URL" do
     lambda do
       Net::HTTP::Post.should_receive(:new).with(@expected_uri).and_return(@request)
       @client.update(@message)
-    end.should_raise(Twitter::RESTError)
+    end.should raise_error(Twitter::RESTError)
   end
 end
 
-context "Twitter::Client#public_timeline" do
-  setup do
+describe "Twitter::Client#public_timeline" do
+  before(:each) do
     @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response
     
@@ -274,14 +292,14 @@ context "Twitter::Client#public_timeline" do
     @client = Twitter::Client.from_config 'config/twitter.yml'
   end
   
-  specify "should delegate work to Twitter::Client#public(:public)" do
+  it "should delegate work to Twitter::Client#public(:public)" do
     @client.should_receive(:timeline).with(:public).once
     @client.public_timeline
   end
 end
 
-context "Twitter::Client#friend_timeline" do
-  setup do
+describe "Twitter::Client#friend_timeline" do
+  before(:each) do
     @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response
     
@@ -289,14 +307,14 @@ context "Twitter::Client#friend_timeline" do
     @client = Twitter::Client.from_config 'config/twitter.yml'
   end
   
-  specify "should delegate work to Twitter::Client#public(:friends)" do
+  it "should delegate work to Twitter::Client#public(:friends)" do
     @client.should_receive(:timeline).with(:friends).once
     @client.friend_timeline
   end
 end
 
-context "Twitter::Client#friend_statuses" do
-  setup do
+describe "Twitter::Client#friend_statuses" do
+  before(:each) do
     @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response
     
@@ -304,14 +322,14 @@ context "Twitter::Client#friend_statuses" do
     @client = Twitter::Client.from_config 'config/twitter.yml'
   end
   
-  specify "should delegate work to Twitter::Client#public(:friends_statuses)" do
+  it "should delegate work to Twitter::Client#public(:friends_statuses)" do
     @client.should_receive(:timeline).with(:friends_statuses).once
     @client.friend_statuses
   end
 end
 
-context "Twitter::Client#follower_statuses" do
-  setup do
+describe "Twitter::Client#follower_statuses" do
+  before(:each) do
     @request = mas_net_http_get(:basic_auth => nil)
     @response = mas_net_http_response
     
@@ -319,14 +337,14 @@ context "Twitter::Client#follower_statuses" do
     @client = Twitter::Client.from_config 'config/twitter.yml'
   end
   
-  specify "should delegate work to Twitter::Client#public(:followers)" do
+  it "should delegate work to Twitter::Client#public(:followers)" do
     @client.should_receive(:timeline).with(:followers).once
     @client.follower_statuses
   end
 end
 
-context "Twitter::Client#send_direct_message" do
-  setup do
+describe "Twitter::Client#send_direct_message" do
+  before(:each) do
     @request = mas_net_http_post(:basic_auth => nil)
     @response = mas_net_http_response
     
@@ -344,29 +362,29 @@ context "Twitter::Client#send_direct_message" do
     @expected_params = "user=#{@user.screen_name}&text=#{URI.escape(@message)}"
   end
   
-  specify "should convert given Twitter::User object to screen name" do
+  it "should convert given Twitter::User object to screen name" do
     @user.should_receive(:screen_name).once
     @client.send_direct_message(@user, @message)
   end
   
-  specify "should POST to expected URI" do
+  it "should POST to expected URI" do
     Net::HTTP::Post.should_receive(:new).with(@expected_uri).once.and_return(@request)
     @client.send_direct_message(@user, @message)
   end
   
-  specify "should login via HTTP Basic Authentication using expected credentials" do
+  it "should login via HTTP Basic Authentication using expected credentials" do
     @request.should_receive(:basic_auth).with(@login, @password).once
     @client.send_direct_message(@user, @message)
   end
   
-  specify "should make POST request with expected URI escaped parameters" do
+  it "should make POST request with expected URI escaped parameters" do
     @http.should_receive(:request).with(@request, @expected_params).once.and_return(@response)
     @client.send_direct_message(@user, @message)
   end
 end
 
-context "Twitter::Status#eql?" do
-  setup do
+describe "Twitter::Status#eql?" do
+  before(:each) do
     @attr_hash = { :text => 'Status', :id => 34329594003, 
                    :user => { :name => 'Tess',
                               :description => "Unfortunate D'Urberville",
@@ -379,27 +397,27 @@ context "Twitter::Status#eql?" do
     @other = Twitter::Status.new @attr_hash
   end
   
-  specify "should return true when non-transient object attributes are eql?" do
+  it "should return true when non-transient object attributes are eql?" do
     @obj.should.eql? @other
     @obj.eql?(@other).should.eql? true # for the sake of getting rcov to recognize this method is covered in the specs
   end
 
-  specify "should return false when not all non-transient object attributes are eql?" do
+  it "should return false when not all non-transient object attributes are eql?" do
     @other.created_at = Time.now.to_s
-    @obj.should.not.eql? @other
-    @obj.eql?(@other).should.eql? false # for the sake of getting rcov to recognize this method is covered in the specs
+    @obj.should_not eql(@other)
+    @obj.eql?(@other).should be(false) # for the sake of getting rcov to recognize this method is covered in the specs
   end
   
-  specify "should return true when comparing same object to itself" do
-    @obj.should.eql? @obj
-    @obj.eql?(@obj).should.eql? true # for the sake of getting rcov to recognize this method is covered in the specs
-    @other.should.eql? @other
-    @other.eql?(@other).should.eql? true # for the sake of getting rcov to recognize this method is covered in the specs
+  it "should return true when comparing same object to itself" do
+    @obj.should eql(@obj)
+    @obj.eql?(@obj).should be(true) # for the sake of getting rcov to recognize this method is covered in the specs
+    @other.should eql(@other)
+    @other.eql?(@other).should be(true) # for the sake of getting rcov to recognize this method is covered in the specs
   end
 end
 
-context "Twitter::User#eql?" do
-  setup do
+describe "Twitter::User#eql?" do
+  before(:each) do
     @attr_hash = { :name => 'Elizabeth Jane Newson-Henshard',
                    :description => "Wronged 'Daughter'",
                    :location => 'Casterbridge',
@@ -410,21 +428,21 @@ context "Twitter::User#eql?" do
     @other = Twitter::User.new @attr_hash
   end
   
-  specify "should return true when non-transient object attributes are eql?" do
-    @obj.should.eql? @other
-    @obj.eql?(@other).should.eql? true
+  it "should return true when non-transient object attributes are eql?" do
+    @obj.should eql(@other)
+    @obj.eql?(@other).should be(true)
   end
   
-  specify "should return false when not all non-transient object attributes are eql?" do
+  it "should return false when not all non-transient object attributes are eql?" do
     @other.id = 1
-    @obj.should.not.eql? @other
-    @obj.eql?(@other).should.eql? false
+    @obj.should_not eql(@other)
+    @obj.eql?(@other).should be(false)
   end
   
-  specify "should return true when comparing same object to itself" do
-    @obj.should.eql? @obj
-    @obj.eql?(@obj).should.eql? true
-    @other.should.eql? @other
-    @obj.eql?(@obj).should.eql? true
+  it "should return true when comparing same object to itself" do
+    @obj.should eql(@obj)
+    @obj.eql?(@obj).should be(true)
+    @other.should eql(@other)
+    @obj.eql?(@obj).should be(true)
   end
 end

data/spec/twitter/meta_spec.rb

@@ -21,9 +21,10 @@ module ERBMetaMixin
   end
 end
 
-context "Twitter::Meta cache policy" do
+describe "Twitter::Meta cache policy" do
   include ERBMetaMixin
-  setup do
+  include ERBMetaMixin
+  before(:each) do
     @root_dir = project_root_dir
     @meta = Twitter::Meta.new(@root_dir)
     @expected_pkg_info = load_erb_yaml(File.join(@root_dir, 'pkg-info.yml'), binding)
@@ -31,34 +32,26 @@ context "Twitter::Meta cache policy" do
     @expected_spec_files = spec_files
   end
   
-  specify "should store value returned from pkg_info in @pkg_info after first YAML load" do
-    @meta.instance_eval("@pkg_info").should.eql?(nil)
-    @meta.pkg_info
-    @meta.instance_eval("@pkg_info").should_eql?(@expected_pkg_info)
-    @meta.pkg_info
-    @meta.instance_eval("@pkg_info").should_eql?(@expected_pkg_info)
-  end
-  
-  specify "should store value returned from project_files in @project_files after first glob" do
-    @meta.instance_eval("@project_files").should.eql?(nil)
+  it "should store value returned from project_files in @project_files after first glob" do
+    @meta.instance_eval("@project_files").should be(nil)
     @meta.project_files
-    @meta.instance_eval("@project_files").should.eql?(@expected_project_files)
+    @meta.instance_eval("@project_files").should eql(@expected_project_files)
     @meta.project_files
-    @meta.instance_eval("@project_files").should.eql?(@expected_project_files)
+    @meta.instance_eval("@project_files").should eql(@expected_project_files)
   end
   
-  specify "should store value returned from spec_files in @spec_files after first glob" do
-    @meta.instance_eval("@spec_files").should.eql?(nil)
+  it "should store value returned from spec_files in @spec_files after first glob" do
+    @meta.instance_eval("@spec_files").should be(nil)
     @meta.spec_files
-    @meta.instance_eval("@spec_files").should.eql?(@expected_spec_files)
+    @meta.instance_eval("@spec_files").should eql(@expected_spec_files)
     @meta.spec_files
-    @meta.instance_eval("@spec_files").should.eql?(@expected_spec_files)
+    @meta.instance_eval("@spec_files").should eql(@expected_spec_files)
   end
 end
 
-context "Twitter::Meta" do
+describe "Twitter::Meta" do
   include ERBMetaMixin
-  setup do
+  before(:each) do
     @root_dir = project_root_dir
     @meta = Twitter::Meta.new(@root_dir)
     @expected_yaml_hash = load_erb_yaml(File.join(@root_dir, 'pkg-info.yml'), binding)
@@ -66,27 +59,27 @@ context "Twitter::Meta" do
     @expected_spec_files = spec_files
   end
   
-  specify "should load and return YAML file into Hash object upon #pkg_info call" do
+  it "should load and return YAML file into Hash object upon #pkg_info call" do
     yaml_hash = @meta.pkg_info
     yaml_hash.should.eql? @expected_yaml_hash
   end
   
-  specify "should return the embedded hash responding to key 'spec' of #pkg_info call upon #spec_info call" do
+  it "should return the embedded hash responding to key 'spec' of #pkg_info call upon #spec_info call" do
     yaml_hash = @meta.spec_info
     yaml_hash.should.eql? @expected_yaml_hash['spec']
   end
   
-  specify "should return list of files matching ROOT_DIR/lib/**/*.rb upon #project_files call" do
+  it "should return list of files matching ROOT_DIR/lib/**/*.rb upon #project_files call" do
     project_files = @meta.project_files
     project_files.should.eql? @expected_project_files
   end
   
-  specify "should return list of files matching ROOT_DIR/spec/**/*.rb upon #spec_files call" do
+  it "should return list of files matching ROOT_DIR/spec/**/*.rb upon #spec_files call" do
     spec_files = @meta.spec_files
     spec_files.should.eql? @expected_spec_files    
   end
   
-  specify "should return Gem specification based on YAML file contents and #project_files and #spec_files return values" do
+  it "should return Gem specification based on YAML file contents and #project_files and #spec_files return values" do
     spec = @meta.gem_spec
     expected_spec_hash = @expected_yaml_hash['spec']
     expected_spec_hash.each do |key, val|

data/spec/twitter/version_spec.rb

@@ -5,15 +5,15 @@ VERSION_LIST = [Twitter::Version::MAJOR, Twitter::Version::MINOR, Twitter::Versi
 EXPECTED_VERSION = VERSION_LIST.join('.')
 EXPECTED_NAME = VERSION_LIST.join('_')
 
-context "Twitter::Version.to_version" do
-  specify "should return #{EXPECTED_VERSION}" do
-    Twitter::Version.to_version.should.eql EXPECTED_VERSION
+describe "Twitter::Version.to_version" do
+  it "should return #{EXPECTED_VERSION}" do
+    Twitter::Version.to_version.should eql(EXPECTED_VERSION)
   end
 end
 
-context "Twitter::Version.to_name" do
-  specify "should return #{EXPECTED_NAME}" do
-    Twitter::Version.to_name.should.eql EXPECTED_NAME
+describe "Twitter::Version.to_name" do
+  it "should return #{EXPECTED_NAME}" do
+    Twitter::Version.to_name.should eql(EXPECTED_NAME)
   end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: twitter4r
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-05-06 00:00:00 -05:00
+  version: 0.1.1
+date: 2007-06-25 00:00:00 -05:00
 summary: A clean Twitter client API in pure Ruby (not command-line client). Will include Twitter add-ons also in Ruby.
 require_paths: 
 - lib