twitter 5.0.0 → 5.4.1

data/lib/twitter/cursor.rb

@@ -1,15 +1,14 @@
-require 'twitter/core_ext/kernel'
+require 'twitter/enumerable'
 
 module Twitter
   class Cursor
-    include Enumerable
+    include Twitter::Enumerable
     attr_reader :attrs
-    alias to_h attrs
-    alias to_hash attrs
-    alias to_hsh attrs
+    alias_method :to_h, :attrs
+    alias_method :to_hash, :attrs
+    alias_method :to_hsh, :attrs
 
     class << self
-
       # Construct a new Cursor object from a response hash
       #
       # @param response [Hash]
@@ -20,10 +19,9 @@ module Twitter
       # @param path [String]
       # @param options [Hash]
       # @return [Twitter::Cursor]
-      def from_response(response, key, klass, client, request_method, path, options)
+      def from_response(response, key, klass, client, request_method, path, options) # rubocop:disable ParameterLists
         new(response[:body], key, klass, client, request_method, path, options)
       end
-
     end
 
     # Initializes a new Cursor
@@ -36,7 +34,7 @@ module Twitter
     # @param path [String]
     # @param options [Hash]
     # @return [Twitter::Cursor]
-    def initialize(attrs, key, klass, client, request_method, path, options)
+    def initialize(attrs, key, klass, client, request_method, path, options = {}) # rubocop:disable ParameterLists
       @key = key.to_sym
       @klass = klass
       @client = client
@@ -47,42 +45,18 @@ module Twitter
       set_attrs(attrs)
     end
 
-    # @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
+  private
 
     def next_cursor
       @attrs[:next_cursor] || -1
     end
-    alias next next_cursor
-
-    def previous_cursor
-      @attrs[:previous_cursor]
-    end
-    alias previous previous_cursor
-
-    # @return [Boolean]
-    def first?
-      previous_cursor.zero?
-    end
+    alias_method :next, :next_cursor
 
     # @return [Boolean]
     def last?
       next_cursor.zero?
     end
 
-  private
-
     def fetch_next_page
       response = @client.send(@request_method, @path, @options.merge(:cursor => next_cursor))
       set_attrs(response[:body])
@@ -94,6 +68,5 @@ module Twitter
         @collection << (@klass ? @klass.new(element) : element)
       end
     end
-
   end
 end

data/lib/twitter/direct_message.rb

@@ -5,7 +5,7 @@ module Twitter
   class DirectMessage < Twitter::Identity
     include Twitter::Creatable
     attr_reader :text
-    alias full_text text
+    alias_method :full_text, :text
     object_attr_reader :User, :recipient
     object_attr_reader :User, :sender
   end

data/lib/twitter/entity/uri.rb

@@ -7,8 +7,8 @@ module Twitter
       uri_attr_reader :expanded_uri, :uri
     end
 
-    Uri = URI
     URL = URI
-    Url = URI
+    Uri = URI # rubocop:disable ConstantName
+    Url = URI # rubocop:disable ConstantName
   end
 end

data/lib/twitter/enumerable.rb

@@ -3,13 +3,22 @@ module Twitter
     include ::Enumerable
 
     # @return [Enumerator]
-    def each(start=0, &block)
+    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
 
+    # @return [Boolean]
+    def last?
+      true
+    end
   end
 end

data/lib/twitter/error/already_favorited.rb

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

data/lib/twitter/error/already_posted.rb

@@ -4,7 +4,7 @@ module Twitter
   class Error
     # Raised when a Tweet has already been posted
     class AlreadyPosted < Twitter::Error::Forbidden
-      MESSAGE = "Status is a duplicate"
+      MESSAGE = 'Status is a duplicate'
     end
   end
 end

data/lib/twitter/error/already_retweeted.rb

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

data/lib/twitter/error/too_many_requests.rb

@@ -6,7 +6,7 @@ module Twitter
     class TooManyRequests < Twitter::Error
       HTTP_STATUS_CODE = 429
     end
-    EnhanceYourCalm = TooManyRequests
-    RateLimited = TooManyRequests
+    EnhanceYourCalm = TooManyRequests # rubocop:disable ConstantName
+    RateLimited = TooManyRequests # rubocop:disable ConstantName
   end
 end

data/lib/twitter/error.rb

@@ -15,11 +15,14 @@ module Twitter
       DEPRECATED_CALL              = 68
       RATE_LIMIT_EXCEEDED          = 88
       INVALID_OR_EXPIRED_TOKEN     = 89
+      UNABLE_TO_VERIFY_CREDENTIALS = 99
       OVER_CAPACITY                = 130
       INTERNAL_ERROR               = 131
       OAUTH_TIMESTAMP_OUT_OF_RANGE = 135
+      FOLLOW_ALREADY_REQUESTED     = 160
       FOLLOW_LIMIT_EXCEEDED        = 161
       PROTECTED_STATUS             = 179
+      OVER_UPDATE_LIMIT            = 185
       DUPLICATE_STATUS             = 187
       BAD_AUTHENTICATION_DATA      = 215
       LOGIN_VERIFICATION_NEEDED    = 231
@@ -27,19 +30,18 @@ module Twitter
     end
 
     class << self
-
       # Create a new error from an HTTP response
       #
       # @param response [Hash]
       # @return [Twitter::Error]
-      def from_response(response={})
+      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|
+        @errors ||= descendants.reduce({}) do |hash, klass|
           hash[klass::HTTP_STATUS_CODE] = klass
           hash
         end
@@ -65,7 +67,6 @@ module Twitter
           [first.chomp, nil]
         end
       end
-
     end
 
     # Initializes a new Error object
@@ -74,12 +75,11 @@ module Twitter
     # @param response_headers [Hash]
     # @param code [Integer]
     # @return [Twitter::Error]
-    def initialize(exception=$!, response_headers={}, code=nil)
+    def initialize(exception = $ERROR_INFO, response_headers = {}, code = nil) # rubocop:disable MethodLength
       @rate_limit = RateLimit.new(response_headers)
       @wrapped_exception = exception
       @code = code
       exception.respond_to?(:message) ? super(exception.message) : super(exception.to_s)
     end
-
   end
 end

data/lib/twitter/factory.rb

@@ -1,8 +1,6 @@
 module Twitter
   class Factory
-
     class << self
-
       # Construct a new object
       #
       # @param method [Symbol]
@@ -10,13 +8,11 @@ module Twitter
       # @param attrs [Hash]
       # @raise [IndexError] Error raised when supplied argument is missing a key.
       # @return [Twitter::Base]
-      def new(method, klass, attrs={})
+      def new(method, klass, attrs = {})
         type = attrs.fetch(method.to_sym)
-        const_name = type.gsub(/\/(.?)/){"::#{$1.upcase}"}.gsub(/(?:^|_)(.)/){$1.upcase}
+        const_name = type.gsub(/\/(.?)/) { "::#{Regexp.last_match[1].upcase}" }.gsub(/(?:^|_)(.)/) { Regexp.last_match[1].upcase }
         klass.const_get(const_name.to_sym).new(attrs)
       end
-
     end
-
   end
 end

data/lib/twitter/geo/point.rb

@@ -3,20 +3,18 @@ require 'twitter/geo'
 module Twitter
   class Geo
     class Point < Twitter::Geo
-
       # @return [Integer]
       def latitude
         coordinates[0]
       end
-      alias lat latitude
+      alias_method :lat, :latitude
 
       # @return [Integer]
       def longitude
         coordinates[1]
       end
-      alias long longitude
-      alias lng longitude
-
+      alias_method :long, :longitude
+      alias_method :lng, :longitude
     end
   end
 end

data/lib/twitter/geo.rb

@@ -5,6 +5,6 @@ module Twitter
   class Geo < Twitter::Base
     include Equalizer.new(:coordinates)
     attr_reader :coordinates
-    alias coords coordinates
+    alias_method :coords, :coordinates
   end
 end

data/lib/twitter/geo_factory.rb

@@ -4,19 +4,15 @@ require 'twitter/geo/polygon'
 
 module Twitter
   class GeoFactory < Twitter::Factory
-
     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={})
+      def new(attrs = {})
         super(:type, Geo, attrs)
       end
-
     end
-
   end
 end

data/lib/twitter/geo_results.rb

@@ -4,27 +4,25 @@ module Twitter
   class GeoResults
     include Twitter::Enumerable
     attr_reader :attrs
-    alias to_h attrs
-    alias to_hash attrs
-    alias to_hsh attrs
+    alias_method :to_h, :attrs
+    alias_method :to_hash, :attrs
+    alias_method :to_hsh, :attrs
 
     class << self
-
       # Construct a new GeoResults object from a response hash
       #
       # @param response [Hash]
       # @return [Twitter::Base]
-      def from_response(response={})
+      def from_response(response = {})
         new(response[:body])
       end
-
     end
 
     # Initializes a new GeoResults object
     #
     # @param attrs [Hash]
     # @return [Twitter::GeoResults]
-    def initialize(attrs={})
+    def initialize(attrs = {})
       @attrs = attrs
       @collection = Array(@attrs[:result][:places]).map do |place|
         Place.new(place)
@@ -35,6 +33,5 @@ module Twitter
     def token
       @attrs[:token]
     end
-
   end
 end

data/lib/twitter/identity.rb

@@ -11,10 +11,9 @@ module Twitter
     # @param attrs [Hash]
     # @raise [ArgumentError] Error raised when supplied argument is missing an :id key.
     # @return [Twitter::Identity]
-    def initialize(attrs={})
+    def initialize(attrs = {})
       attrs.fetch(:id)
       super
     end
-
   end
 end

data/lib/twitter/list.rb

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

data/lib/twitter/media/photo.rb

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

data/lib/twitter/media_factory.rb

@@ -3,19 +3,15 @@ require 'twitter/media/photo'
 
 module Twitter
   class MediaFactory < Twitter::Factory
-
     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={})
+      def new(attrs = {})
         super(:type, Media, attrs)
       end
-
     end
-
   end
 end

data/lib/twitter/null_object.rb

@@ -1,6 +1,5 @@
 module Twitter
   class NullObject
-
     # @return [TrueClass] This method always returns true.
     def nil?
       true
@@ -12,14 +11,13 @@ module Twitter
     end
 
     # @return [TrueClass] This method always returns true.
-    def respond_to?(method_name, include_private=false)
+    def respond_to?(method_name, include_private = false)
       true
-    end if RUBY_VERSION < "1.9"
+    end if RUBY_VERSION < '1.9'
 
     # @return [TrueClass] This method always returns true.
-    def respond_to_missing?(method_name, include_private=false)
+    def respond_to_missing?(method_name, include_private = false)
       true
-    end if RUBY_VERSION >= "1.9"
-
+    end if RUBY_VERSION >= '1.9'
   end
 end

data/lib/twitter/oembed.rb

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

data/lib/twitter/place.rb

@@ -3,17 +3,29 @@ require 'twitter/base'
 
 module Twitter
   class Place < Twitter::Base
-    include Equalizer.new(:woeid)
     attr_reader :attributes, :country, :full_name, :name, :woeid
-    alias woe_id woeid
+    alias_method :woe_id, :woeid
     object_attr_reader :GeoFactory, :bounding_box
     object_attr_reader :Place, :contained_within
-    alias contained? contained_within?
+    alias_method :contained?, :contained_within?
     uri_attr_reader :uri
 
+    # @param other [Twitter::Place]
+    # @return [Boolean]
+    def eql?(other)
+      super || instance_of?(other.class) && !woeid.nil? && other.respond_to?(:woeid) && woeid.eql?(other.woeid)
+    end
+
+    # @param other [Twitter::Place]
+    # @return [Boolean]
+    def ==(other)
+      other = coerce(other) if respond_to?(:coerce, true)
+      super || kind_of?(self.class) && !woeid.nil? && other.respond_to?(:woeid) && woeid == other.woeid
+    end
+
     # @return [String]
     def country_code
-      @attrs[:country_code] || @attrs[:countryCode]
+      @attrs[:country_code] || @attrs[:countryCode] # rubocop:disable SymbolName
     end
     memoize :country_code
 
@@ -25,9 +37,8 @@ module Twitter
 
     # @return [String]
     def place_type
-      @attrs[:place_type] || @attrs[:placeType] && @attrs[:placeType][:name]
+      @attrs[:place_type] || @attrs[:placeType] && @attrs[:placeType][:name] # rubocop:disable SymbolName
     end
     memoize :place_type
-
   end
 end

data/lib/twitter/profile_banner.rb

@@ -2,17 +2,15 @@ require 'twitter/base'
 
 module Twitter
   class ProfileBanner < Twitter::Base
-
     # Returns an array of photo sizes
     #
     # @return [Array<Twitter::Size>]
     def sizes
-      Array(@attrs[:sizes]).inject({}) do |object, (key, value)|
+      Array(@attrs[:sizes]).reduce({}) do |object, (key, value)|
         object[key] = Size.new(value)
         object
       end
     end
     memoize :sizes
-
   end
 end

data/lib/twitter/rate_limit.rb

@@ -1,6 +1,5 @@
 module Twitter
   class RateLimit < Twitter::Base
-
     # @return [Integer]
     def limit
       limit = @attrs['x-rate-limit-limit']
@@ -26,7 +25,6 @@ module Twitter
     def reset_in
       [(reset_at - Time.now).ceil, 0].max if reset_at
     end
-    alias retry_after reset_in
-
+    alias_method :retry_after, :reset_in
   end
 end

data/lib/twitter/relationship.rb

@@ -9,9 +9,8 @@ module Twitter
     #
     # @param attrs [Hash]
     # @return [Twitter::Relationship]
-    def initialize(attrs={})
+    def initialize(attrs = {})
       @attrs = attrs[:relationship]
     end
-
   end
 end

data/lib/twitter/rest/api/direct_messages.rb

@@ -2,6 +2,7 @@ require 'twitter/arguments'
 require 'twitter/direct_message'
 require 'twitter/rest/api/utils'
 require 'twitter/user'
+require 'twitter/utils'
 
 module Twitter
   module REST
@@ -22,8 +23,8 @@ module Twitter
         # @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
         # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 200.
         # @option options [Integer] :page Specifies the page of results to retrieve.
-        def direct_messages_received(options={})
-          objects_from_response(Twitter::DirectMessage, :get, "/1.1/direct_messages.json", options)
+        def direct_messages_received(options = {})
+          objects_from_response(Twitter::DirectMessage, :get, '/1.1/direct_messages.json', options)
         end
 
         # Returns the 20 most recent direct messages sent by the authenticating user
@@ -39,8 +40,8 @@ module Twitter
         # @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
         # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 200.
         # @option options [Integer] :page Specifies the page of results to retrieve.
-        def direct_messages_sent(options={})
-          objects_from_response(Twitter::DirectMessage, :get, "/1.1/direct_messages/sent.json", options)
+        def direct_messages_sent(options = {})
+          objects_from_response(Twitter::DirectMessage, :get, '/1.1/direct_messages/sent.json', options)
         end
 
         # Returns a direct message
@@ -53,9 +54,9 @@ module Twitter
         # @return [Twitter::DirectMessage] The requested messages.
         # @param id [Integer] A direct message ID.
         # @param options [Hash] A customizable set of options.
-        def direct_message(id, options={})
+        def direct_message(id, options = {})
           options[:id] = id
-          object_from_response(Twitter::DirectMessage, :get, "/1.1/direct_messages/show.json", options)
+          object_from_response(Twitter::DirectMessage, :get, '/1.1/direct_messages/show.json', options)
         end
 
         # @note This method requires an access token with RWD (read, write & direct message) permissions. Consult The Application Permission Model for more information.
@@ -63,7 +64,7 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Array<Twitter::DirectMessage>] The requested messages.
-        # @overload direct_messages(options={})
+        # @overload direct_messages(options = {})
         #   Returns the 20 most recent direct messages sent to the authenticating user
         #
         #   @see https://dev.twitter.com/docs/api/1.1/get/direct_messages
@@ -88,7 +89,7 @@ module Twitter
           if arguments.empty?
             direct_messages_received(arguments.options)
           else
-            arguments.flatten.threaded_map do |id|
+            Twitter::Utils.parallel_map(arguments) do |id|
               direct_message(id, arguments.options)
             end
           end
@@ -108,7 +109,7 @@ module Twitter
         #   @param ids [Enumerable<Integer>] A collection of direct message IDs.
         #   @param options [Hash] A customizable set of options.
         def destroy_direct_message(*args)
-          threaded_objects_from_response(Twitter::DirectMessage, :post, "/1.1/direct_messages/destroy.json", args)
+          threaded_objects_from_response(Twitter::DirectMessage, :post, '/1.1/direct_messages/destroy.json', args)
         end
         deprecate_alias :direct_message_destroy, :destroy_direct_message
 
@@ -122,16 +123,15 @@ module Twitter
         # @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 options [Hash] A customizable set of options.
-        def create_direct_message(user, text, options={})
+        def create_direct_message(user, text, options = {})
           merge_user!(options, user)
           options[:text] = text
-          object_from_response(Twitter::DirectMessage, :post, "/1.1/direct_messages/new.json", options)
+          object_from_response(Twitter::DirectMessage, :post, '/1.1/direct_messages/new.json', options)
         end
-        alias d create_direct_message
-        alias m create_direct_message
-        alias dm create_direct_message
+        alias_method :d, :create_direct_message
+        alias_method :m, :create_direct_message
+        alias_method :dm, :create_direct_message
         deprecate_alias :direct_message_create, :create_direct_message
-
       end
     end
   end