twitter 5.0.0 → 5.4.1

data/spec/twitter/rest/api/oauth_spec.rb

@@ -3,64 +3,64 @@ require 'helper'
 describe Twitter::REST::API::OAuth do
 
   before do
-    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS")
+    @client = Twitter::REST::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS')
   end
 
-  describe "#token" do
+  describe '#token' do
     before do
       # WebMock treats Basic Auth differently so we have to chack against the full URL with credentials.
-      @oauth2_token_url = "https://CK:CS@api.twitter.com/oauth2/token"
-      stub_request(:post, @oauth2_token_url).with(:body => "grant_type=client_credentials").to_return(:body => fixture("bearer_token.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      @oauth2_token_url = 'https://CK:CS@api.twitter.com/oauth2/token'
+      stub_request(:post, @oauth2_token_url).with(:body => 'grant_type=client_credentials').to_return(:body => fixture('bearer_token.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
-    it "requests the correct resource" do
+    it 'requests the correct resource' do
       @client.token
-      expect(a_request(:post, @oauth2_token_url).with(:body => {:grant_type => "client_credentials"})).to have_been_made
+      expect(a_request(:post, @oauth2_token_url).with(:body => {:grant_type => 'client_credentials'})).to have_been_made
     end
-    it "requests with the correct headers" do
+    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
+    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
 
-  describe "#invalidate_token" do
+  describe '#invalidate_token' do
     before do
-      stub_post("/oauth2/invalidate_token").with(:body => {:access_token => "AAAA%2FAAA%3DAAAAAAAA"}).to_return(:body => '{"access_token" : "AAAA%2FAAA%3DAAAAAAAA"}', :headers => {:content_type => "application/json; charset=utf-8"})
-      @client.bearer_token = "AAAA%2FAAA%3DAAAAAAAA"
+      stub_post('/oauth2/invalidate_token').with(:body => {:access_token => 'AAAA%2FAAA%3DAAAAAAAA'}).to_return(:body => '{"access_token":"AAAA%2FAAA%3DAAAAAAAA"}', :headers => {:content_type => 'application/json; charset=utf-8'})
+      @client.bearer_token = 'AAAA%2FAAA%3DAAAAAAAA'
     end
-    it "requests the correct resource" do
-      @client.invalidate_token("AAAA%2FAAA%3DAAAAAAAA")
-      expect(a_post("/oauth2/invalidate_token").with(:body => {:access_token => "AAAA%2FAAA%3DAAAAAAAA"})).to have_been_made
+    it 'requests the correct resource' do
+      @client.invalidate_token('AAAA%2FAAA%3DAAAAAAAA')
+      expect(a_post('/oauth2/invalidate_token').with(:body => {:access_token => 'AAAA%2FAAA%3DAAAAAAAA'})).to have_been_made
     end
-    it "returns the invalidated token" do
-      token = @client.invalidate_token("AAAA%2FAAA%3DAAAAAAAA")
-      expect(token.access_token).to eq("AAAA%2FAAA%3DAAAAAAAA")
+    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 be_nil
     end
-    context "with a token" do
-      it "requests the correct resource" do
-        token = Twitter::Token.new(:access_token => "AAAA%2FAAA%3DAAAAAAAA")
+    context 'with a token' do
+      it 'requests the correct resource' do
+        token = Twitter::Token.new(:access_token => 'AAAA%2FAAA%3DAAAAAAAA')
         @client.invalidate_token(token)
-        expect(a_post("/oauth2/invalidate_token").with(:body => {:access_token => "AAAA%2FAAA%3DAAAAAAAA"})).to have_been_made
+        expect(a_post('/oauth2/invalidate_token').with(:body => {:access_token => 'AAAA%2FAAA%3DAAAAAAAA'})).to have_been_made
       end
     end
   end
 
-  describe "#reverse_token" do
+  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"})
+      @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
+    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
+      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
+    it 'requests the correct resource' do
       expect(@client.reverse_token).to eql fixture('request_token.txt').read
     end
   end

data/spec/twitter/rest/api/saved_searches_spec.rb

@@ -3,85 +3,95 @@ require 'helper'
 describe Twitter::REST::API::SavedSearches do
 
   before do
-    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+    @client = Twitter::REST::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :access_token => 'AT', :access_token_secret => 'AS')
   end
 
-  describe "#saved_searches" do
-    context "with ids passed" do
+  describe '#saved_searches' do
+    context 'with ids passed' do
       before do
-        stub_get("/1.1/saved_searches/show/16129012.json").to_return(:body => fixture("saved_search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get('/1.1/saved_searches/show/16129012.json').to_return(:body => fixture('saved_search.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/saved_searches/show/16129013.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_searches(16129012)
-        expect(a_get("/1.1/saved_searches/show/16129012.json")).to have_been_made
+      it 'requests the correct resource' do
+        @client.saved_searches(16_129_012, 16_129_013)
+        expect(a_get('/1.1/saved_searches/show/16129012.json')).to have_been_made
+        expect(a_get('/1.1/saved_searches/show/16129013.json')).to have_been_made
       end
-      it "returns an array of saved searches" do
-        saved_searches = @client.saved_searches(16129012)
+      it 'returns an array of saved searches' do
+        saved_searches = @client.saved_searches(16_129_012, 16_129_013)
         expect(saved_searches).to be_an Array
+        expect(saved_searches.size).to eq(2)
         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')
+        expect(saved_searches.last).to be_a Twitter::SavedSearch
+        expect(saved_searches.last.name).to eq('twitter')
       end
     end
-    context "without ids passed" do
+    context 'without ids passed' do
       before do
-        stub_get("/1.1/saved_searches/list.json").to_return(:body => fixture("saved_searches.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get('/1.1/saved_searches/list.json').to_return(:body => fixture('saved_searches.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
-      it "requests the correct resource" do
+      it 'requests the correct resource' do
         @client.saved_searches
-        expect(a_get("/1.1/saved_searches/list.json")).to have_been_made
+        expect(a_get('/1.1/saved_searches/list.json')).to have_been_made
       end
-      it "returns the authenticated user's saved search queries" do
+      it 'returns the saved search queries for the authenticated user' 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
 
-  describe "#saved_search" do
+  describe '#saved_search' do
     before do
-      stub_get("/1.1/saved_searches/show/16129012.json").to_return(:body => fixture("saved_search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get('/1.1/saved_searches/show/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(16129012)
-      expect(a_get("/1.1/saved_searches/show/16129012.json")).to have_been_made
+    it 'requests the correct resource' do
+      @client.saved_search(16_129_012)
+      expect(a_get('/1.1/saved_searches/show/16129012.json')).to have_been_made
     end
-    it "returns a saved search" do
-      saved_search = @client.saved_search(16129012)
+    it 'returns a saved search' do
+      saved_search = @client.saved_search(16_129_012)
       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 "#create_saved_search" 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"})
+      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.create_saved_search("twitter")
-      expect(a_post("/1.1/saved_searches/create.json").with(:body => {:query => "twitter"})).to have_been_made
+    it 'requests the correct resource' do
+      @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.create_saved_search("twitter")
+    it 'returns the created saved search' do
+      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 "#destroy_saved_search" 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"})
+      stub_post('/1.1/saved_searches/destroy/16129012.json').to_return(:body => fixture('saved_search.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/saved_searches/destroy/16129013.json').to_return(:body => fixture('saved_search.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
-    it "requests the correct resource" do
-      @client.destroy_saved_search(16129012)
-      expect(a_post("/1.1/saved_searches/destroy/16129012.json")).to have_been_made
+    it 'requests the correct resource' do
+      @client.destroy_saved_search(16_129_012, 16_129_013)
+      expect(a_post('/1.1/saved_searches/destroy/16129012.json')).to have_been_made
+      expect(a_post('/1.1/saved_searches/destroy/16129013.json')).to have_been_made
     end
-    it "returns an array of deleted saved searches" do
-      saved_searches = @client.destroy_saved_search(16129012)
+    it 'returns an array of deleted saved searches' do
+      saved_searches = @client.destroy_saved_search(16_129_012, 16_129_013)
       expect(saved_searches).to be_an Array
+      expect(saved_searches.size).to eq(2)
       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')
+      expect(saved_searches.last).to be_a Twitter::SavedSearch
+      expect(saved_searches.last.name).to eq('twitter')
     end
   end
 

data/spec/twitter/rest/api/search_spec.rb

@@ -3,37 +3,38 @@ require 'helper'
 describe Twitter::REST::API::Search do
 
   before do
-    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+    @client = Twitter::REST::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :access_token => 'AT', :access_token_secret => 'AS')
   end
 
-  describe "#search" do
-    before do
-      stub_get("/1.1/search/tweets.json").with(:query => {:q => "twitter"}).to_return(:body => fixture("search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.search("twitter")
-      expect(a_get("/1.1/search/tweets.json").with(:query => {:q => "twitter"})).to have_been_made
-    end
-    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.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)
+  describe '#search' do
+    context 'without count specified' do
+      before do
+        stub_get('/1.1/search/tweets.json').with(:query => {:q => '#freebandnames', :count => '100'}).to_return(:body => fixture('search.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      end
+      it 'requests the correct resource' do
+        @client.search('#freebandnames')
+        expect(a_get('/1.1/search/tweets.json').with(:query => {:q => '#freebandnames', :count => '100'})).to have_been_made
+      end
+      it 'returns recent Tweets related to a query with images and videos embedded' do
+        search = @client.search('#freebandnames')
+        expect(search).to be_a Twitter::SearchResults
+        expect(search.first).to be_a Twitter::Tweet
+        expect(search.first.text).to eq('@Just_Reboot #FreeBandNames mono surround')
+      end
     end
-
-    context "when search API responds a malformed result" do
+    context 'with count specified' 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 => '#freebandnames', :count => '3'}).to_return(:body => fixture('search.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
-
-      it "returns an empty array" do
-        search = @client.search("twitter")
-        expect(search.to_a).to be_an Array
-        expect(search.to_a).to be_empty
+      it 'requests the correct resource' do
+        @client.search('#freebandnames', :count => 3)
+        expect(a_get('/1.1/search/tweets.json').with(:query => {:q => '#freebandnames', :count => '3'})).to have_been_made
+      end
+      it 'returns recent Tweets related to a query with images and videos embedded' do
+        search = @client.search('#freebandnames', :count => 3)
+        expect(search).to be_a Twitter::SearchResults
+        expect(search.first).to be_a Twitter::Tweet
+        expect(search.first.text).to eq('@Just_Reboot #FreeBandNames mono surround')
       end
     end
   end

data/spec/twitter/rest/api/spam_reporting_spec.rb

@@ -3,22 +3,22 @@ require 'helper'
 describe Twitter::REST::API::SpamReporting do
 
   before do
-    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+    @client = Twitter::REST::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :access_token => 'AT', :access_token_secret => 'AS')
   end
 
-  describe "#report_spam" do
+  describe '#report_spam' do
     before do
-      stub_post("/1.1/users/report_spam.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post('/1.1/users/report_spam.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
-    it "requests the correct resource" do
-      @client.report_spam("sferik")
-      expect(a_post("/1.1/users/report_spam.json").with(:body => {:screen_name => "sferik"})).to have_been_made
+    it 'requests the correct resource' do
+      @client.report_spam('sferik')
+      expect(a_post('/1.1/users/report_spam.json').with(:body => {:screen_name => 'sferik'})).to have_been_made
     end
-    it "returns an array of users" do
-      users = @client.report_spam("sferik")
+    it 'returns an array of users' 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(7_505_382)
     end
   end
 

data/spec/twitter/rest/api/suggested_users_spec.rb

@@ -3,53 +3,53 @@ require 'helper'
 describe Twitter::REST::API::SuggestedUsers do
 
   before do
-    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+    @client = Twitter::REST::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :access_token => 'AT', :access_token_secret => 'AS')
   end
 
-  describe "#suggestions" do
-    context "with a category slug passed" do
+  describe '#suggestions' do
+    context 'with a category slug passed' do
       before do
-        stub_get("/1.1/users/suggestions/art-design.json").to_return(:body => fixture("category.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get('/1.1/users/suggestions/art-design.json').to_return(:body => fixture('category.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
-      it "requests the correct resource" do
-        @client.suggestions("art-design")
-        expect(a_get("/1.1/users/suggestions/art-design.json")).to have_been_made
+      it 'requests the correct resource' do
+        @client.suggestions('art-design')
+        expect(a_get('/1.1/users/suggestions/art-design.json')).to have_been_made
       end
-      it "returns the users in a given category of the Twitter suggested user list" do
-        suggestion = @client.suggestions("art-design")
+      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
     end
-    context "without arguments passed" do
+    context 'without arguments passed' do
       before do
-        stub_get("/1.1/users/suggestions.json").to_return(:body => fixture("suggestions.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get('/1.1/users/suggestions.json').to_return(:body => fixture('suggestions.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
-      it "requests the correct resource" do
+      it 'requests the correct resource' do
         @client.suggestions
-        expect(a_get("/1.1/users/suggestions.json")).to have_been_made
+        expect(a_get('/1.1/users/suggestions.json')).to have_been_made
       end
-      it "returns the list of suggested user categories" do
+      it 'returns the list of suggested user categories' 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
 
-  describe "#suggest_users" do
+  describe '#suggest_users' do
     before do
-      stub_get("/1.1/users/suggestions/art-design/members.json").to_return(:body => fixture("members.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get('/1.1/users/suggestions/art-design/members.json').to_return(:body => fixture('members.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
-    it "requests the correct resource" do
-      @client.suggest_users("art-design")
-      expect(a_get("/1.1/users/suggestions/art-design/members.json")).to have_been_made
+    it 'requests the correct resource' do
+      @client.suggest_users('art-design')
+      expect(a_get('/1.1/users/suggestions/art-design/members.json')).to have_been_made
     end
-    it "returns users in a given category of the Twitter suggested user list and return their most recent status if they are not a protected user" do
-      suggest_users = @client.suggest_users("art-design")
+    it 'returns users in a given category of the Twitter suggested user list and return their most recent status if they are not a protected user' 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)