twitter 6.1.0 → 6.2.0

data/lib/twitter/rest/utils.rb

@@ -4,12 +4,12 @@ require 'twitter/cursor'
 require 'twitter/rest/request'
 require 'twitter/user'
 require 'twitter/utils'
+require 'uri'
 
 module Twitter
   module REST
     module Utils
       include Twitter::Utils
-      URI_SUBSTRING = '://'.freeze
       DEFAULT_CURSOR = -1
 
     private
@@ -24,7 +24,7 @@ module Twitter
           object
         when ::String
           object.split('/').last.to_i
-        when URI
+        when URI, Addressable::URI
           object.path.split('/').last.to_i
         when Twitter::Identity
           object.id
@@ -193,11 +193,7 @@ module Twitter
         when Integer
           set_compound_key('user_id', user, hash, prefix)
         when String
-          if user[URI_SUBSTRING]
-            set_compound_key('screen_name', user.split('/').last, hash, prefix)
-          else
-            set_compound_key('screen_name', user, hash, prefix)
-          end
+          set_compound_key('screen_name', user, hash, prefix)
         when URI, Addressable::URI
           set_compound_key('screen_name', user.path.split('/').last, hash, prefix)
         when Twitter::User
@@ -217,7 +213,9 @@ module Twitter
       # @param users [Enumerable<Integer, String, Twitter::User>] A collection of Twitter user IDs, screen_names, or objects.
       # @return [Hash]
       def merge_users(hash, users)
-        merge_users!(hash.dup, users)
+        copy = hash.dup
+        merge_users!(copy, users)
+        copy
       end
 
       # Take a multiple users and merge them into the hash with the correct keys
@@ -226,25 +224,20 @@ module Twitter
       # @param users [Enumerable<Integer, String, URI, Twitter::User>] A collection of Twitter user IDs, screen_names, URIs, or objects.
       # @return [Hash]
       def merge_users!(hash, users)
-        user_ids, screen_names = collect_user_ids_and_screen_names(users)
+        user_ids, screen_names = collect_users(users)
         hash[:user_id] = user_ids.join(',') unless user_ids.empty?
         hash[:screen_name] = screen_names.join(',') unless screen_names.empty?
-        hash
       end
 
-      def collect_user_ids_and_screen_names(users)
+      def collect_users(users) # rubocop:disable MethodLength
         user_ids = []
         screen_names = []
-        users.flatten.each do |user|
+        users.each do |user|
           case user
-          when Integer
-            user_ids << user
-          when String
-            screen_names << (user[URI_SUBSTRING] ? user.split('/').last : user)
-          when URI
-            screen_names << user.path.split('/').last
-          when Twitter::User
-            user_ids << user.id
+          when Integer               then user_ids << user
+          when Twitter::User         then user_ids << user.id
+          when String                then screen_names << user
+          when URI, Addressable::URI then screen_names << user.path.split('/').last
           end
         end
         [user_ids, screen_names]

data/lib/twitter/search_results.rb

@@ -12,7 +12,6 @@ module Twitter
     attr_reader :attrs
     alias to_h attrs
     alias to_hash to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new SearchResults object
     #
@@ -49,7 +48,7 @@ module Twitter
 
     # @return [Hash]
     def fetch_next_page
-      response = Twitter::REST::Request.new(@client, @request_method, @path, next_page).perform
+      response = Twitter::REST::Request.new(@client, @request_method, @path, @options.merge(next_page)).perform
       self.attrs = response
     end
 

data/lib/twitter/streaming/client.rb

@@ -3,14 +3,15 @@ require 'twitter/arguments'
 require 'twitter/client'
 require 'twitter/headers'
 require 'twitter/streaming/connection'
-require 'twitter/streaming/response'
 require 'twitter/streaming/message_parser'
+require 'twitter/streaming/response'
+require 'twitter/utils'
 
 module Twitter
   module Streaming
     class Client < Twitter::Client
+      include Twitter::Utils
       attr_writer :connection
-      attr_accessor :tcp_socket_class, :ssl_socket_class
 
       # Initializes a new Client object
       #
@@ -108,9 +109,8 @@ module Twitter
 
       def request(method, uri, params)
         before_request.call
-        authorization = Twitter::Headers.new(self, method, uri, params).oauth_auth_header.to_s
-        headers = default_headers.merge(authorization: authorization)
-        request = HTTP::Request.new(verb: method, uri: uri + '?' + to_url_params(params), headers: headers)
+        headers = Twitter::Headers.new(self, method, uri, params).request_headers
+        request = HTTP::Request.new(verb: method, uri: uri + '?' + to_url_params(params), headers: headers, proxy: proxy)
         response = Streaming::Response.new do |data|
           if item = Streaming::MessageParser.parse(data) # rubocop:disable AssignmentInCondition
             yield(item)
@@ -120,29 +120,23 @@ module Twitter
       end
 
       def to_url_params(params)
-        params.collect do |param, value|
-          [param, URI.encode(value)].join('=')
-        end.sort.join('&')
-      end
-
-      def default_headers
-        @default_headers ||= {
-          accept: '*/*',
-          user_agent: user_agent,
-        }
+        uri = Addressable::URI.new
+        uri.query_values = params
+        uri.query
       end
 
+      # Takes a mixed array of Integers and Twitter::User objects and returns a
+      # consistent array of Twitter user IDs.
+      #
+      # @param users [Array]
+      # @return [Array<Integer>]
       def collect_user_ids(users)
-        user_ids = []
-        users.flatten.each do |user|
+        users.collect do |user|
           case user
-          when Integer
-            user_ids << user
-          when Twitter::User
-            user_ids << user.id
+          when Integer       then user
+          when Twitter::User then user.id
           end
-        end
-        user_ids
+        end.compact
       end
     end
   end

data/lib/twitter/streaming/connection.rb

@@ -5,22 +5,35 @@ require 'resolv'
 module Twitter
   module Streaming
     class Connection
-      def initialize(opts = {})
-        @tcp_socket_class = opts.fetch(:tcp_socket_class) { TCPSocket }
-        @ssl_socket_class = opts.fetch(:ssl_socket_class) { OpenSSL::SSL::SSLSocket }
-      end
       attr_reader :tcp_socket_class, :ssl_socket_class
 
+      def initialize(options = {})
+        @tcp_socket_class = options.fetch(:tcp_socket_class) { TCPSocket }
+        @ssl_socket_class = options.fetch(:ssl_socket_class) { OpenSSL::SSL::SSLSocket }
+        @using_ssl        = options.fetch(:using_ssl)        { false }
+      end
+
       def stream(request, response)
+        client = connect(request)
+        request.stream(client)
+        while body = client.readpartial(1024) # rubocop:disable AssignmentInCondition
+          response << body
+        end
+      end
+
+      def connect(request)
+        client = new_tcp_socket(request.socket_host, request.socket_port)
+        return client if !@using_ssl && request.using_proxy?
+
         client_context = OpenSSL::SSL::SSLContext.new
-        client         = @tcp_socket_class.new(Resolv.getaddress(request.socket_host), request.socket_port)
         ssl_client     = @ssl_socket_class.new(client, client_context)
-
         ssl_client.connect
-        request.stream(ssl_client)
-        while body = ssl_client.readpartial(1024) # rubocop:disable AssignmentInCondition
-          response << body
-        end
+      end
+
+    private
+
+      def new_tcp_socket(host, port)
+        @tcp_socket_class.new(Resolv.getaddress(host), port)
       end
     end
   end

data/lib/twitter/streaming/deleted_tweet.rb

@@ -4,6 +4,5 @@ module Twitter
       # @return [Integer]
       attr_reader :user_id
     end
-    DeletedStatus = DeletedTweet
   end
 end

data/lib/twitter/streaming/event.rb

@@ -1,14 +1,14 @@
 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_EVENTS = %i[
+        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
       ].freeze
 
-      TWEET_EVENTS = [
-        :favorite, :unfavorite, :quoted_tweet
+      TWEET_EVENTS = %i[
+        favorite unfavorite quoted_tweet
       ].freeze
 
       attr_reader :name, :source, :target, :target_object

data/lib/twitter/streaming/message_parser.rb

@@ -8,7 +8,7 @@ require 'twitter/tweet'
 module Twitter
   module Streaming
     class MessageParser
-      def self.parse(data) # rubocop:disable CyclomaticComplexity, PerceivedComplexity
+      def self.parse(data) # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
         if data[:id]
           Tweet.new(data)
         elsif data[:event]

data/lib/twitter/streaming/response.rb

@@ -20,8 +20,8 @@ module Twitter
       end
 
       def on_headers_complete(_headers)
-        error = Twitter::Error.errors[@parser.status_code]
-        raise error.new if error
+        error = Twitter::Error::ERRORS[@parser.status_code]
+        raise error if error
       end
 
       def on_body(data)

data/lib/twitter/trend_results.rb

@@ -14,7 +14,6 @@ module Twitter
     attr_reader :attrs
     alias to_h attrs
     alias to_hash to_h
-    deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new TrendResults object
     #
@@ -31,7 +30,7 @@ module Twitter
     #
     # @return [Time]
     def as_of
-      Time.parse(@attrs[:as_of]) unless @attrs[:as_of].nil?
+      Time.parse(@attrs[:as_of]).utc unless @attrs[:as_of].nil?
     end
     memoize :as_of
 

data/lib/twitter/tweet.rb

@@ -11,11 +11,8 @@ module Twitter
     # @return [Integer]
     attr_reader :favorite_count, :in_reply_to_status_id, :in_reply_to_user_id,
                 :retweet_count
-    deprecate_alias :favorites_count, :favorite_count
-    deprecate_alias :favoriters_count, :favorite_count
     alias in_reply_to_tweet_id in_reply_to_status_id
     alias reply? in_reply_to_user_id?
-    deprecate_alias :retweeters_count, :retweet_count
     object_attr_reader :GeoFactory, :geo
     object_attr_reader :Metadata, :metadata
     object_attr_reader :Place, :place
@@ -32,7 +29,7 @@ module Twitter
     predicate_attr_reader :favorited, :possibly_sensitive, :retweeted,
                           :truncated
 
-    # @note May be > 140 characters.
+    # @note May be > 280 characters.
     # @return [String]
     def full_text
       if retweet?
@@ -51,5 +48,4 @@ module Twitter
     memoize :uri
     alias url uri
   end
-  Status = Tweet
 end

data/lib/twitter/user.rb

@@ -1,5 +1,4 @@
 require 'addressable/uri'
-require 'memoizable'
 require 'twitter/basic_user'
 require 'twitter/creatable'
 require 'twitter/entity/uri'
@@ -9,7 +8,6 @@ module Twitter
   class User < Twitter::BasicUser
     include Twitter::Creatable
     include Twitter::Profile
-    include Memoizable
     # @return [Array]
     attr_reader :connections
     # @return [Integer]

data/lib/twitter/utils.rb

@@ -1,19 +1,6 @@
 module Twitter
   module Utils
-    class << self
-      def included(base)
-        base.extend(ClassMethods)
-      end
-    end
-
-    module ClassMethods
-      def deprecate_alias(new_name, old_name, &block)
-        define_method(new_name) do |*args|
-          warn "#{Kernel.caller.first}: [DEPRECATION] ##{new_name} is deprecated. Use ##{old_name} instead."
-          send(old_name, *args, &block)
-        end
-      end
-    end
+  module_function
 
     # Returns a new array with the concatenated results of running block once for every element in enumerable.
     # If no block is given, an enumerator is returned instead.
@@ -24,7 +11,6 @@ module Twitter
       return to_enum(:flat_pmap, enumerable) unless block_given?
       pmap(enumerable, &Proc.new).flatten(1)
     end
-    module_function :flat_pmap
 
     # Returns a new array with the results of running block once for every element in enumerable.
     # If no block is given, an enumerator is returned instead.
@@ -39,6 +25,5 @@ module Twitter
         enumerable.collect { |object| Thread.new { yield(object) } }.collect(&:value)
       end
     end
-    module_function :pmap
   end
 end

data/lib/twitter/version.rb

@@ -9,7 +9,7 @@ module Twitter
 
     # @return [Integer]
     def minor
-      1
+      2
     end
 
     # @return [Integer]

data/twitter.gemspec

@@ -3,26 +3,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'twitter/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'addressable', '~> 2.5'
+  spec.add_dependency 'addressable', '~> 2.3'
   spec.add_dependency 'buftok', '~> 0.2.0'
-  spec.add_dependency 'equalizer', '0.0.11'
-  spec.add_dependency 'faraday', '~> 0.11.0'
-  spec.add_dependency 'http', '~> 2.1'
+  spec.add_dependency 'equalizer', '~> 0.0.11'
+  spec.add_dependency 'http', '~> 3.0'
+  spec.add_dependency 'http-form_data', '~> 2.0'
   spec.add_dependency 'http_parser.rb', '~> 0.6.0'
-  spec.add_dependency 'memoizable', '~> 0.4.2'
-  spec.add_dependency 'naught', '~> 1.1'
-  spec.add_dependency 'simple_oauth', '~> 0.3.1'
+  spec.add_dependency 'memoizable', '~> 0.4.0'
+  spec.add_dependency 'multipart-post', '~> 2.0'
+  spec.add_dependency 'naught', '~> 1.0'
+  spec.add_dependency 'simple_oauth', '~> 0.3.0'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors = ['Erik Michaels-Ober', 'John Nunemaker', 'Wynn Netherland', 'Steve Richert', 'Steve Agalloco']
   spec.description = 'A Ruby interface to the Twitter API.'
-  spec.email = %w(sferik@gmail.com)
-  spec.files = %w(.yardopts CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md twitter.gemspec) + Dir['lib/**/*.rb']
+  spec.email = %w[sferik@gmail.com]
+  spec.files = %w[.yardopts CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md twitter.gemspec] + Dir['lib/**/*.rb']
   spec.homepage = 'http://sferik.github.com/twitter/'
-  spec.licenses = %w(MIT)
+  spec.licenses = %w[MIT]
   spec.name = 'twitter'
-  spec.require_paths = %w(lib)
-  spec.required_ruby_version = '>= 2'
-  spec.required_rubygems_version = '>= 1.3.5'
+  spec.require_paths = %w[lib]
+  spec.required_ruby_version = '>= 1.9.3'
   spec.summary = spec.description
   spec.version = Twitter::Version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: buftok
   requirement: !ruby/object:Gem::Requirement
@@ -46,44 +46,44 @@ dependencies:
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.11
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: http-form_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -104,42 +104,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: naught
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -213,14 +227,9 @@ files:
 - lib/twitter/rest/friends_and_followers.rb
 - lib/twitter/rest/help.rb
 - lib/twitter/rest/lists.rb
-- lib/twitter/rest/media.rb
 - lib/twitter/rest/oauth.rb
 - lib/twitter/rest/places_and_geo.rb
 - lib/twitter/rest/request.rb
-- lib/twitter/rest/request/multipart_with_file.rb
-- lib/twitter/rest/response/parse_error_json.rb
-- lib/twitter/rest/response/parse_json.rb
-- lib/twitter/rest/response/raise_error.rb
 - lib/twitter/rest/saved_searches.rb
 - lib/twitter/rest/search.rb
 - lib/twitter/rest/spam_reporting.rb
@@ -246,7 +255,6 @@ files:
 - lib/twitter/streaming/stall_warning.rb
 - lib/twitter/suggestion.rb
 - lib/twitter/target_user.rb
-- lib/twitter/token.rb
 - lib/twitter/trend.rb
 - lib/twitter/trend_results.rb
 - lib/twitter/tweet.rb
@@ -267,15 +275,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.5
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Twitter API.