twitter 5.0.0.rc.1 → 5.0.0

data/lib/twitter/user.rb

@@ -4,6 +4,7 @@ require 'twitter/creatable'
 module Twitter
   class User < Twitter::BasicUser
     PROFILE_IMAGE_SUFFIX_REGEX = /_normal(\.gif|\.jpe?g|\.png)$/i
+    PREDICATE_URI_METHOD_REGEX = /_uri\?$/
     include Twitter::Creatable
     attr_reader :connections, :contributors_enabled, :default_profile,
       :default_profile_image, :description, :favourites_count,
@@ -16,6 +17,7 @@ module Twitter
       :profile_use_background_image, :protected, :statuses_count, :time_zone,
       :utc_offset, :verified
     alias favorites_count favourites_count
+    remove_method :favourites_count
     alias profile_background_image_uri profile_background_image_url
     alias profile_background_image_uri_https profile_background_image_url_https
     alias translator? is_translator
@@ -25,14 +27,29 @@ module Twitter
     alias tweet? status?
     alias tweeted? status?
 
-    # @return [Array<Twitter::Entity::Url>]
-    def description_uris
-      memoize(:description_urls) do
-        Array(@attrs[:entities][:description][:urls]).map do |entity|
-          Twitter::Entity::Url.new(entity)
+    class << self
+
+    private
+
+      def alias_predicate_uri_methods(method)
+        for replacement in %w(_url? _uri_https? _url_https?)
+          alias_method_sub(method, PREDICATE_URI_METHOD_REGEX, replacement)
         end
       end
+
+      def alias_method_sub(method, pattern, replacement)
+        alias_method(method.to_s.sub(pattern, replacement).to_sym, method)
+      end
+
     end
+
+    # @return [Array<Twitter::Entity::URI>]
+    def description_uris
+      Array(@attrs[:entities][:description][:urls]).map do |entity|
+        Entity::URI.new(entity)
+      end
+    end
+    memoize :description_uris
     alias description_urls description_uris
 
     # Return the URL to the user's profile banner image
@@ -53,12 +70,12 @@ module Twitter
     end
     alias profile_banner_url_https profile_banner_uri_https
 
+    # @return [Boolean]
     def profile_banner_uri?
       !!@attrs[:profile_banner_url]
     end
-    alias profile_banner_url? profile_banner_uri?
-    alias profile_banner_uri_https? profile_banner_uri?
-    alias profile_banner_url_https? profile_banner_uri?
+    memoize :profile_banner_uri?
+    alias_predicate_uri_methods :profile_banner_uri?
 
     # Return the URL to the user's profile image
     #
@@ -87,29 +104,31 @@ module Twitter
     def profile_image_uri?
       !!@attrs[:profile_image_url_https]
     end
-    alias profile_image_url? profile_image_uri?
-    alias profile_image_uri_https? profile_image_uri?
-    alias profile_image_url_https? profile_image_uri?
+    memoize :profile_image_uri?
+    alias_predicate_uri_methods :profile_image_uri?
 
     # @return [String] The URL to the user.
     def uri
-      @uri ||= ::URI.parse("https://twitter.com/#{screen_name}")
+      URI.parse("https://twitter.com/#{screen_name}")
     end
+    memoize :uri
     alias url uri
 
     # @return [String] The URL to the user's website.
     def website
-      @website ||= ::URI.parse(@attrs[:url]) if @attrs[:url]
+      URI.parse(@attrs[:url]) if @attrs[:url]
     end
+    memoize :website
 
     def website?
       !!@attrs[:url]
     end
+    memoize :website?
 
   private
 
     def parse_encoded_uri(uri)
-      ::URI.parse(::URI.encode(uri))
+      URI.parse(URI.encode(uri))
     end
 
     def insecure_uri(uri)
@@ -117,11 +136,7 @@ module Twitter
     end
 
     def profile_image_suffix(size)
-      if :original == size.to_sym
-        "\\1"
-      else
-        "_#{size}\\1"
-      end
+      :original == size.to_sym ? "\\1" : "_#{size}\\1"
     end
 
   end

data/lib/twitter/version.rb

@@ -3,7 +3,7 @@ module Twitter
     MAJOR = 5
     MINOR = 0
     PATCH = 0
-    PRE = "rc.1"
+    PRE = nil
 
     class << self
 

data/spec/fixtures/request_token.txt

@@ -0,0 +1,6 @@
+OAuth oauth_signature="AAAAAAAAA",
+oauth_timestamp="1380473364", oauth_version="1.0",
+oauth_token="BBBBBBBBB",
+oauth_signature_method="HMAC-SHA1",
+oauth_consumer_key="CCCCCCCCCCC",
+oauth_nonce="DDDDDDDDDDD"

data/spec/fixtures/track_streaming_user.json

@@ -0,0 +1,5 @@
+{"friends":[488736931,311444249]}
+{"created_at":"Wed Apr 06 19:13:37 +0000 2011","id":55709764298092545,"id_str":"55709764298092545","text":"The problem with your code is that it's doing exactly what you told it to do.","source":"\u003ca href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter for iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":7505382,"id_str":"7505382","name":"Erik Michaels-Ober","screen_name":"sferik","location":"San Francisco","description":"Write code. Not too much. Mostly Ruby.","url":"https:\/\/github.com\/sferik","entities":{"url":{"urls":[{"url":"https:\/\/github.com\/sferik","expanded_url":null,"indices":[0,25]}]},"description":{"urls":[]}},"protected":false,"followers_count":2479,"friends_count":200,"listed_count":132,"created_at":"Mon Jul 16 12:59:01 +0000 2007","favourites_count":4421,"utc_offset":-28800,"time_zone":"Pacific Time (US & Canada)","geo_enabled":true,"verified":false,"statuses_count":8730,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"000000","profile_background_image_url":"http:\/\/a0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_image_url_https":"https:\/\/si0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_banner_url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693","profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":false,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"geo":{"type":"Point","coordinates":[37.78349999,-122.39362884]},"coordinates":{"type":"Point","coordinates":[-122.39362884,37.78349999]},"place":{"id":"5c92ab5379de3839","url":"https:\/\/api.twitter.com\/1.1\/geo\/id\/5c92ab5379de3839.json","place_type":"neighborhood","name":"South Beach","full_name":"South Beach, San Francisco","country_code":"US","country":"United States","bounding_box":{"type":"Polygon","coordinates":[[[-122.403482,37.777529],[-122.387436,37.777529],[-122.387436,37.794486],[-122.403482,37.794486]]]},"attributes":{}},"contributors":null,"retweet_count":316,"entities":{"hashtags":[],"urls":[],"user_mentions":[]},"favorited":false,"retweeted":false}
+{"created_at":"Wed Apr 06 19:13:37 +0000 2011","id":55709764298092545,"id_str":"55709764298092545","text":"The problem with your code is that it's doing exactly what you told it to do.","source":"\u003ca href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter for iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":7505382,"id_str":"7505382","name":"Erik Michaels-Ober","screen_name":"sferik","location":"San Francisco","description":"Write code. Not too much. Mostly Ruby.","url":"https:\/\/github.com\/sferik","entities":{"url":{"urls":[{"url":"https:\/\/github.com\/sferik","expanded_url":null,"indices":[0,25]}]},"description":{"urls":[]}},"protected":false,"followers_count":2479,"friends_count":200,"listed_count":132,"created_at":"Mon Jul 16 12:59:01 +0000 2007","favourites_count":4421,"utc_offset":-28800,"time_zone":"Pacific Time (US & Canada)","geo_enabled":true,"verified":false,"statuses_count":8730,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"000000","profile_background_image_url":"http:\/\/a0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_image_url_https":"https:\/\/si0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_banner_url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693","profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":false,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"geo":{"type":"Point","coordinates":[37.78349999,-122.39362884]},"coordinates":{"type":"Point","coordinates":[-122.39362884,37.78349999]},"place":{"id":"5c92ab5379de3839","url":"https:\/\/api.twitter.com\/1.1\/geo\/id\/5c92ab5379de3839.json","place_type":"neighborhood","name":"South Beach","full_name":"South Beach, San Francisco","country_code":"US","country":"United States","bounding_box":{"type":"Polygon","coordinates":[[[-122.403482,37.777529],[-122.387436,37.777529],[-122.387436,37.794486],[-122.403482,37.794486]]]},"attributes":{}},"contributors":null,"retweet_count":316,"entities":{"hashtags":[],"urls":[],"user_mentions":[]},"favorited":false,"retweeted":false}
+{"direct_message":{"id":389327745617891328,"id_str":"389327745617891328","text":"hello bot","sender":{"id":10083602,"id_str":"10083602","name":"Adam Bird","screen_name":"adambird","location":"Nottingham, UK","url":"http:\/\/about.me\/adambird", "description":"CEO @onediaryapp, ex @esendex CTO and co-founder, still cycling","protected":false,"followers_count":1286,"friends_count":850,"listed_count":51,"created_at":"Fri Nov 09 00:35:12 +0000 2007","favourites_count":93,"utc_offset":3600,"time_zone":"London","geo_enabled":true,"verified":false,"statuses_count":13480,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"C0DEED","profile_background_image_url":"http:\/\/abs.twimg.com\/images\/themes\/theme1\/bg.png","profile_background_image_url_https":"https:\/\/abs.twimg.com\/images\/themes\/theme1\/bg.png","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/378800000477232297\/23d85bb78f71534eea1e1133fb771f86_normal.jpeg","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/378800000477232297\/23d85bb78f71534eea1e1133fb771f86_normal.jpeg","profile_link_color":"0084B4","profile_sidebar_border_color":"C0DEED","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":true,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"sender_id":10083602,"sender_id_str":"10083602","sender_screen_name":"adambird","recipient":{"id":1292911088,"id_str":"1292911088","name":"One Diary Bot","screen_name":"onediarybot","location":"","url":"http:\/\/www.onediary.com","description":"I'm the One Diary bot, here to help you with your life including personal cycling weather forecasts.","protected":false,"followers_count":113,"friends_count":148,"listed_count":1,"created_at":"Sat Mar 23 23:52:18 +0000 2013","favourites_count":0,"utc_offset":"","time_zone":"","geo_enabled":false,"verified":false,"statuses_count":7919,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"C0DEED","profile_background_image_url":"http:\/\/abs.twimg.com\/images\/themes\/theme1\/bg.png","profile_background_image_url_https":"https:\/\/abs.twimg.com\/images\/themes\/theme1\/bg.png","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/3651575369\/090551d8dd92080198f707769239ff43_normal.jpeg","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/3651575369\/090551d8dd92080198f707769239ff43_normal.jpeg","profile_link_color":"0084B4","profile_sidebar_border_color":"C0DEED","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":true,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"recipient_id":1292911088,"recipient_id_str":"1292911088","recipient_screen_name":"onediarybot","created_at":"Sun Oct 13 09:52:22 +0000 2013","entities":{"hashtags":[],"symbols":[],"urls":[],"user_mentions":[]}}}
+{"event":"follow","source":{"id":10083602,"id_str":"10083602","name":"Adam Bird","screen_name":"adambird","location":"Nottingham, UK","url":"http://t.co/M1eaIKDQyz","description":"CEO @onediaryapp, ex @esendex CTO and co-founder, still cycling","protected":false,"followers_count":1295,"friends_count":850,"listed_count":53,"created_at":"Fri Nov 09 00:35:12 +0000 2007","favourites_count":93,"utc_offset":0,"time_zone":"London","geo_enabled":true,"verified":false,"statuses_count":13507,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"C0DEED","profile_background_image_url":"http://abs.twimg.com/images/themes/theme1/bg.png","profile_background_image_url_https":"https://abs.twimg.com/images/themes/theme1/bg.png","profile_background_tile":false,"profile_image_url":"http://pbs.twimg.com/profile_images/378800000477232297/23d85bb78f71534eea1e1133fb771f86_normal.jpeg","profile_image_url_https":"https://pbs.twimg.com/profile_images/378800000477232297/23d85bb78f71534eea1e1133fb771f86_normal.jpeg","profile_link_color":"0084B4","profile_sidebar_border_color":"C0DEED","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":true,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"target":{"id":1292911088,"id_str":"1292911088","name":"One Diary Bot","screen_name":"onediarybot","location":null,"url":"http://t.co/etHGc0xHX4","description":"I'm the One Diary bot, here to help you with your life including personal cycling weather forecasts.","protected":false,"followers_count":123,"friends_count":157,"listed_count":1,"created_at":"Sat Mar 23 23:52:18 +0000 2013","favourites_count":0,"utc_offset":null,"time_zone":null,"geo_enabled":false,"verified":false,"statuses_count":9637,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"C0DEED","profile_background_image_url":"http://abs.twimg.com/images/themes/theme1/bg.png","profile_background_image_url_https":"https://abs.twimg.com/images/themes/theme1/bg.png","profile_background_tile":false,"profile_image_url":"http://pbs.twimg.com/profile_images/3651575369/090551d8dd92080198f707769239ff43_normal.jpeg","profile_image_url_https":"https://pbs.twimg.com/profile_images/3651575369/090551d8dd92080198f707769239ff43_normal.jpeg","profile_link_color":"0084B4","profile_sidebar_border_color":"C0DEED","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":true,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"created_at":"Sun Oct 27 20:35:25 +0000 2013"}

data/spec/twitter/base_spec.rb

@@ -24,20 +24,4 @@ describe Twitter::Base do
     end
   end
 
-  describe "#delete" do
-    it "deletes an attribute and returns its value" do
-      base = Twitter::Base.new(:id => 1)
-      expect(base.delete(:id)).to eq(1)
-      expect(base.attrs[:id]).to be_nil
-    end
-  end
-
-  describe "#update" do
-    it "returns a hash of attributes" do
-      base = Twitter::Base.new(:id => 1)
-      base.update(:id => 2)
-      expect(base.attrs[:id]).to eq(2)
-    end
-  end
-
 end

data/spec/twitter/basic_user_spec.rb

@@ -6,17 +6,17 @@ describe Twitter::BasicUser do
     it "returns true when objects IDs are the same" do
       saved_search = Twitter::BasicUser.new(:id => 1, :name => "foo")
       other = Twitter::BasicUser.new(:id => 1, :name => "bar")
-      expect(saved_search == other).to be_true
+      expect(saved_search == other).to be true
     end
     it "returns false when objects IDs are different" do
       saved_search = Twitter::BasicUser.new(:id => 1)
       other = Twitter::BasicUser.new(:id => 2)
-      expect(saved_search == other).to be_false
+      expect(saved_search == other).to be false
     end
     it "returns false when classes are different" do
       saved_search = Twitter::BasicUser.new(:id => 1)
       other = Twitter::Identity.new(:id => 1)
-      expect(saved_search == other).to be_false
+      expect(saved_search == other).to be false
     end
   end
 

data/spec/twitter/cursor_spec.rb

@@ -33,7 +33,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:previous_cursor => 0}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns true" do
-        expect(@cursor.first?).to be_true
+        expect(@cursor.first?).to be true
       end
     end
     context "when previous cursor does not equal zero" do
@@ -41,7 +41,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:previous_cursor => 1}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns true" do
-        expect(@cursor.first?).to be_false
+        expect(@cursor.first?).to be false
       end
     end
   end
@@ -52,7 +52,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:next_cursor => 0}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns true" do
-        expect(@cursor.last?).to be_true
+        expect(@cursor.last?).to be true
       end
     end
     context "when next cursor does not equal zero" do
@@ -60,7 +60,7 @@ describe Twitter::Cursor do
         @cursor = Twitter::Cursor.new({:next_cursor => 1}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns false" do
-        expect(@cursor.last?).to be_false
+        expect(@cursor.last?).to be false
       end
     end
   end

data/spec/twitter/direct_message_spec.rb

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

data/spec/twitter/entity/uri_spec.rb

@@ -1,12 +1,13 @@
+# coding: utf-8
 require 'helper'
 
 describe Twitter::Entity::URI do
 
   describe "#display_uri" do
-    it "returns a URI when the display_url is set" do
-      uri = Twitter::Entity::URI.new(:display_url => "https://github.com/sferik")
-      expect(uri.display_uri).to be_a URI
-      expect(uri.display_uri.to_s).to eq("https://github.com/sferik")
+    it "returns a String when the display_url is set" do
+      uri = Twitter::Entity::URI.new(:display_url => "example.com/expanded…")
+      expect(uri.display_uri).to be_a String
+      expect(uri.display_uri).to eq("example.com/expanded…")
     end
     it "returns nil when the display_url is not set" do
       uri = Twitter::Entity::URI.new
@@ -16,12 +17,12 @@ describe Twitter::Entity::URI do
 
   describe "#display_uri?" do
     it "returns true when the display_url is set" do
-      uri = Twitter::Entity::URI.new(:display_url => "https://github.com/sferik")
-      expect(uri.display_uri).to be_true
+      uri = Twitter::Entity::URI.new(:display_url => "example.com/expanded…")
+      expect(uri.display_uri?).to be true
     end
     it "returns false when the display_url is not set" do
       uri = Twitter::Entity::URI.new
-      expect(uri.display_uri).to be_false
+      expect(uri.display_uri?).to be false
     end
   end
 
@@ -40,11 +41,11 @@ describe Twitter::Entity::URI do
   describe "#expanded_uri?" do
     it "returns true when the expanded_url is set" do
       uri = Twitter::Entity::URI.new(:expanded_url => "https://github.com/sferik")
-      expect(uri.expanded_uri).to be_true
+      expect(uri.expanded_uri?).to be true
     end
     it "returns false when the expanded_url is not set" do
       uri = Twitter::Entity::URI.new
-      expect(uri.expanded_uri).to be_false
+      expect(uri.expanded_uri?).to be false
     end
   end
 
@@ -63,11 +64,11 @@ describe Twitter::Entity::URI do
   describe "#uri?" do
     it "returns true when the url is set" do
       uri = Twitter::Entity::URI.new(:url => "https://github.com/sferik")
-      expect(uri.uri).to be_true
+      expect(uri.uri?).to be true
     end
     it "returns false when the url is not set" do
       uri = Twitter::Entity::URI.new
-      expect(uri.uri).to be_false
+      expect(uri.uri?).to be false
     end
   end
 

data/spec/twitter/geo/point_spec.rb

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

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

@@ -11,8 +11,8 @@ describe Twitter::GeoFactory do
       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.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_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,8 +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
+    it "raises an IndexError when id is not specified" do
+      expect{Twitter::Identity.new}.to raise_error IndexError
     end
   end
 
@@ -12,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