twitter 5.0.0.rc.1 → 5.0.0

data/spec/twitter/list_spec.rb

@@ -6,17 +6,17 @@ describe Twitter::List do
     it "returns true when objects IDs are the same" do
       list = Twitter::List.new(:id => 1, :slug => "foo")
       other = Twitter::List.new(:id => 1, :slug => "bar")
-      expect(list == other).to be_true
+      expect(list == other).to be true
     end
     it "returns false when objects IDs are different" do
       list = Twitter::List.new(:id => 1)
       other = Twitter::List.new(:id => 2)
-      expect(list == other).to be_false
+      expect(list == other).to be false
     end
     it "returns false when classes are different" do
       list = Twitter::List.new(:id => 1)
       other = Twitter::Identity.new(:id => 1)
-      expect(list == other).to be_false
+      expect(list == other).to be false
     end
   end
 
@@ -34,11 +34,11 @@ describe Twitter::List do
   describe "#created?" do
     it "returns true when created_at is set" do
       list = Twitter::List.new(:id => 8863586, :created_at => "Mon Jul 16 12:59:01 +0000 2007")
-      expect(list.created?).to be_true
+      expect(list.created?).to be true
     end
     it "returns false when created_at is not set" do
       list = Twitter::List.new(:id => 8863586)
-      expect(list.created?).to be_false
+      expect(list.created?).to be false
     end
   end
 
@@ -77,11 +77,11 @@ describe Twitter::List do
   describe "#user?" do
     it "returns true when user is set" do
       list = Twitter::List.new(:id => 8863586, :user => {:id => 7505382})
-      expect(list.user?).to be_true
+      expect(list.user?).to be true
     end
     it "returns false when user is not set" do
       list = Twitter::List.new(:id => 8863586)
-      expect(list.user?).to be_false
+      expect(list.user?).to be false
     end
   end
 

data/spec/twitter/media/photo_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'helper'
 
 describe Twitter::Media::Photo do
@@ -6,17 +7,17 @@ describe Twitter::Media::Photo do
     it "returns true when objects IDs are the same" do
       photo = Twitter::Media::Photo.new(:id => 1)
       other = Twitter::Media::Photo.new(:id => 1)
-      expect(photo == other).to be_true
+      expect(photo == other).to be true
     end
     it "returns false when objects IDs are different" do
       photo = Twitter::Media::Photo.new(:id => 1)
       other = Twitter::Media::Photo.new(:id => 2)
-      expect(photo == other).to be_false
+      expect(photo == other).to be false
     end
     it "returns false when classes are different" do
       photo = Twitter::Media::Photo.new(:id => 1)
       other = Twitter::Identity.new(:id => 1)
-      expect(photo == other).to be_false
+      expect(photo == other).to be false
     end
   end
 
@@ -33,10 +34,10 @@ describe Twitter::Media::Photo do
   end
 
   describe "#display_uri" do
-    it "returns a URI when the display_url is set" do
-      photo = Twitter::Media::Photo.new(:id => 1, :display_url => "http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
-      expect(photo.display_uri).to be_a URI
-      expect(photo.display_uri.to_s).to eq("http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
+    it "returns a String when the display_url is set" do
+      photo = Twitter::Media::Photo.new(:id => 1, :display_url => "example.com/expanded…")
+      expect(photo.display_uri).to be_a String
+      expect(photo.display_uri).to eq("example.com/expanded…")
     end
     it "returns nil when the display_url is not set" do
       photo = Twitter::Media::Photo.new(:id => 1)
@@ -46,12 +47,12 @@ describe Twitter::Media::Photo do
 
   describe "#display_uri?" do
     it "returns true when the display_url is set" do
-      photo = Twitter::Media::Photo.new(:id => 1, :display_url => "http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
-      expect(photo.display_uri).to be_true
+      photo = Twitter::Media::Photo.new(:id => 1, :display_url => "example.com/expanded…")
+      expect(photo.display_uri?).to be true
     end
     it "returns false when the display_url is not set" do
       photo = Twitter::Media::Photo.new(:id => 1)
-      expect(photo.display_uri).to be_false
+      expect(photo.display_uri?).to be false
     end
   end
 
@@ -70,11 +71,11 @@ describe Twitter::Media::Photo do
   describe "#expanded_uri?" do
     it "returns true when the expanded_url is set" do
       photo = Twitter::Media::Photo.new(:id => 1, :expanded_url => "http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
-      expect(photo.expanded_uri).to be_true
+      expect(photo.expanded_uri?).to be true
     end
     it "returns false when the expanded_url is not set" do
       photo = Twitter::Media::Photo.new(:id => 1)
-      expect(photo.expanded_uri).to be_false
+      expect(photo.expanded_uri?).to be false
     end
   end
 
@@ -93,11 +94,11 @@ describe Twitter::Media::Photo do
   describe "#media_uri?" do
     it "returns true when the media_url is set" do
       photo = Twitter::Media::Photo.new(:id => 1, :media_url => "http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
-      expect(photo.media_uri).to be_true
+      expect(photo.media_uri?).to be true
     end
     it "returns false when the media_url is not set" do
       photo = Twitter::Media::Photo.new(:id => 1)
-      expect(photo.media_uri).to be_false
+      expect(photo.media_uri?).to be false
     end
   end
 
@@ -116,11 +117,11 @@ describe Twitter::Media::Photo do
   describe "#media_uri_https?" do
     it "returns true when the media_url_https is set" do
       photo = Twitter::Media::Photo.new(:id => 1, :media_url_https => "http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
-      expect(photo.media_uri_https).to be_true
+      expect(photo.media_uri_https?).to be true
     end
     it "returns false when the media_url_https is not set" do
       photo = Twitter::Media::Photo.new(:id => 1)
-      expect(photo.media_uri_https).to be_false
+      expect(photo.media_uri_https?).to be false
     end
   end
 
@@ -139,11 +140,11 @@ describe Twitter::Media::Photo do
   describe "#uri?" do
     it "returns true when the url is set" do
       photo = Twitter::Media::Photo.new(:id => 1, :url => "http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
-      expect(photo.uri).to be_true
+      expect(photo.uri?).to be true
     end
     it "returns false when the url is not set" do
       photo = Twitter::Media::Photo.new(:id => 1)
-      expect(photo.uri).to be_false
+      expect(photo.uri?).to be false
     end
   end
 

data/spec/twitter/media_factory_spec.rb

@@ -7,8 +7,8 @@ describe Twitter::MediaFactory do
       media = Twitter::MediaFactory.new(:id => 1, :type => "photo")
       expect(media).to be_a Twitter::Media::Photo
     end
-    it "raises an ArgumentError when type is not specified" do
-      expect{Twitter::MediaFactory.new}.to raise_error ArgumentError
+    it "raises an IndexError when type is not specified" do
+      expect{Twitter::MediaFactory.new}.to raise_error IndexError
     end
   end
 

data/spec/twitter/null_object_spec.rb

@@ -2,24 +2,25 @@ require 'helper'
 
 describe Twitter::NullObject do
 
+  before do
+    @null_object = Twitter::NullObject.new
+  end
+
   describe "#nil?" do
     it "returns true" do
-      null_object = Twitter::NullObject.instance
-      expect(null_object.null?).to be_true
+      expect(@null_object.nil?).to be true
     end
   end
 
   describe "calling any method" do
     it "returns self" do
-      null_object = Twitter::NullObject.instance
-      expect(null_object.any).to equal null_object
+      expect(@null_object.any).to equal @null_object
     end
   end
 
   describe "#respond_to?" do
     it "returns true" do
-      null_object = Twitter::NullObject.instance
-      expect(null_object.respond_to?(:any)).to be_true
+      expect(@null_object.respond_to?(:any)).to be true
     end
   end
 

data/spec/twitter/oembed_spec.rb

@@ -17,11 +17,11 @@ describe Twitter::OEmbed do
   describe "#author_uri?" do
     it "returns true when the author_url is set" do
       oembed = Twitter::OEmbed.new(:author_url => "https://twitter.com/sferik")
-      expect(oembed.author_uri?).to be_true
+      expect(oembed.author_uri?).to be true
     end
     it "returns false when the author_uri is not set" do
       oembed = Twitter::OEmbed.new
-      expect(oembed.author_uri?).to be_false
+      expect(oembed.author_uri?).to be false
     end
   end
 
@@ -99,11 +99,11 @@ describe Twitter::OEmbed do
   describe "#provider_uri?" do
     it "returns true when the provider_url is set" do
       oembed = Twitter::OEmbed.new(:provider_url => "https://twitter.com/sferik")
-      expect(oembed.provider_uri?).to be_true
+      expect(oembed.provider_uri?).to be true
     end
     it "returns false when the provider_uri is not set" do
       oembed = Twitter::OEmbed.new
-      expect(oembed.provider_uri?).to be_false
+      expect(oembed.provider_uri?).to be false
     end
   end
 
@@ -148,11 +148,11 @@ describe Twitter::OEmbed do
   describe "#uri?" do
     it "returns true when the url is set" do
       oembed = Twitter::OEmbed.new(:url => "https://twitter.com/twitterapi/status/133640144317198338")
-      expect(oembed.uri?).to be_true
+      expect(oembed.uri?).to be true
     end
     it "returns false when the url is not set" do
       oembed = Twitter::OEmbed.new
-      expect(oembed.uri?).to be_false
+      expect(oembed.uri?).to be false
     end
   end
 

data/spec/twitter/place_spec.rb

@@ -3,128 +3,128 @@ require 'helper'
 describe Twitter::Place do
 
   describe "#==" do
-    it "returns true when objects IDs are the same" do
-      place = Twitter::Place.new(:id => 1, :name => "foo")
-      other = Twitter::Place.new(:id => 1, :name => "bar")
-      expect(place == other).to be_true
+    it "returns true when objects WOE IDs are the same" do
+      place = Twitter::Place.new(:woeid => 1, :name => "foo")
+      other = Twitter::Place.new(:woeid => 1, :name => "bar")
+      expect(place == other).to be true
     end
-    it "returns false when objects IDs are different" do
-      place = Twitter::Place.new(:id => 1)
-      other = Twitter::Place.new(:id => 2)
-      expect(place == other).to be_false
+    it "returns false when objects WOE IDs are different" do
+      place = Twitter::Place.new(:woeid => 1)
+      other = Twitter::Place.new(:woeid => 2)
+      expect(place == other).to be false
     end
     it "returns false when classes are different" do
-      place = Twitter::Place.new(:id => 1)
-      other = Twitter::Identity.new(:id => 1)
-      expect(place == other).to be_false
+      place = Twitter::Place.new(:woeid => 1)
+      other = Twitter::Base.new(:woeid => 1)
+      expect(place == other).to be false
     end
   end
 
   describe "#bounding_box" do
     it "returns a Twitter::Geo when bounding_box is set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :bounding_box => {:type => "Polygon", :coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]]})
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :bounding_box => {:type => "Polygon", :coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]]})
       expect(place.bounding_box).to be_a Twitter::Geo::Polygon
     end
     it "returns nil when not bounding_box is not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
       expect(place.bounding_box).to be_nil
     end
   end
 
   describe "#bounding_box?" do
     it "returns true when bounding_box is set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :bounding_box => {:type => "Polygon", :coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]]})
-      expect(place.bounding_box?).to be_true
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :bounding_box => {:type => "Polygon", :coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]]})
+      expect(place.bounding_box?).to be true
     end
     it "returns false when bounding_box is not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
-      expect(place.bounding_box?).to be_false
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
+      expect(place.bounding_box?).to be false
     end
   end
 
   describe "#contained_within" do
     it "returns a Twitter::Place when contained_within is set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :contained_within => {:id => "247f43d441defc04"})
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :contained_within => {:woeid => "247f43d441defc04"})
       expect(place.contained_within).to be_a Twitter::Place
     end
     it "returns nil when not contained_within is not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
       expect(place.contained_within).to be_nil
     end
   end
 
   describe "#contained_within?" do
     it "returns true when contained_within is set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :contained_within => {:id => "247f43d441defc04"})
-      expect(place.contained?).to be_true
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :contained_within => {:woeid => "247f43d441defc04"})
+      expect(place.contained?).to be true
     end
     it "returns false when contained_within is not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
-      expect(place.contained?).to be_false
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
+      expect(place.contained?).to be false
     end
   end
 
   describe "#country_code" do
     it "returns a country code when set with country_code" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :country_code => "US")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :country_code => "US")
       expect(place.country_code).to eq("US")
     end
     it "returns a country code when set with countryCode" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :countryCode => "US")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :countryCode => "US")
       expect(place.country_code).to eq("US")
     end
     it "returns nil when not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
       expect(place.country_code).to be_nil
     end
   end
 
   describe "#parent_id" do
     it "returns a parent ID when set with parentid" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :parentid => 1)
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :parentid => 1)
       expect(place.parent_id).to eq(1)
     end
     it "returns nil when not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
       expect(place.parent_id).to be_nil
     end
   end
 
   describe "#place_type" do
     it "returns a place type when set with place_type" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :place_type => "city")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :place_type => "city")
       expect(place.place_type).to eq("city")
     end
     it "returns a place type when set with placeType[name]" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :placeType => {:name => "Town"})
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :placeType => {:name => "Town"})
       expect(place.place_type).to eq("Town")
     end
     it "returns nil when not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
       expect(place.place_type).to be_nil
     end
   end
 
   describe "#uri" do
     it "returns a URI when the url is set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :url => "https://api.twitter.com/1.1/geo/id/247f43d441defc03.json")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :url => "https://api.twitter.com/1.1/geo/id/247f43d441defc03.json")
       expect(place.uri).to be_a URI
       expect(place.uri.to_s).to eq("https://api.twitter.com/1.1/geo/id/247f43d441defc03.json")
     end
     it "returns nil when the url is not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
       expect(place.uri).to be_nil
     end
   end
 
   describe "#uri?" do
     it "returns true when the url is set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03", :url => "https://api.twitter.com/1.1/geo/id/247f43d441defc03.json")
-      expect(place.uri).to be_true
+      place = Twitter::Place.new(:woeid => "247f43d441defc03", :url => "https://api.twitter.com/1.1/geo/id/247f43d441defc03.json")
+      expect(place.uri?).to be true
     end
     it "returns false when the url is not set" do
-      place = Twitter::Place.new(:id => "247f43d441defc03")
-      expect(place.uri).to be_false
+      place = Twitter::Place.new(:woeid => "247f43d441defc03")
+      expect(place.uri?).to be false
     end
   end
 

data/spec/twitter/rate_limit_spec.rb

@@ -56,21 +56,4 @@ describe Twitter::RateLimit do
     end
   end
 
-  describe "#update" do
-    before do
-      Timecop.freeze(Time.utc(2012, 6, 6, 17, 22, 0))
-    end
-    after do
-      Timecop.return
-    end
-    it "updates a rate limit" do
-      rate_limit = Twitter::RateLimit.new("x-rate-limit-reset" => "1339019097")
-      expect(rate_limit.reset_in).to be_an Integer
-      expect(rate_limit.reset_in).to eq(15777)
-      rate_limit.update({"x-rate-limit-reset" => "1339019098"})
-      expect(rate_limit.reset_in).to be_an Integer
-      expect(rate_limit.reset_in).to eq(15778)
-    end
-  end
-
 end

data/spec/twitter/relationship_spec.rb

@@ -16,11 +16,11 @@ describe Twitter::Relationship do
   describe "#source?" do
     it "returns true when source is set" do
       relationship = Twitter::Relationship.new(:relationship => {:source => {:id => 7505382}})
-      expect(relationship.source?).to be_true
+      expect(relationship.source?).to be true
     end
     it "returns false when source is not set" do
       relationship = Twitter::Relationship.new(:relationship => {})
-      expect(relationship.source?).to be_false
+      expect(relationship.source?).to be false
     end
   end
 
@@ -38,19 +38,11 @@ describe Twitter::Relationship do
   describe "#target?" do
     it "returns true when target is set" do
       relationship = Twitter::Relationship.new(:relationship => {:target => {:id => 7505382}})
-      expect(relationship.target?).to be_true
+      expect(relationship.target?).to be true
     end
     it "returns false when target is not set" do
       relationship = Twitter::Relationship.new(:relationship => {})
-      expect(relationship.target?).to be_false
-    end
-  end
-
-  describe "#update" do
-    it "updates a relationship" do
-      relationship = Twitter::Relationship.new(:relationship => {:target => {:id => 7505382}})
-      relationship.update(:relationship => {:target => {:id => 14100886}})
-      expect(relationship.target.id).to eq(14100886)
+      expect(relationship.target?).to be false
     end
   end