twitter 4.5.0 → 4.6.0

data.tar.gz.sig

@@ -0,0 +1,3 @@
+oq
+;[�=Y�3�fe�a�p
+Z�VۭV	&'.3"p�zd1S���Ru"+\r�iF��%�=Dr�_���ǵ~���xM�O��1.�O�ߏ1���E�ݥ;=�>�uݭ���~3��|B�͠�gO~��}��D�&E[wy���k�W�����W*��=�t�c��fO��O0�%I�=�fص��k":j菃p�7E�p/�28����1A%�i�2I�!�n

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+4.6.0
+-----
+* [Make `Twitter::Base#attrs` call methods if they exist](https://github.com/sferik/twitter/commit/ff4f2daccd1acdfddcea7139d4dd6490b55129db)
+* [Allow `Twitter::API::Tweets#oembed` and `Twitter::API::Tweets#oembeds` to take a URL](https://github.com/sferik/twitter/commit/0d986fa4b0c254e8c816bce086c3f6648d8fd3d7) ([@bshelton229](https://twitter.com/bshelton229))
+* [Add `Twitter::Tweet#filter_level` and `Twitter##Tweet#lang` attribute readers](https://github.com/sferik/twitter/commit/283aafbe1219e55f19a76517d9edce497001fca2)
+* [Add "Quick Start Guide" to the `README`](https://github.com/sferik/twitter/commit/afc24ee1bd07f19ef7fb8fd6b85aede34f3ab156) ([@coreyhaines](https://twitter.com/coreyhaines))
+
 4.5.0
 -----
-* [Add no_retweet_ids](https://github.com/sferik/twitter/commit/cab8d6ebf3afdbd24463932262798a132d70a6f1)
+* [Add no_retweet_ids](https://github.com/sferik/twitter/commit/cab8d6ebf3afdbd24463932262798a132d70a6f1) ([@tibbon](https://twitter.com/tibbon))
 
 4.4.4
 -----

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2012 John Nunemaker, Wynn Netherland, Erik Michaels-Ober, Steve Richert
+Copyright (c) 2006-2013 John Nunemaker, Wynn Netherland, Erik Michaels-Ober, Steve Richert
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,31 +1,67 @@
 # The Twitter Ruby Gem
+
 [![Gem Version](https://badge.fury.io/rb/twitter.png)][gem]
 [![Build Status](https://secure.travis-ci.org/sferik/twitter.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/sferik/twitter.png?travis)][gemnasium]
-[![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
+[![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]
 
 [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
 
 A Ruby interface to the Twitter API.
 
 ## Installation
-```sh
-gem install twitter
+    gem install twitter
+
+To ensure the code you're installing hasn't been tampered with, it's
+recommended that you verify the signature. To do this, you need to add my
+public key as a trusted certificate (you only need to do this once):
+
+    gem cert --add <(curl -Ls https://gist.github.com/sferik/4701180/raw/public_cert.pem)
+
+Then, install the gem with the high security trust policy:
+
+    gem install twitter -P HighSecurity
+
+## Quick Start Guide
+So you want to get up and tweeting as fast as possible?
+
+First, [register your application with Twitter][register].
+
+Then, copy and paste in your OAuth data.
+
+```ruby
+Twitter.configure do |config|
+  config.consumer_key = YOUR_CONSUMER_KEY
+  config.consumer_secret = YOUR_CONSUMER_SECRET
+  config.oauth_token = YOUR_OAUTH_TOKEN
+  config.oauth_token_secret = YOUR_OAUTH_TOKEN_SECRET
+end
 ```
 
+That's it! You're ready to Tweet:
+```ruby
+Twitter.update("I'm tweeting with @gem!")
+```
+
+For more examples of how to use the gem, read the [documentation][] or see [Usage Examples][] below.
+
+[register]: https://dev.twitter.com/apps/new
+[Usage Examples]: #usage-examples
+
+## CLI
+
 Looking for the Twitter command-line interface? It was [removed][] from this
-gem in version 0.5.0 and now exists as a [separate project][separate]:
+gem in version 0.5.0 and now exists as a [separate project][t].
 
-```sh
-gem install t
-```
 [removed]: https://github.com/sferik/twitter/commit/dd2445e3e2c97f38b28a3f32ea902536b3897adf
-[separate]: https://github.com/sferik/t
+[t]: https://github.com/sferik/t
 
 ## Documentation
 [http://rdoc.info/gems/twitter][documentation]
@@ -49,132 +85,11 @@ wiki][apps]!
 
 [apps]: https://github.com/sferik/twitter/wiki/apps
 
-## What's new in version 4?
-
-#### Twitter API v1.1
-
-Version 4 of this library targets Twitter API v1.1. To understand the
-implications of this change, please read the following announcements from
-Twitter:
-
-* [Changes coming in Version 1.1 of the Twitter API][coming]
-* [Current status: API v1.1][status]
-* [Overview: Version 1.1 of the Twitter API][overview]
-
-[coming]: https://dev.twitter.com/blog/changes-coming-to-twitter-api
-[status]: https://dev.twitter.com/blog/current-status-api-v1.1
-[overview]: https://dev.twitter.com/docs/api/1.1/overview
-
-Despite the removal of certain underlying functionality in Twitter API v1.1,
-this library aims to preserve backward-compatibility wherever possible. For
-example, despite the removal of the [`GET
-statuses/retweeted_by_user`][retweeted_by_user] resource, the
-`Twitter::API#retweeted_by_user` method continues to exist, implemented by
-making multiple requests to the [`GET statuses/user_timeline`][user_timeline]
-resource. As a result, there is no longer a one-to-one correlation between
-method calls and Twitter API requests. In fact, it's possible for a single
-method call to exceed the Twitter API rate limit for a resource. If you think
-this might cause a problem for your application, feel free to [join the
-discussion][discussion].
-
-[retweeted_by_user]: https://dev.twitter.com/docs/api/1/get/statuses/retweeted_by_user
-[user_timeline]: https://dev.twitter.com/docs/api/1.1/get/statuses/user_timeline
-[discussion]: https://dev.twitter.com/discussions/10644
-
-#### Rate Limiting
-
-Another consequence of Twitter API v1.1 is that the
-`Twitter::Client#rate_limit` method has been removed, since the concept of a
-client-wide rate limit no longer exists. Rate limits are now applied on a
-per-resource level, however, since there is no longer a one-to-one mapping
-between methods and Twitter API resources, it's not entirely obvious how rate
-limit information should be exposed. I've decided to go back to the pre-3.0.0
-behavior of including rate limit information on `Twitter::Error` objects.
-Here's an example of how to handle rate limits:
-
-```ruby
-MAX_ATTEMPTS = 3
-num_attempts = 0
-begin
-  num_attempts += 1
-  retweets = Twitter.retweeted_by_user("sferik")
-rescue Twitter::Error::TooManyRequests => error
-  if num_attempts <= MAX_ATTEMPTS
-    # NOTE: Your process could go to sleep for up to 15 minutes but if you
-    # retry any sooner, it will almost certainly fail with the same exception.
-    sleep error.rate_limit.reset_in
-    retry
-  else
-    raise
-  end
-end
-```
-#### Methods Missing
-
-As a consequence of moving to Twitter API v1.1, the following methods from
-version 3 are no longer available in version 4:
-
-* `Twitter::API#accept`
-* `Twitter::API#deny`
-* `Twitter::API#disable_notifications`
-* `Twitter::API#enable_notifications`
-* `Twitter::API#end_session`
-* `Twitter::API#rate_limit_status`
-* `Twitter::API#rate_limited?`
-* `Twitter::API#recommendations`
-* `Twitter::API#related_results`
-* `Twitter::API#retweeted_to_user`
-* `Twitter::API#trends_daily`
-* `Twitter::API#trends_weekly`
-* `Twitter::Client#rate_limit`
-* `Twitter::RateLimit#class`
-
-#### Custom Endpoints
-
-The `Twitter::API#update_with_media` method no longer uses the custom
-`upload.twitter.com` endpoint, so `media_endpoint` configuration has been
-removed. Likewise, the `Twitter::API#search` method no longer uses the custom
-`search.twitter.com` endpoint, so `search_endpoint` configuration has also been
-removed.
-
-#### Errors
-
-It's worth mentioning new error classes:
-
-* `Twitter::Error::GatewayTimeout`
-* `Twitter::Error::TooManyRequests`
-* `Twitter::Error::UnprocessableEntity`
-
-In previous versions of this library, rate limit errors were indicated by
-raising either `Twitter::Error::BadRequest` or
-`Twitter::Error::EnhanceYourCalm` (for the Search API). As of version 4, the
-library will raise `Twitter::Error::TooManyRequests` for all rate limit errors.
-The `Twitter::Error::EnhanceYourCalm` class has been aliased to
-`Twitter::Error::TooManyRequests`.
-
-#### Identity Map
-
-In version 4, the identity map is [disabled by default][disabled]. If you want
-to enable this feature, you can use the [default identity map][default] or
-[write a custom identity map][custom].
-
-```ruby
-Twitter.identity_map = Twitter::IdentityMap
-```
-
-[disabled]: https://github.com/sferik/twitter/commit/c6c5960bea998abdc3e82cbb8dd68766a2df52e1
-[default]: https://github.com/sferik/twitter/blob/master/lib/twitter/identity_map.rb
-[custom]: https://github.com/sferik/twitter/blob/master/etc/sqlite_identity_map.rb
-
 ## Configuration
-
-Twitter API v1.1 requires you to authenticate via OAuth, so you'll need a
-registered Twitter application. To register a new application, sign-in using
-your Twitter account and the fill out the form at
-http://dev.twitter.com/apps/new. If you've previously registered a Twitter
-application, it will be listed at http://dev.twitter.com/apps. Once you've
-registered an application, make sure to set the correct access level, otherwise
-you may see the error:
+Twitter API v1.1 requires you to authenticate via OAuth, so you'll need to
+[register your application with Twitter][register]. Once you've registered an
+application, make sure to set the correct access level, otherwise you may see
+the error:
 
     Read-only application cannot POST
 
@@ -199,12 +114,10 @@ end
 
 Alternately, you can set the following environment variables:
 
-```sh
-TWITTER_CONSUMER_KEY
-TWITTER_CONSUMER_SECRET
-TWITTER_OAUTH_TOKEN
-TWITTER_OAUTH_TOKEN_SECRET
-```
+    TWITTER_CONSUMER_KEY
+    TWITTER_CONSUMER_SECRET
+    TWITTER_OAUTH_TOKEN
+    TWITTER_OAUTH_TOKEN_SECRET
 
 After configuration, requests can be made like so:
 
@@ -213,7 +126,6 @@ Twitter.update("I'm tweeting with @gem!")
 ```
 
 #### Thread Safety
-
 Applications that make requests on behalf of multiple Twitter users should
 avoid using global configuration. In this case, you may still specify the
 `consumer_key` and `consumer_secret` globally. (In a Rails application, this
@@ -230,12 +142,12 @@ Then, for each user's access token/secret pair, instantiate a
 `Twitter::Client`:
 
 ```ruby
-@client_erik = Twitter::Client.new(
+erik = Twitter::Client.new(
   :oauth_token => "Erik's access token",
   :oauth_token_secret => "Erik's access secret"
 )
 
-@client_john = Twitter::Client.new(
+john = Twitter::Client.new(
   :oauth_token => "John's access token",
   :oauth_token_secret => "John's access secret"
 )
@@ -244,15 +156,15 @@ Then, for each user's access token/secret pair, instantiate a
 You can now make threadsafe requests as the authenticated user:
 
 ```ruby
-Thread.new{@client_erik.update("Tweeting as Erik!")}
-Thread.new{@client_john.update("Tweeting as John!")}
+Thread.new{erik.update("Tweeting as Erik!")}
+Thread.new{john.update("Tweeting as John!")}
 ```
 
 Or, if you prefer, you can specify all configuration options when instantiating
 a `Twitter::Client`:
 
 ```ruby
-@client = Twitter::Client.new(
+client = Twitter::Client.new(
   :consumer_key => "an application's consumer key",
   :consumer_secret => "an application's consumer secret",
   :oauth_token => "a user's access token",
@@ -263,7 +175,6 @@ a `Twitter::Client`:
 This may be useful if you're using multiple consumer key/secret pairs.
 
 #### Middleware
-
 The Faraday middleware stack is fully configurable and is exposed as a
 `Faraday::Builder` object. You can modify the default middleware in-place:
 
@@ -360,7 +271,6 @@ Twitter.search("#ruby -rt", :lang => "ja", :count => 1).results.first.text
 For more usage examples, please see the full [documentation][].
 
 ## Streaming
-
 To access the Twitter Streaming API, we recommend [TweetStream][].
 
 [tweetstream]: https://github.com/intridea/tweetstream
@@ -374,7 +284,6 @@ recommend [Oj][].
 [oj]: https://rubygems.org/gems/oj
 
 ## Statistics
-
 Here are some fun facts about this library:
 
 * It is implemented in just 2,000 lines of Ruby code
@@ -396,13 +305,15 @@ Here are some fun facts about this library:
 
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby
-version:
+implementations:
 
 * Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
 
+If something doesn't work on one of these interpreters, it's a bug.
+
 This library may inadvertently work (or seem to work) on other Ruby
 implementations, however support will only be provided for the versions listed
 above.
@@ -410,12 +321,11 @@ above.
 If you would like this library to support another Ruby version, you may
 volunteer to be a maintainer. Being a maintainer entails making sure all tests
 run and pass on that implementation. When something breaks on your
-implementation, you will be personally responsible for providing patches in a
-timely fashion. If critical issues for a particular implementation exist at the
-time of a major release, support for that Ruby version may be dropped.
+implementation, you will be responsible for providing patches in a timely
+fashion. If critical issues for a particular implementation exist at the time
+of a major release, support for that Ruby version may be dropped.
 
 ## Versioning
-
 This library aims to adhere to [Semantic Versioning 2.0.0][semver]. Violations
 of this scheme should be reported as bugs. Specifically, if a minor or patch
 version is released that breaks backward compatibility, that version should be
@@ -430,6 +340,116 @@ Constraint][pvc] with two digits of precision. For example:
 [semver]: http://semver.org/
 [pvc]: http://docs.rubygems.org/read/chapter/16#page74
 
+## What's new in version 4?
+#### Twitter API v1.1
+Version 4 of this library targets Twitter API v1.1. To understand the
+implications of this change, please read the following announcements from
+Twitter:
+
+* [Changes coming in Version 1.1 of the Twitter API][coming]
+* [Current status: API v1.1][status]
+* [Overview: Version 1.1 of the Twitter API][overview]
+
+[coming]: https://dev.twitter.com/blog/changes-coming-to-twitter-api
+[status]: https://dev.twitter.com/blog/current-status-api-v1.1
+[overview]: https://dev.twitter.com/docs/api/1.1/overview
+
+Despite the removal of certain underlying functionality in Twitter API v1.1,
+this library aims to preserve backward-compatibility wherever possible. For
+example, despite the removal of the [`GET
+statuses/retweeted_by_user`][retweeted_by_user] resource, the
+`Twitter::API#retweeted_by_user` method continues to exist, implemented by
+making multiple requests to the [`GET statuses/user_timeline`][user_timeline]
+resource. As a result, there is no longer a one-to-one correlation between
+method calls and Twitter API requests. In fact, it's possible for a single
+method call to exceed the Twitter API rate limit for a resource. If you think
+this might cause a problem for your application, feel free to [join the
+discussion][discussion].
+
+[retweeted_by_user]: https://dev.twitter.com/docs/api/1/get/statuses/retweeted_by_user
+[user_timeline]: https://dev.twitter.com/docs/api/1.1/get/statuses/user_timeline
+[discussion]: https://dev.twitter.com/discussions/10644
+
+#### Rate Limiting
+Another consequence of Twitter API v1.1 is that the
+`Twitter::Client#rate_limit` method has been removed, since the concept of a
+client-wide rate limit no longer exists. Rate limits are now applied on a
+per-resource level, however, since there is no longer a one-to-one mapping
+between methods and Twitter API resources, it's not entirely obvious how rate
+limit information should be exposed. I've decided to go back to the pre-3.0.0
+behavior of including rate limit information on `Twitter::Error` objects.
+Here's an example of how to handle rate limits:
+
+```ruby
+MAX_ATTEMPTS = 3
+num_attempts = 0
+begin
+  num_attempts += 1
+  retweets = Twitter.retweeted_by_user("sferik")
+rescue Twitter::Error::TooManyRequests => error
+  if num_attempts <= MAX_ATTEMPTS
+    # NOTE: Your process could go to sleep for up to 15 minutes but if you
+    # retry any sooner, it will almost certainly fail with the same exception.
+    sleep error.rate_limit.reset_in
+    retry
+  else
+    raise
+  end
+end
+```
+#### Methods Missing
+As a consequence of moving to Twitter API v1.1, the following methods from
+version 3 are no longer available in version 4:
+
+* `Twitter::API#accept`
+* `Twitter::API#deny`
+* `Twitter::API#disable_notifications`
+* `Twitter::API#enable_notifications`
+* `Twitter::API#end_session`
+* `Twitter::API#rate_limit_status`
+* `Twitter::API#rate_limited?`
+* `Twitter::API#recommendations`
+* `Twitter::API#related_results`
+* `Twitter::API#retweeted_to_user`
+* `Twitter::API#trends_daily`
+* `Twitter::API#trends_weekly`
+* `Twitter::Client#rate_limit`
+* `Twitter::RateLimit#class`
+
+#### Custom Endpoints
+The `Twitter::API#update_with_media` method no longer uses the custom
+`upload.twitter.com` endpoint, so `media_endpoint` configuration has been
+removed. Likewise, the `Twitter::API#search` method no longer uses the custom
+`search.twitter.com` endpoint, so `search_endpoint` configuration has also been
+removed.
+
+#### Errors
+It's worth mentioning new error classes:
+
+* `Twitter::Error::GatewayTimeout`
+* `Twitter::Error::TooManyRequests`
+* `Twitter::Error::UnprocessableEntity`
+
+In previous versions of this library, rate limit errors were indicated by
+raising either `Twitter::Error::BadRequest` or
+`Twitter::Error::EnhanceYourCalm` (for the Search API). As of version 4, the
+library will raise `Twitter::Error::TooManyRequests` for all rate limit errors.
+The `Twitter::Error::EnhanceYourCalm` class has been aliased to
+`Twitter::Error::TooManyRequests`.
+
+#### Identity Map
+In version 4, the identity map is [disabled by default][disabled]. If you want
+to enable this feature, you can use the [default identity map][default] or
+[write a custom identity map][custom].
+
+```ruby
+Twitter.identity_map = Twitter::IdentityMap
+```
+
+[disabled]: https://github.com/sferik/twitter/commit/c6c5960bea998abdc3e82cbb8dd68766a2df52e1
+[default]: lib/twitter/identity_map.rb
+[custom]: etc/sqlite_identity_map.rb
+
 ## Additional Notes
 This will be the last major version of this library to support Ruby 1.8.
 Requiring Ruby 1.9 will allow us to [remove][class_variable_get]
@@ -446,7 +466,7 @@ critical security vulnerabilities are discovered.
 [ruby192]: http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/367983
 
 ## Copyright
-Copyright (c) 2006-2012 John Nunemaker, Wynn Netherland, Erik Michaels-Ober, Steve Richert.
+Copyright (c) 2006-2013 John Nunemaker, Wynn Netherland, Erik Michaels-Ober, Steve Richert.
 See [LICENSE][] for details.
 
-[license]: https://github.com/sferik/twitter/blob/master/LICENSE.md
+[license]: LICENSE.md

data/lib/twitter/api/friends_and_followers.rb

@@ -115,7 +115,7 @@ module Twitter
       # Allows the authenticating user to follow the specified users, unless they are already followed
       #
       # @see https://dev.twitter.com/docs/api/1.1/post/friendships/create
-      # @rate_limited No
+      # @rate_limited Yes
       # @authentication Requires user context
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Array<Twitter::User>] The followed users.
@@ -259,7 +259,7 @@ module Twitter
       # @authentication Requires user context
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::Cursor]
-      # @overload friend_ids(options={})
+      # @overload followers(options={})
       #   Returns an array of numeric IDs for every user the authenticated user is following
       #
       #   @param options [Hash] A customizable set of options.
@@ -267,8 +267,8 @@ module Twitter
       #   @option options [Boolean, String, Integer] :skip_status Do not include contributee's Tweets when set to true, 't' or 1.
       #   @option options [Boolean, String, Integer] :include_user_entities The user entities node will be disincluded when set to false.
       #   @example Return the authenticated user's friends' IDs
-      #     Twitter.friend_ids
-      # @overload friend_ids(user, options={})
+      #     Twitter.followers
+      # @overload followers(user, options={})
       #   Returns an array of numeric IDs for every user the specified user is following
       #
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, or object.
@@ -290,7 +290,7 @@ module Twitter
       # @authentication Requires user context
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::Cursor]
-      # @overload friend_ids(options={})
+      # @overload friends(options={})
       #   Returns an array of numeric IDs for every user the authenticated user is following
       #
       #   @param options [Hash] A customizable set of options.
@@ -298,8 +298,8 @@ module Twitter
       #   @option options [Boolean, String, Integer] :skip_status Do not include contributee's Tweets when set to true, 't' or 1.
       #   @option options [Boolean, String, Integer] :include_user_entities The user entities node will be disincluded when set to false.
       #   @example Return the authenticated user's friends' IDs
-      #     Twitter.friend_ids
-      # @overload friend_ids(user, options={})
+      #     Twitter.friends
+      # @overload friends(user, options={})
       #   Returns an array of numeric IDs for every user the specified user is following
       #
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, or object.
@@ -330,7 +330,7 @@ module Twitter
         get("/1.1/friendships/no_retweets/ids.json", options)[:body].map(&:to_i)
       end
       alias no_retweets_ids no_retweet_ids
-      
+
     end
   end
 end

data/lib/twitter/api/tweets.rb

@@ -212,7 +212,7 @@ module Twitter
       # @authentication Requires user context
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::OEmbed] OEmbed for the requested Tweet.
-      # @param id [Integer, String] A Tweet ID.
+      # @param id_or_url [Integer, String] A Tweet ID or URL.
       # @param options [Hash] A customizable set of options.
       # @option options [Integer] :maxwidth The maximum width in pixels that the embed should be rendered at. This value is constrained to be between 250 and 550 pixels.
       # @option options [Boolean, String, Integer] :hide_media Specifies whether the embedded Tweet should automatically expand images which were uploaded via {https://dev.twitter.com/docs/api/1.1/post/statuses/update_with_media POST statuses/update_with_media}. When set to either true, t or 1 images will not be expanded. Defaults to false.
@@ -223,8 +223,9 @@ module Twitter
       # @option options [String] :lang Language code for the rendered embed. This will affect the text and localization of the rendered HTML.
       # @example Return oEmbeds for Tweet with the ID 25938088801
       #   Twitter.status_with_activity(25938088801)
-      def oembed(id, options={})
-        object_from_response(Twitter::OEmbed, :get, "/1.1/statuses/oembed.json?id=#{id}", options)
+      def oembed(id_or_url, options={})
+        key = id_or_url.is_a?(String) && id_or_url.match(%r{^https?://}i) ? "url" : "id"
+        object_from_response(Twitter::OEmbed, :get, "/1.1/statuses/oembed.json?#{key}=#{id_or_url}", options)
       end
 
       # Returns oEmbeds for Tweets
@@ -250,8 +251,8 @@ module Twitter
       #   @option options [String] :lang Language code for the rendered embed. This will affect the text and localization of the rendered HTML.
       def oembeds(*args)
         arguments = Twitter::API::Arguments.new(args)
-        arguments.flatten.threaded_map do |id|
-          object_from_response(Twitter::OEmbed, :get, "/1.1/statuses/oembed.json?id=#{id}", arguments.options)
+        arguments.flatten.threaded_map do |id_or_url|
+          oembed(id_or_url, arguments.options)
         end
       end
 

data/lib/twitter/api/users.rb

@@ -270,6 +270,7 @@ module Twitter
       #   Returns extended information for the authenticated user
       #
       #   @param options [Hash] A customizable set of options.
+      #   @option options [Boolean] :include_entities The tweet entities node will be disincluded when set to false.
       #   @option options [Boolean, String, Integer] :skip_status Do not include user's Tweets when set to true, 't' or 1.
       #   @example Return extended information for the authenticated user
       #     Twitter.user
@@ -278,6 +279,8 @@ module Twitter
       #
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, or object.
       #   @param options [Hash] A customizable set of options.
+      #   @option options [Boolean] :include_entities The tweet entities node will be disincluded when set to false.
+      #   @option options [Boolean, String, Integer] :skip_status Do not include user's Tweets when set to true, 't' or 1.
       #   @example Return extended information for @sferik
       #     Twitter.user('sferik')
       #     Twitter.user(7505382)  # Same as above

data/lib/twitter/base.rb

@@ -93,7 +93,9 @@ module Twitter
     #
     # @return [Hash]
     def attrs
-      @attrs
+      @attrs.inject({}) do |attrs, (key, value)|
+        attrs.merge!(key => respond_to?(key) ? send(key) : value)
+      end
     end
     alias to_hash attrs
 

data/lib/twitter/error/client_error.rb

@@ -22,7 +22,7 @@ module Twitter
           body[:error]
         elsif body[:errors]
           first = Array(body[:errors]).first
-          if first.kind_of?(Hash)
+          if first.is_a?(Hash)
             first[:message].chomp
           else
             first.chomp

data/lib/twitter/tweet.rb

@@ -10,9 +10,8 @@ module Twitter
     include Twitter::Exceptable
     attr_reader :favorited, :favoriters, :from_user_id, :from_user_name,
       :in_reply_to_screen_name, :in_reply_to_attrs_id, :in_reply_to_status_id,
-      :in_reply_to_user_id, :iso_language_code, :repliers, :retweeted,
-      :retweeters, :source, :text, :to_user, :to_user_id, :to_user_name,
-      :truncated
+      :in_reply_to_user_id, :lang, :repliers, :retweeted, :retweeters, :source,
+      :text, :to_user, :to_user_id, :to_user_name, :truncated
     alias in_reply_to_tweet_id in_reply_to_status_id
     alias favourited favorited
     alias favourited? favorited?
@@ -40,6 +39,10 @@ module Twitter
       @attrs[:from_user] || user && user.screen_name
     end
 
+    def filter_level
+      @attrs[:filter_level] || "none"
+    end
+
     # @return [String]
     # @note May be > 140 characters.
     def full_text
@@ -138,8 +141,8 @@ module Twitter
     # @param key [Symbol]
     def entities(klass, key)
       if entities?
-        Array(@attrs[:entities][key.to_sym]).map do |user_mention|
-          klass.fetch_or_new(user_mention)
+        Array(@attrs[:entities][key.to_sym]).map do |entity|
+          klass.fetch_or_new(entity)
         end
       else
         warn "#{Kernel.caller.first}: To get #{key.to_s.tr('_', ' ')}, you must pass `:include_entities => true` when requesting the #{self.class.name}."

data/lib/twitter/user.rb

@@ -32,6 +32,13 @@ module Twitter
     alias update_count statuses_count
     alias updates_count statuses_count
 
+    # @return [Array<Twitter::Entity::Url>]
+    def description_urls
+      @description_urls ||= Array(@attrs[:entities][:description][:urls]).map do |entity|
+        Twitter::Entity::Url.fetch_or_new(entity)
+      end
+    end
+
     # Return the URL to the user's profile banner image
     #
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 4 unless defined? Twitter::Version::MAJOR
-    MINOR = 5 unless defined? Twitter::Version::MINOR
+    MINOR = 6 unless defined? Twitter::Version::MINOR
     PATCH = 0 unless defined? Twitter::Version::PATCH
     PRE = nil unless defined? Twitter::Version::PRE
 

data/spec/helper.rb

@@ -1,9 +1,11 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'spec'
-  end
-end
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
 require 'twitter'
 require 'twitter/identity_map'
@@ -13,6 +15,8 @@ require 'tempfile'
 require 'timecop'
 require 'webmock/rspec'
 
+WebMock.disable_net_connect!(:allow => 'coveralls.io')
+
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect

data/spec/twitter/api/tweets_spec.rb

@@ -220,11 +220,16 @@ describe Twitter::API::Tweets do
   describe "#oembed" do
     before do
       stub_get("/1.1/statuses/oembed.json").with(:query => {:id => "25938088801"}).to_return(:body => fixture("oembed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/statuses/oembed.json").with(:query => {:url => "https://twitter.com/sferik/status/25938088801"}).to_return(:body => fixture("oembed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.oembed(25938088801)
       expect(a_get("/1.1/statuses/oembed.json").with(:query => {:id => "25938088801"})).to have_been_made
     end
+    it "requests the correct resource when a URL is given" do
+      @client.oembed("https://twitter.com/sferik/status/25938088801")
+      expect(a_get("/1.1/statuses/oembed.json").with(:query => {:url => "https://twitter.com/sferik/status/25938088801"}))
+    end
     it "returns an array of OEmbed instances" do
       oembed = @client.oembed(25938088801)
       expect(oembed).to be_a Twitter::OEmbed
@@ -234,11 +239,16 @@ describe Twitter::API::Tweets do
   describe "#oembeds" do
     before do
       stub_get("/1.1/statuses/oembed.json").with(:query => {:id => "25938088801"}).to_return(:body => fixture("oembed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/statuses/oembed.json").with(:query => {:url => "https://twitter.com/sferik/status/25938088801"}).to_return(:body => fixture("oembed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.oembeds(25938088801)
       expect(a_get("/1.1/statuses/oembed.json").with(:query => {:id => "25938088801"})).to have_been_made
     end
+    it "requests the correct resource when a URL is given" do
+      @client.oembeds("https://twitter.com/sferik/status/25938088801")
+      expect(a_get("/1.1/statuses/oembed.json").with(:query => {:url => "https://twitter.com/sferik/status/25938088801"})).to have_been_made
+    end
     it "returns an array of OEmbed instances" do
       oembeds = @client.oembeds(25938088801)
       expect(oembeds).to be_an Array

data/spec/twitter/tweet_spec.rb

@@ -104,13 +104,13 @@ describe Twitter::Tweet do
 
   describe "#hashtags" do
     it "returns an Array of Entity::Hashtag when entities are set" do
-      hashtags_hash = [
+      hashtags_array = [
         {
           :text => 'twitter',
           :indices => [10, 33],
         }
       ]
-      hashtags = Twitter::Tweet.new(:id => 28669546014, :entities => {:hashtags => hashtags_hash}).hashtags
+      hashtags = Twitter::Tweet.new(:id => 28669546014, :entities => {:hashtags => hashtags_array}).hashtags
       expect(hashtags).to be_an Array
       expect(hashtags.first).to be_a Twitter::Entity::Hashtag
       expect(hashtags.first.indices).to eq [10, 33]
@@ -234,7 +234,7 @@ describe Twitter::Tweet do
     end
 
     it "returns true if there are entities set" do
-      urls_hash = [
+      urls_array = [
         {
           :url => 'http://example.com/t.co',
           :expanded_url => 'http://example.com/expanded',
@@ -242,14 +242,14 @@ describe Twitter::Tweet do
           :indices => [10, 33],
         }
       ]
-      tweet = Twitter::Tweet.new(:id => 28669546014, :entities => {:urls => urls_hash})
+      tweet = Twitter::Tweet.new(:id => 28669546014, :entities => {:urls => urls_array})
       expect(tweet.entities?).to be_true
     end
   end
 
   describe "#urls" do
     it "returns an Array of Entity::Url when entities are set" do
-      urls_hash = [
+      urls_array = [
         {
           :url => 'http://example.com/t.co',
           :expanded_url => 'http://example.com/expanded',
@@ -257,7 +257,7 @@ describe Twitter::Tweet do
           :indices => [10, 33],
         }
       ]
-      urls = Twitter::Tweet.new(:id => 28669546014, :entities => {:urls => urls_hash}).urls
+      urls = Twitter::Tweet.new(:id => 28669546014, :entities => {:urls => urls_array}).urls
       expect(urls).to be_an Array
       expect(urls.first).to be_a Twitter::Entity::Url
       expect(urls.first.indices).to eq [10, 33]
@@ -301,7 +301,7 @@ describe Twitter::Tweet do
 
   describe "#user_mentions" do
     it "returns an Array of Entity::UserMention when entities are set" do
-      user_mentions_hash = [
+      user_mentions_array = [
         {
           :screen_name => 'sferik',
           :name => 'Erik Michaels-Ober',
@@ -310,7 +310,7 @@ describe Twitter::Tweet do
           :id => 7505382,
         }
       ]
-      user_mentions = Twitter::Tweet.new(:id => 28669546014, :entities => {:user_mentions => user_mentions_hash}).user_mentions
+      user_mentions = Twitter::Tweet.new(:id => 28669546014, :entities => {:user_mentions => user_mentions_array}).user_mentions
       expect(user_mentions).to be_an Array
       expect(user_mentions.first).to be_a Twitter::Entity::UserMention
       expect(user_mentions.first.indices).to eq [0, 6]

data/spec/twitter/user_spec.rb

@@ -31,6 +31,28 @@ describe Twitter::User do
     end
   end
 
+  describe "#description_urls" do
+    it "returns an Array of Entity::Url" do
+      urls_array = [
+        {
+          :url => 'http://example.com/t.co',
+          :expanded_url => 'http://example.com/expanded',
+          :display_url => 'example.com/expanded',
+          :indices => [10, 33],
+        }
+      ]
+      description_urls = Twitter::User.new(:id => 7505382, :entities => {:description => {:urls => urls_array}}).description_urls
+      expect(description_urls).to be_an Array
+      expect(description_urls.first).to be_a Twitter::Entity::Url
+      expect(description_urls.first.indices).to eq [10, 33]
+      expect(description_urls.first.display_url).to eq 'example.com/expanded'
+    end
+    it "is empty when not set" do
+      description_urls = Twitter::User.new(:id => 7505382, :entities => {:description => {:urls => []}}).description_urls
+      expect(description_urls).to be_empty
+    end
+  end
+
   describe "#profile_banner_url" do
     it "returns a String when profile_banner_url is set" do
       user = Twitter::User.new(:id => 7505382, :profile_banner_url => "https://si0.twimg.com/profile_banners/7505382/1348266581")

data/twitter.gemspec

@@ -1,13 +1,17 @@
-# encoding: utf-8
-require File.expand_path('../lib/twitter/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'twitter/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'faraday',      ['~> 0.8', '< 0.10']
-  spec.add_dependency 'multi_json',   ['~> 1.0']
-  spec.add_dependency 'simple_oauth', ['~> 0.2']
-  spec.authors = ["John Nunemaker", "Wynn Netherland", "Erik Michaels-Ober", "Steve Richert"]
+  spec.add_dependency 'faraday', ['~> 0.8', '< 0.10']
+  spec.add_dependency 'multi_json', '~> 1.0'
+  spec.add_dependency 'simple_oauth', '~> 0.2'
+  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.authors = ["John Nunemaker", "Wynn Netherland", "Erik Michaels-Ober", "Steve Richert", "Steve Agalloco"]
+  spec.cert_chain  = ['certs/sferik.pem']
   spec.description = %q{A Ruby interface to the Twitter API.}
-  spec.email = ['nunemaker@gmail.com', 'wynn.netherland@gmail.com', 'sferik@gmail.com', 'steve.richert@gmail.com']
+  spec.email = ['nunemaker@gmail.com', 'wynn.netherland@gmail.com', 'sferik@gmail.com', 'steve.richert@gmail.com', 'steve.agalloco@gmail.com']
   spec.files = %w(.yardopts CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md Rakefile twitter.gemspec)
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("spec/**/*")
@@ -15,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.licenses = ['MIT']
   spec.name = 'twitter'
   spec.require_paths = ['lib']
-  spec.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
+  spec.required_rubygems_version = '>= 1.3.6'
+  spec.signing_key = File.expand_path("~/.gem/private_key.pem") if $0 =~ /gem\z/
   spec.summary = spec.description
   spec.test_files = Dir.glob("spec/**/*")
   spec.version = Twitter::Version

metadata

@@ -1,22 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
+  version: 4.6.0
   prerelease: 
-  version: 4.5.0
 platform: ruby
 authors:
 - John Nunemaker
 - Wynn Netherland
 - Erik Michaels-Ober
 - Steve Richert
+- Steve Agalloco
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVE4d0RRWURWUVFEREFaelpt
+  VnkKYVdzeEZUQVRCZ29Ka2lhSmsvSXNaQUVaRmdWbmJXRnBiREVUTUJFR0Nn
+  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TXpBeU1ETXhNREF5TWpkYUZ3
+  MHhOREF5TURNeE1EQXlNamRhTUQweER6QU5CZ05WQkFNTUJuTm1aWEpwCmF6
+  RVZNQk1HQ2dtU0pvbVQ4aXhrQVJrV0JXZHRZV2xzTVJNd0VRWUtDWkltaVpQ
+  eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
+  QU1JSUJDZ0tDQVFFQWwweDVkeDh1S3hpN1Rrckl1eUJVVEpWQgp2MW85M25V
+  QjlqL3k0TTk2Z1Yycll3QWNpMUpQQnNlTmQ2RnliempvM1lHdUhsN0VRSHVT
+  SE5hZjFwMmx4ZXcvCnk2MEpYSUpCQmdQY0RLL0tDUDROVUhvZm0wamZvWUQr
+  SDV1TkpmSENOcTcvWnNUeE90RTNSYTkyczBCQ01UcG0Kd0JNTWxXUjVNdGRF
+  aElZdUJPNFhobmVqWWdIMEwvN0JMMmx5bW50Vm5zci9hZ2RRb29qUUNOMUlR
+  bXNSSnZyUgpkdVpSTzN0WnZvSW8xcEJjNEpFZWhEdXFDZXlCZ1BMT3FNb0t0
+  UWxvbGQxVFFzMWtXVUJLN0tXTUZFaEtDL0tnCnp5ektSSFFvOXlEWXdPdllu
+  Z29CTFkrVC9sd0NUNGR5c3NkaHpSYmZueEFoYUt1NFNBc3NJd2FDMDF5Vm93
+  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJTMHJ1
+  RGZSYWs1Y2kxT3BETlgvWmRERWtJcwppVEFMQmdOVkhROEVCQU1DQkxBd0RR
+  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFISFNNcy9NUDBzT2FMa0V2NEpvCnp2
+  a20zcW41QTZ0MHZhSHg3NzRjbWVqeU1VKzV3eVN4UmV6c3BMN1VMaDlOZXVL
+  Mk9oVStPZTNUcHFyQWc1VEsKUjhHUUlMblZ1MkZlbUdBNnNBa1BEbGNQdGdB
+  NmllSTE5UFpPRjZIVkxtYy9JRC9kUC9OZ1pXV3pFZXFRS21jSwoyK0hNK1NF
+  RURoWmtTY1lla3c0Wk9lMTY0WnRaRzgxNm9BdjV4MHBHaXRTSWt1bVVwN1Y4
+  aUVaLzZlaHI3WTllClhPZzRlZXVuNUwvSmptakFSb1cya05kdmtSRDNjMkVl
+  U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
+  cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
+  cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,10 +53,10 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '0.10'
-    none: false
   type: :runtime
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,45 +64,61 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '0.10'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
   type: :runtime
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
 - !ruby/object:Gem::Dependency
+  name: simple_oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    none: false
-  type: :runtime
-  name: simple_oauth
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A Ruby interface to the Twitter API.
 email:
 - nunemaker@gmail.com
 - wynn.netherland@gmail.com
 - sferik@gmail.com
 - steve.richert@gmail.com
+- steve.agalloco@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -315,17 +360,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25