twitter 4.8.1 → 5.0.0

data/spec/twitter/{api → rest/api}/oauth_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::OAuth do
+describe Twitter::REST::API::OAuth do
 
   before do
-    @client = Twitter::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS')
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS")
   end
 
   describe "#token" do
@@ -18,15 +18,12 @@ describe Twitter::API::OAuth do
     end
     it "requests with the correct headers" do
       @client.token
-      expect(a_request(:post, @oauth2_token_url).with(:headers => {
-          :content_type => "application/x-www-form-urlencoded; charset=UTF-8",
-          :accept => "*/*"
-        })).to have_been_made
+      expect(a_request(:post, @oauth2_token_url).with(:headers => {:content_type => "application/x-www-form-urlencoded; charset=UTF-8", :accept => "*/*"})).to have_been_made
     end
     it "returns the bearer token" do
       bearer_token = @client.token
-      expect(bearer_token.access_token).to eq "AAAA%2FAAA%3DAAAAAAAA"
-      expect(bearer_token.token_type).to eq "bearer"
+      expect(bearer_token.access_token).to eq("AAAA%2FAAA%3DAAAAAAAA")
+      expect(bearer_token.token_type).to eq("bearer")
     end
   end
 
@@ -41,8 +38,8 @@ describe Twitter::API::OAuth do
     end
     it "returns the invalidated token" do
       token = @client.invalidate_token("AAAA%2FAAA%3DAAAAAAAA")
-      expect(token.access_token).to eq "AAAA%2FAAA%3DAAAAAAAA"
-      expect(token.token_type).to eq nil
+      expect(token.access_token).to eq("AAAA%2FAAA%3DAAAAAAAA")
+      expect(token.token_type).to be_nil
     end
     context "with a token" do
       it "requests the correct resource" do
@@ -53,4 +50,18 @@ describe Twitter::API::OAuth do
     end
   end
 
+  describe "#reverse_token" do
+    before do
+      # WebMock treats Basic Auth differently so we have to chack against the full URL with credentials.
+      @oauth_request_token_url = "https://api.twitter.com/oauth/request_token?x_auth_mode=reverse_auth"
+      stub_request(:post, @oauth_request_token_url).to_return(:body => fixture('request_token.txt'), :headers => {:content_type => "text/html; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.reverse_token
+      expect(a_request(:post, @oauth_request_token_url).with(:params => {:x_auth_mode => "reverse_auth"})).to have_been_made
+    end
+    it "requests the correct resource" do
+      expect(@client.reverse_token).to eql fixture('request_token.txt').read
+    end
+  end
 end

data/spec/twitter/{api → rest/api}/saved_searches_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::SavedSearches do
+describe Twitter::REST::API::SavedSearches do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#saved_searches" do
@@ -19,7 +19,7 @@ describe Twitter::API::SavedSearches do
         saved_searches = @client.saved_searches(16129012)
         expect(saved_searches).to be_an Array
         expect(saved_searches.first).to be_a Twitter::SavedSearch
-        expect(saved_searches.first.name).to eq "twitter"
+        expect(saved_searches.first.name).to eq("twitter")
       end
     end
     context "without ids passed" do
@@ -34,7 +34,7 @@ describe Twitter::API::SavedSearches do
         saved_searches = @client.saved_searches
         expect(saved_searches).to be_an Array
         expect(saved_searches.first).to be_a Twitter::SavedSearch
-        expect(saved_searches.first.name).to eq "twitter"
+        expect(saved_searches.first.name).to eq("twitter")
       end
     end
   end
@@ -50,38 +50,38 @@ describe Twitter::API::SavedSearches do
     it "returns a saved search" do
       saved_search = @client.saved_search(16129012)
       expect(saved_search).to be_a Twitter::SavedSearch
-      expect(saved_search.name).to eq "twitter"
+      expect(saved_search.name).to eq("twitter")
     end
   end
 
-  describe "#saved_search_create" do
+  describe "#create_saved_search" do
     before do
       stub_post("/1.1/saved_searches/create.json").with(:body => {:query => "twitter"}).to_return(:body => fixture("saved_search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
-      @client.saved_search_create("twitter")
+      @client.create_saved_search("twitter")
       expect(a_post("/1.1/saved_searches/create.json").with(:body => {:query => "twitter"})).to have_been_made
     end
     it "returns the created saved search" do
-      saved_search = @client.saved_search_create("twitter")
+      saved_search = @client.create_saved_search("twitter")
       expect(saved_search).to be_a Twitter::SavedSearch
-      expect(saved_search.name).to eq "twitter"
+      expect(saved_search.name).to eq("twitter")
     end
   end
 
-  describe "#saved_search_destroy" do
+  describe "#destroy_saved_search" do
     before do
       stub_post("/1.1/saved_searches/destroy/16129012.json").to_return(:body => fixture("saved_search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
-      @client.saved_search_destroy(16129012)
+      @client.destroy_saved_search(16129012)
       expect(a_post("/1.1/saved_searches/destroy/16129012.json")).to have_been_made
     end
     it "returns an array of deleted saved searches" do
-      saved_searches = @client.saved_search_destroy(16129012)
+      saved_searches = @client.destroy_saved_search(16129012)
       expect(saved_searches).to be_an Array
       expect(saved_searches.first).to be_a Twitter::SavedSearch
-      expect(saved_searches.first.name).to eq "twitter"
+      expect(saved_searches.first.name).to eq("twitter")
     end
   end
 

data/spec/twitter/{api → rest/api}/search_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Search do
+describe Twitter::REST::API::Search do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#search" do
@@ -17,24 +17,23 @@ describe Twitter::API::Search do
     it "returns recent Tweets related to a query with images and videos embedded" do
       search = @client.search("twitter")
       expect(search).to be_a Twitter::SearchResults
-      expect(search.results).to be_an Array
-      expect(search.results.first).to be_a Twitter::Tweet
-      expect(search.results.first.text).to eq "Bubble Mailer #freebandnames"
+      expect(search.first).to be_a Twitter::Tweet
+      expect(search.first.text).to eq("Bubble Mailer #freebandnames")
     end
     it "returns the max_id value for a search result" do
       search = @client.search("twitter")
-      expect(search.max_id).to eq 250126199840518145
+      expect(search.max_id).to eq(250126199840518145)
     end
 
     context "when search API responds a malformed result" do
       before do
-        stub_get("/1.1/search/tweets.json").with(:query => {:q => "twitter"}).to_return(:body => fixture("/search_malformed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/search/tweets.json").with(:query => {:q => "twitter"}).to_return(:body => fixture("search_malformed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
 
       it "returns an empty array" do
         search = @client.search("twitter")
-        expect(search.results).to be_an Array
-        expect(search.results).to be_empty
+        expect(search.to_a).to be_an Array
+        expect(search.to_a).to be_empty
       end
     end
   end

data/spec/twitter/{api → rest/api}/spam_reporting_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::SpamReporting do
+describe Twitter::REST::API::SpamReporting do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#report_spam" do
@@ -18,7 +18,7 @@ describe Twitter::API::SpamReporting do
       users = @client.report_spam("sferik")
       expect(users).to be_an Array
       expect(users.first).to be_a Twitter::User
-      expect(users.first.id).to eq 7505382
+      expect(users.first.id).to eq(7505382)
     end
   end
 

data/spec/twitter/{api → rest/api}/suggested_users_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::SuggestedUsers do
+describe Twitter::REST::API::SuggestedUsers do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#suggestions" do
@@ -18,7 +18,7 @@ describe Twitter::API::SuggestedUsers do
       it "returns the users in a given category of the Twitter suggested user list" do
         suggestion = @client.suggestions("art-design")
         expect(suggestion).to be_a Twitter::Suggestion
-        expect(suggestion.name).to eq "Art & Design"
+        expect(suggestion.name).to eq("Art & Design")
         expect(suggestion.users).to be_an Array
         expect(suggestion.users.first).to be_a Twitter::User
       end
@@ -35,7 +35,7 @@ describe Twitter::API::SuggestedUsers do
         suggestions = @client.suggestions
         expect(suggestions).to be_an Array
         expect(suggestions.first).to be_a Twitter::Suggestion
-        expect(suggestions.first.name).to eq "Art & Design"
+        expect(suggestions.first.name).to eq("Art & Design")
       end
     end
   end
@@ -52,7 +52,7 @@ describe Twitter::API::SuggestedUsers do
       suggest_users = @client.suggest_users("art-design")
       expect(suggest_users).to be_an Array
       expect(suggest_users.first).to be_a Twitter::User
-      expect(suggest_users.first.id).to eq 13
+      expect(suggest_users.first.id).to eq(13)
     end
   end
 

data/spec/twitter/{api → rest/api}/timelines_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Timelines do
+describe Twitter::REST::API::Timelines do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#mentions_timeline" do
@@ -18,7 +18,7 @@ describe Twitter::API::Timelines do
       tweets = @client.mentions_timeline
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "Happy Birthday @imdane. Watch out for those @rally pranksters!"
+      expect(tweets.first.text).to eq("Happy Birthday @imdane. Watch out for those @rally pranksters!")
     end
   end
 
@@ -35,7 +35,7 @@ describe Twitter::API::Timelines do
         tweets = @client.user_timeline("sferik")
         expect(tweets).to be_an Array
         expect(tweets.first).to be_a Twitter::Tweet
-        expect(tweets.first.text).to eq "Happy Birthday @imdane. Watch out for those @rally pranksters!"
+        expect(tweets.first.text).to eq("Happy Birthday @imdane. Watch out for those @rally pranksters!")
       end
     end
     context "without a screen name passed" do
@@ -63,7 +63,7 @@ describe Twitter::API::Timelines do
       tweets = @client.retweeted_by_user("sferik")
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k"
+      expect(tweets.first.text).to eq("RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k")
     end
   end
 
@@ -81,7 +81,7 @@ describe Twitter::API::Timelines do
       tweets = @client.retweeted_by_me
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k"
+      expect(tweets.first.text).to eq("RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k")
     end
   end
 
@@ -97,7 +97,7 @@ describe Twitter::API::Timelines do
       tweets = @client.home_timeline
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "Happy Birthday @imdane. Watch out for those @rally pranksters!"
+      expect(tweets.first.text).to eq("Happy Birthday @imdane. Watch out for those @rally pranksters!")
     end
   end
 
@@ -115,7 +115,7 @@ describe Twitter::API::Timelines do
       tweets = @client.retweeted_to_me
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k"
+      expect(tweets.first.text).to eq("RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k")
     end
   end
 
@@ -131,7 +131,7 @@ describe Twitter::API::Timelines do
       tweets = @client.retweets_of_me
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "Happy Birthday @imdane. Watch out for those @rally pranksters!"
+      expect(tweets.first.text).to eq("Happy Birthday @imdane. Watch out for those @rally pranksters!")
     end
   end
 

data/spec/twitter/{api → rest/api}/trends_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Trends do
+describe Twitter::REST::API::Trends do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#trends" do
@@ -17,9 +17,9 @@ describe Twitter::API::Trends do
       end
       it "returns the top 10 trending topics for a specific WOEID" do
         matching_trends = @client.trends(2487956)
-        expect(matching_trends).to be_an Array
+        expect(matching_trends).to be_a Twitter::TrendResults
         expect(matching_trends.first).to be_a Twitter::Trend
-        expect(matching_trends.first.name).to eq "#sevenwordsaftersex"
+        expect(matching_trends.first.name).to eq("#sevenwordsaftersex")
       end
     end
     context "without arguments passed" do
@@ -45,7 +45,7 @@ describe Twitter::API::Trends do
       locations = @client.trends_available
       expect(locations).to be_an Array
       expect(locations.first).to be_a Twitter::Place
-      expect(locations.first.name).to eq "Ireland"
+      expect(locations.first.name).to eq("Ireland")
     end
   end
 
@@ -61,7 +61,7 @@ describe Twitter::API::Trends do
       locations = @client.trends_closest
       expect(locations).to be_an Array
       expect(locations.first).to be_a Twitter::Place
-      expect(locations.first.name).to eq "Ireland"
+      expect(locations.first.name).to eq("Ireland")
     end
   end