twitter 5.0.0 → 5.4.1

data/lib/twitter/search_results.rb

@@ -4,70 +4,52 @@ module Twitter
   class SearchResults
     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 SearchResults object from a response hash
       #
       # @param response [Hash]
-      # @return [Twitter::Base]
-      def from_response(response={})
-        new(response[:body])
+      # @param client [Twitter::REST::Client]
+      # @param path [String]
+      # @return [Twitter::SearchResults]
+      def from_response(response, client, request_method, path, options) # rubocop:disable ParameterLists
+        new(response[:body], client, request_method, path, options)
       end
-
     end
 
     # Initializes a new SearchResults object
     #
     # @param attrs [Hash]
+    # @param client [Twitter::REST::Client]
+    # @param request_method [String, Symbol]
+    # @param path [String]
+    # @param options [Hash]
     # @return [Twitter::SearchResults]
-    def initialize(attrs={})
-      @attrs = attrs
-      @collection = Array(@attrs[:statuses]).map do |tweet|
-        Tweet.new(tweet)
-      end
-    end
-
-    # @return [Float]
-    def completed_in
-      @attrs[:search_metadata][:completed_in] if @attrs[:search_metadata]
+    def initialize(attrs, client, request_method, path, options = {}) # rubocop:disable ParameterLists
+      @client = client
+      @request_method = request_method.to_sym
+      @path = path
+      @options = options
+      @collection = []
+      set_attrs(attrs)
     end
 
-    # @return [Integer]
-    def max_id
-      @attrs[:search_metadata][:max_id] if @attrs[:search_metadata]
-    end
-
-    # @return [Integer]
-    def page
-      @attrs[:search_metadata][:page] if @attrs[:search_metadata]
-    end
-
-    # @return [String]
-    def query
-      @attrs[:search_metadata][:query] if @attrs[:search_metadata]
-    end
-
-    # @return [Integer]
-    def results_per_page
-      @attrs[:search_metadata][:count] if @attrs[:search_metadata]
-    end
-    alias rpp results_per_page
-    alias count results_per_page
+  private
 
-    # @return [Integer]
-    def since_id
-      @attrs[:search_metadata][:since_id] if @attrs[:search_metadata]
+    # @return [Boolean]
+    def last?
+      !next_results?
     end
 
     # @return [Boolean]
     def next_results?
       !!(@attrs[:search_metadata] && @attrs[:search_metadata][:next_results])
     end
-    alias next_page? next_results?
+    alias_method :next_page?, :next_results?
+    alias_method :next?, :next_results?
 
     # Returns a Hash of query parameters for the next result in the search
     #
@@ -79,19 +61,20 @@ module Twitter
         query_string_to_hash(query_string)
       end
     end
-    alias next_page next_results
+    alias_method :next_page, :next_results
+    alias_method :next, :next_results
 
-    # Returns a Hash of query parameters for the refresh URL in the search
-    #
-    # @note Returned Hash can be merged into the previous search options list to easily access the refresh page.
-    # @return [Hash] The parameters needed to refresh the page.
-    def refresh_results
-      query_string = strip_first_character(@attrs[:search_metadata][:refresh_url])
-      query_string_to_hash(query_string)
+    def fetch_next_page
+      response = @client.send(@request_method, @path, next_page)
+      set_attrs(response[:body])
     end
-    alias refresh_page refresh_results
 
-  private
+    def set_attrs(attrs)
+      @attrs = attrs
+      Array(@attrs[:statuses]).map do |tweet|
+        @collection << Tweet.new(tweet)
+      end
+    end
 
     # Returns the string with the first character removed
     #
@@ -110,7 +93,7 @@ module Twitter
     # @example Remove the first character from a query string
     #   strip_first_character!("?foo=bar&baz=qux") #=> "foo=bar&baz=qux"
     def strip_first_character!(string)
-      string[0] = ""
+      string[0] = ''
       string
     end
 
@@ -132,8 +115,7 @@ module Twitter
     # @example Convert hash's keys to symbols
     #   symbolize_keys({"foo"=>"bar", "baz"=>"qux"}) #=> {:foo=>"bar", :baz=>"qux"}
     def symbolize_keys(hash)
-      Hash[hash.map{|key, value| [key.to_sym, value]}]
+      Hash[hash.map { |key, value| [key.to_sym, value] }]
     end
-
   end
 end

data/lib/twitter/settings.rb

@@ -3,8 +3,8 @@ require 'twitter/base'
 module Twitter
   class Settings < Twitter::Base
     attr_reader :always_use_https, :discoverable_by_email, :geo_enabled,
-      :language, :protected, :screen_name, :show_all_inline_media, :sleep_time,
-      :time_zone
+                :language, :protected, :screen_name, :show_all_inline_media,
+                :sleep_time, :time_zone
     object_attr_reader :Place, :trend_location
   end
 end

data/lib/twitter/size.rb

@@ -5,7 +5,7 @@ module Twitter
   class Size < Twitter::Base
     include Equalizer.new(:h, :w)
     attr_reader :h, :resize, :w
-    alias height h
-    alias width w
+    alias_method :height, :h
+    alias_method :width, :w
   end
 end

data/lib/twitter/source_user.rb

@@ -3,6 +3,6 @@ require 'twitter/basic_user'
 module Twitter
   class SourceUser < Twitter::BasicUser
     attr_reader :all_replies, :blocking, :can_dm, :followed_by, :marked_spam,
-      :notifications_enabled, :want_retweets
+                :notifications_enabled, :want_retweets
   end
 end

data/lib/twitter/streaming/client.rb

@@ -4,8 +4,6 @@ require 'twitter/client'
 require 'twitter/streaming/connection'
 require 'twitter/streaming/response'
 require 'twitter/streaming/message_parser'
-require 'twitter/streaming/event'
-require 'twitter/streaming/friend_list'
 
 module Twitter
   module Streaming
@@ -15,34 +13,74 @@ module Twitter
       # Initializes a new Client object
       #
       # @return [Twitter::Streaming::Client]
-      def initialize(options={}, &block)
+      def initialize(options = {}, &block)
         super
         @connection = Streaming::Connection.new
       end
 
-      # @yield [Twitter::Tweet] A stream of tweets.
-      def filter(options={}, &block)
+      # Returns public statuses that match one or more filter predicates
+      #
+      # @see https://dev.twitter.com/docs/api/1.1/post/statuses/filter
+      # @see https://dev.twitter.com/docs/streaming-apis/parameters
+      # @note At least one predicate parameter (follow, locations, or track) must be specified.
+      # @param options [Hash] A customizable set of options.
+      # @option options [String] :follow A comma separated list of user IDs, indicating the users to return statuses for in the stream.
+      # @option options [String] :track Includes additional Tweets matching the specified keywords. Phrases of keywords are specified by a comma-separated list.
+      # @option options [String] :locations Includes additional Tweets falling within the specified bounding boxes.
+      # @yield [Twitter::Tweet, Twitter::Streaming::Event, Twitter::DirectMessage, Twitter::Streaming::FriendList, Twitter::Streaming::DeletedTweet, Twitter::Streaming::StallWarning] A stream of Twitter objects.
+      def filter(options = {}, &block)
         request(:post, 'https://stream.twitter.com:443/1.1/statuses/filter.json', options, &block)
       end
 
-      # @yield [Twitter::Tweet] A stream of tweets.
-      def firehose(options={}, &block)
+      # Returns all public statuses
+      #
+      # @see https://dev.twitter.com/docs/api/1.1/get/statuses/firehose
+      # @see https://dev.twitter.com/docs/streaming-apis/parameters
+      # @note This endpoint requires special permission to access.
+      # @param options [Hash] A customizable set of options.
+      # @option options [Integer] :count The number of messages to backfill.
+      # @yield [Twitter::Tweet, Twitter::Streaming::Event, Twitter::DirectMessage, Twitter::Streaming::FriendList, Twitter::Streaming::DeletedTweet, Twitter::Streaming::StallWarning] A stream of Twitter objects.
+      def firehose(options = {}, &block)
         request(:get, 'https://stream.twitter.com:443/1.1/statuses/firehose.json', options, &block)
       end
 
-      # @yield [Twitter::Tweet] A stream of tweets.
-      def sample(options={}, &block)
+      # Returns a small random sample of all public statuses
+      #
+      # @see https://dev.twitter.com/docs/api/1.1/get/statuses/sample
+      # @see https://dev.twitter.com/docs/streaming-apis/parameters
+      # @yield [Twitter::Tweet, Twitter::Streaming::Event, Twitter::DirectMessage, Twitter::Streaming::FriendList, Twitter::Streaming::DeletedTweet, Twitter::Streaming::StallWarning] A stream of Twitter objects.
+      def sample(options = {}, &block)
         request(:get, 'https://stream.twitter.com:443/1.1/statuses/sample.json', options, &block)
       end
 
-      # @yield [Twitter::Tweet] A stream of tweets.
+      # Streams messages for a set of user
+      #
+      # @see https://dev.twitter.com/docs/api/1.1/get/site
+      # @see https://dev.twitter.com/docs/streaming-apis/streams/site
+      # @see https://dev.twitter.com/docs/streaming-apis/parameters
+      # @param follow [Enumerable<Integer, String, Twitter::User>] A list of user IDs, indicating the users to return statuses for in the stream.
+      # @param options [Hash] A customizable set of options.
+      # @option options [String] :with Specifies whether to return information for just the users specified in the follow parameter, or include messages from accounts they follow.
+      # @option options [String] :replies Specifies whether stall warnings should be delivered.
+      # @yield [Twitter::Tweet, Twitter::Streaming::Event, Twitter::DirectMessage, Twitter::Streaming::FriendList, Twitter::Streaming::DeletedTweet, Twitter::Streaming::StallWarning] A stream of Twitter objects.
       def site(*args, &block)
         arguments = Arguments.new(args)
-        request(:get, 'https://sitestream.twitter.com:443/1.1/site.json', arguments.options.merge(:follow => arguments.join(',')), &block)
+        user_ids = collect_user_ids(arguments)
+        request(:get, 'https://sitestream.twitter.com:443/1.1/site.json', arguments.options.merge(:follow => user_ids.join(',')), &block)
       end
 
-      # @yield [Twitter::Tweet] A stream of tweets.
-      def user(options={}, &block)
+      # Streams messages for a single user
+      #
+      # @see https://dev.twitter.com/docs/api/1.1/get/user
+      # @see https://dev.twitter.com/docs/streaming-apis/streams/user
+      # @see https://dev.twitter.com/docs/streaming-apis/parameters
+      # @param options [Hash] A customizable set of options.
+      # @option options [String] :with Specifies whether to return information for just the users specified in the follow parameter, or include messages from accounts they follow.
+      # @option options [String] :replies Specifies whether stall warnings should be delivered.
+      # @option options [String] :track Includes additional Tweets matching the specified keywords. Phrases of keywords are specified by a comma-separated list.
+      # @option options [String] :locations Includes additional Tweets falling within the specified bounding boxes.
+      # @yield [Twitter::Tweet, Twitter::Streaming::Event, Twitter::DirectMessage, Twitter::Streaming::FriendList, Twitter::Streaming::DeletedTweet, Twitter::Streaming::StallWarning] A stream of Twitter objects.
+      def user(options = {}, &block)
         request(:get, 'https://userstream.twitter.com:443/1.1/user.json', options, &block)
       end
 
@@ -54,19 +92,19 @@ module Twitter
         elsif instance_variable_defined?(:@before_request)
           @before_request
         else
-          Proc.new {}
+          proc {}
         end
       end
 
     private
 
-      def request(method, uri, params, &block)
+      def request(method, uri, params, &block) # rubocop:disable ParameterLists
         before_request.call
         headers  = default_headers.merge(:authorization => oauth_auth_header(method, uri, params).to_s)
         request  = HTTP::Request.new(method, uri + '?' + to_url_params(params), headers)
         response = Streaming::Response.new do |data|
-          if item = Streaming::MessageParser.parse(data)
-            yield item
+          if item = Streaming::MessageParser.parse(data) # rubocop:disable AssignmentInCondition, IfUnlessModifier
+            block.call(item)
           end
         end
         @connection.stream(request, response)
@@ -74,7 +112,7 @@ module Twitter
 
       def to_url_params(params)
         params.map do |param, value|
-          [param, URI.encode(value)].join("=")
+          [param, URI.encode(value)].join('=')
         end.sort.join('&')
       end
 
@@ -84,6 +122,19 @@ module Twitter
           :user_agent => user_agent,
         }
       end
+
+      def collect_user_ids(users)
+        user_ids = []
+        users.flatten.each do |user|
+          case user
+          when Integer
+            user_ids << user
+          when Twitter::User
+            user_ids << user.id
+          end
+        end
+        user_ids
+      end
     end
   end
 end

data/lib/twitter/streaming/connection.rb

@@ -5,18 +5,16 @@ require 'resolv'
 module Twitter
   module Streaming
     class Connection
-
       def stream(request, response)
         client_context = OpenSSL::SSL::SSLContext.new
         client         = TCPSocket.new(Resolv.getaddress(request.uri.host), request.uri.port)
         ssl_client     = OpenSSL::SSL::SSLSocket.new(client, client_context)
         ssl_client.connect
         request.stream(ssl_client)
-        while body = ssl_client.readpartial(1024)
+        while body = ssl_client.readpartial(1024) # rubocop:disable AssignmentInCondition, WhileUntilModifier
           response << body
         end
       end
-
     end
   end
 end

data/lib/twitter/streaming/deleted_tweet.rb

@@ -0,0 +1,8 @@
+module Twitter
+  module Streaming
+    class DeletedTweet < Twitter::Identity
+      attr_reader :user_id
+    end
+    DeletedStatus = DeletedTweet # rubocop:disable ConstantName
+  end
+end

data/lib/twitter/streaming/event.rb

@@ -1,28 +1,28 @@
 module Twitter
   module Streaming
     class Event
-
       LIST_EVENTS = [
-        :list_created, :list_destroyed, :list_updated, :list_member_added, 
-        :list_member_added, :list_member_removed, :list_user_subscribed, 
-        :list_user_subscribed, :list_user_unsubscribed, :list_user_unsubscribed
+        :list_created, :list_destroyed, :list_updated, :list_member_added,
+        :list_member_added, :list_member_removed, :list_user_subscribed,
+        :list_user_subscribed, :list_user_unsubscribed, :list_user_unsubscribed,
       ]
 
       TWEET_EVENTS = [
-        :favorite, :unfavorite
+        :favorite, :unfavorite,
       ]
-        
+
       attr_reader :name, :source, :target, :target_object
 
       # @param data [Hash]
       def initialize(data)
-        @name = data[:event].intern
+        @name = data[:event].to_sym
         @source = Twitter::User.new(data[:source])
         @target = Twitter::User.new(data[:target])
         @target_object = target_object_factory(@name, data[:target_object])
       end
 
     private
+
       def target_object_factory(event_name, data)
         if LIST_EVENTS.include?(event_name)
           Twitter::List.new(data)
@@ -32,4 +32,4 @@ module Twitter
       end
     end
   end
-end
+end

data/lib/twitter/streaming/friend_list.rb

@@ -1,13 +1,6 @@
 module Twitter
   module Streaming
-    class FriendList
-
-      attr_reader :friend_ids
-
-      # @param friend_ids [Array]
-      def initialize(friend_ids)
-        @friend_ids = friend_ids
-      end
+    class FriendList < Array
     end
   end
-end
+end

data/lib/twitter/streaming/message_parser.rb

@@ -1,8 +1,14 @@
+require 'twitter/direct_message'
+require 'twitter/streaming/deleted_tweet'
+require 'twitter/streaming/event'
+require 'twitter/streaming/friend_list'
+require 'twitter/streaming/stall_warning'
+require 'twitter/tweet'
+
 module Twitter
   module Streaming
     class MessageParser
-
-      def self.parse(data)
+      def self.parse(data) # rubocop:disable CyclomaticComplexity
         if data[:id]
           Tweet.new(data)
         elsif data[:event]
@@ -11,8 +17,12 @@ module Twitter
           DirectMessage.new(data[:direct_message])
         elsif data[:friends]
           FriendList.new(data[:friends])
+        elsif data[:delete] && data[:delete][:status]
+          DeletedTweet.new(data[:delete][:status])
+        elsif data[:warning]
+          StallWarning.new(data[:warning])
         end
       end
     end
   end
-end
+end

data/lib/twitter/streaming/response.rb

@@ -3,7 +3,6 @@ require 'buftok'
 module Twitter
   module Streaming
     class Response
-
       # Initializes a new Response object
       #
       # @return [Twitter::Streaming::Response]
@@ -28,7 +27,6 @@ module Twitter
           @block.call(JSON.parse(line, :symbolize_names => true))
         end
       end
-
     end
   end
 end

data/lib/twitter/streaming/stall_warning.rb

@@ -0,0 +1,7 @@
+module Twitter
+  module Streaming
+    class StallWarning < Twitter::Base
+      attr_reader :code, :message, :percent_full
+    end
+  end
+end

data/lib/twitter/suggestion.rb

@@ -13,6 +13,5 @@ module Twitter
       end
     end
     memoize :users
-
   end
 end

data/lib/twitter/token.rb

@@ -3,15 +3,14 @@ require 'twitter/base'
 module Twitter
   class Token < Twitter::Base
     attr_reader :access_token, :token_type
-    alias to_s access_token
+    alias_method :to_s, :access_token
 
-    BEARER_TYPE = "bearer"
+    BEARER_TYPE = 'bearer'
 
     # @return [Boolean]
     def bearer?
       @attrs[:token_type] == BEARER_TYPE
     end
     memoize :bearer?
-
   end
 end

data/lib/twitter/trend_results.rb

@@ -9,27 +9,25 @@ module Twitter
     include Twitter::Enumerable
     include Memoizable
     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 TrendResults object from a response hash
       #
       # @param response [Hash]
       # @return [Twitter::Base]
-      def from_response(response={})
+      def from_response(response = {})
         new(response[:body].first)
       end
-
     end
 
     # Initializes a new TrendResults object
     #
     # @param attrs [Hash]
     # @return [Twitter::TrendResults]
-    def initialize(attrs={})
+    def initialize(attrs = {})
       @attrs = attrs
       @collection = Array(@attrs[:trends]).map do |trend|
         Trend.new(trend)
@@ -60,6 +58,5 @@ module Twitter
       !@attrs[:locations].nil? && !@attrs[:locations].first.nil?
     end
     memoize :location?
-
   end
 end

data/lib/twitter/tweet.rb

@@ -4,30 +4,31 @@ module Twitter
   class Tweet < Twitter::Identity
     include Twitter::Creatable
     attr_reader :favorite_count, :favorited, :in_reply_to_screen_name,
-      :in_reply_to_attrs_id, :in_reply_to_status_id, :in_reply_to_user_id,
-      :lang, :retweet_count, :retweeted, :source, :text, :truncated
-    alias favorites_count favorite_count
-    alias favoriters_count favorite_count
-    alias in_reply_to_tweet_id in_reply_to_status_id
-    alias retweeters_count retweet_count
+                :in_reply_to_attrs_id, :in_reply_to_status_id,
+                :in_reply_to_user_id, :lang, :retweet_count, :retweeted,
+                :source, :text, :truncated
+    alias_method :favorites_count, :favorite_count
+    alias_method :favoriters_count, :favorite_count
+    alias_method :in_reply_to_tweet_id, :in_reply_to_status_id
+    alias_method :retweeters_count, :retweet_count
     object_attr_reader :GeoFactory, :geo
     object_attr_reader :Metadata, :metadata
     object_attr_reader :Place, :place
     object_attr_reader :Tweet, :retweeted_status
-    alias retweet retweeted_status
-    alias retweeted_tweet retweeted_status
-    alias retweet? retweeted_status?
-    alias retweeted_tweet? retweeted_status?
+    alias_method :retweet, :retweeted_status
+    alias_method :retweeted_tweet, :retweeted_status
+    alias_method :retweet?, :retweeted_status?
+    alias_method :retweeted_tweet?, :retweeted_status?
     object_attr_reader :User, :user, :status
 
     # @return [Boolean]
     def entities?
-      !@attrs[:entities].nil? && @attrs[:entities].any?{|_, array| !array.empty?}
+      !@attrs[:entities].nil? && @attrs[:entities].any? { |_, array| !array.empty? }
     end
     memoize :entities?
 
     def filter_level
-      @attrs[:filter_level] || "none"
+      @attrs[:filter_level] || 'none'
     end
     memoize :filter_level
 
@@ -72,10 +73,10 @@ module Twitter
 
     # @return [String] The URL to the tweet.
     def uri
-      URI.parse("https://twitter.com/#{user.screen_name}/status/#{id}")
+      Addressable::URI.parse("https://twitter.com/#{user.screen_name}/status/#{id}")
     end
     memoize :uri
-    alias url uri
+    alias_method :url, :uri
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::URI>]
@@ -83,7 +84,7 @@ module Twitter
       entities(Entity::URI, :urls)
     end
     memoize :uris
-    alias urls uris
+    alias_method :urls, :uris
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::UserMention>]
@@ -106,8 +107,6 @@ module Twitter
         []
       end
     end
-
   end
-
-  Status = Tweet
+  Status = Tweet # rubocop:disable ConstantName
 end