twitter 4.8.1 → 5.0.0

data/spec/twitter/geo/polygon_spec.rb

@@ -7,22 +7,22 @@ describe Twitter::Geo::Polygon do
   end
 
   describe "#==" do
-    it "returns false for empty objects" do
+    it "returns true for empty objects" do
       polygon = Twitter::Geo::Polygon.new
       other = Twitter::Geo::Polygon.new
-      expect(polygon == other).to be_false
+      expect(polygon == other).to be true
     end
     it "returns true when objects coordinates are the same" do
       other = Twitter::Geo::Polygon.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      expect(@polygon == other).to be_true
+      expect(@polygon == other).to be true
     end
     it "returns false when objects coordinates are different" do
       other = Twitter::Geo::Polygon.new(:coordinates => [[[37.77752898, -122.40348192], [37.77752898, -122.387436], [37.79448597, -122.387436], [37.79448597, -122.40348192]]])
-      expect(@polygon == other).to be_false
+      expect(@polygon == other).to be false
     end
     it "returns false when classes are different" do
       other = Twitter::Geo.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      expect(@polygon == other).to be_false
+      expect(@polygon == other).to be false
     end
   end
 

data/spec/twitter/geo_factory_spec.rb

@@ -4,15 +4,15 @@ describe Twitter::GeoFactory do
 
   describe ".new" do
     it "generates a Point" do
-      geo = Twitter::GeoFactory.fetch_or_new(:type => 'Point')
+      geo = Twitter::GeoFactory.new(:type => "Point")
       expect(geo).to be_a Twitter::Geo::Point
     end
     it "generates a Polygon" do
-      geo = Twitter::GeoFactory.fetch_or_new(:type => 'Polygon')
+      geo = Twitter::GeoFactory.new(:type => "Polygon")
       expect(geo).to be_a Twitter::Geo::Polygon
     end
-    it "raises an ArgumentError when type is not specified" do
-      expect{Twitter::GeoFactory.fetch_or_new}.to raise_error ArgumentError
+    it "raises an IndexError when type is not specified" do
+      expect{Twitter::GeoFactory.new}.to raise_error IndexError
     end
   end
 

data/spec/twitter/geo_results_spec.rb

@@ -0,0 +1,35 @@
+require 'helper'
+
+describe Twitter::GeoResults do
+
+  describe "#each" do
+    before do
+      @geo_results = Twitter::GeoResults.new(:result => {:places => [{:id => 1}, {:id => 2}, {:id => 3}, {:id => 4}, {:id => 5}, {:id => 6}]})
+    end
+    it "iterates" do
+      count = 0
+      @geo_results.each{count += 1}
+      expect(count).to eq(6)
+    end
+    context "with start" do
+      it "iterates" do
+        count = 0
+        @geo_results.each(5){count += 1}
+        expect(count).to eq(1)
+      end
+    end
+  end
+
+  describe "#token" do
+    it "returns a String when token is set" do
+      geo_results = Twitter::GeoResults.new(:result => {}, :token => "abc123")
+      expect(geo_results.token).to be_a String
+      expect(geo_results.token).to eq("abc123")
+    end
+    it "returns nil when token is not set" do
+      geo_results = Twitter::GeoResults.new(:result => {})
+      expect(geo_results.token).to be_nil
+    end
+  end
+
+end

data/spec/twitter/geo_spec.rb

@@ -7,22 +7,22 @@ describe Twitter::Geo do
   end
 
   describe "#==" do
-    it "returns false for empty objects" do
+    it "returns true for empty objects" do
       geo = Twitter::Geo.new
       other = Twitter::Geo.new
-      expect(geo == other).to be_false
+      expect(geo == other).to be true
     end
     it "returns true when objects coordinates are the same" do
       other = Twitter::Geo.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      expect(@geo == other).to be_true
+      expect(@geo == other).to be true
     end
     it "returns false when objects coordinates are different" do
       other = Twitter::Geo.new(:coordinates => [[[37.77752898, -122.40348192], [37.77752898, -122.387436], [37.79448597, -122.387436], [37.79448597, -122.40348192]]])
-      expect(@geo == other).to be_false
+      expect(@geo == other).to be false
     end
-    it "returns false when classes are different" do
+    it "returns true when classes are different" do
       other = Twitter::Geo::Polygon.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      expect(@geo == other).to be_false
+      expect(@geo == other).to be true
     end
   end
 

data/spec/twitter/identifiable_spec.rb

@@ -3,29 +3,8 @@ require 'helper'
 describe Twitter::Identity do
 
   describe "#initialize" do
-    it "raises an ArgumentError when type is not specified" do
-      expect{Twitter::Identity.new}.to raise_error ArgumentError
-    end
-  end
-
-  context "identity map enabled" do
-    before do
-      Twitter.identity_map = Twitter::IdentityMap
-    end
-
-    after do
-      Twitter.identity_map = false
-    end
-
-    describe ".fetch" do
-      it "returns existing objects" do
-        Twitter::Identity.store(Twitter::Identity.new(:id => 1))
-        expect(Twitter::Identity.fetch(:id => 1)).to be
-      end
-
-      it "raises an error on objects that don't exist" do
-        expect{Twitter::Identity.fetch(:id => 6)}.to raise_error Twitter::Error::IdentityMapKeyError
-      end
+    it "raises an IndexError when id is not specified" do
+      expect{Twitter::Identity.new}.to raise_error IndexError
     end
   end
 
@@ -33,17 +12,17 @@ describe Twitter::Identity do
     it "returns true when objects IDs are the same" do
       one = Twitter::Identity.new(:id => 1, :screen_name => "sferik")
       two = Twitter::Identity.new(:id => 1, :screen_name => "garybernhardt")
-      expect(one == two).to be_true
+      expect(one == two).to be true
     end
     it "returns false when objects IDs are different" do
       one = Twitter::Identity.new(:id => 1)
       two = Twitter::Identity.new(:id => 2)
-      expect(one == two).to be_false
+      expect(one == two).to be false
     end
     it "returns false when classes are different" do
       one = Twitter::Identity.new(:id => 1)
       two = Twitter::Base.new(:id => 1)
-      expect(one == two).to be_false
+      expect(one == two).to be false
     end
   end
 

data/spec/twitter/list_spec.rb

@@ -6,39 +6,82 @@ 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
 
   describe "#created_at" do
     it "returns a Time when created_at is set" do
-      user = Twitter::List.new(:id => 8863586, :created_at => "Mon Jul 16 12:59:01 +0000 2007")
-      expect(user.created_at).to be_a Time
+      list = Twitter::List.new(:id => 8863586, :created_at => "Mon Jul 16 12:59:01 +0000 2007")
+      expect(list.created_at).to be_a Time
     end
     it "returns nil when created_at is not set" do
-      user = Twitter::List.new(:id => 8863586)
-      expect(user.created_at).to be_nil
+      list = Twitter::List.new(:id => 8863586)
+      expect(list.created_at).to be_nil
+    end
+  end
+
+  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
+    end
+    it "returns false when created_at is not set" do
+      list = Twitter::List.new(:id => 8863586)
+      expect(list.created?).to be false
+    end
+  end
+
+  describe "#members_uri" do
+    it "returns the URI to the list members" do
+      list = Twitter::List.new(:id => 8863586, :slug => "presidents", :user => {:id => 7505382, :screen_name => "sferik"})
+      expect(list.members_uri.to_s).to eq("https://twitter.com/sferik/presidents/members")
+    end
+  end
+
+  describe "#subscribers_uri" do
+    it "returns the URI to the list subscribers" do
+      list = Twitter::List.new(:id => 8863586, :slug => "presidents", :user => {:id => 7505382, :screen_name => "sferik"})
+      expect(list.subscribers_uri.to_s).to eq("https://twitter.com/sferik/presidents/subscribers")
+    end
+  end
+
+  describe "#uri" do
+    it "returns the URI to the list" do
+      list = Twitter::List.new(:id => 8863586, :slug => "presidents", :user => {:id => 7505382, :screen_name => "sferik"})
+      expect(list.uri.to_s).to eq("https://twitter.com/sferik/presidents")
     end
   end
 
   describe "#user" do
     it "returns a User when user is set" do
-      user = Twitter::List.new(:id => 8863586, :user => {:id => 7505382}).user
-      expect(user).to be_a Twitter::User
+      list = Twitter::List.new(:id => 8863586, :user => {:id => 7505382})
+      expect(list.user).to be_a Twitter::User
     end
     it "returns nil when status is not set" do
-      user = Twitter::List.new(:id => 8863586).user
-      expect(user).to be_nil
+      list = Twitter::List.new(:id => 8863586)
+      expect(list.user).to be_nil
+    end
+  end
+
+  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
+    end
+    it "returns false when user is not set" do
+      list = Twitter::List.new(:id => 8863586)
+      expect(list.user?).to be false
     end
   end
 

data/spec/twitter/media/photo_spec.rb

@@ -1,28 +1,29 @@
+# coding: utf-8
 require 'helper'
 
 describe Twitter::Media::Photo do
 
   describe "#==" do
     it "returns true when objects IDs are the same" do
-      photo = Twitter::Media::Photo.new(:id => 1, :url => "foo")
-      other = Twitter::Media::Photo.new(:id => 1, :url => "bar")
-      expect(photo == other).to be_true
+      photo = Twitter::Media::Photo.new(:id => 1)
+      other = Twitter::Media::Photo.new(:id => 1)
+      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
 
   describe "#sizes" do
     it "returns a hash of Sizes when sizes is set" do
-      sizes = Twitter::Media::Photo.new(:id => 110102452988157952, :sizes => {:small => {:h => 226, :w => 340, :resize => 'fit'}, :large => {:h => 466, :w => 700, :resize => 'fit'}, :medium => {:h => 399, :w => 600, :resize => 'fit'}, :thumb => {:h => 150, :w => 150, :resize => 'crop'}}).sizes
+      sizes = Twitter::Media::Photo.new(:id => 110102452988157952, :sizes => {:small => {:h => 226, :w => 340, :resize => "fit"}, :large => {:h => 466, :w => 700, :resize => "fit"}, :medium => {:h => 399, :w => 600, :resize => "fit"}, :thumb => {:h => 150, :w => 150, :resize => "crop"}}).sizes
       expect(sizes).to be_a Hash
       expect(sizes[:small]).to be_a Twitter::Size
     end
@@ -32,4 +33,119 @@ describe Twitter::Media::Photo do
     end
   end
 
+  describe "#display_uri" do
+    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)
+      expect(photo.display_uri).to be_nil
+    end
+  end
+
+  describe "#display_uri?" do
+    it "returns true 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 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
+    end
+  end
+
+  describe "#expanded_uri" do
+    it "returns a URI 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_a URI
+      expect(photo.expanded_uri.to_s).to eq("http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
+    end
+    it "returns nil when the expanded_url is not set" do
+      photo = Twitter::Media::Photo.new(:id => 1)
+      expect(photo.expanded_uri).to be_nil
+    end
+  end
+
+  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
+    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
+    end
+  end
+
+  describe "#media_uri" do
+    it "returns a URI 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_a URI
+      expect(photo.media_uri.to_s).to eq("http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
+    end
+    it "returns nil when the media_url is not set" do
+      photo = Twitter::Media::Photo.new(:id => 1)
+      expect(photo.media_uri).to be_nil
+    end
+  end
+
+  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
+    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
+    end
+  end
+
+  describe "#media_uri_https" do
+    it "returns a URI 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_a URI
+      expect(photo.media_uri_https.to_s).to eq("http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
+    end
+    it "returns nil when the media_url_https is not set" do
+      photo = Twitter::Media::Photo.new(:id => 1)
+      expect(photo.media_uri_https).to be_nil
+    end
+  end
+
+  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
+    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
+    end
+  end
+
+  describe "#uri" do
+    it "returns a URI 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_a URI
+      expect(photo.uri.to_s).to eq("http://pbs.twimg.com/media/BQD6MPOCEAAbCH0.png")
+    end
+    it "returns nil when the url is not set" do
+      photo = Twitter::Media::Photo.new(:id => 1)
+      expect(photo.uri).to be_nil
+    end
+  end
+
+  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
+    end
+    it "returns false when the url is not set" do
+      photo = Twitter::Media::Photo.new(:id => 1)
+      expect(photo.uri?).to be false
+    end
+  end
+
 end

data/spec/twitter/media_factory_spec.rb

@@ -4,11 +4,11 @@ describe Twitter::MediaFactory do
 
   describe ".new" do
     it "generates a Photo" do
-      media = Twitter::MediaFactory.fetch_or_new(:id => 1, :type => 'photo')
+      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.fetch_or_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

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

data/spec/twitter/oembed_spec.rb

@@ -2,24 +2,34 @@ require 'helper'
 
 describe Twitter::OEmbed do
 
-  describe "#author_url" do
-    it "returns the author's url" do
-      oembed = Twitter::OEmbed.new(:author_url => 'https://twitter.com/sferik')
-      expect(oembed.author_url).to eq "https://twitter.com/sferik"
+  describe "#author_uri" do
+    it "returns a URI when the author_url is set" do
+      oembed = Twitter::OEmbed.new(:author_url => "https://twitter.com/sferik")
+      expect(oembed.author_uri).to be_a URI
+      expect(oembed.author_uri.to_s).to eq("https://twitter.com/sferik")
     end
+    it "returns nil when the author_uri is not set" do
+      oembed = Twitter::OEmbed.new
+      expect(oembed.author_uri).to be_nil
+    end
+  end
 
-    it "returns nil when not set" do
-      author_url = Twitter::OEmbed.new.author_url
-      expect(author_url).to be_nil
+  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
+    end
+    it "returns false when the author_uri is not set" do
+      oembed = Twitter::OEmbed.new
+      expect(oembed.author_uri?).to be false
     end
   end
 
   describe "#author_name" do
     it "returns the author's name" do
-      oembed = Twitter::OEmbed.new(:author_name => 'Erik Michaels-Ober')
-      expect(oembed.author_name).to eq "Erik Michaels-Ober"
+      oembed = Twitter::OEmbed.new(:author_name => "Erik Michaels-Ober")
+      expect(oembed.author_name).to eq("Erik Michaels-Ober")
     end
-
     it "returns nil when not set" do
       author_name = Twitter::OEmbed.new.author_name
       expect(author_name).to be_nil
@@ -28,10 +38,9 @@ describe Twitter::OEmbed do
 
   describe "#cache_age" do
     it "returns the cache_age" do
-      oembed = Twitter::OEmbed.new(:cache_age => '31536000000')
-      expect(oembed.cache_age).to eq "31536000000"
+      oembed = Twitter::OEmbed.new(:cache_age => "31536000000")
+      expect(oembed.cache_age).to eq("31536000000")
     end
-
     it "returns nil when not set" do
       cache_age = Twitter::OEmbed.new.cache_age
       expect(cache_age).to be_nil
@@ -41,14 +50,12 @@ describe Twitter::OEmbed do
   describe "#height" do
     it "returns the height" do
       oembed = Twitter::OEmbed.new(:height => 200)
-      expect(oembed.height).to eq 200
+      expect(oembed.height).to eq(200)
     end
-
     it "returns it as an Integer" do
       oembed = Twitter::OEmbed.new(:height => 200)
       expect(oembed.height).to be_an Integer
     end
-
     it "returns nil when not set" do
       height = Twitter::OEmbed.new.height
       expect(height).to be_nil
@@ -57,10 +64,9 @@ describe Twitter::OEmbed do
 
   describe "#html" do
     it "returns the html" do
-      oembed = Twitter::OEmbed.new(:html => '<blockquote>all my <b>witty tweet</b> stuff here</blockquote>')
-      expect(oembed.html).to eq "<blockquote>all my <b>witty tweet</b> stuff here</blockquote>"
+      oembed = Twitter::OEmbed.new(:html => "<blockquote>all my <b>witty tweet</b> stuff here</blockquote>")
+      expect(oembed.html).to eq("<blockquote>all my <b>witty tweet</b> stuff here</blockquote>")
     end
-
     it "returns nil when not set" do
       html = Twitter::OEmbed.new.html
       expect(html).to be_nil
@@ -69,34 +75,43 @@ describe Twitter::OEmbed do
 
   describe "#provider_name" do
     it "returns the provider_name" do
-      oembed = Twitter::OEmbed.new(:provider_name => 'Twitter')
-      expect(oembed.provider_name).to eq "Twitter"
+      oembed = Twitter::OEmbed.new(:provider_name => "Twitter")
+      expect(oembed.provider_name).to eq("Twitter")
     end
-
     it "returns nil when not set" do
       provider_name = Twitter::OEmbed.new.provider_name
       expect(provider_name).to be_nil
     end
   end
 
-  describe "#provider_url" do
-    it "returns the provider_url" do
-      oembed = Twitter::OEmbed.new(:provider_url => 'http://twitter.com')
-      expect(oembed.provider_url).to eq "http://twitter.com"
+  describe "#provider_uri" do
+    it "returns a URI when the provider_url is set" do
+      oembed = Twitter::OEmbed.new(:provider_url => "http://twitter.com")
+      expect(oembed.provider_uri).to be_a URI
+      expect(oembed.provider_uri.to_s).to eq("http://twitter.com")
+    end
+    it "returns nil when the provider_uri is not set" do
+      oembed = Twitter::OEmbed.new
+      expect(oembed.provider_uri).to be_nil
     end
+  end
 
-    it "returns nil when not set" do
-      provider_url = Twitter::OEmbed.new.provider_url
-      expect(provider_url).to be_nil
+  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
+    end
+    it "returns false when the provider_uri is not set" do
+      oembed = Twitter::OEmbed.new
+      expect(oembed.provider_uri?).to be false
     end
   end
 
   describe "#type" do
     it "returns the type" do
-      oembed = Twitter::OEmbed.new(:type => 'rich')
-      expect(oembed.type).to eq "rich"
+      oembed = Twitter::OEmbed.new(:type => "rich")
+      expect(oembed.type).to eq("rich")
     end
-
     it "returns nil when not set" do
       type = Twitter::OEmbed.new.type
       expect(type).to be_nil
@@ -106,41 +121,50 @@ describe Twitter::OEmbed do
   describe "#width" do
     it "returns the width" do
       oembed = Twitter::OEmbed.new(:width => 550)
-      expect(oembed.width).to eq 550
+      expect(oembed.width).to eq(550)
     end
-
     it "returns it as an Integer" do
       oembed = Twitter::OEmbed.new(:width => 550)
       expect(oembed.width).to be_an Integer
     end
-
     it "returns nil when not set" do
       width = Twitter::OEmbed.new.width
       expect(width).to be_nil
     end
   end
 
-  describe "#url" do
-    it "returns the url" do
-      oembed = Twitter::OEmbed.new(:url => 'https://twitter.com/twitterapi/status/133640144317198338')
-      expect(oembed.url).to eq "https://twitter.com/twitterapi/status/133640144317198338"
+  describe "#uri" do
+    it "returns a URI when the url is set" do
+      oembed = Twitter::OEmbed.new(:url => "https://twitter.com/twitterapi/status/133640144317198338")
+      expect(oembed.uri).to be_a URI
+      expect(oembed.uri.to_s).to eq("https://twitter.com/twitterapi/status/133640144317198338")
+    end
+    it "returns nil when the url is not set" do
+      oembed = Twitter::OEmbed.new
+      expect(oembed.uri).to be_nil
     end
+  end
 
-    it "returns nil when not set" do
-      url = Twitter::OEmbed.new.url
-      expect(url).to be_nil
+  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
+    end
+    it "returns false when the url is not set" do
+      oembed = Twitter::OEmbed.new
+      expect(oembed.uri?).to be false
     end
   end
 
   describe "#version" do
     it "returns the version" do
-      oembed = Twitter::OEmbed.new(:version => '1.0')
-      expect(oembed.version).to eq "1.0"
+      oembed = Twitter::OEmbed.new(:version => "1.0")
+      expect(oembed.version).to eq("1.0")
     end
-
     it "returns nil when not set" do
       version = Twitter::OEmbed.new.version
       expect(version).to be_nil
     end
   end
+
 end