twitter 4.8.1 → 5.0.0.rc.1

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

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::PlacesAndGeo do
+describe Twitter::REST::API::PlacesAndGeo 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 "#place" do
@@ -16,7 +16,7 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns a place" do
       place = @client.place("247f43d441defc03")
-      expect(place.name).to eq "Twitter HQ"
+      expect(place.name).to eq("Twitter HQ")
     end
   end
 
@@ -30,8 +30,8 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns places" do
       places = @client.reverse_geocode(:lat => "37.7821120598956", :long => "-122.400612831116")
-      expect(places).to be_an Array
-      expect(places.first.name).to eq "Bernal Heights"
+      expect(places).to be_a Twitter::GeoResults
+      expect(places.first.name).to eq("Bernal Heights")
     end
   end
 
@@ -45,8 +45,8 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns nearby places" do
       places = @client.geo_search(:ip => "74.125.19.104")
-      expect(places).to be_an Array
-      expect(places.first.name).to eq "Bernal Heights"
+      expect(places).to be_a Twitter::GeoResults
+      expect(places.first.name).to eq("Bernal Heights")
     end
   end
 
@@ -60,8 +60,8 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns similar places" do
       places = @client.similar_places(:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ")
-      expect(places).to be_an Array
-      expect(places.first.name).to eq "Bernal Heights"
+      expect(places).to be_a Twitter::GeoResults
+      expect(places.first.name).to eq("Bernal Heights")
     end
   end
 
@@ -75,7 +75,7 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns a place" do
       place = @client.place_create(:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581")
-      expect(place.name).to eq "Twitter HQ"
+      expect(place.name).to eq("Twitter HQ")
     end
   end
 

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

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Help do
+describe Twitter::REST::API::Help 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 "#configuration" do
@@ -17,7 +17,7 @@ describe Twitter::API::Help do
     it "returns Twitter's current configuration" do
       configuration = @client.configuration
       expect(configuration).to be_a Twitter::Configuration
-      expect(configuration.characters_reserved_per_media).to eq 20
+      expect(configuration.characters_reserved_per_media).to eq(20)
     end
   end
 
@@ -33,7 +33,7 @@ describe Twitter::API::Help do
       languages = @client.languages
       expect(languages).to be_an Array
       expect(languages.first).to be_a Twitter::Language
-      expect(languages.first.name).to eq "Portuguese"
+      expect(languages.first.name).to eq("Portuguese")
     end
   end
 
@@ -47,7 +47,7 @@ describe Twitter::API::Help do
     end
     it "returns Twitter's Privacy Policy" do
       privacy = @client.privacy
-      expect(privacy.split.first).to eq "Twitter"
+      expect(privacy.split.first).to eq("Twitter")
     end
   end
 
@@ -61,7 +61,7 @@ describe Twitter::API::Help do
     end
     it "returns Twitter's Terms of Service" do
       tos = @client.tos
-      expect(tos.split.first).to eq "Terms"
+      expect(tos.split.first).to eq("Terms")
     end
   end
 

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

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Lists do
+describe Twitter::REST::API::Lists 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 "#lists" do
@@ -18,7 +18,7 @@ describe Twitter::API::Lists do
       lists = @client.lists
       expect(lists).to be_an Array
       expect(lists.first).to be_a Twitter::List
-      expect(lists.first.name).to eq "Rubyists"
+      expect(lists.first.name).to eq("Rubyists")
     end
   end
 
@@ -35,7 +35,34 @@ describe Twitter::API::Lists do
         tweets = @client.list_timeline("sferik", "presidents")
         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
+      context "with a URI object passed" do
+        it "requests the correct resource" do
+          list = URI.parse("https://twitter.com/sferik/presidents")
+          @client.list_timeline(list)
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
+      end
+      context "with a URI string passed" do
+        it "requests the correct resource" do
+          @client.list_timeline("https://twitter.com/sferik/presidents")
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
+      end
+      context "with URI objects passed" do
+        it "requests the correct resource" do
+          user = URI.parse("https://twitter.com/sferik")
+          list = URI.parse("https://twitter.com/sferik/presidents")
+          @client.list_timeline(user, list)
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
+      end
+      context "with URI strings passed" do
+        it "requests the correct resource" do
+          @client.list_timeline("https://twitter.com/sferik", "https://twitter.com/sferik/presidents")
+          expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents"})).to have_been_made
+        end
       end
     end
     context "without a screen name passed" do
@@ -62,7 +89,7 @@ describe Twitter::API::Lists do
       it "returns the list" do
         list = @client.list_remove_member("sferik", "presidents", 813286)
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -89,16 +116,15 @@ describe Twitter::API::Lists do
       it "returns the lists the specified user has been added to" do
         memberships = @client.memberships("sferik")
         expect(memberships).to be_a Twitter::Cursor
-        expect(memberships.lists).to be_an Array
-        expect(memberships.lists.first).to be_a Twitter::List
-        expect(memberships.lists.first.name).to eq "developer"
+        expect(memberships.first).to be_a Twitter::List
+        expect(memberships.first.name).to eq("developer")
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("memberships2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.memberships("sferik").all
+          @client.memberships("sferik").each{}
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -112,12 +138,12 @@ describe Twitter::API::Lists do
         @client.memberships(7505382)
         expect(a_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"}).to_return(:body => fixture("memberships2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.memberships(7505382).all
+          @client.memberships(7505382).each{}
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -132,12 +158,12 @@ describe Twitter::API::Lists do
         @client.memberships
         expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("memberships2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.memberships.all
+          @client.memberships.each{}
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -157,16 +183,15 @@ describe Twitter::API::Lists do
       it "returns the subscribers of the specified list" do
         list_subscribers = @client.list_subscribers("sferik", "presidents")
         expect(list_subscribers).to be_a Twitter::Cursor
-        expect(list_subscribers.users).to be_an Array
-        expect(list_subscribers.users.first).to be_a Twitter::User
-        expect(list_subscribers.users.first.id).to eq 7505382
+        expect(list_subscribers.first).to be_a Twitter::User
+        expect(list_subscribers.first.id).to eq(7505382)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_subscribers("sferik", "presidents").all
+          @client.list_subscribers("sferik", "presidents").each{}
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -180,12 +205,12 @@ describe Twitter::API::Lists do
         @client.list_subscribers(7505382, "presidents")
         expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_subscribers(7505382, "presidents").all
+          @client.list_subscribers(7505382, "presidents").each{}
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -200,12 +225,12 @@ describe Twitter::API::Lists do
         @client.list_subscribers("presidents")
         expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_subscribers("presidents").all
+          @client.list_subscribers("presidents").each{}
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -225,7 +250,7 @@ describe Twitter::API::Lists do
       it "returns the specified list" do
         list = @client.list_subscribe("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -325,7 +350,7 @@ describe Twitter::API::Lists do
       it "returns the specified list" do
         list = @client.list_unsubscribe("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -352,7 +377,7 @@ describe Twitter::API::Lists do
       it "returns the list" do
         list = @client.list_add_members("sferik", "presidents", [813286, 18755393])
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "with a combination of member IDs and member screen names to add" do
@@ -461,16 +486,15 @@ describe Twitter::API::Lists do
       it "returns the members of the specified list" do
         list_members = @client.list_members("sferik", "presidents")
         expect(list_members).to be_a Twitter::Cursor
-        expect(list_members.users).to be_an Array
-        expect(list_members.users.first).to be_a Twitter::User
-        expect(list_members.users.first.id).to eq 7505382
+        expect(list_members.first).to be_a Twitter::User
+        expect(list_members.first.id).to eq(7505382)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_members("sferik", "presidents").all
+          @client.list_members("sferik", "presidents").each{}
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -484,12 +508,12 @@ describe Twitter::API::Lists do
         @client.list_members(7505382, "presidents")
         expect(a_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_members(7505382, "presidents").all
+          @client.list_members(7505382, "presidents").each{}
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_id => "7505382", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -504,12 +528,12 @@ describe Twitter::API::Lists do
         @client.list_members("presidents")
         expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.list_members("presidents").all
+          @client.list_members("presidents").each{}
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => "sferik", :slug => "presidents", :cursor => "1322801608223717003"})).to have_been_made
         end
@@ -529,7 +553,7 @@ describe Twitter::API::Lists do
       it "returns the list" do
         list = @client.list_add_member("sferik", "presidents", 813286)
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -556,7 +580,7 @@ describe Twitter::API::Lists do
       it "returns the deleted list" do
         list = @client.list_destroy("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -602,7 +626,7 @@ describe Twitter::API::Lists do
       it "returns the updated list" do
         list = @client.list_update("sferik", "presidents", :description => "Presidents of the United States of America")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "without a screen name passed" do
@@ -647,7 +671,7 @@ describe Twitter::API::Lists do
     it "returns the created list" do
       list = @client.list_create("presidents")
       expect(list).to be_a Twitter::List
-      expect(list.name).to eq "presidents"
+      expect(list.name).to eq("presidents")
     end
   end
 
@@ -663,7 +687,7 @@ describe Twitter::API::Lists do
       it "returns the updated list" do
         list = @client.list("sferik", "presidents")
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "with a user ID passed" do
@@ -728,16 +752,15 @@ describe Twitter::API::Lists do
       it "returns the lists the specified user follows" do
         subscriptions = @client.subscriptions("sferik")
         expect(subscriptions).to be_a Twitter::Cursor
-        expect(subscriptions.lists).to be_an Array
-        expect(subscriptions.lists.first).to be_a Twitter::List
-        expect(subscriptions.lists.first.name).to eq "Rubyists"
+        expect(subscriptions.first).to be_a Twitter::List
+        expect(subscriptions.first.name).to eq("Rubyists")
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("subscriptions2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.subscriptions("sferik").all
+          @client.subscriptions("sferik").each{}
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -751,12 +774,12 @@ describe Twitter::API::Lists do
         @client.subscriptions(7505382)
         expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"}).to_return(:body => fixture("subscriptions2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.subscriptions(7505382).all
+          @client.subscriptions(7505382).each{}
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:user_id => "7505382", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -771,12 +794,12 @@ describe Twitter::API::Lists do
         @client.subscriptions
         expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"}).to_return(:body => fixture("subscriptions2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.subscriptions.all
+          @client.subscriptions.each{}
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "-1"})).to have_been_made
           expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => "sferik", :cursor => "1401037770457540712"})).to have_been_made
         end
@@ -796,7 +819,7 @@ describe Twitter::API::Lists do
       it "returns the list" do
         list = @client.list_remove_members("sferik", "presidents", [813286, 18755393])
         expect(list).to be_a Twitter::List
-        expect(list.name).to eq "presidents"
+        expect(list.name).to eq("presidents")
       end
     end
     context "with a user ID passed" do
@@ -841,9 +864,8 @@ describe Twitter::API::Lists do
       it "returns the requested list" do
         lists = @client.lists_owned("sferik")
         expect(lists).to be_a Twitter::Cursor
-        expect(lists.lists).to be_an Array
-        expect(lists.lists.first).to be_a Twitter::List
-        expect(lists.lists.first.name).to eq "My favstar.fm list"
+        expect(lists.first).to be_a Twitter::List
+        expect(lists.first.name).to eq("My favstar.fm list")
       end
     end
     context "without a screen name passed" do
@@ -858,9 +880,8 @@ describe Twitter::API::Lists do
       it "returns the requested list" do
         lists = @client.lists_owned
         expect(lists).to be_a Twitter::Cursor
-        expect(lists.lists).to be_an Array
-        expect(lists.lists.first).to be_a Twitter::List
-        expect(lists.lists.first.name).to eq "My favstar.fm list"
+        expect(lists.first).to be_a Twitter::List
+        expect(lists.first.name).to eq("My favstar.fm list")
       end
     end
   end