twitter 5.9.0 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ccffc8468f91442ccd9eeebff411dbebf92b0a
-  data.tar.gz: cca2da3dc5ddff38608dbd836c3d159e4477bbe2
+  metadata.gz: 8ed9a45b1f841e8fd80f06a88cdb71d73448c27b
+  data.tar.gz: 28ec0e841594b0e1c7b26a262ae1d8451157f1c0
 SHA512:
-  metadata.gz: ef86cf848faf9325291bc7ab2405f925bbb9f187f53765d969b173cc5ec340b3252ced4ca6f5bd3257aec418414b8ebf98dc2c645bf5ae200148ac735f63463c
-  data.tar.gz: 81f7b4ae2818191008017355e69d1476413055b4e87f9a1c1953445aeacfc5e2267e3b255e6f403a4f41131b19f4268eaa8a058d5ba0648d735318040b7f5a60
+  metadata.gz: 7a1171a26b33386f6bc0a5d5fc71dd7c9250f4b8e45efe50465b8d795436dedf6fb767b026be8882c2e370bf8c4ef5d371b3c4aed0a3a99a67268bb147bce6f9
+  data.tar.gz: 046690ce229a2af4d4d762602b1e64f694d0a2fcd138324a6dd0d430545c5967c15cde11b8181e250d5bdb64631ba3754aacd642f3fc309f81c17d002b751dce

data/.yardopts

@@ -12,4 +12,5 @@ examples/AllTweets.md
 examples/Configuration.md
 examples/RateLimiting.md
 examples/Search.md
+examples/Streaming.md
 examples/Update.md

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+5.10.0
+------
+* [Add support for extended entities](https://github.com/sferik/twitter/commit/ed7c708e4208de1df27d141678c14e23422504a0)
+* [Add `Twitter::REST::Client#upload`](https://github.com/sferik/twitter/commit/f5a747b53c4866bb378d6022f309d6176620122e)
+
 5.9.0
 -----
 * [Use expanded URIs when available](https://github.com/sferik/twitter/commit/f1d5d1f4c0ea75ebeaf9e7eb760b9efd245a5df2)

data/README.md

@@ -6,15 +6,15 @@
 [![Code Climate](http://img.shields.io/codeclimate/github/sferik/twitter.svg)][codeclimate]
 [![Coverage Status](http://img.shields.io/coveralls/sferik/twitter.svg)][coveralls]
 [![Gittip](http://img.shields.io/gittip/gems.svg)][gittip]
-[![Inline docs](http://inch-pages.github.io/github/sferik/twitter.png)][inchpages]
+[![Inline docs](http://inch-ci.org/github/sferik/twitter.png)][inchpages]
 
 [gem]: https://rubygems.org/gems/twitter
-[travis]: http://travis-ci.org/sferik/twitter
+[travis]: https://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
 [gittip]: https://www.gittip.com/gems/
-[inchpages]: http://inch-pages.github.io/github/sferik/twitter
+[inchpages]: http://inch-ci.org/github/sferik/twitter
 
 A Ruby interface to the Twitter API.
 
@@ -318,7 +318,7 @@ method has been removed.
 ### Trend Results
 The `#trends` method now returns an [`Enumerable`][enumerable]
 `Twitter::TrendResults` object instead of an array. This object provides
-methods to determinte the recency of the trend (`#as_of`), when the trend
+methods to determine the recency of the trend (`#as_of`), when the trend
 started (`#created_at`), and the location of the trend (`#location`). This data
 was previously unavailable.
 

data/Rakefile

@@ -14,7 +14,7 @@ task :test => :spec
 
 begin
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
+  RuboCop::RakeTask.new
 rescue LoadError
   task :rubocop do
     $stderr.puts 'Rubocop is disabled'

data/lib/twitter/entities.rb

@@ -31,7 +31,8 @@ module Twitter
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Media>]
     def media
-      entities(MediaFactory, :media)
+      extended_entities = entities(MediaFactory, :media, :extended_entities)
+      extended_entities.empty? ? entities(MediaFactory, :media) : extended_entities
     end
     memoize :media
 
@@ -84,15 +85,11 @@ module Twitter
   private
 
     # @param klass [Class]
-    # @param key [Symbol]
-    def entities(klass, key)
-      if @attrs[:entities].nil?
-        warn "#{Kernel.caller.first}: To get #{key.to_s.tr('_', ' ')}, you must pass `:include_entities => true` when requesting the #{self.class}."
-        []
-      else
-        @attrs[:entities].fetch(key.to_sym, []).collect do |entity|
-          klass.new(entity)
-        end
+    # @param key2 [Symbol]
+    # @param key1 [Symbol]
+    def entities(klass, key2, key1 = :entities)
+      @attrs.fetch(key1.to_sym, {}).fetch(key2.to_sym, []).collect do |entity|
+        klass.new(entity)
       end
     end
   end

data/lib/twitter/error.rb

@@ -49,6 +49,7 @@ module Twitter
           404 => Twitter::Error::NotFound,
           406 => Twitter::Error::NotAcceptable,
           408 => Twitter::Error::RequestTimeout,
+          420 => Twitter::Error::EnhanceYourCalm,
           422 => Twitter::Error::UnprocessableEntity,
           429 => Twitter::Error::TooManyRequests,
           500 => Twitter::Error::InternalServerError,
@@ -90,7 +91,7 @@ module Twitter
 
     # Initializes a new Error object
     #
-    # @param exception [Exception, String]
+    # @param message [Exception, String]
     # @param rate_limit [Hash]
     # @param code [Integer]
     # @return [Twitter::Error]

data/lib/twitter/place.rb

@@ -14,8 +14,8 @@ module Twitter
     # Initializes a new place
     #
     # @param attrs [Hash]
-    # @raise [ArgumentError] Error raised when supplied argument is missing an :id key.
-    # @return [Twitter::Identity]
+    # @raise [ArgumentError] Error raised when supplied argument is missing a :woeid key.
+    # @return [Twitter::Place]
     def initialize(attrs = {})
       attrs[:id] ||= attrs[:woeid]
       super

data/lib/twitter/rest/api.rb

@@ -3,6 +3,7 @@ require 'twitter/rest/favorites'
 require 'twitter/rest/friends_and_followers'
 require 'twitter/rest/help'
 require 'twitter/rest/lists'
+require 'twitter/rest/media'
 require 'twitter/rest/oauth'
 require 'twitter/rest/places_and_geo'
 require 'twitter/rest/saved_searches'
@@ -23,6 +24,7 @@ module Twitter
       include Twitter::REST::FriendsAndFollowers
       include Twitter::REST::Help
       include Twitter::REST::Lists
+      include Twitter::REST::Media
       include Twitter::REST::OAuth
       include Twitter::REST::PlacesAndGeo
       include Twitter::REST::SavedSearches

data/lib/twitter/rest/client.rb

@@ -19,7 +19,8 @@ module Twitter
     class Client < Twitter::Client
       include Twitter::REST::API
       attr_accessor :bearer_token
-      ENDPOINT = 'https://api.twitter.com'
+      URL_PREFIX = 'https://api.twitter.com'
+      ENDPOINT = URL_PREFIX
 
       # @param connection_options [Hash]
       # @return [Hash]
@@ -74,13 +75,13 @@ module Twitter
 
       # Perform an HTTP GET request
       def get(path, params = {})
-        headers = request_headers(:get, path, params)
+        headers = request_headers(:get, URL_PREFIX + path, params)
         request(:get, path, params, headers)
       end
 
       # Perform an HTTP POST request
       def post(path, params = {})
-        headers = params.values.any? { |value| value.respond_to?(:to_io) } ? request_headers(:post, path, params, {}) : request_headers(:post, path, params)
+        headers = params.values.any? { |value| value.respond_to?(:to_io) } ? request_headers(:post, URL_PREFIX + path, params, {}) : request_headers(:post, URL_PREFIX + path, params)
         request(:post, path, params, headers)
       end
 
@@ -100,7 +101,7 @@ module Twitter
       #
       # @return [Faraday::Connection]
       def connection
-        @connection ||= Faraday.new(ENDPOINT, connection_options)
+        @connection ||= Faraday.new(URL_PREFIX, connection_options)
       end
 
       def request(method, path, params = {}, headers = {})
@@ -111,7 +112,7 @@ module Twitter
         raise(Twitter::Error.new(error))
       end
 
-      def request_headers(method, path, params = {}, signature_params = params)
+      def request_headers(method, url, params = {}, signature_params = params)
         bearer_token_request = params.delete(:bearer_token_request)
         headers = {}
         if bearer_token_request
@@ -119,17 +120,17 @@ module Twitter
           headers[:authorization] = bearer_token_credentials_auth_header
           headers[:content_type]  = 'application/x-www-form-urlencoded; charset=UTF-8'
         else
-          headers[:authorization] = auth_header(method, path, params, signature_params)
+          headers[:authorization] = auth_header(method, url, params, signature_params)
         end
         headers
       end
 
-      def auth_header(method, path, params = {}, signature_params = params)
+      def auth_header(method, url, params = {}, signature_params = params)
         if !user_token?
           @bearer_token = token unless bearer_token?
           bearer_auth_header
         else
-          oauth_auth_header(method, ENDPOINT + path, signature_params).to_s
+          oauth_auth_header(method, url, signature_params).to_s
         end
       end
 

data/lib/twitter/rest/media.rb

@@ -0,0 +1,29 @@
+require 'twitter/error'
+require 'twitter/rest/utils'
+
+module Twitter
+  module REST
+    module Media
+      # Uploads media to attach to a tweet
+      #
+      # @see https://dev.twitter.com/docs/api/multiple-media-extended-entities
+      # @rate_limited No
+      # @authentication Requires user context
+      # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
+      # @raise [Twitter::Error::UnacceptableIO] Error when the IO object for the media argument does not have a to_io method.
+      # @return [Integer] The uploaded media ID.
+      # @param media [File, Hash] A File object with your picture (PNG, JPEG or GIF)
+      # @param options [Hash] A customizable set of options.
+      def upload(media, options = {})
+        fail(Twitter::Error::UnacceptableIO.new) unless media.respond_to?(:to_io)
+        url_prefix = 'https://upload.twitter.com'
+        path = '/1.1/media/upload.json'
+        conn = connection.dup
+        conn.url_prefix = url_prefix
+        headers = request_headers(:post, url_prefix + path, options)
+        options.merge!(:media => media)
+        conn.post(path, options) { |request| request.headers.update(headers) }.env.body[:media_id]
+      end
+    end
+  end
+end

data/lib/twitter/rest/request/multipart_with_file.rb

@@ -11,9 +11,8 @@ module Twitter
 
         def call(request)
           request.body.each do |key, value|
-            if value.respond_to?(:to_io)
-              request.body[key] = Faraday::UploadIO.new(value, mime_type(value.path), value.path)
-            end
+            next unless value.respond_to?(:to_io)
+            request.body[key] = Faraday::UploadIO.new(value, mime_type(value.path), value.path)
           end if request.body.is_a?(::Hash)
           @app.call(request)
         end

data/lib/twitter/rest/response/raise_error.rb

@@ -8,14 +8,13 @@ module Twitter
         def on_complete(response)
           status_code = response.status.to_i
           klass = Twitter::Error.errors[status_code]
-          if klass
-            error = if klass == Twitter::Error::Forbidden
-              handle_forbidden_errors(response)
-            else
-              klass.from_response(response)
-            end
-            fail(error)
+          return unless klass
+          error = if klass == Twitter::Error::Forbidden
+            handle_forbidden_errors(response)
+          else
+            klass.from_response(response)
           end
+          fail(error)
         end
 
       private

data/lib/twitter/rest/search.rb

@@ -24,7 +24,6 @@ module Twitter
       # @option options [String] :until Optional. Returns tweets generated before the given date. Date should be formatted as YYYY-MM-DD.
       # @option options [Integer] :since_id Returns results with an ID greater than (that is, more recent than) the specified ID. There are limits to the number of Tweets which can be accessed through the API. If the limit of Tweets has occured since the since_id, the since_id will be forced to the oldest ID available.
       # @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
-      # @option options [Boolean, String, Integer] :include_entities The tweet entities node will be disincluded when set to false.
       # @return [Twitter::SearchResults] Return tweets that match a specified query with search metadata
       def search(q, options = {})
         options[:count] ||= MAX_TWEETS_PER_REQUEST

data/lib/twitter/rest/timelines.rb

@@ -110,7 +110,6 @@ module Twitter
       # @option options [Boolean, String, Integer] :exclude_replies This parameter will prevent replies from appearing in the returned timeline. Using exclude_replies with the count parameter will mean you will receive up-to count tweets - this is because the count parameter retrieves that many tweets before filtering out retweets and replies.
       # @option options [Boolean, String, Integer] :include_rts Specifies that the timeline should include native retweets in addition to regular tweets. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will no longer contain a full user object.
       # @option options [Boolean, String, Integer] :contributor_details Specifies that the contributors element should be enhanced to include the screen_name of the contributor.
-      # @option options [Boolean, String, Integer] :include_entities The tweet entities node will be disincluded when set to false.
       def home_timeline(options = {})
         perform_with_objects(:get, '/1.1/statuses/home_timeline.json', options, Twitter::Tweet)
       end
@@ -130,7 +129,6 @@ module Twitter
       # @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.
       # @option options [Boolean, String, Integer] :exclude_replies This parameter will prevent replies from appearing in the returned timeline. Using exclude_replies with the count parameter will mean you will receive up-to count tweets - this is because the count parameter retrieves that many tweets before filtering out retweets and replies.
       # @option options [Boolean, String, Integer] :contributor_details Specifies that the contributors element should be enhanced to include the screen_name of the contributor.
-      # @option options [Boolean, String, Integer] :include_entities The tweet entities node will be disincluded when set to false.
       def retweeted_to_me(options = {})
         retweets_from_timeline(options) do |opts|
           home_timeline(opts)
@@ -149,7 +147,6 @@ module Twitter
       # @option options [Integer] :since_id Returns results with an ID greater than (that is, more recent than) the specified ID.
       # @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
       # @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.
-      # @option options [Boolean, String, Integer] :include_entities The tweet entities node will be disincluded when set to false.
       # @option options [Boolean, String, Integer] :include_user_entities The user entities node will be disincluded when set to false.
       def retweets_of_me(options = {})
         perform_with_objects(:get, '/1.1/statuses/retweets_of_me.json', options, Twitter::Tweet)

data/lib/twitter/rest/tweets.rb

@@ -73,7 +73,6 @@ module Twitter
       #   @param tweets [Enumerable<Integer, String, URI, Twitter::Tweet>] A collection of Tweet IDs, URIs, or objects.
       #   @param options [Hash] A customizable set of options.
       #   @option options [Symbol, String] :method Requests users via a GET request instead of the standard POST request if set to ':get'.
-      #   @option options [Boolean] :include_entities The tweet entities node will be disincluded when set to false.
       #   @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 statuses(*args)
         arguments = Twitter::Arguments.new(args)
@@ -117,12 +116,14 @@ 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 [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 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::PlacesAndGeo#reverse_geocode}.
       # @option options [String] :place_id A place in the world. These IDs can be retrieved from {Twitter::REST::PlacesAndGeo#reverse_geocode}.
+      # @option options [String] :media_ids A comma separated list of uploaded media IDs to attach to the Tweet.
       # @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 = {})
@@ -142,12 +143,14 @@ 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 [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 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::PlacesAndGeo#reverse_geocode}.
       # @option options [String] :place_id A place in the world. These IDs can be retrieved from {Twitter::REST::PlacesAndGeo#reverse_geocode}.
+      # @option options [String] :media_ids A comma separated list of uploaded media IDs to attach to the Tweet.
       # @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 = {})

data/lib/twitter/rest/users.rb

@@ -136,7 +136,6 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Array<Twitter::User>] User objects that the authenticating user is blocking.
       # @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.
       def blocked(options = {})
         perform_with_cursor(:get, '/1.1/blocks/list.json', options, :users, Twitter::User)
@@ -225,7 +224,6 @@ module Twitter
       #   @param users [Enumerable<Integer, String, Twitter::User>] A collection of Twitter user IDs, screen names, or objects.
       #   @param options [Hash] A customizable set of options.
       #   @option options [Symbol, String] :method Requests users via a GET request instead of the standard POST request if set to ':get'.
-      #   @option options [Boolean] :include_entities The tweet entities node will be disincluded when set to false.
       def users(*args)
         arguments = Twitter::Arguments.new(args)
         request_method = arguments.options.delete(:method) || :post
@@ -243,14 +241,12 @@ 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.
       # @overload user(user, options = {})
       #   Returns extended information for a given user
       #
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, 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.
       def user(*args)
         arguments = Twitter::Arguments.new(args)
@@ -421,7 +417,6 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Array<Twitter::User>] User objects that the authenticating user is muting.
       # @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.
       def muted(options = {})
         perform_with_cursor(:get, '/1.1/mutes/users/list.json', options, :users, Twitter::User)

data/lib/twitter/rest/utils.rb

@@ -115,7 +115,7 @@ module Twitter
       end
 
       def user_id
-        @user_id ||= verify_credentials(:include_entities => false, :skip_status => true).id
+        @user_id ||= verify_credentials(:skip_status => true).id
       end
 
       def user_id?

data/lib/twitter/search_results.rb

@@ -43,9 +43,7 @@ module Twitter
     # @note Returned Hash can be merged into the previous search options list to easily access the next page.
     # @return [Hash] The parameters needed to fetch the next page.
     def next_page
-      if next_page?
-        query_string_to_hash(@attrs[:search_metadata][:next_results])
-      end
+      query_string_to_hash(@attrs[:search_metadata][:next_results]) if next_page?
     end
 
     # @return [Hash]

data/lib/twitter/user.rb

@@ -89,7 +89,7 @@ module Twitter
     def website
       if website_urls?
         website_urls.first.expanded_url
-      elsif @attrs[:url]
+      else
         Addressable::URI.parse(@attrs[:url])
       end
     end

data/lib/twitter/utils.rb

@@ -25,11 +25,8 @@ module Twitter
     # @param enumerable [Enumerable]
     # @return [Array, Enumerator]
     def flat_pmap(enumerable)
-      if block_given?
-        pmap(enumerable, &Proc.new).flatten(1)
-      else
-        to_enum(:flat_pmap, enumerable)
-      end
+      return to_enum(:flat_pmap, enumerable) unless block_given?
+      pmap(enumerable, &Proc.new).flatten(1)
     end
     module_function :flat_pmap
 

data/lib/twitter/version.rb

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

data/spec/fixtures/status.json

@@ -1 +1 @@
-{"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":"Fri Mar 28 21:34:45 +0000 2014","id":449660889793581056,"id_str":"449660889793581056","text":"\"I hope you'll keep...building bonds of friendship that will enrich your lives & enrich our world\" \u2014FLOTUS in China, http:\/\/t.co\/fxmuQN9JL9","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":1093090866,"id_str":"1093090866","name":"The First Lady","screen_name":"FLOTUS","location":"Washington, DC","description":"This account is run by the Office of First Lady Michelle Obama. Tweets from the First Lady are signed \u2013mo. Tweets may be archived. More at http:\/\/t.co\/9DxP65hB","url":"http:\/\/t.co\/RvRZspIO8c","entities":{"url":{"urls":[{"url":"http:\/\/t.co\/RvRZspIO8c","expanded_url":"http:\/\/www.whitehouse.gov","display_url":"whitehouse.gov","indices":[0,22]}]},"description":{"urls":[{"url":"http:\/\/t.co\/9DxP65hB","expanded_url":"http:\/\/wh.gov\/privacy","display_url":"wh.gov\/privacy","indices":[139,159]}]}},"protected":false,"followers_count":875307,"friends_count":21,"listed_count":5338,"created_at":"Tue Jan 15 20:03:17 +0000 2013","favourites_count":0,"utc_offset":-14400,"time_zone":"Eastern Time (US & Canada)","geo_enabled":false,"verified":true,"statuses_count":812,"lang":"en","contributors_enabled":false,"is_translator":false,"is_translation_enabled":false,"profile_background_color":"0084B4","profile_background_image_url":"http:\/\/pbs.twimg.com\/profile_background_images\/766168824\/6d7e9bac6f5904ab0843bd1e9d935695.jpeg","profile_background_image_url_https":"https:\/\/pbs.twimg.com\/profile_background_images\/766168824\/6d7e9bac6f5904ab0843bd1e9d935695.jpeg","profile_background_tile":false,"profile_image_url":"http:\/\/pbs.twimg.com\/profile_images\/453354757499781120\/WsSISQK__normal.jpeg","profile_image_url_https":"https:\/\/pbs.twimg.com\/profile_images\/453354757499781120\/WsSISQK__normal.jpeg","profile_banner_url":"https:\/\/pbs.twimg.com\/profile_banners\/1093090866\/1396923217","profile_link_color":"0084B4","profile_sidebar_border_color":"FFFFFF","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":null,"coordinates":null,"place":null,"contributors":null,"retweet_count":222,"favorite_count":295,"entities":{"hashtags":[],"symbols":[],"urls":[],"user_mentions":[],"media":[{"id":449660809380380673,"id_str":"449660809380380673","indices":[121,143],"media_url":"http:\/\/pbs.twimg.com\/media\/Bj2EH6yIQAEYvxu.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bj2EH6yIQAEYvxu.jpg","url":"http:\/\/t.co\/fxmuQN9JL9","display_url":"pic.twitter.com\/fxmuQN9JL9","expanded_url":"http:\/\/twitter.com\/FLOTUS\/status\/449660889793581056\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":399,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"large":{"w":640,"h":426,"resize":"fit"},"small":{"w":340,"h":226,"resize":"fit"}}}]},"extended_entities":{"media":[{"id":449660809380380673,"id_str":"449660809380380673","indices":[121,143],"media_url":"http:\/\/pbs.twimg.com\/media\/Bj2EH6yIQAEYvxu.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bj2EH6yIQAEYvxu.jpg","url":"http:\/\/t.co\/fxmuQN9JL9","display_url":"pic.twitter.com\/fxmuQN9JL9","expanded_url":"http:\/\/twitter.com\/FLOTUS\/status\/449660889793581056\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":399,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"large":{"w":640,"h":426,"resize":"fit"},"small":{"w":340,"h":226,"resize":"fit"}}},{"id":449660806754738177,"id_str":"449660806754738177","indices":[121,143],"media_url":"http:\/\/pbs.twimg.com\/media\/Bj2EHxAIIAE8dtg.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bj2EHxAIIAE8dtg.jpg","url":"http:\/\/t.co\/fxmuQN9JL9","display_url":"pic.twitter.com\/fxmuQN9JL9","expanded_url":"http:\/\/twitter.com\/FLOTUS\/status\/449660889793581056\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":399,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"large":{"w":640,"h":426,"resize":"fit"},"small":{"w":340,"h":226,"resize":"fit"}}},{"id":449660808537333761,"id_str":"449660808537333761","indices":[121,143],"media_url":"http:\/\/pbs.twimg.com\/media\/Bj2EH3pIYAE4LQn.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bj2EH3pIYAE4LQn.jpg","url":"http:\/\/t.co\/fxmuQN9JL9","display_url":"pic.twitter.com\/fxmuQN9JL9","expanded_url":"http:\/\/twitter.com\/FLOTUS\/status\/449660889793581056\/photo\/1","type":"photo","sizes":{"small":{"w":340,"h":227,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"large":{"w":640,"h":427,"resize":"fit"},"medium":{"w":600,"h":400,"resize":"fit"}}},{"id":449660877097406464,"id_str":"449660877097406464","indices":[121,143],"media_url":"http:\/\/pbs.twimg.com\/media\/Bj2EL3DIEAAzGAX.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bj2EL3DIEAAzGAX.jpg","url":"http:\/\/t.co\/fxmuQN9JL9","display_url":"pic.twitter.com\/fxmuQN9JL9","expanded_url":"http:\/\/twitter.com\/FLOTUS\/status\/449660889793581056\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":399,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"large":{"w":640,"h":426,"resize":"fit"},"small":{"w":340,"h":226,"resize":"fit"}}}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"lang":"en"}

data/spec/fixtures/upload.json

@@ -0,0 +1 @@
+{"image":{"w":428,"h":428,"image_type":"image\/png"},"media_id":470030289822314497,"media_id_string":"470030289822314497","size":68900}

data/spec/helper.rb

@@ -1,13 +1,5 @@
 require 'simplecov'
 require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
-
-SimpleCov.start do
-  add_filter '/spec/'
-  minimum_coverage(99.15)
-end
-
 require 'twitter'
 require 'rspec'
 require 'stringio'
@@ -24,35 +16,35 @@ RSpec.configure do |config|
 end
 
 def a_delete(path)
-  a_request(:delete, Twitter::REST::Client::ENDPOINT + path)
+  a_request(:delete, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def a_get(path)
-  a_request(:get, Twitter::REST::Client::ENDPOINT + path)
+  a_request(:get, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def a_post(path)
-  a_request(:post, Twitter::REST::Client::ENDPOINT + path)
+  a_request(:post, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def a_put(path)
-  a_request(:put, Twitter::REST::Client::ENDPOINT + path)
+  a_request(:put, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def stub_delete(path)
-  stub_request(:delete, Twitter::REST::Client::ENDPOINT + path)
+  stub_request(:delete, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def stub_get(path)
-  stub_request(:get, Twitter::REST::Client::ENDPOINT + path)
+  stub_request(:get, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def stub_post(path)
-  stub_request(:post, Twitter::REST::Client::ENDPOINT + path)
+  stub_request(:post, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def stub_put(path)
-  stub_request(:put, Twitter::REST::Client::ENDPOINT + path)
+  stub_request(:put, Twitter::REST::Client::URL_PREFIX + path)
 end
 
 def fixture_path