twitter 5.0.0 → 5.1.0

data/.yardopts

@@ -8,3 +8,5 @@ CHANGELOG.md
 CONTRIBUTING.md
 LICENSE.md
 README.md
+examples/Configuration.md
+examples/Update.md

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+5.1.0
+-----
+* [Use `Addressable::URI` everywhere](https://github.com/sferik/twitter/commit/97d7c68900c9974a1f6841f6eed2706df9030d64) ([@matthewrudy](https://twitter.com/matthewrudy))
+* [Allow use of `Twitter::Place` instead of `place_id`](https://github.com/sferik/twitter/commit/c2b31dd2385fefa30a9ddccf15415a713cf5953a)
+* [Allow use of `Twitter::Tweet` instead of `in_reply_to_status_id`](https://github.com/sferik/twitter/commit/6b7d6c2b637a074c348a56a51fb1e02252482fb2)
+
+5.0.1
+-----
+* [Fix `buftok` delimiter handling](https://github.com/sferik/twitter/pull/484)
+* [Started handling streaming deletes](https://github.com/sferik/twitter/commit/8860b97bce4bc36086116f380a2771af3c199ea2)
+* [Replace `URI` with `adressable`](https://github.com/sferik/twitter/commit/7ea2f5390dc7456950f55c90aa4e48f29dcd4604)
+
 5.0.0
 -----
 * [Remove `Twitter::API::Undocumented#status_activity` and `#statuses_activity`](https://github.com/sferik/twitter/commit/7f970810af251b2fe80c38b30c54485c55bd2034)

data/CONTRIBUTING.md

@@ -14,10 +14,10 @@ improve this project. Here are some ways *you* can contribute:
 * Refactor code.
 * Fix [issues][].
 * Review patches.
-* Financially pledge using [Pledgie][].
+* Financially pledge using [gittip][].
 
 [issues]: https://github.com/sferik/twitter/issues
-[Pledgie]: http://pledgie.com/campaigns/18388
+[gittip]: https://www.gittip.com/sferik/
 
 ## Submitting an Issue
 We use the [GitHub issue tracker][issues] to track bugs and features. Before
@@ -38,7 +38,7 @@ Ideally, a bug report should include a pull request with failing specs.
 6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
 7. Run `open coverage/index.html`. If your changes are not completely covered
    by your tests, return to step 3.
-8.  Run `RUBYOPT=W2 bundle exec rake spec 2>&1 | grep twitter`. If your changes
+8. Run `RUBYOPT=W2 bundle exec rake spec 2>&1 | grep twitter`. If your changes
    produce any warnings, return to step 5.
 9. Add documentation for your feature or bug fix.
 10. Run `bundle exec rake yard`. If your changes are not 100% documented, go

data/README.md

@@ -5,14 +5,14 @@
 [![Dependency Status](https://gemnasium.com/sferik/twitter.png?travis)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/sferik/twitter.png)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/sferik/twitter/badge.png?branch=master)][coveralls]
-[![Click here to make a donation](http://www.pledgie.com/campaigns/18388.png)][pledgie]
+[![Gittip](http://img.shields.io/gittip/sferik.png)][gittip]
 
 [gem]: https://rubygems.org/gems/twitter
 [travis]: http://travis-ci.org/sferik/twitter
 [gemnasium]: https://gemnasium.com/sferik/twitter
 [codeclimate]: https://codeclimate.com/github/sferik/twitter
 [coveralls]: https://coveralls.io/r/sferik/twitter
-[pledgie]: http://pledgie.com/campaigns/18388
+[gittip]: https://www.gittip.com/sferik/
 
 A Ruby interface to the Twitter API.
 
@@ -137,7 +137,7 @@ end
 
 ```ruby
 client.user do |message|
-  puts message 
+  puts message
 end
 ```
 
@@ -161,14 +161,14 @@ simplicity and performance.
       <th>Notes</th>
       <th colspan="2">Version 4</th>
       <th colspan="2">Version 5</th>
-    </th>
+    </tr>
     <tr>
       <th></th>
       <th>Code</th>
       <th>HTTP GETs</th>
       <th>Code</th>
       <th>HTTP GETs</th>
-    </th>
+    </tr>
   </thead>
   <tbody>
     <tr>
@@ -176,13 +176,13 @@ simplicity and performance.
         Are you at the start of the cursor?
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.first</code></pre>
+        <pre><code>client.friends.first</code></pre>
       </td>
       <td>
         <em>Θ(1)</em>
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.first?</code></pre>
+        <pre><code>client.friends.first?</code></pre>
       </td>
       <td>
         <em>Θ(1)</em>
@@ -193,13 +193,13 @@ simplicity and performance.
         Return your most recent follower.
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.users.first</code></pre>
+        <pre><code>client.friends.users.first</code></pre>
       </td>
       <td>
         <em>Θ(1)</em>
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.first</code></pre>
+        <pre><code>client.friends.first</code></pre>
       </td>
       <td>
         <em>Θ(1)</em>
@@ -210,13 +210,13 @@ simplicity and performance.
         Return an array of all your friends.
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.all</code></pre>
+        <pre><code>client.friends.all</code></pre>
       </td>
       <td>
         <em>Θ(n+1)</em>
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.to_a</code></pre>
+        <pre><code>client.friends.to_a</code></pre>
       </td>
       <td>
         <em>Θ(n)</em>
@@ -227,13 +227,13 @@ simplicity and performance.
         Collect your 20 most recent friends.
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.take(20)</code></pre>
+        <pre><code>client.friends.take(20)</code></pre>
       </td>
       <td>
         <em>Θ(n+1)</em>
       </td>
       <td>
-        <pre><code lang="ruby">client.friends.take(20)</code></pre>
+        <pre><code>client.friends.take(20)</code></pre>
       </td>
       <td>
         <em>Θ(1)</em>
@@ -244,7 +244,7 @@ simplicity and performance.
         Collect your 20 most recent friends twice.
       </td>
       <td>
-        <pre><code lang="ruby">friends = client.friends
+        <pre><code>friends = client.friends
 2.times.collect do
   friends.take(20)
 end</code></pre>
@@ -253,7 +253,7 @@ end</code></pre>
         <em>Θ(2n+2)</em>
       </td>
       <td>
-        <pre><code lang="ruby">friends = client.friends
+        <pre><code>friends = client.friends
 2.times.collect do
   friends.take(20)
 end</code></pre>
@@ -423,8 +423,8 @@ These methods are aliased to `#url` for users who prefer that nomenclature.
 `Twitter::User` previously had a `#url` method, which returned the user's
 website. This URI is now available via the `#website` method.
 
-All `#uri` methods now return `URI` objects instead of strings. To convert a
-`URI` object to a string, call `#to_s` on it.
+All `#uri` methods now return `Addressable::URI` objects instead of strings. To convert an
+`Addressable::URI` object to a string, call `#to_s` on it.
 
 ## Configuration
 Twitter API v1.1 requires you to authenticate via OAuth, so you'll need to
@@ -600,7 +600,7 @@ introduced with new major versions. As a result of this policy, you can (and
 should) specify a dependency on this gem using the [Pessimistic Version
 Constraint][pvc] with two digits of precision. For example:
 
-    spec.add_dependency 'twitter', '~> 4.0'
+    spec.add_dependency 'twitter', '~> 5.0'
 
 [semver]: http://semver.org/
 [pvc]: http://docs.rubygems.org/read/chapter/16#page74

data/lib/twitter/base.rb

@@ -1,7 +1,7 @@
+require 'addressable/uri'
 require 'forwardable'
 require 'memoizable'
 require 'twitter/null_object'
-require 'uri'
 
 module Twitter
   class Base
@@ -74,7 +74,7 @@ module Twitter
       # @param key2 [Symbol]
       def define_uri_method(key1, key2)
         define_method(key1) do ||
-          URI.parse(@attrs[key2]) if @attrs[key2]
+          Addressable::URI.parse(@attrs[key2]) if @attrs[key2]
         end
         memoize(key1)
       end

data/lib/twitter/client.rb

@@ -1,6 +1,6 @@
+require 'addressable/uri'
 require 'simple_oauth'
 require 'twitter/version'
-require 'uri'
 
 module Twitter
   class Client
@@ -62,7 +62,7 @@ module Twitter
     end
 
     def oauth_auth_header(method, uri, params={})
-      uri = URI.parse(uri)
+      uri = Addressable::URI.parse(uri)
       SimpleOAuth::Header.new(method, uri, params, credentials)
     end
 

data/lib/twitter/list.rb

@@ -8,23 +8,23 @@ module Twitter
       :mode, :name, :slug, :subscriber_count
     object_attr_reader :User, :user
 
-    # @return [URI] The URI to the list members.
+    # @return [Addressable::URI] The URI to the list members.
     def members_uri
-      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/members")
+      Addressable::URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/members")
     end
     memoize :members_uri
     alias members_url members_uri
 
-    # @return [URI] The URI to the list subscribers.
+    # @return [Addressable::URI] The URI to the list subscribers.
     def subscribers_uri
-      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/subscribers")
+      Addressable::URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/subscribers")
     end
     memoize :subscribers_uri
     alias subscribers_url subscribers_uri
 
-    # @return [URI] The URI to the list.
+    # @return [Addressable::URI] The URI to the list.
     def uri
-      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}")
+      Addressable::URI.parse("https://twitter.com/#{user.screen_name}/#{slug}")
     end
     memoize :uri
     alias url uri

data/lib/twitter/rest/api/tweets.rb

@@ -110,14 +110,19 @@ module Twitter
         # @return [Twitter::Tweet] The created Tweet.
         # @param status [String] The text of your status update, up to 140 characters.
         # @param options [Hash] A customizable set of options.
+        # @option options [Twitter::Tweet] :in_reply_to_status An existing status that the update is in reply to.
         # @option options [Integer] :in_reply_to_status_id The ID of an existing status that the update is in reply to.
         # @option options [Float] :lat The latitude of the location this tweet refers to. This option will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding :long option.
         # @option options [Float] :long The longitude of the location this tweet refers to. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This option will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding :lat option.
+        # @option options [Twitter::Place] :place A place in the world. These can be retrieved from {Twitter::REST::API::PlacesAndGeo#reverse_geocode}.
         # @option options [String] :place_id A place in the world. These IDs can be retrieved from {Twitter::REST::API::PlacesAndGeo#reverse_geocode}.
         # @option options [String] :display_coordinates Whether or not to put a pin on the exact coordinates a tweet has been sent from.
         # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
         def update(status, options={})
-          object_from_response(Twitter::Tweet, :post, "/1.1/statuses/update.json", options.merge(:status => status))
+          hash = options.dup
+          hash[:in_reply_to_status_id] = hash.delete(:in_reply_to_status).id unless hash[:in_reply_to_status].nil?
+          hash[:place_id] = hash.delete(:place).woeid unless hash[:place].nil?
+          object_from_response(Twitter::Tweet, :post, "/1.1/statuses/update.json", hash.merge(:status => status))
         rescue Twitter::Error::Forbidden => error
           handle_forbidden_error(Twitter::Error::AlreadyPosted, error)
         end
@@ -184,14 +189,20 @@ module Twitter
         # @param status [String] The text of your status update, up to 140 characters.
         # @param media [File, Hash] A File object with your picture (PNG, JPEG or GIF)
         # @param options [Hash] A customizable set of options.
+        # @option options [Boolean, String, Integer] :possibly_sensitive Set to true for content which may not be suitable for every audience.
+        # @option options [Twitter::Tweet] :in_reply_to_status An existing status that the update is in reply to.
         # @option options [Integer] :in_reply_to_status_id The ID of an existing Tweet that the update is in reply to.
         # @option options [Float] :lat The latitude of the location this tweet refers to. This option will be ignored unless it is inside the range -90.0 to +90.0 (North is positive) inclusive. It will also be ignored if there isn't a corresponding :long option.
         # @option options [Float] :long The longitude of the location this tweet refers to. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This option will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding :lat option.
+        # @option options [Twitter::Place] :place A place in the world. These can be retrieved from {Twitter::REST::API::PlacesAndGeo#reverse_geocode}.
         # @option options [String] :place_id A place in the world. These IDs can be retrieved from {Twitter::REST::API::PlacesAndGeo#reverse_geocode}.
         # @option options [String] :display_coordinates Whether or not to put a pin on the exact coordinates a tweet has been sent from.
         # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
         def update_with_media(status, media, options={})
-          object_from_response(Twitter::Tweet, :post, "/1.1/statuses/update_with_media.json", options.merge('media[]' => media, 'status' => status))
+          hash = options.dup
+          hash[:in_reply_to_status_id] = hash.delete(:in_reply_to_status).id unless hash[:in_reply_to_status].nil?
+          hash[:place_id] = hash.delete(:place).woeid unless hash[:place].nil?
+          object_from_response(Twitter::Tweet, :post, "/1.1/statuses/update_with_media.json", hash.merge('media[]' => media, 'status' => status))
         rescue Twitter::Error::Forbidden => error
           handle_forbidden_error(Twitter::Error::AlreadyPosted, error)
         end

data/lib/twitter/rest/api/users.rb

@@ -169,7 +169,7 @@ module Twitter
           user_id = case user
           when Integer
             user
-          when String, URI
+          when String, URI, Addressable::URI
             user(user).id
           when Twitter::User
             user.id

data/lib/twitter/rest/api/utils.rb

@@ -1,7 +1,7 @@
+require 'addressable/uri'
 require 'twitter/arguments'
 require 'twitter/cursor'
 require 'twitter/user'
-require 'uri'
 
 module Twitter
   module REST
@@ -185,7 +185,7 @@ module Twitter
             else
               set_compound_key("screen_name", user, hash, prefix)
             end
-          when URI
+          when URI, Addressable::URI
             set_compound_key("screen_name", user.path.split("/").last, hash, prefix)
           when Twitter::User
             set_compound_key("user_id", user.id, hash, prefix)

data/lib/twitter/streaming/message_parser.rb

@@ -11,6 +11,10 @@ module Twitter
           DirectMessage.new(data[:direct_message])
         elsif data[:friends]
           FriendList.new(data[:friends])
+        elsif data[:delete]
+          if data[:delete][:status]
+            Tweet.new(data[:delete][:status].merge(:deleted => true))
+          end
         end
       end
     end

data/lib/twitter/tweet.rb

@@ -10,6 +10,7 @@ module Twitter
     alias favoriters_count favorite_count
     alias in_reply_to_tweet_id in_reply_to_status_id
     alias retweeters_count retweet_count
+    attr_reader :deleted
     object_attr_reader :GeoFactory, :geo
     object_attr_reader :Metadata, :metadata
     object_attr_reader :Place, :place
@@ -30,6 +31,12 @@ module Twitter
       @attrs[:filter_level] || "none"
     end
     memoize :filter_level
+    
+    # @note Not a real entity
+    # @return [Boolean]
+    def deleted?
+      deleted == true
+    end
 
     # @return [String]
     # @note May be > 140 characters.
@@ -72,7 +79,7 @@ module Twitter
 
     # @return [String] The URL to the tweet.
     def uri
-      URI.parse("https://twitter.com/#{user.screen_name}/status/#{id}")
+      Addressable::URI.parse("https://twitter.com/#{user.screen_name}/status/#{id}")
     end
     memoize :uri
     alias url uri

data/lib/twitter/user.rb

@@ -109,14 +109,14 @@ module Twitter
 
     # @return [String] The URL to the user.
     def uri
-      URI.parse("https://twitter.com/#{screen_name}")
+      Addressable::URI.parse("https://twitter.com/#{screen_name}")
     end
     memoize :uri
     alias url uri
 
     # @return [String] The URL to the user's website.
     def website
-      URI.parse(@attrs[:url]) if @attrs[:url]
+      Addressable::URI.parse(@attrs[:url]) if @attrs[:url]
     end
     memoize :website
 
@@ -128,7 +128,7 @@ module Twitter
   private
 
     def parse_encoded_uri(uri)
-      URI.parse(URI.encode(uri))
+      Addressable::URI.parse(URI.encode(uri))
     end
 
     def insecure_uri(uri)

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 5
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     PRE = nil
 

data/lib/twitter.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'twitter/configuration'
 require 'twitter/cursor'
 require 'twitter/direct_message'
@@ -28,4 +29,3 @@ require 'twitter/target_user'
 require 'twitter/trend'
 require 'twitter/tweet'
 require 'twitter/user'
-require 'uri'

data/spec/twitter/entity/uri_spec.rb

@@ -29,7 +29,7 @@ describe Twitter::Entity::URI do
   describe "#expanded_uri" do
     it "returns a URI when the expanded_url is set" do
       uri = Twitter::Entity::URI.new(:expanded_url => "https://github.com/sferik")
-      expect(uri.expanded_uri).to be_a URI
+      expect(uri.expanded_uri).to be_a Addressable::URI
       expect(uri.expanded_uri.to_s).to eq("https://github.com/sferik")
     end
     it "returns nil when the expanded_url is not set" do
@@ -52,7 +52,7 @@ describe Twitter::Entity::URI do
   describe "#uri" do
     it "returns a URI when the url is set" do
       uri = Twitter::Entity::URI.new(:url => "https://github.com/sferik")
-      expect(uri.uri).to be_a URI
+      expect(uri.uri).to be_a Addressable::URI
       expect(uri.uri.to_s).to eq("https://github.com/sferik")
     end
     it "returns nil when the url is not set" do

data/spec/twitter/media/photo_spec.rb

@@ -59,7 +59,7 @@ describe Twitter::Media::Photo do
   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 be_a Addressable::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
@@ -82,7 +82,7 @@ describe Twitter::Media::Photo do
   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 be_a Addressable::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
@@ -105,7 +105,7 @@ describe Twitter::Media::Photo do
   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 be_a Addressable::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
@@ -128,7 +128,7 @@ describe Twitter::Media::Photo do
   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 be_a Addressable::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

data/spec/twitter/oembed_spec.rb

@@ -5,7 +5,7 @@ describe Twitter::OEmbed do
   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 be_a Addressable::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
@@ -87,7 +87,7 @@ describe Twitter::OEmbed do
   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 be_a Addressable::URI
       expect(oembed.provider_uri.to_s).to eq("http://twitter.com")
     end
     it "returns nil when the provider_uri is not set" do
@@ -136,7 +136,7 @@ describe Twitter::OEmbed do
   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 be_a Addressable::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

data/spec/twitter/place_spec.rb

@@ -108,7 +108,7 @@ describe Twitter::Place do
   describe "#uri" do
     it "returns a URI when the url is set" do
       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 be_a Addressable::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

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

@@ -226,6 +226,44 @@ describe Twitter::REST::API::Tweets do
         expect{@client.update("The problem with your code is that it's doing exactly what you told it to do.")}.to raise_error Twitter::Error::AlreadyPosted
       end
     end
+    context "with an in-reply-to status" do
+      before do
+        @tweet = Twitter::Tweet.new(:id => 1)
+        stub_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :in_reply_to_status_id => "1"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.update("The problem with your code is that it's doing exactly what you told it to do.", :in_reply_to_status => @tweet)
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :in_reply_to_status_id => "1"})).to have_been_made
+      end
+    end
+    context "with an in-reply-to status ID" do
+      before do
+        stub_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :in_reply_to_status_id => "1"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.update("The problem with your code is that it's doing exactly what you told it to do.", :in_reply_to_status_id => 1)
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :in_reply_to_status_id => "1"})).to have_been_made
+      end
+    end
+    context "with a place" do
+      before do
+        @place = Twitter::Place.new(:woeid => "df51dec6f4ee2b2c")
+        stub_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :place_id => "df51dec6f4ee2b2c"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.update("The problem with your code is that it's doing exactly what you told it to do.", :place => @place)
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :place_id => "df51dec6f4ee2b2c"})).to have_been_made
+      end
+    end
+    context "with a place ID" do
+      before do
+        stub_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :place_id => "df51dec6f4ee2b2c"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.update("The problem with your code is that it's doing exactly what you told it to do.", :place_id => "df51dec6f4ee2b2c")
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "The problem with your code is that it's doing exactly what you told it to do.", :place_id => "df51dec6f4ee2b2c"})).to have_been_made
+      end
+    end
   end
 
   describe "#retweet" do

data/spec/twitter/trend_spec.rb

@@ -28,7 +28,7 @@ describe Twitter::Trend do
   describe "#uri" do
     it "returns a URI when the url is set" do
       trend = Twitter::Trend.new(:url => "http://twitter.com/search/?q=%23sevenwordsaftersex")
-      expect(trend.uri).to be_a URI
+      expect(trend.uri).to be_a Addressable::URI
       expect(trend.uri.to_s).to eq("http://twitter.com/search/?q=%23sevenwordsaftersex")
     end
     it "returns nil when the url is not set" do

data/spec/twitter/tweet_spec.rb

@@ -310,12 +310,29 @@ describe Twitter::Tweet do
       Twitter::Tweet.new(:id => 28669546014).urls
       expect($stderr.string).to match(/To get urls, you must pass `:include_entities => true` when requesting the Twitter::Tweet\./)
     end
+
+    it "can handle strange urls" do
+      urls_array = [
+        {
+          :url => "http://with_underscore.example.com/t.co",
+          :expanded_url => "http://with_underscore.example.com/expanded",
+          :display_url => "with_underscore.example.com/expanded…",
+          :indices => [10, 33],
+        }
+      ]
+      tweet = Twitter::Tweet.new(:id => 28669546014, :entities => {:urls => urls_array})
+      uri = tweet.uris.first
+      expect{ uri.url }.to_not raise_error
+      expect{ uri.expanded_url }.to_not raise_error
+      expect{ uri.display_url }.to_not raise_error
+    end
+
   end
 
   describe "#uri" do
     it "returns the URI to the tweet" do
       tweet = Twitter::Tweet.new(:id => 28669546014, :user => {:id => 7505382, :screen_name => "sferik"})
-      expect(tweet.uri).to be_a URI
+      expect(tweet.uri).to be_a Addressable::URI
       expect(tweet.uri.to_s).to eq("https://twitter.com/sferik/status/28669546014")
     end
   end

data/spec/twitter/user_spec.rb

@@ -68,11 +68,11 @@ describe Twitter::User do
   describe "#profile_banner_uri" do
     it "accepts utf8 urls" do
       user = Twitter::User.new(:id => 7505382, :profile_banner_url => "https://si0.twimg.com/profile_banners/7505382/1348266581©_normal.png")
-      expect(user.profile_banner_uri).to be_a URI
+      expect(user.profile_banner_uri).to be_a Addressable::URI
     end
     it "returns a URI when profile_banner_url is set" do
       user = Twitter::User.new(:id => 7505382, :profile_banner_url => "https://si0.twimg.com/profile_banners/7505382/1348266581")
-      expect(user.profile_banner_uri).to be_a URI
+      expect(user.profile_banner_uri).to be_a Addressable::URI
     end
     it "returns nil when profile_banner_uri is not set" do
       user = Twitter::User.new(:id => 7505382)
@@ -117,11 +117,11 @@ describe Twitter::User do
   describe "#profile_banner_uri_https" do
     it "accepts utf8 urls" do
       user = Twitter::User.new(:id => 7505382, :profile_banner_url => "https://si0.twimg.com/profile_banners/7505382/1348266581©_normal.png")
-      expect(user.profile_banner_uri_https).to be_a URI
+      expect(user.profile_banner_uri_https).to be_a Addressable::URI
     end
     it "returns a URI when profile_banner_url is set" do
       user = Twitter::User.new(:id => 7505382, :profile_banner_url => "https://si0.twimg.com/profile_banners/7505382/1348266581")
-      expect(user.profile_banner_uri_https).to be_a URI
+      expect(user.profile_banner_uri_https).to be_a Addressable::URI
     end
     it "returns nil when created_at is not set" do
       user = Twitter::User.new(:id => 7505382)
@@ -168,7 +168,7 @@ describe Twitter::User do
       user = Twitter::User.new(:id => 7505382, :profile_banner_url => "https://si0.twimg.com/profile_banners/7505382/1348266581")
       expect(user.profile_banner_uri?).to be true
     end
-    it "returns false when status is not set" do
+    it "returns false when profile_banner_url is not set" do
       user = Twitter::User.new(:id => 7505382)
       expect(user.profile_banner_uri?).to be false
     end
@@ -177,11 +177,11 @@ describe Twitter::User do
   describe "#profile_image_uri" do
     it "accepts utf8 urls" do
       user = Twitter::User.new(:id => 7505382, :profile_image_url_https => "https://si0.twimg.com/profile_images/7505382/1348266581©_normal.png")
-      expect(user.profile_image_uri).to be_a URI
+      expect(user.profile_image_uri).to be_a Addressable::URI
     end
     it "returns a URI when profile_image_url_https is set" do
       user = Twitter::User.new(:id => 7505382, :profile_image_url_https => "https://a0.twimg.com/profile_images/1759857427/image1326743606_normal.png")
-      expect(user.profile_image_uri).to be_a URI
+      expect(user.profile_image_uri).to be_a Addressable::URI
     end
     it "returns nil when created_at is not set" do
       user = Twitter::User.new(:id => 7505382)
@@ -222,11 +222,11 @@ describe Twitter::User do
   describe "#profile_image_uri_https" do
     it "accepts utf8 urls" do
       user = Twitter::User.new(:id => 7505382, :profile_image_url_https => "https://si0.twimg.com/profile_images/7505382/1348266581©_normal.png")
-      expect(user.profile_image_uri_https).to be_a URI
+      expect(user.profile_image_uri_https).to be_a Addressable::URI
     end
     it "returns a URI when profile_image_url_https is set" do
       user = Twitter::User.new(:id => 7505382, :profile_image_url_https => "https://a0.twimg.com/profile_images/1759857427/image1326743606_normal.png")
-      expect(user.profile_image_uri_https).to be_a URI
+      expect(user.profile_image_uri_https).to be_a Addressable::URI
     end
     it "returns nil when created_at is not set" do
       user = Twitter::User.new(:id => 7505382)
@@ -265,11 +265,11 @@ describe Twitter::User do
   end
 
   describe "#profile_image_uri?" do
-    it "returns true when profile_banner_url is set" do
+    it "returns true when profile_image_url_https is set" do
       user = Twitter::User.new(:id => 7505382, :profile_image_url_https => "https://si0.twimg.com/profile_banners/7505382/1348266581")
       expect(user.profile_image_uri?).to be true
     end
-    it "returns false when status is not set" do
+    it "returns false when profile_image_url_https is not set" do
       user = Twitter::User.new(:id => 7505382)
       expect(user.profile_image_uri?).to be false
     end
@@ -305,7 +305,7 @@ describe Twitter::User do
   describe "#uri" do
     it "returns the URI to the user" do
       user = Twitter::User.new(:id => 7505382, :screen_name => "sferik")
-      expect(user.uri).to be_a URI
+      expect(user.uri).to be_a Addressable::URI
       expect(user.uri.to_s).to eq("https://twitter.com/sferik")
     end
   end
@@ -313,7 +313,7 @@ describe Twitter::User do
   describe "#website" do
     it "returns a URI when the url is set" do
       user = Twitter::User.new(:id => 7505382, :url => "https://github.com/sferik")
-      expect(user.website).to be_a URI
+      expect(user.website).to be_a Addressable::URI
       expect(user.website.to_s).to eq("https://github.com/sferik")
     end
     it "returns nil when the url is not set" do

data/twitter.gemspec

@@ -3,7 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'twitter/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'buftok', '~> 0.1.0'
+  spec.add_dependency 'addressable', '~> 2.3'
+  spec.add_dependency 'buftok', '~> 0.2.0'
   spec.add_dependency 'descendants_tracker', '~> 0.0.1'
   spec.add_dependency 'equalizer', '~> 0.0.7'
   spec.add_dependency 'faraday', ['>= 0.8', '< 0.10']
@@ -13,7 +14,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'memoizable', '~> 0.2.0'
   spec.add_dependency 'simple_oauth', '~> 0.2.0'
   spec.add_development_dependency 'bundler', '~> 1.0'
-  spec.date = "2013-11-18"
   spec.authors = ["Erik Michaels-Ober", "John Nunemaker", "Wynn Netherland", "Steve Richert", "Steve Agalloco"]
   spec.cert_chain  = ['certs/sferik.pem']
   spec.description = %q{A Ruby interface to the Twitter API.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -40,8 +40,24 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: buftok
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +65,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +73,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
   requirement: !ruby/object:Gem::Requirement