twitter 4.8.1 → 5.0.0.rc.1

data/lib/twitter/configuration.rb

@@ -4,14 +4,18 @@ module Twitter
   class Configuration < Twitter::Base
     attr_reader :characters_reserved_per_media, :max_media_per_upload,
       :non_username_paths, :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
 
     # Returns an array of photo sizes
     #
     # @return [Array<Twitter::Size>]
     def photo_sizes
-      @photo_sizes ||= Array(@attrs[:photo_sizes]).inject({}) do |object, (key, value)|
-        object[key] = Twitter::Size.fetch_or_new(value)
-        object
+      memoize(:photo_sizes) do
+        Array(@attrs[:photo_sizes]).inject({}) do |object, (key, value)|
+          object[key] = Twitter::Size.new(value)
+          object
+        end
       end
     end
 

data/lib/twitter/creatable.rb

@@ -7,13 +7,11 @@ module Twitter
     #
     # @return [Time]
     def created_at
-      @created_at ||= Time.parse(@attrs[:created_at]) if created?
+      @created_at ||= Time.parse(@attrs[:created_at]) if @attrs[:created_at]
     end
 
-  private
-
     def created?
-      !@attrs[:created_at].nil?
+      !!@attrs[:created_at]
     end
 
   end

data/lib/twitter/cursor.rb

@@ -3,62 +3,58 @@ require 'twitter/core_ext/kernel'
 module Twitter
   class Cursor
     include Enumerable
-    attr_reader :attrs, :collection
+    attr_reader :attrs
+    alias to_h attrs
     alias to_hash attrs
+    alias to_hsh attrs
 
-    # Initializes a new Cursor object
+    # Construct a new Cursor object from a response hash
     #
     # @param response [Hash]
-    # @param collection_name [String, Symbol] The name of the method to return the collection
-    # @param klass [Class] The class to instantiate object in the collection
-    # @param client [Twitter::Client]
-    # @param method_name [String, Symbol]
-    # @param method_options [Hash]
+    # @param key [String, Symbol] The key to fetch the data from the response
+    # @param klass [Class] The class to instantiate objects in the response
+    # @param client [Twitter::REST::Client]
+    # @param request_method [String, Symbol]
+    # @param path [String]
+    # @param options [Hash]
     # @return [Twitter::Cursor]
-    def self.from_response(response, collection_name, klass, client, method_name, method_options)
-      new(response[:body], collection_name, klass, client, method_name, method_options)
+    def self.from_response(response, key, klass, client, request_method, path, options)
+      new(response[:body], key, klass, client, request_method, path, options)
     end
 
     # Initializes a new Cursor
     #
     # @param attrs [Hash]
-    # @param collection_name [String, Symbol] The name of the method to return the collection
-    # @param klass [Class] The class to instantiate object in the collection
-    # @param client [Twitter::Client]
-    # @param method_name [String, Symbol]
-    # @param method_options [Hash]
+    # @param key [String, Symbol] The key to fetch the data from the response
+    # @param klass [Class] The class to instantiate objects in the response
+    # @param client [Twitter::REST::Client]
+    # @param request_method [String, Symbol]
+    # @param path [String]
+    # @param options [Hash]
     # @return [Twitter::Cursor]
-    def initialize(attrs, collection_name, klass, client, method_name, method_options)
-      @attrs = attrs
+    def initialize(attrs, key, klass, client, request_method, path, options)
+      @key = key.to_sym
+      @klass = klass
       @client = client
-      @method_name = method_name
-      @method_options = method_options
-      @collection = Array(attrs[collection_name.to_sym]).map do |item|
-        if klass
-          klass.fetch_or_new(item)
-        else
-          item
-        end
-      end
-      singleton_class.class_eval do
-        alias_method(collection_name.to_sym, :collection)
-      end
+      @request_method = request_method.to_sym
+      @path = path
+      @options = options
+      @collection = []
+      set_attrs(attrs)
     end
 
-    # @param collection [Array]
-    # @param cursor [Integer]
-    # @return [Array]
-    def all(collection=collection, cursor=next_cursor)
-      cursor = @client.send(@method_name.to_sym, @method_options.merge(:cursor => cursor))
-      collection += cursor.collection
-      cursor.last? ? collection.flatten : all(collection, cursor.next_cursor)
-    end
-
-    # @return [Enumerable]
-    def each
-      all(collection, next_cursor).each do |element|
+    # @return [Enumerator]
+    def each(start = 0, &block)
+      return to_enum(:each) unless block_given?
+      Array(@collection[start..-1]).each do |element|
         yield element
       end
+      unless last?
+        start = [@collection.size, start].max
+        fetch_next_page
+        each(start, &block)
+      end
+      self
     end
 
     def next_cursor
@@ -75,13 +71,25 @@ module Twitter
     def first?
       previous_cursor.zero?
     end
-    alias first first?
 
     # @return [Boolean]
     def last?
       next_cursor.zero?
     end
-    alias last last?
+
+  private
+
+    def fetch_next_page
+      response = @client.send(@request_method, @path, @options.merge(:cursor => next_cursor))
+      set_attrs(response[:body])
+    end
+
+    def set_attrs(attrs)
+      @attrs = attrs
+      Array(attrs[@key]).each do |element|
+        @collection << (@klass ? @klass.new(element) : element)
+      end
+    end
 
   end
 end

data/lib/twitter/direct_message.rb

@@ -6,16 +6,7 @@ module Twitter
     include Twitter::Creatable
     attr_reader :text
     alias full_text text
-
-    # @return [Twitter::User]
-    def recipient
-      @recipient ||= Twitter::User.fetch_or_new(@attrs[:recipient])
-    end
-
-    # @return [Twitter::User]
-    def sender
-      @sender ||= Twitter::User.fetch_or_new(@attrs[:sender])
-    end
-
+    object_attr_reader :User, :recipient
+    object_attr_reader :User, :sender
   end
 end

data/lib/twitter/entity/uri.rb

@@ -0,0 +1,13 @@
+require 'twitter/entity'
+
+module Twitter
+  class Entity
+    class URI < Twitter::Entity
+      uri_attr_reader :display_uri, :expanded_uri, :uri
+    end
+
+    Uri = URI
+    URL = URI
+    Url = URI
+  end
+end

data/lib/twitter/enumerable.rb

@@ -0,0 +1,15 @@
+module Twitter
+  module Enumerable
+    include ::Enumerable
+
+    # @return [Enumerator]
+    def each(start = 0, &block)
+      return to_enum(:each) unless block_given?
+      Array(@collection[start..-1]).each do |element|
+        yield element
+      end
+      self
+    end
+
+  end
+end

data/lib/twitter/error.rb

@@ -3,31 +3,79 @@ require 'twitter/rate_limit'
 module Twitter
   # Custom error class for rescuing from all Twitter errors
   class Error < StandardError
-    attr_reader :rate_limit, :wrapped_exception
+    attr_reader :rate_limit, :wrapped_exception, :code
+
+    # If error code is missing see https://dev.twitter.com/docs/error-codes-responses
+    module Codes
+      AUTHENTICATION_PROBLEM       = 32
+      RESOURCE_NOT_FOUND           = 34
+      SUSPENDED_ACCOUNT            = 64
+      DEPRECATED_CALL              = 68
+      RATE_LIMIT_EXCEEDED          = 88
+      INVALID_OR_EXPIRED_TOKEN     = 89
+      OVER_CAPACITY                = 130
+      INTERNAL_ERROR               = 131
+      OAUTH_TIMESTAMP_OUT_OF_RANGE = 135
+      DUPLICATE_STATUS             = 187
+      BAD_AUTHENTICATION_DATA      = 215
+      LOGIN_VERIFICATION_NEEDED    = 231
+    end
+
+    # Create a new error from an HTTP response
+    #
+    # @param response [Hash]
+    # @return [Twitter::Error]
+    def self.from_response(response={})
+      error, code = parse_error(response[:body])
+      new(error, response[:response_headers], code)
+    end
 
     # @return [Hash]
     def self.errors
-      @errors ||= Hash[descendants.map{|klass| [klass.const_get(:HTTP_STATUS_CODE), klass]}]
+      @errors ||= descendants.inject({}) do |hash, klass|
+        hash[klass::HTTP_STATUS_CODE] = klass
+        hash
+      end
     end
 
     # @return [Array]
     def self.descendants
-      ObjectSpace.each_object(::Class).select{|klass| klass < self}
+      @descendants ||= []
+    end
+
+    # @return [Array]
+    def self.inherited(descendant)
+      descendants << descendant
     end
 
     # Initializes a new Error object
     #
     # @param exception [Exception, String]
     # @param response_headers [Hash]
+    # @param code [Integer]
     # @return [Twitter::Error]
-    def initialize(exception=$!, response_headers={})
+    def initialize(exception=$!, response_headers={}, code=nil)
       @rate_limit = Twitter::RateLimit.new(response_headers)
       @wrapped_exception = exception
-      exception.respond_to?(:backtrace) ? super(exception.message) : super(exception.to_s)
+      @code = code
+      exception.respond_to?(:message) ? super(exception.message) : super(exception.to_s)
     end
 
-    def backtrace
-      @wrapped_exception.respond_to?(:backtrace) ? @wrapped_exception.backtrace : super
+  private
+
+    def self.parse_error(body)
+      if body.nil?
+        ['', nil]
+      elsif body[:error]
+        [body[:error], nil]
+      elsif body[:errors]
+        first = Array(body[:errors]).first
+        if first.is_a?(Hash)
+          [first[:message].chomp, first[:code]]
+        else
+          [first.chomp, nil]
+        end
+      end
     end
 
   end

data/lib/twitter/error/already_favorited.rb

@@ -3,7 +3,7 @@ require 'twitter/error/forbidden'
 module Twitter
   class Error
     # Raised when a Tweet has already been favorited
-    class AlreadyFavorited < Twitter::Error
+    class AlreadyFavorited < Twitter::Error::Forbidden
       MESSAGE = "You have already favorited this status"
     end
   end

data/lib/twitter/error/already_posted.rb

@@ -0,0 +1,10 @@
+require 'twitter/error/forbidden'
+
+module Twitter
+  class Error
+    # Raised when a Tweet has already been posted
+    class AlreadyPosted < Twitter::Error::Forbidden
+      MESSAGE = "Status is a duplicate"
+    end
+  end
+end

data/lib/twitter/error/already_retweeted.rb

@@ -3,7 +3,7 @@ require 'twitter/error/forbidden'
 module Twitter
   class Error
     # Raised when a Tweet has already been retweeted
-    class AlreadyRetweeted < Twitter::Error
+    class AlreadyRetweeted < Twitter::Error::Forbidden
       MESSAGE = "sharing is not permissible for this status (Share validations failed)"
     end
   end

data/lib/twitter/error/bad_gateway.rb

@@ -1,11 +1,10 @@
-require 'twitter/error/server_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 502
-    class BadGateway < Twitter::Error::ServerError
+    class BadGateway < Twitter::Error
       HTTP_STATUS_CODE = 502
-      MESSAGE = "Twitter is down or being upgraded."
     end
   end
 end

data/lib/twitter/error/bad_request.rb

@@ -1,9 +1,9 @@
-require 'twitter/error/client_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 400
-    class BadRequest < Twitter::Error::ClientError
+    class BadRequest < Twitter::Error
       HTTP_STATUS_CODE = 400
     end
   end

data/lib/twitter/error/forbidden.rb

@@ -1,9 +1,9 @@
-require 'twitter/error/client_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 403
-    class Forbidden < Twitter::Error::ClientError
+    class Forbidden < Twitter::Error
       HTTP_STATUS_CODE = 403
     end
   end

data/lib/twitter/error/gateway_timeout.rb

@@ -1,11 +1,10 @@
-require 'twitter/error/server_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 504
-    class GatewayTimeout < Twitter::Error::ServerError
+    class GatewayTimeout < Twitter::Error
       HTTP_STATUS_CODE = 504
-      MESSAGE = "The Twitter servers are up, but the request couldn't be serviced due to some failure within our stack. Try again later."
     end
   end
 end

data/lib/twitter/error/internal_server_error.rb

@@ -1,11 +1,10 @@
-require 'twitter/error/server_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 500
-    class InternalServerError < Twitter::Error::ServerError
+    class InternalServerError < Twitter::Error
       HTTP_STATUS_CODE = 500
-      MESSAGE = "Something is technically wrong."
     end
   end
 end

data/lib/twitter/error/not_acceptable.rb

@@ -1,9 +1,9 @@
-require 'twitter/error/client_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 406
-    class NotAcceptable < Twitter::Error::ClientError
+    class NotAcceptable < Twitter::Error
       HTTP_STATUS_CODE = 406
     end
   end

data/lib/twitter/error/not_found.rb

@@ -1,9 +1,9 @@
-require 'twitter/error/client_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 404
-    class NotFound < Twitter::Error::ClientError
+    class NotFound < Twitter::Error
       HTTP_STATUS_CODE = 404
     end
   end

data/lib/twitter/error/service_unavailable.rb

@@ -1,11 +1,10 @@
-require 'twitter/error/server_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 503
-    class ServiceUnavailable < Twitter::Error::ServerError
+    class ServiceUnavailable < Twitter::Error
       HTTP_STATUS_CODE = 503
-      MESSAGE = "(__-){ Twitter is over capacity."
     end
   end
 end

data/lib/twitter/error/too_many_requests.rb

@@ -1,9 +1,9 @@
-require 'twitter/error/client_error'
+require 'twitter/error'
 
 module Twitter
   class Error
     # Raised when Twitter returns the HTTP status code 429
-    class TooManyRequests < Twitter::Error::ClientError
+    class TooManyRequests < Twitter::Error
       HTTP_STATUS_CODE = 429
     end
     EnhanceYourCalm = TooManyRequests