twitter 6.1.0 → 6.2.0

data/lib/twitter/base.rb

@@ -13,7 +13,6 @@ module Twitter
     attr_reader :attrs
     alias to_h attrs
     alias to_hash to_h
-    deprecate_alias :to_hsh, :to_hash
 
     class << self
       # Define methods that retrieve the value from attributes
@@ -29,7 +28,6 @@ module Twitter
       def predicate_attr_reader(*attrs)
         attrs.each do |attr|
           define_predicate_method(attr)
-          deprecate_attribute_method(attr)
         end
       end
 
@@ -87,25 +85,13 @@ module Twitter
         define_method(key1) do
           if attr_falsey_or_empty?(key1)
             NullObject.new
-          elsif klass.nil?
-            @attrs[key1]
           else
-            attrs = attrs_for_object(key1, key2)
-            Twitter.const_get(klass).new(attrs)
+            klass.nil? ? @attrs[key1] : Twitter.const_get(klass).new(attrs_for_object(key1, key2))
           end
         end
         memoize(key1)
       end
 
-      # @param key [Symbol]
-      def deprecate_attribute_method(key)
-        define_method(key) do
-          warn "#{Kernel.caller.first}: [DEPRECATION] ##{key} is deprecated. Use ##{key}? instead."
-          @attrs[key]
-        end
-        memoize(key)
-      end
-
       # Dynamically define a predicate method for an attribute
       #
       # @param key1 [Symbol]
@@ -139,7 +125,7 @@ module Twitter
   private
 
     def attr_falsey_or_empty?(key)
-      @attrs[key].nil? || @attrs[key] == false || @attrs[key].respond_to?(:empty?) && @attrs[key].empty?
+      !@attrs[key] || @attrs[key].respond_to?(:empty?) && @attrs[key].empty?
     end
 
     def attrs_for_object(key1, key2 = nil)

data/lib/twitter/basic_user.rb

@@ -5,9 +5,6 @@ module Twitter
   class BasicUser < Twitter::Identity
     # @return [String]
     attr_reader :screen_name
-    deprecate_alias :handle, :screen_name
-    deprecate_alias :username, :screen_name
-    deprecate_alias :user_name, :screen_name
     predicate_attr_reader :following
   end
 end

data/lib/twitter/client.rb

@@ -5,12 +5,8 @@ require 'twitter/version'
 module Twitter
   class Client
     include Twitter::Utils
-    attr_accessor :access_token, :access_token_secret, :consumer_key, :consumer_secret, :proxy
+    attr_accessor :access_token, :access_token_secret, :consumer_key, :consumer_secret, :proxy, :timeouts
     attr_writer :user_agent
-    deprecate_alias :oauth_token, :access_token
-    deprecate_alias :oauth_token=, :access_token=
-    deprecate_alias :oauth_token_secret, :access_token_secret
-    deprecate_alias :oauth_token_secret=, :access_token_secret=
 
     # Initializes a new Client object
     #
@@ -21,12 +17,11 @@ module Twitter
         instance_variable_set("@#{key}", value)
       end
       yield(self) if block_given?
-      validate_credentials!
     end
 
     # @return [Boolean]
     def user_token?
-      !!(access_token && access_token_secret)
+      !(blank?(access_token) || blank?(access_token_secret))
     end
 
     # @return [String]
@@ -41,27 +36,18 @@ module Twitter
         consumer_secret: consumer_secret,
         token: access_token,
         token_secret: access_token_secret,
-        ignore_extra_keys: true,
       }
     end
 
     # @return [Boolean]
     def credentials?
-      credentials.values.all?
+      credentials.values.none? { |v| blank?(v) }
     end
 
   private
 
-    # Ensures that all credentials set during configuration are of a
-    # valid type. Valid types are String and Boolean.
-    #
-    # @raise [Twitter::Error::ConfigurationError] Error is raised when
-    #   supplied twitter credentials are not a String or Boolean.
-    def validate_credentials!
-      credentials.each do |credential, value|
-        next if value.nil? || value == true || value == false || value.is_a?(String)
-        raise(Twitter::Error::ConfigurationError.new("Invalid #{credential} specified: #{value.inspect} must be a String."))
-      end
+    def blank?(s)
+      s.respond_to?(:empty?) ? s.empty? : !s
     end
   end
 end

data/lib/twitter/configuration.rb

@@ -8,8 +8,9 @@ module Twitter
     # @return [Array<String>]
     attr_reader :non_username_paths
     # @return [Integer]
-    attr_reader :characters_reserved_per_media, :max_media_per_upload,
-                :photo_size_limit, :short_url_length, :short_url_length_https
+    attr_reader :characters_reserved_per_media, :dm_text_character_limit,
+                :max_media_per_upload, :photo_size_limit, :short_url_length,
+                :short_url_length_https
     alias short_uri_length short_url_length
     alias short_uri_length_https short_url_length_https
 

data/lib/twitter/creatable.rb

@@ -9,7 +9,7 @@ module Twitter
     #
     # @return [Time]
     def created_at
-      Time.parse(@attrs[:created_at]) unless @attrs[:created_at].nil?
+      Time.parse(@attrs[:created_at]).utc unless @attrs[:created_at].nil?
     end
     memoize :created_at
 

data/lib/twitter/cursor.rb

@@ -10,7 +10,6 @@ module Twitter
     attr_reader :attrs
     alias to_h attrs
     alias to_hash to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new Cursor
     #

data/lib/twitter/entity/uri.rb

@@ -6,9 +6,5 @@ module Twitter
       display_uri_attr_reader
       uri_attr_reader :expanded_uri, :uri
     end
-
-    URL = URI
-    Uri = URI
-    Url = URI
   end
 end

data/lib/twitter/error.rb

@@ -8,6 +8,79 @@ module Twitter
     # @return [Twitter::RateLimit]
     attr_reader :rate_limit
 
+    # Raised when Twitter returns a 4xx HTTP status code
+    ClientError = Class.new(self)
+
+    # Raised when Twitter returns the HTTP status code 400
+    BadRequest = Class.new(ClientError)
+
+    # Raised when Twitter returns the HTTP status code 401
+    Unauthorized = Class.new(ClientError)
+
+    # Raised when Twitter returns the HTTP status code 403
+    Forbidden = Class.new(ClientError)
+
+    # Raised when Twitter returns the HTTP status code 413
+    RequestEntityTooLarge = Class.new(ClientError)
+
+    # Raised when a Tweet has already been favorited
+    AlreadyFavorited = Class.new(Forbidden)
+
+    # Raised when a Tweet has already been retweeted
+    AlreadyRetweeted = Class.new(Forbidden)
+
+    # Raised when a Tweet has already been posted
+    DuplicateStatus = Class.new(Forbidden)
+
+    # Raised when Twitter returns the HTTP status code 404
+    NotFound = Class.new(ClientError)
+
+    # Raised when Twitter returns the HTTP status code 406
+    NotAcceptable = Class.new(ClientError)
+
+    # Raised when Twitter returns the HTTP status code 422
+    UnprocessableEntity = Class.new(ClientError)
+
+    # Raised when Twitter returns the HTTP status code 429
+    TooManyRequests = Class.new(ClientError)
+
+    # Raised when Twitter returns a 5xx HTTP status code
+    ServerError = Class.new(self)
+
+    # Raised when Twitter returns the HTTP status code 500
+    InternalServerError = Class.new(ServerError)
+
+    # Raised when Twitter returns the HTTP status code 502
+    BadGateway = Class.new(ServerError)
+
+    # Raised when Twitter returns the HTTP status code 503
+    ServiceUnavailable = Class.new(ServerError)
+
+    # Raised when Twitter returns the HTTP status code 504
+    GatewayTimeout = Class.new(ServerError)
+
+    ERRORS = {
+      400 => Twitter::Error::BadRequest,
+      401 => Twitter::Error::Unauthorized,
+      403 => Twitter::Error::Forbidden,
+      404 => Twitter::Error::NotFound,
+      406 => Twitter::Error::NotAcceptable,
+      413 => Twitter::Error::RequestEntityTooLarge,
+      422 => Twitter::Error::UnprocessableEntity,
+      429 => Twitter::Error::TooManyRequests,
+      500 => Twitter::Error::InternalServerError,
+      502 => Twitter::Error::BadGateway,
+      503 => Twitter::Error::ServiceUnavailable,
+      504 => Twitter::Error::GatewayTimeout,
+    }.freeze
+
+    FORBIDDEN_MESSAGES = {
+      'Status is a duplicate.' => Twitter::Error::DuplicateStatus,
+      'You have already favorited this status.' => Twitter::Error::AlreadyFavorited,
+      'You have already retweeted this tweet.' => Twitter::Error::AlreadyRetweeted,
+      'sharing is not permissible for this status (Share validations failed)' => Twitter::Error::AlreadyRetweeted,
+    }.freeze
+
     # If error code is missing see https://dev.twitter.com/overview/api/response-codes
     module Code
       AUTHENTICATION_PROBLEM       =  32
@@ -35,49 +108,24 @@ module Twitter
       CANNOT_MUTE                  = 271
       CANNOT_UNMUTE                = 272
     end
-    Codes = Code
 
     class << self
+      include Twitter::Utils
+
       # Create a new error from an HTTP response
       #
-      # @param response [Faraday::Response]
+      # @param body [String]
+      # @param headers [Hash]
       # @return [Twitter::Error]
-      def from_response(response)
-        message, code = parse_error(response.body)
-        new(message, response.response_headers, code)
-      end
-
-      # @return [Hash]
-      def errors
-        @errors ||= {
-          400 => Twitter::Error::BadRequest,
-          401 => Twitter::Error::Unauthorized,
-          403 => Twitter::Error::Forbidden,
-          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,
-          502 => Twitter::Error::BadGateway,
-          503 => Twitter::Error::ServiceUnavailable,
-          504 => Twitter::Error::GatewayTimeout,
-        }
-      end
-
-      def forbidden_messages
-        @forbidden_messages ||= {
-          'Status is a duplicate.' => Twitter::Error::DuplicateStatus,
-          'You have already favorited this status.' => Twitter::Error::AlreadyFavorited,
-          'sharing is not permissible for this status (Share validations failed)' => Twitter::Error::AlreadyRetweeted,
-        }
+      def from_response(body, headers)
+        message, code = parse_error(body)
+        new(message, headers, code)
       end
 
     private
 
       def parse_error(body)
-        if body.nil?
+        if body.nil? || body.empty?
           ['', nil]
         elsif body[:error]
           [body[:error], nil]
@@ -107,68 +155,5 @@ module Twitter
       @rate_limit = Twitter::RateLimit.new(rate_limit)
       @code = code
     end
-
-    ConfigurationError = Class.new(::ArgumentError)
-
-    # Raised when a Tweet includes media that doesn't have a to_io method
-    class UnacceptableIO < StandardError
-      def initialize
-        super('The IO object for media must respond to to_io')
-      end
-    end
-
-    # Raised when Twitter returns a 4xx HTTP status code
-    ClientError = Class.new(self)
-
-    # Raised when Twitter returns the HTTP status code 400
-    BadRequest = Class.new(ClientError)
-
-    # Raised when Twitter returns the HTTP status code 401
-    Unauthorized = Class.new(ClientError)
-
-    # Raised when Twitter returns the HTTP status code 403
-    Forbidden = Class.new(ClientError)
-
-    # Raised when a Tweet has already been favorited
-    AlreadyFavorited = Class.new(Forbidden)
-
-    # Raised when a Tweet has already been retweeted
-    AlreadyRetweeted = Class.new(Forbidden)
-
-    # Raised when a Tweet has already been posted
-    DuplicateStatus = Class.new(Forbidden)
-    AlreadyPosted = DuplicateStatus
-
-    # Raised when Twitter returns the HTTP status code 404
-    NotFound = Class.new(ClientError)
-
-    # Raised when Twitter returns the HTTP status code 406
-    NotAcceptable = Class.new(ClientError)
-
-    # Raised when Twitter returns the HTTP status code 408
-    RequestTimeout = Class.new(ClientError)
-
-    # Raised when Twitter returns the HTTP status code 422
-    UnprocessableEntity = Class.new(ClientError)
-
-    # Raised when Twitter returns the HTTP status code 429
-    TooManyRequests = Class.new(ClientError)
-    EnhanceYourCalm = TooManyRequests
-    RateLimited = TooManyRequests
-
-    # Raised when Twitter returns a 5xx HTTP status code
-    ServerError = Class.new(self)
-
-    # Raised when Twitter returns the HTTP status code 500
-    InternalServerError = Class.new(ServerError)
-
-    # Raised when Twitter returns the HTTP status code 502
-    BadGateway = Class.new(ServerError)
-
-    # Raised when Twitter returns the HTTP status code 503
-    ServiceUnavailable = Class.new(ServerError)
-
-    # Raised when Twitter returns the HTTP status code 504
-    GatewayTimeout = Class.new(ServerError)
   end
 end

data/lib/twitter/geo_results.rb

@@ -9,7 +9,6 @@ module Twitter
     attr_reader :attrs
     alias to_h attrs
     alias to_hash to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new GeoResults object
     #

data/lib/twitter/headers.rb

@@ -8,21 +8,24 @@ module Twitter
       @client = client
       @request_method = request_method.to_sym
       @uri = Addressable::URI.parse(url)
+      @bearer_token_request = options.delete(:bearer_token_request)
       @options = options
-      @signature_options = @request_method == :post && @options.values.any? { |value| value.respond_to?(:to_io) } ? {} : @options
+    end
+
+    def bearer_token_request?
+      !!@bearer_token_request
     end
 
     def oauth_auth_header
-      SimpleOAuth::Header.new(@request_method, @uri, @signature_options, @client.credentials)
+      SimpleOAuth::Header.new(@request_method, @uri, @options, @client.credentials.merge(ignore_extra_keys: true))
     end
 
     def request_headers
-      bearer_token_request = @options.delete(:bearer_token_request)
       headers = {}
-      if bearer_token_request
+      headers[:user_agent] = @client.user_agent
+      if bearer_token_request?
         headers[:accept]        = '*/*'
         headers[:authorization] = bearer_token_credentials_auth_header
-        headers[:content_type]  = 'application/x-www-form-urlencoded; charset=UTF-8'
       else
         headers[:authorization] = auth_header
       end
@@ -40,18 +43,16 @@ module Twitter
       end
     end
 
+    # @return [String]
     def bearer_auth_header
-      bearer_token = @client.bearer_token
-      token = bearer_token.is_a?(Twitter::Token) && bearer_token.bearer? ? bearer_token.access_token : bearer_token
-      "Bearer #{token}"
+      "Bearer #{@client.bearer_token}"
     end
 
     # Generates authentication header for a bearer token request
     #
     # @return [String]
     def bearer_token_credentials_auth_header
-      basic_auth_token = Base64.strict_encode64("#{@client.consumer_key}:#{@client.consumer_secret}")
-      "Basic #{basic_auth_token}"
+      "Basic #{Base64.strict_encode64("#{@client.consumer_key}:#{@client.consumer_secret}")}"
     end
   end
 end

data/lib/twitter/media/photo.rb

@@ -8,6 +8,10 @@ module Twitter
 
       # @return [Array<Integer>]
       attr_reader :indices
+
+      # @return [String]
+      attr_reader :type
+
       display_uri_attr_reader
       uri_attr_reader :expanded_uri, :media_uri, :media_uri_https, :uri
 

data/lib/twitter/media/video.rb

@@ -9,6 +9,10 @@ module Twitter
 
       # @return [Array<Integer>]
       attr_reader :indices
+
+      # @return [String]
+      attr_reader :type
+
       display_uri_attr_reader
       uri_attr_reader :expanded_uri, :media_uri, :media_uri_https, :uri
 
@@ -18,7 +22,6 @@ module Twitter
       def sizes
         @attrs.fetch(:sizes, []).each_with_object({}) do |(key, value), object|
           object[key] = Size.new(value)
-          object
         end
       end
       memoize :sizes