twitter 4.8.1 → 5.0.0

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/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

data/lib/twitter/error/unauthorized.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 401
-    class Unauthorized < Twitter::Error::ClientError
+    class Unauthorized < Twitter::Error
       HTTP_STATUS_CODE = 401
     end
   end

data/lib/twitter/error/unprocessable_entity.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 422
-    class UnprocessableEntity < Twitter::Error::ClientError
+    class UnprocessableEntity < Twitter::Error
       HTTP_STATUS_CODE = 422
     end
   end

data/lib/twitter/error.rb

@@ -1,33 +1,84 @@
+require 'descendants_tracker'
 require 'twitter/rate_limit'
 
 module Twitter
   # Custom error class for rescuing from all Twitter errors
   class Error < StandardError
-    attr_reader :rate_limit, :wrapped_exception
+    extend DescendantsTracker
+    attr_reader :rate_limit, :wrapped_exception, :code
 
-    # @return [Hash]
-    def self.errors
-      @errors ||= Hash[descendants.map{|klass| [klass.const_get(:HTTP_STATUS_CODE), klass]}]
+    # 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
+      FOLLOW_LIMIT_EXCEEDED        = 161
+      PROTECTED_STATUS             = 179
+      DUPLICATE_STATUS             = 187
+      BAD_AUTHENTICATION_DATA      = 215
+      LOGIN_VERIFICATION_NEEDED    = 231
+      ENDPOINT_RETIRED             = 251
     end
 
-    # @return [Array]
-    def self.descendants
-      ObjectSpace.each_object(::Class).select{|klass| klass < self}
+    class << self
+
+      # Create a new error from an HTTP response
+      #
+      # @param response [Hash]
+      # @return [Twitter::Error]
+      def from_response(response={})
+        error, code = parse_error(response[:body])
+        new(error, response[:response_headers], code)
+      end
+
+      # @return [Hash]
+      def errors
+        @errors ||= descendants.inject({}) do |hash, klass|
+          hash[klass::HTTP_STATUS_CODE] = klass
+          hash
+        end
+      end
+
+    private
+
+      def parse_error(body)
+        if body.nil?
+          ['', nil]
+        elsif body[:error]
+          [body[:error], nil]
+        elsif body[:errors]
+          extract_message_from_errors(body)
+        end
+      end
+
+      def extract_message_from_errors(body)
+        first = Array(body[:errors]).first
+        if first.is_a?(Hash)
+          [first[:message].chomp, first[:code]]
+        else
+          [first.chomp, nil]
+        end
+      end
+
     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={})
-      @rate_limit = Twitter::RateLimit.new(response_headers)
+    def initialize(exception=$!, response_headers={}, code=nil)
+      @rate_limit = RateLimit.new(response_headers)
       @wrapped_exception = exception
-      exception.respond_to?(:backtrace) ? super(exception.message) : super(exception.to_s)
-    end
-
-    def backtrace
-      @wrapped_exception.respond_to?(:backtrace) ? @wrapped_exception.backtrace : super
+      @code = code
+      exception.respond_to?(:message) ? super(exception.message) : super(exception.to_s)
     end
 
   end

data/lib/twitter/factory.rb

@@ -1,20 +1,21 @@
 module Twitter
   class Factory
 
-    # Instantiates a new action object
-    #
-    # @param attrs [Hash]
-    # @raise [ArgumentError] Error raised when supplied argument is missing an :action key.
-    # @return [Twitter::Action::Favorite, Twitter::Action::Follow, Twitter::Action::ListMemberAdded, Twitter::Action::Mention, Twitter::Action::Reply, Twitter::Action::Retweet]
-    def self.fetch_or_new(method, klass, attrs={})
-      return unless attrs
-      type = attrs.delete(method.to_sym)
-      if type
+    class << self
+
+      # Construct a new object
+      #
+      # @param method [Symbol]
+      # @param klass [Class]
+      # @param attrs [Hash]
+      # @raise [IndexError] Error raised when supplied argument is missing a key.
+      # @return [Twitter::Base]
+      def new(method, klass, attrs={})
+        type = attrs.fetch(method.to_sym)
         const_name = type.gsub(/\/(.?)/){"::#{$1.upcase}"}.gsub(/(?:^|_)(.)/){$1.upcase}
-        klass.const_get(const_name.to_sym).fetch_or_new(attrs)
-      else
-        raise ArgumentError, "argument must have :#{method} key"
+        klass.const_get(const_name.to_sym).new(attrs)
       end
+
     end
 
   end

data/lib/twitter/geo.rb

@@ -1,15 +1,10 @@
+require 'equalizer'
 require 'twitter/base'
 
 module Twitter
   class Geo < Twitter::Base
+    include Equalizer.new(:coordinates)
     attr_reader :coordinates
     alias coords coordinates
-
-    # @param other [Twitter::Geo]
-    # @return [Boolean]
-    def ==(other)
-      super || attr_equal(:coordinates, other) || attrs_equal(other)
-    end
-
   end
 end

data/lib/twitter/geo_factory.rb

@@ -5,13 +5,17 @@ require 'twitter/geo/polygon'
 module Twitter
   class GeoFactory < Twitter::Factory
 
-    # Instantiates a new geo object
-    #
-    # @param attrs [Hash]
-    # @raise [ArgumentError] Error raised when supplied argument is missing a :type key.
-    # @return [Twitter::Geo]
-    def self.fetch_or_new(attrs={})
-      super(:type, Twitter::Geo, attrs)
+    class << self
+
+      # Construct a new geo object
+      #
+      # @param attrs [Hash]
+      # @raise [IndexError] Error raised when supplied argument is missing a :type key.
+      # @return [Twitter::Geo]
+      def new(attrs={})
+        super(:type, Geo, attrs)
+      end
+
     end
 
   end

data/lib/twitter/geo_results.rb

@@ -0,0 +1,40 @@
+require 'twitter/enumerable'
+
+module Twitter
+  class GeoResults
+    include Twitter::Enumerable
+    attr_reader :attrs
+    alias to_h attrs
+    alias to_hash attrs
+    alias to_hsh attrs
+
+    class << self
+
+      # Construct a new GeoResults object from a response hash
+      #
+      # @param response [Hash]
+      # @return [Twitter::Base]
+      def from_response(response={})
+        new(response[:body])
+      end
+
+    end
+
+    # Initializes a new GeoResults object
+    #
+    # @param attrs [Hash]
+    # @return [Twitter::GeoResults]
+    def initialize(attrs={})
+      @attrs = attrs
+      @collection = Array(@attrs[:result][:places]).map do |place|
+        Place.new(place)
+      end
+    end
+
+    # @return [String]
+    def token
+      @attrs[:token]
+    end
+
+  end
+end

data/lib/twitter/identity.rb

@@ -1,29 +1,10 @@
+require 'equalizer'
 require 'twitter/base'
-require 'twitter/error/identity_map_key_error'
 
 module Twitter
   class Identity < Twitter::Base
-
-    def self.fetch(attrs)
-      return unless identity_map
-
-      id = attrs[:id]
-      if id  && object = identity_map.fetch(id)
-        return object.update(attrs)
-      end
-
-      return yield if block_given?
-      raise Twitter::Error::IdentityMapKeyError, "key not found"
-    end
-
-    # Stores an object in the identity map.
-    #
-    # @param object [Object]
-    # @return [Twitter::Identity]
-    def self.store(object)
-      return object unless identity_map
-      identity_map.store(object.id, object)
-    end
+    include Equalizer.new(:id)
+    attr_reader :id
 
     # Initializes a new object
     #
@@ -31,19 +12,8 @@ module Twitter
     # @raise [ArgumentError] Error raised when supplied argument is missing an :id key.
     # @return [Twitter::Identity]
     def initialize(attrs={})
+      attrs.fetch(:id)
       super
-      raise ArgumentError, "argument must have an :id key" unless id
-    end
-
-    # @param other [Twitter::Identity]
-    # @return [Boolean]
-    def ==(other)
-      super || attr_equal(:id, other) || attrs_equal(other)
-    end
-
-    # @return [Integer]
-    def id
-      @attrs[:id]
     end
 
   end

data/lib/twitter/list.rb

@@ -5,12 +5,29 @@ module Twitter
   class List < Twitter::Identity
     include Twitter::Creatable
     attr_reader :description, :following, :full_name, :member_count,
-      :mode, :name, :slug, :subscriber_count, :uri
+      :mode, :name, :slug, :subscriber_count
+    object_attr_reader :User, :user
 
-    # @return [Twitter::User]
-    def user
-      @user ||= Twitter::User.fetch_or_new(@attrs[:user])
+    # @return [URI] The URI to the list members.
+    def members_uri
+      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/members")
     end
+    memoize :members_uri
+    alias members_url members_uri
+
+    # @return [URI] The URI to the list subscribers.
+    def subscribers_uri
+      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}/subscribers")
+    end
+    memoize :subscribers_uri
+    alias subscribers_url subscribers_uri
+
+    # @return [URI] The URI to the list.
+    def uri
+      URI.parse("https://twitter.com/#{user.screen_name}/#{slug}")
+    end
+    memoize :uri
+    alias url uri
 
   end
 end

data/lib/twitter/media/photo.rb

@@ -3,18 +3,20 @@ require 'twitter/identity'
 module Twitter
   module Media
     class Photo < Twitter::Identity
-      attr_reader :display_url, :expanded_url, :indices, :media_url,
-        :media_url_https, :url
+      attr_reader :indices
+      display_uri_attr_reader
+      uri_attr_reader :expanded_uri, :media_uri, :media_uri_https, :uri
 
       # Returns an array of photo sizes
       #
       # @return [Array<Twitter::Size>]
       def sizes
-        @sizes ||= Array(@attrs[:sizes]).inject({}) do |object, (key, value)|
-          object[key] = Twitter::Size.fetch_or_new(value)
+        Array(@attrs[:sizes]).inject({}) do |object, (key, value)|
+          object[key] = Size.new(value)
           object
         end
       end
+      memoize :sizes
 
     end
   end

data/lib/twitter/media_factory.rb

@@ -4,13 +4,17 @@ require 'twitter/media/photo'
 module Twitter
   class MediaFactory < Twitter::Factory
 
-    # Instantiates a new media object
-    #
-    # @param attrs [Hash]
-    # @raise [ArgumentError] Error raised when supplied argument is missing a :type key.
-    # @return [Twitter::Media]
-    def self.fetch_or_new(attrs={})
-      super(:type, Twitter::Media, attrs)
+    class << self
+
+      # Construct a new media object
+      #
+      # @param attrs [Hash]
+      # @raise [IndexError] Error raised when supplied argument is missing a :type key.
+      # @return [Twitter::Media]
+      def new(attrs={})
+        super(:type, Media, attrs)
+      end
+
     end
 
   end

data/lib/twitter/null_object.rb

@@ -0,0 +1,25 @@
+module Twitter
+  class NullObject
+
+    # @return [TrueClass] This method always returns true.
+    def nil?
+      true
+    end
+
+    # @return [Twitter::NullObject] This method always returns self.
+    def method_missing(*args, &block)
+      self
+    end
+
+    # @return [TrueClass] This method always returns true.
+    def respond_to?(method_name, include_private=false)
+      true
+    end if RUBY_VERSION < "1.9"
+
+    # @return [TrueClass] This method always returns true.
+    def respond_to_missing?(method_name, include_private=false)
+      true
+    end if RUBY_VERSION >= "1.9"
+
+  end
+end

data/lib/twitter/oembed.rb

@@ -2,7 +2,8 @@ require 'twitter/base'
 
 module Twitter
   class OEmbed < Twitter::Base
-    attr_reader :author_name, :author_url, :cache_age, :height, :html,
-      :provider_name, :provider_url, :type, :url, :version, :width
+    attr_reader :author_name, :cache_age, :height, :html, :provider_name,
+      :type, :version, :width
+    uri_attr_reader :author_uri, :provider_uri, :uri
   end
 end

data/lib/twitter/place.rb

@@ -1,33 +1,33 @@
-require 'twitter/identity'
+require 'equalizer'
+require 'twitter/base'
 
 module Twitter
-  class Place < Twitter::Identity
-    attr_reader :attributes, :country, :full_name, :name, :url, :woeid
+  class Place < Twitter::Base
+    include Equalizer.new(:woeid)
+    attr_reader :attributes, :country, :full_name, :name, :woeid
     alias woe_id woeid
-
-    # @return [Twitter::Geo]
-    def bounding_box
-      @bounding_box ||= Twitter::GeoFactory.fetch_or_new(@attrs[:bounding_box])
-    end
+    object_attr_reader :GeoFactory, :bounding_box
+    object_attr_reader :Place, :contained_within
+    alias contained? contained_within?
+    uri_attr_reader :uri
 
     # @return [String]
     def country_code
-      @country_code ||= @attrs[:country_code] || @attrs[:countryCode]
+      @attrs[:country_code] || @attrs[:countryCode]
     end
+    memoize :country_code
 
     # @return [Integer]
     def parent_id
-      @parent_id ||= @attrs[:parentid]
+      @attrs[:parentid]
     end
+    memoize :parent_id
 
     # @return [String]
     def place_type
-      @place_type ||= @attrs[:place_type] || @attrs[:placeType] && @attrs[:placeType][:name]
-    end
-
-    def id
-      @attrs[:id] || @attrs[:woeid]
+      @attrs[:place_type] || @attrs[:placeType] && @attrs[:placeType][:name]
     end
+    memoize :place_type
 
   end
 end

data/lib/twitter/profile_banner.rb

@@ -7,11 +7,12 @@ module Twitter
     #
     # @return [Array<Twitter::Size>]
     def sizes
-      @sizes ||= Array(@attrs[:sizes]).inject({}) do |object, (key, value)|
-        object[key] = Twitter::Size.fetch_or_new(value)
+      Array(@attrs[:sizes]).inject({}) do |object, (key, value)|
+        object[key] = Size.new(value)
         object
       end
     end
+    memoize :sizes
 
   end
 end