twitter 6.1.0 → 6.2.0

data/lib/twitter/media/video_info.rb

@@ -16,7 +16,7 @@ module Twitter
       #
       # @return [Array<Twitter::Variant>]
       def variants
-        @attrs.fetch(:variants, []).map do |variant|
+        @attrs.fetch(:variants, []).collect do |variant|
           Variant.new(variant)
         end
       end

data/lib/twitter/null_object.rb

@@ -18,12 +18,12 @@ module Twitter
     end
 
     def instance_of?(klass)
-      raise(TypeError.new('class or module required')) unless klass.is_a?(Class)
+      raise(TypeError, 'class or module required') unless klass.is_a?(Class)
       self.class == klass
     end
 
     def kind_of?(mod)
-      raise(TypeError.new('class or module required')) unless mod.is_a?(Module)
+      raise(TypeError, 'class or module required') unless mod.is_a?(Module)
       self.class.ancestors.include?(mod)
     end
 

data/lib/twitter/profile.rb

@@ -1,4 +1,5 @@
 require 'addressable/uri'
+require 'cgi'
 require 'memoizable'
 
 module Twitter
@@ -11,7 +12,7 @@ module Twitter
     private
 
       def alias_predicate_uri_methods(method)
-        %w(_url? _uri_https? _url_https?).each do |replacement|
+        %w[_url? _uri_https? _url_https?].each do |replacement|
           alias_method_sub(method, PREDICATE_URI_METHOD_REGEX, replacement)
         end
       end
@@ -88,7 +89,7 @@ module Twitter
     end
 
     def profile_image_suffix(size)
-      :original == size.to_sym ? '\\1' : "_#{size}\\1"
+      size.to_sym == :original ? '\\1' : "_#{size}\\1"
     end
   end
 end

data/lib/twitter/rate_limit.rb

@@ -21,7 +21,7 @@ module Twitter
     # @return [Time]
     def reset_at
       reset = @attrs['x-rate-limit-reset']
-      Time.at(reset.to_i) if reset
+      Time.at(reset.to_i).utc if reset
     end
     memoize :reset_at
 

data/lib/twitter/rest/api.rb

@@ -3,7 +3,6 @@ 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'
@@ -26,7 +25,6 @@ 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

@@ -1,85 +1,14 @@
-require 'faraday'
-require 'faraday/request/multipart'
 require 'twitter/client'
 require 'twitter/rest/api'
 require 'twitter/rest/request'
-require 'twitter/rest/request/multipart_with_file'
-require 'twitter/rest/response/parse_json'
-require 'twitter/rest/response/raise_error'
 require 'twitter/rest/utils'
 
 module Twitter
   module REST
     class Client < Twitter::Client
       include Twitter::REST::API
-      BASE_URL = 'https://api.twitter.com'.freeze
-      URL_PREFIX = BASE_URL
-      ENDPOINT = BASE_URL
       attr_accessor :bearer_token
 
-      # @param connection_options [Hash]
-      # @return [Hash]
-      def connection_options=(connection_options)
-        warn "#{Kernel.caller.first}: [DEPRECATION] #{self.class.name}##{__method__} is deprecated and will be removed."
-        @connection_options = connection_options
-      end
-
-      # @return [Hash]
-      def connection_options
-        @connection_options ||= {
-          builder: middleware,
-          headers: {
-            accept: 'application/json',
-            user_agent: user_agent,
-          },
-          request: {
-            open_timeout: 10,
-            timeout: 30,
-          },
-          proxy: proxy,
-        }
-      end
-
-      # @params middleware [Faraday::RackBuilder]
-      # @return [Faraday::RackBuilder]
-      def middleware=(middleware)
-        warn "#{Kernel.caller.first}: [DEPRECATION] #{self.class.name}##{__method__} is deprecated and will be removed."
-        @middleware = middleware
-      end
-
-      # @note Faraday's middleware stack implementation is comparable to that of Rack middleware.  The order of middleware is important: the first middleware on the list wraps all others, while the last middleware is the innermost one.
-      # @see https://github.com/technoweenie/faraday#advanced-middleware-usage
-      # @see http://mislav.uniqpath.com/2011/07/faraday-advanced-http/
-      # @return [Faraday::RackBuilder]
-      def middleware
-        @middleware ||= Faraday::RackBuilder.new do |faraday|
-          # Convert file uploads to Faraday::UploadIO objects
-          faraday.request :twitter_multipart_with_file
-          # Checks for files in the payload, otherwise leaves everything untouched
-          faraday.request :multipart
-          # Encodes as "application/x-www-form-urlencoded" if not already encoded
-          faraday.request :url_encoded
-          # Handle error responses
-          faraday.response :twitter_raise_error
-          # Parse JSON response bodies
-          faraday.response :twitter_parse_json
-          # Set default HTTP adapter
-          faraday.adapter :net_http
-        end
-      end
-
-      # Perform an HTTP GET request
-      def get(path, options = {})
-        warn "#{Kernel.caller.first}: [DEPRECATION] #{self.class.name}##{__method__} is deprecated. Use Twitter::REST::Request#perform instead."
-        perform_get(path, options)
-      end
-
-      # Perform an HTTP POST request
-      def post(path, options = {})
-        warn "#{Kernel.caller.first}: [DEPRECATION] #{self.class.name}##{__method__} is deprecated. Use Twitter::REST::Request#perform instead."
-        perform_post(path, options)
-      end
-
       # @return [Boolean]
       def bearer_token?
         !!bearer_token
@@ -89,13 +18,6 @@ module Twitter
       def credentials?
         super || bearer_token?
       end
-
-      # Returns a Faraday::Connection object
-      #
-      # @return [Faraday::Connection]
-      def connection
-        @connection ||= Faraday.new(BASE_URL, connection_options)
-      end
     end
   end
 end

data/lib/twitter/rest/direct_messages.rb

@@ -55,6 +55,7 @@ module Twitter
       # @param id [Integer] A direct message ID.
       # @param options [Hash] A customizable set of options.
       def direct_message(id, options = {})
+        options = options.dup
         options[:id] = id
         perform_get_with_object('/1.1/direct_messages/show.json', options, Twitter::DirectMessage)
       end
@@ -111,7 +112,6 @@ module Twitter
       def destroy_direct_message(*args)
         parallel_objects_from_response(Twitter::DirectMessage, :post, '/1.1/direct_messages/destroy.json', args)
       end
-      deprecate_alias :direct_message_destroy, :destroy_direct_message
 
       # Sends a new direct message to the specified user from the authenticating user
       #
@@ -121,9 +121,10 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::DirectMessage] The sent message.
       # @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
-      # @param text [String] The text of your direct message, up to 140 characters.
+      # @param text [String] The text of your direct message, up to 10,000 characters.
       # @param options [Hash] A customizable set of options.
       def create_direct_message(user, text, options = {})
+        options = options.dup
         merge_user!(options, user)
         options[:text] = text
         perform_post_with_object('/1.1/direct_messages/new.json', options, Twitter::DirectMessage)
@@ -131,7 +132,6 @@ module Twitter
       alias d create_direct_message
       alias m create_direct_message
       alias dm create_direct_message
-      deprecate_alias :direct_message_create, :create_direct_message
     end
   end
 end

data/lib/twitter/rest/favorites.rb

@@ -48,10 +48,33 @@ 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.
       def unfavorite(*args)
-        parallel_objects_from_response(Twitter::Tweet, :post, '/1.1/favorites/destroy.json', args)
+        arguments = Twitter::Arguments.new(args)
+        pmap(arguments) do |tweet|
+          begin
+            perform_post_with_object('/1.1/favorites/destroy.json', arguments.options.merge(id: extract_id(tweet)), Twitter::Tweet)
+          rescue Twitter::Error::NotFound
+            next
+          end
+        end.compact
       end
       alias destroy_favorite unfavorite
-      deprecate_alias :favorite_destroy, :unfavorite
+
+      # Un-favorites the specified Tweets as the authenticating user and raises an error if one is not found
+      #
+      # @see https://dev.twitter.com/rest/reference/post/favorites/destroy
+      # @rate_limited No
+      # @authentication Requires user context
+      # @raise [Twitter::Error::NotFound] Error raised when tweet does not exist or has been deleted.
+      # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
+      # @return [Array<Twitter::Tweet>] The un-favorited Tweets.
+      # @overload unfavorite!(*tweets)
+      #   @param tweets [Enumerable<Integer, String, URI, Twitter::Tweet>] A collection of Tweet IDs, URIs, or objects.
+      # @overload unfavorite!(*tweets, options)
+      #   @param tweets [Enumerable<Integer, String, URI, Twitter::Tweet>] A collection of Tweet IDs, URIs, or objects.
+      #   @param options [Hash] A customizable set of options.
+      def unfavorite!(*args)
+        parallel_objects_from_response(Twitter::Tweet, :post, '/1.1/favorites/destroy.json', args)
+      end
 
       # Favorites the specified Tweets as the authenticating user
       #
@@ -77,7 +100,6 @@ module Twitter
       end
       alias fav favorite
       alias fave favorite
-      deprecate_alias :favorite_create, :favorite
 
       # Favorites the specified Tweets as the authenticating user and raises an error if one has already been favorited
       #
@@ -102,7 +124,6 @@ module Twitter
       alias create_favorite! favorite!
       alias fav! favorite!
       alias fave! favorite!
-      deprecate_alias :favorite_create!, :favorite!
     end
   end
 end

data/lib/twitter/rest/friends_and_followers.rb

@@ -114,7 +114,6 @@ module Twitter
         follow!(new_friends.value - existing_friends.value, arguments.options)
       end
       alias create_friendship follow
-      deprecate_alias :friendship_create, :follow
 
       # Allows the authenticating user to follow the specified users
       #
@@ -136,7 +135,6 @@ module Twitter
         end.compact
       end
       alias create_friendship! follow!
-      deprecate_alias :friendship_create!, :follow!
 
       # Allows the authenticating user to unfollow the specified users
       #
@@ -154,7 +152,6 @@ module Twitter
         parallel_users_from_response(:post, '/1.1/friendships/destroy.json', args)
       end
       alias destroy_friendship unfollow
-      deprecate_alias :friendship_destroy, :unfollow
 
       # Allows one to enable or disable retweets and device notifications from the specified user.
       #
@@ -183,6 +180,7 @@ module Twitter
       # @param target [Integer, String, Twitter::User] The Twitter user ID, screen name, or object of the target user.
       # @param options [Hash] A customizable set of options.
       def friendship(source, target, options = {})
+        options = options.dup
         merge_user!(options, source, 'source')
         options[:source_id] = options.delete(:source_user_id) unless options[:source_user_id].nil?
         merge_user!(options, target, 'target')

data/lib/twitter/rest/lists.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'twitter/arguments'
 require 'twitter/cursor'
 require 'twitter/error'
@@ -7,6 +8,7 @@ require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/user'
 require 'twitter/utils'
+require 'uri'
 
 module Twitter
   module REST
@@ -14,7 +16,6 @@ module Twitter
       include Twitter::REST::Utils
       include Twitter::Utils
       MAX_USERS_PER_REQUEST = 100
-      URI_SUBSTRING = '://'.freeze
 
       # Returns all lists the authenticating or specified user subscribes to, including their own
       #
@@ -83,7 +84,6 @@ module Twitter
       def remove_list_member(*args)
         list_from_response_with_user('/1.1/lists/members/destroy.json', args)
       end
-      deprecate_alias :list_remove_member, :remove_list_member
 
       # List the lists the specified user has been added to
       #
@@ -206,7 +206,6 @@ module Twitter
       def add_list_members(*args)
         list_from_response_with_users('/1.1/lists/members/create_all.json', args)
       end
-      deprecate_alias :list_add_members, :add_list_members
 
       # Check if a user is a member of the specified list
       #
@@ -269,7 +268,6 @@ module Twitter
       def add_list_member(*args)
         list_from_response_with_user('/1.1/lists/members/create.json', args)
       end
-      deprecate_alias :list_add_member, :add_list_member
 
       # Deletes the specified list
       #
@@ -290,7 +288,6 @@ module Twitter
       def destroy_list(*args)
         list_from_response(:post, '/1.1/lists/destroy.json', args)
       end
-      deprecate_alias :list_destroy, :destroy_list
 
       # Updates the specified list
       #
@@ -330,7 +327,6 @@ module Twitter
       def create_list(name, options = {})
         perform_post_with_object('/1.1/lists/create.json', options.merge(name: name), Twitter::List)
       end
-      deprecate_alias :list_create, :create_list
 
       # Show the specified list
       #
@@ -388,7 +384,6 @@ module Twitter
       def remove_list_members(*args)
         list_from_response_with_users('/1.1/lists/members/destroy_all.json', args)
       end
-      deprecate_alias :list_remove_members, :remove_list_members
 
       # Returns the lists owned by the specified Twitter user
       #
@@ -407,8 +402,6 @@ module Twitter
       def owned_lists(*args)
         cursor_from_response_with_user(:lists, Twitter::List, '/1.1/lists/ownerships.json', args)
       end
-      deprecate_alias :lists_ownerships, :owned_lists
-      deprecate_alias :lists_owned, :owned_lists
 
     private
 
@@ -464,28 +457,24 @@ module Twitter
       #
       # @param hash [Hash]
       # @param list [Integer, String, URI, Twitter::List] A Twitter list ID, slug, URI, or object.
-      # @return [Hash]
-      def merge_list!(hash, list) # rubocop:disable MethodLength
+      def merge_list!(hash, list)
         case list
-        when Integer
-          hash[:list_id] = list
-        when String
-          if list[URI_SUBSTRING]
-            list = list.split('/')
-            hash[:slug] = list.pop
-            hash[:owner_screen_name] = list.pop
-          else
-            hash[:slug] = list
-          end
-        when URI
-          list = list.path.split('/')
-          hash[:slug] = list.pop
-          hash[:owner_screen_name] = list.pop
-        when Twitter::List
-          hash[:list_id] = list.id
-          merge_owner!(hash, list.user)
+        when Integer               then hash[:list_id] = list
+        when Twitter::List         then merge_list_and_owner!(hash, list)
+        when String                then merge_slug_and_owner!(hash, list)
+        when URI, Addressable::URI then merge_slug_and_owner!(hash, list.path)
         end
-        hash
+      end
+
+      def merge_slug_and_owner!(hash, path)
+        list = path.split('/')
+        hash[:slug] = list.pop
+        hash[:owner_screen_name] = list.pop unless list.empty?
+      end
+
+      def merge_list_and_owner!(hash, list)
+        merge_list!(hash, list.id)
+        merge_owner!(hash, list.user)
       end
 
       # Take an owner and merge it into the hash with the correct key

data/lib/twitter/rest/oauth.rb

@@ -1,7 +1,5 @@
 require 'twitter/headers'
 require 'twitter/rest/utils'
-require 'twitter/rest/response/parse_error_json'
-require 'twitter/token'
 
 module Twitter
   module REST
@@ -18,15 +16,19 @@ module Twitter
       # @rate_limited No
       # @authentication Required
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Twitter::Token] The Bearer Token. token_type should be 'bearer'.
+      # @return [String] The Bearer token.
       # @param options [Hash] A customizable set of options.
       # @example Generate a Bearer Token
-      #   client = Twitter::REST::Client.new(:consumer_key => "abc", :consumer_secret => 'def')
+      #   client = Twitter::REST::Client.new(consumer_key: 'abc', consumer_secret: 'def')
       #   bearer_token = client.token
       def token(options = {})
+        options = options.dup
         options[:bearer_token_request] = true
         options[:grant_type] ||= 'client_credentials'
-        perform_post_with_object('/oauth2/token', options, Twitter::Token)
+        url = 'https://api.twitter.com/oauth2/token'
+        headers = Twitter::Headers.new(self, :post, url, options).request_headers
+        response = HTTP.headers(headers).post(url, form: options)
+        response.parse['access_token']
       end
       alias bearer_token token
 
@@ -36,13 +38,13 @@ module Twitter
       # @rate_limited No
       # @authentication Required
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @param access_token [String, Twitter::Token] The bearer token to revoke.
+      # @param access_token [String] The bearer token to revoke.
       # @param options [Hash] A customizable set of options.
-      # @return [Twitter::Token] The invalidated token. token_type should be nil.
+      # @return [String] The invalidated token. token_type should be nil.
       def invalidate_token(access_token, options = {})
-        access_token = access_token.access_token if access_token.is_a?(Twitter::Token)
+        options = options.dup
         options[:access_token] = access_token
-        perform_post_with_object('/oauth2/invalidate_token', options, Twitter::Token)
+        perform_post('/oauth2/invalidate_token', options)[:access_token]
       end
 
       # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.
@@ -53,12 +55,10 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [String] The token string.
       def reverse_token
-        conn = connection.dup
-        conn.builder.swap(4, Twitter::REST::Response::ParseErrorJson)
-        response = conn.post('/oauth/request_token?x_auth_mode=reverse_auth') do |request|
-          request.headers[:authorization] = Twitter::Headers.new(self, :post, 'https://api.twitter.com/oauth/request_token', x_auth_mode: 'reverse_auth').oauth_auth_header.to_s
-        end
-        response.body
+        options = {x_auth_mode: 'reverse_auth'}
+        url = 'https://api.twitter.com/oauth/request_token'
+        auth_header = Twitter::Headers.new(self, :post, url, options).oauth_auth_header.to_s
+        HTTP.headers(authorization: auth_header).post(url, params: options).to_s
       end
     end
   end