Rename Twitter::Status to Twitter::Tweet

README.md

@@ -164,7 +164,7 @@ Here are some fun facts about the 3.0 release:
 
 * The entire library is implemented in just 2,000 lines of code
 * With over 5,000 lines of specs, the spec-to-code ratio is over 2.5:1
-* The spec suite contains 675 examples and runs in under 2 seconds on a MacBook
+* The spec suite contains 674 examples and runs in under 2 seconds on a MacBook
 * This project has 100% C0 code coverage (the tests execute every line of
   source code at least once)
 * At the time of release, this library is comprehensive: you can request all

lib/twitter/action/favorite.rb

@@ -1,16 +1,16 @@
-require 'twitter/action/status'
+require 'twitter/action/tweet'
 
 module Twitter
   module Action
-    class Favorite < Twitter::Action::Status
+    class Favorite < Twitter::Action::Tweet
       attr_reader :target_objects
 
-      # A collection containing the favorited status
+      # A collection containing the favorited tweet
       #
-      # @return [Array<Twitter::Status>]
+      # @return [Array<Twitter::Tweet>]
       def targets
-        @targets = Array(@attrs[:targets]).map do |status|
-          Twitter::Status.fetch_or_new(status)
+        @targets = Array(@attrs[:targets]).map do |tweet|
+          Twitter::Tweet.fetch_or_new(tweet)
         end
       end
 

lib/twitter/action/mention.rb

@@ -1,6 +1,6 @@
 require 'twitter/base'
 require 'twitter/creatable'
-require 'twitter/status'
+require 'twitter/tweet'
 require 'twitter/user'
 
 module Twitter
@@ -25,12 +25,12 @@ def source
         @source = sources.first
       end
 
-      # A collection of statuses that mention a user
+      # A collection of tweets that mention a user
       #
-      # @return [Array<Twitter::Status>]
+      # @return [Array<Twitter::Tweet>]
       def target_objects
-        @target_objects = Array(@attrs[:target_objects]).map do |status|
-          Twitter::Status.fetch_or_new(status)
+        @target_objects = Array(@attrs[:target_objects]).map do |tweet|
+          Twitter::Tweet.fetch_or_new(tweet)
         end
       end
 

lib/twitter/action/reply.rb

@@ -1,24 +1,24 @@
-require 'twitter/action/status'
+require 'twitter/action/tweet'
 
 module Twitter
   module Action
-    class Reply < Twitter::Action::Status
+    class Reply < Twitter::Action::Tweet
 
-      # A collection of statuses that reply to a user
+      # A collection of tweets that reply to a user
       #
-      # @return [Array<Twitter::Status>]
+      # @return [Array<Twitter::Tweet>]
       def target_objects
-        @target_objects = Array(@attrs[:target_objects]).map do |status|
-          Twitter::Status.fetch_or_new(status)
+        @target_objects = Array(@attrs[:target_objects]).map do |tweet|
+          Twitter::Tweet.fetch_or_new(tweet)
         end
       end
 
-      # A collection that contains the replied-to status
+      # A collection that contains the replied-to tweets
       #
-      # @return [Array<Twitter::Status>]
+      # @return [Array<Twitter::Tweet>]
       def targets
-        @targets = Array(@attrs[:targets]).map do |status|
-          Twitter::Status.fetch_or_new(status)
+        @targets = Array(@attrs[:targets]).map do |tweet|
+          Twitter::Tweet.fetch_or_new(tweet)
         end
       end
 

lib/twitter/action/retweet.rb

@@ -1,15 +1,15 @@
-require 'twitter/action/status'
+require 'twitter/action/tweet'
 
 module Twitter
   module Action
-    class Retweet < Twitter::Action::Status
+    class Retweet < Twitter::Action::Tweet
 
       # A collection of retweets
       #
-      # @return [Array<Twitter::Status>]
+      # @return [Array<Twitter::Tweet>]
       def target_objects
-        @target_objects = Array(@attrs[:target_objects]).map do |status|
-          Twitter::Status.fetch_or_new(status)
+        @target_objects = Array(@attrs[:target_objects]).map do |tweet|
+          Twitter::Tweet.fetch_or_new(tweet)
         end
       end
 

lib/twitter/action/status.rb → lib/twitter/action/tweet.rb

@@ -1,11 +1,11 @@
 require 'twitter/base'
 require 'twitter/creatable'
-require 'twitter/status'
+require 'twitter/tweet'
 require 'twitter/user'
 
 module Twitter
   module Action
-    class Status < Twitter::Base
+    class Tweet < Twitter::Base
       include Twitter::Creatable
       attr_reader :max_position, :min_position
 
@@ -17,5 +17,6 @@ def sources
       end
 
     end
+    Status = Tweet
   end
 end

lib/twitter/search_results.rb

@@ -1,15 +1,15 @@
 require 'twitter/base'
-require 'twitter/status'
+require 'twitter/tweet'
 
 module Twitter
   class SearchResults < Twitter::Base
     attr_reader :completed_in, :max_id, :next_page, :page, :query,
       :refresh_url, :results_per_page, :since_id
 
-    # @return [Array<Twitter::Status>]
+    # @return [Array<Twitter::Tweet>]
     def results
-      @results ||= Array(@attrs[:results]).map do |status|
-        Twitter::Status.fetch_or_new(status)
+      @results ||= Array(@attrs[:results]).map do |tweet|
+        Twitter::Tweet.fetch_or_new(tweet)
       end
     end
     alias collection results

lib/twitter/status.rb → lib/twitter/tweet.rb

@@ -11,13 +11,14 @@
 require 'twitter/user'
 
 module Twitter
-  class Status < Twitter::Identity
+  class Tweet < Twitter::Identity
     include Twitter::Creatable
     attr_reader :favorited, :favoriters, :from_user_id, :from_user_name,
       :in_reply_to_screen_name, :in_reply_to_attrs_id, :in_reply_to_status_id,
       :in_reply_to_user_id, :iso_language_code, :profile_image_url,
       :profile_image_url_https, :repliers, :retweeted, :retweeters, :source,
       :text, :to_user, :to_user_id, :to_user_name, :truncated
+    alias in_reply_to_tweet_id in_reply_to_status_id
     alias favorited? favorited
     alias favourited favorited
     alias favourited? favorited
@@ -84,12 +85,13 @@ def repliers_count
     end
     alias reply_count repliers_count
 
-    # If this status is itself a retweet, the original tweet is available here.
+    # If this Tweet is a retweet, the original Tweet is available here.
     #
-    # @return [Twitter::Status]
+    # @return [Twitter::Tweet]
     def retweeted_status
       @retweeted_status ||= self.class.fetch_or_new(@attrs[:retweeted_status])
     end
+    alias retweeted_tweet retweeted_status
 
     # @return [String]
     def retweeters_count
@@ -131,4 +133,6 @@ def entities(klass, method)
     end
 
   end
+
+  Status = Tweet
 end

lib/twitter/user.rb

@@ -1,7 +1,7 @@
 require 'twitter/basic_user'
 require 'twitter/core_ext/hash'
 require 'twitter/creatable'
-require 'twitter/status'
+require 'twitter/tweet'
 
 module Twitter
   class User < Twitter::BasicUser
@@ -69,9 +69,9 @@ def profile_image_url_https(size=:normal)
       resize_profile_image_url(@attrs[:profile_image_url_https], size)
     end
 
-    # @return [Twitter::Status]
+    # @return [Twitter::Tweet]
     def status
-      @status ||= Twitter::Status.fetch_or_new(@attrs.dup[:status].merge(:user => @attrs.except(:status))) unless @attrs[:status].nil?
+      @status ||= Twitter::Tweet.fetch_or_new(@attrs.dup[:status].merge(:user => @attrs.except(:status))) unless @attrs[:status].nil?
     end
 
   private

spec/twitter/action/favorite_spec.rb

@@ -3,7 +3,7 @@
 describe Twitter::Action::Favorite do
 
   describe "#sources" do
-    it "returns a collection of users who favorited a status" do
+    it "returns a collection of users who favorited a Tweet" do
       sources = Twitter::Action::Favorite.new(:sources => [{:id => 7505382}]).sources
       sources.should be_an Array
       sources.first.should be_a Twitter::User
@@ -15,10 +15,10 @@
   end
 
   describe "#targets" do
-    it "returns a collection containing the favorited status" do
+    it "returns a collection containing the favorited Tweet" do
       targets = Twitter::Action::Favorite.new(:targets => [{:id => 25938088801}]).targets
       targets.should be_an Array
-      targets.first.should be_a Twitter::Status
+      targets.first.should be_a Twitter::Tweet
     end
     it "is empty when not set" do
       targets = Twitter::Action::Favorite.new.targets

spec/twitter/action/mention_spec.rb

@@ -26,10 +26,10 @@
   end
 
   describe "#target_objects" do
-    it "returns a collection of statuses that mention a user" do
+    it "returns a collection of Tweets that mention a user" do
       targets = Twitter::Action::Mention.new(:target_objects => [{:id => 25938088801}]).target_objects
       targets.should be_an Array
-      targets.first.should be_a Twitter::Status
+      targets.first.should be_a Twitter::Tweet
     end
     it "is empty when not set" do
       targets = Twitter::Action::Mention.new.target_objects

spec/twitter/action/reply_spec.rb

@@ -15,10 +15,10 @@
   end
 
   describe "#target_objects" do
-    it "returns a collection of statuses that reply to a user" do
+    it "returns a collection of Tweets that reply to a user" do
       targets = Twitter::Action::Reply.new(:target_objects => [{:id => 25938088801}]).target_objects
       targets.should be_an Array
-      targets.first.should be_a Twitter::Status
+      targets.first.should be_a Twitter::Tweet
     end
     it "is empty when not set" do
       targets = Twitter::Action::Reply.new.target_objects
@@ -30,7 +30,7 @@
     it "returns a collection that contains the replied-to status" do
       targets = Twitter::Action::Reply.new(:targets => [{:id => 25938088801}]).targets
       targets.should be_an Array
-      targets.first.should be_a Twitter::Status
+      targets.first.should be_a Twitter::Tweet
     end
     it "is empty when not set" do
       targets = Twitter::Action::Reply.new.targets

spec/twitter/action/retweet_spec.rb

@@ -18,7 +18,7 @@
     it "returns a collection of retweets" do
       targets = Twitter::Action::Retweet.new(:target_objects => [{:id => 25938088801}]).target_objects
       targets.should be_an Array
-      targets.first.should be_a Twitter::Status
+      targets.first.should be_a Twitter::Tweet
     end
     it "is empty when not set" do
       targets = Twitter::Action::Retweet.new.target_objects

spec/twitter/action_factory_spec.rb

@@ -27,10 +27,6 @@
       action = Twitter::ActionFactory.fetch_or_new(:action => 'retweet')
       action.should be_a Twitter::Action::Retweet
     end
-    it "generates a Status" do
-      action = Twitter::ActionFactory.fetch_or_new(:action => 'status')
-      action.should be_a Twitter::Action::Status
-    end
     it "raises an ArgumentError when action is not specified" do
       lambda do
         Twitter::ActionFactory.fetch_or_new

spec/twitter/api/lists_spec.rb

@@ -55,10 +55,10 @@
           should have_been_made
       end
       it "returns the timeline for members of the specified list" do
-        statuses = @client.list_timeline("sferik", "presidents")
-        statuses.should be_an Array
-        statuses.first.should be_a Twitter::Status
-        statuses.first.text.should eq "Ruby is the best programming language for hiding the ugly bits."
+        tweets = @client.list_timeline("sferik", "presidents")
+        tweets.should be_an Array
+        tweets.first.should be_a Twitter::Tweet
+        tweets.first.text.should eq "Ruby is the best programming language for hiding the ugly bits."
       end
     end
     context "without a screen name passed" do

spec/twitter/api/search_spec.rb

@@ -18,11 +18,11 @@
         with(:query => {:q => "twitter"}).
         should have_been_made
     end
-    it "returns recent statuses related to a query with images and videos embedded" do
+    it "returns recent Tweets related to a query with images and videos embedded" do
       search = @client.search('twitter')
       search.should be_a Twitter::SearchResults
       search.results.should be_an Array
-      search.results.first.should be_a Twitter::Status
+      search.results.first.should be_a Twitter::Tweet
       search.results.first.text.should eq "@KaiserKuo from not too far away your new twitter icon looks like Vader."
     end
     it "returns the max_id value for a search result" do
@@ -57,10 +57,10 @@
         with(:query => {:q => "twitter"}).
         should have_been_made
     end
-    it "returns recent statuses related to a query with images and videos embedded" do
+    it "returns recent Tweets related to a query with images and videos embedded" do
       search = @client.phoenix_search('twitter')
       search.should be_an Array
-      search.first.should be_a Twitter::Status
+      search.first.should be_a Twitter::Tweet
       search.first.text.should eq "looking at twitter trends just makes me realize how little i really understand about mankind."
     end
   end