twitter 5.15.0 → 5.16.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 798135ed73e54bd85e71fc19b5dd62424f899b69
-  data.tar.gz: d46da3dca80843f6493df263bf623c7041091f0c
-SHA512: 
-  metadata.gz: dc3cea1cee6614e6fd72743526d9e3fe9396ae5fbd76e137281016a724df298ee142b06b9aac9f3ea010c123c70708515ddd1c4ce6754087326eb7fb7108c8b6
-  data.tar.gz: 09b7ce668855fa4171208d3c19b5599b19e990a9b59e9a0b789a905a0651bceedd7177fc6be12f82bea72270ddf7f2df67acc6692d41283b855abc16e71d5b0c
+---
+SHA1:
+  metadata.gz: c196f0dcc5339f83bec5f1ee333691352550d30a
+  data.tar.gz: 82960f248de8016773dc44fc0f90144e27f5c1ff
+SHA512:
+  metadata.gz: 075f2d6c0b5f09a207f87e9d7dd45ecae57b949a2a9519cf4ba6db4d7db21215b68260d43d11b428029dda86259bb238318ee6529bf66597f702324903a29c60
+  data.tar.gz: 126dbaf92971a634d7b7d8875eae3d3fe5eac79e553dcab18308e7988d4242ea14c81a8362ee2505bbd5244e7dc1bef170023332f44115958acd27f31b2b9564

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+5.16.0
+------
+* [Add new settings to `Twitter::Settings`](https://github.com/sferik/twitter/commit/d047ce00034d26a99927076c28679ce08fd69308)
+* [Add `Twitter::Trend#tweet_volume`](https://github.com/sferik/twitter/commit/e797b62e5e6a768e8aeafde6186e1f5310e6bfc6)
+* [Remove the encoding of profile urls](https://github.com/sferik/twitter/commit/6d46bd689ab4a4f119d1d692488aab37e4e99893) ([@TimHaines](https://twitter.com/TimHaines))
+* [Fix issue with port number in streaming connection](https://github.com/sferik/twitter/issues/709)
+
 5.15.0
 ------
 * [`NullObject#as_json` returns 'null'](https://github.com/sferik/twitter/commit/2979e703c09a45f012cb2c5b2d6663bf1f4d3351) ([@lukevmorris](https://twitter.com/lukevmorris))

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2015 Erik Michaels-Ober, John Nunemaker, Wynn Netherland, Steve Richert, Steve Agalloco
+Copyright (c) 2006-2016 Erik Michaels-Ober, John Nunemaker, Wynn Netherland, Steve Richert, Steve Agalloco
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -592,7 +592,7 @@ Constraint][pvc] with two digits of precision. For example:
 [pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint
 
 ## Copyright
-Copyright (c) 2006-2015 Erik Michaels-Ober, John Nunemaker, Wynn Netherland, Steve Richert, Steve Agalloco.
+Copyright (c) 2006-2016 Erik Michaels-Ober, John Nunemaker, Wynn Netherland, Steve Richert, Steve Agalloco.
 See [LICENSE][] for details.
 
 [license]: LICENSE.md

data/lib/twitter/base.rb

@@ -11,8 +11,8 @@ module Twitter
     include Twitter::Utils
     # @return [Hash]
     attr_reader :attrs
-    alias_method :to_h, :attrs
-    alias_method :to_hash, :to_h
+    alias to_h attrs
+    alias to_hash to_h
     deprecate_alias :to_hsh, :to_hash
 
     class << self
@@ -87,13 +87,11 @@ module Twitter
         define_method(key1) do ||
           if attr_falsey_or_empty?(key1)
             NullObject.new
+          elsif klass.nil?
+            @attrs[key1]
           else
-            if klass.nil?
-              @attrs[key1]
-            else
-              attrs = attrs_for_object(key1, key2)
-              Twitter.const_get(klass).new(attrs)
-            end
+            attrs = attrs_for_object(key1, key2)
+            Twitter.const_get(klass).new(attrs)
           end
         end
         memoize(key1)

data/lib/twitter/configuration.rb

@@ -10,8 +10,8 @@ module Twitter
     # @return [Integer]
     attr_reader :characters_reserved_per_media, :max_media_per_upload,
                 :photo_size_limit, :short_url_length, :short_url_length_https
-    alias_method :short_uri_length, :short_url_length
-    alias_method :short_uri_length_https, :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
     #

data/lib/twitter/cursor.rb

@@ -8,8 +8,8 @@ module Twitter
     include Twitter::Utils
     # @return [Hash]
     attr_reader :attrs
-    alias_method :to_h, :attrs
-    alias_method :to_hash, :to_h
+    alias to_h attrs
+    alias to_hash to_h
     deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new Cursor
@@ -35,7 +35,7 @@ module Twitter
     def next_cursor
       @attrs[:next_cursor] || -1
     end
-    alias_method :next, :next_cursor
+    alias next next_cursor
 
     # @return [Boolean]
     def last?

data/lib/twitter/direct_message.rb

@@ -8,7 +8,7 @@ module Twitter
     include Twitter::Entities
     # @return [String]
     attr_reader :text
-    alias_method :full_text, :text
+    alias full_text text
     object_attr_reader :User, :recipient
     object_attr_reader :User, :sender
   end

data/lib/twitter/entities.rb

@@ -61,13 +61,13 @@ module Twitter
       entities(Entity::URI, :urls)
     end
     memoize :uris
-    alias_method :urls, :uris
+    alias urls uris
 
     # @return [Boolean]
     def uris?
       uris.any?
     end
-    alias_method :urls?, :uris?
+    alias urls? uris?
 
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::UserMention>]

data/lib/twitter/geo.rb

@@ -6,6 +6,6 @@ module Twitter
     include Equalizer.new(:coordinates)
     # @return [Array<Float>]
     attr_reader :coordinates
-    alias_method :coords, :coordinates
+    alias coords coordinates
   end
 end

data/lib/twitter/geo/point.rb

@@ -7,14 +7,14 @@ module Twitter
       def latitude
         coordinates[0]
       end
-      alias_method :lat, :latitude
+      alias lat latitude
 
       # @return [Integer]
       def longitude
         coordinates[1]
       end
-      alias_method :long, :longitude
-      alias_method :lng, :longitude
+      alias long longitude
+      alias lng longitude
     end
   end
 end

data/lib/twitter/geo_results.rb

@@ -7,8 +7,8 @@ module Twitter
     include Twitter::Utils
     # @return [Hash]
     attr_reader :attrs
-    alias_method :to_h, :attrs
-    alias_method :to_hash, :to_h
+    alias to_h attrs
+    alias to_hash to_h
     deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new GeoResults object

data/lib/twitter/list.rb

@@ -16,21 +16,21 @@ module Twitter
       Addressable::URI.parse("#{uri}/members") if uri?
     end
     memoize :members_uri
-    alias_method :members_url, :members_uri
+    alias members_url members_uri
 
     # @return [Addressable::URI] The URI to the list subscribers.
     def subscribers_uri
       Addressable::URI.parse("#{uri}/subscribers") if uri?
     end
     memoize :subscribers_uri
-    alias_method :subscribers_url, :subscribers_uri
+    alias subscribers_url subscribers_uri
 
     # @return [Addressable::URI] The URI to the list.
     def uri
       Addressable::URI.parse("https://twitter.com/#{user.screen_name}/#{slug}") if slug? && user.screen_name?
     end
     memoize :uri
-    alias_method :url, :uri
+    alias url uri
 
     def uri?
       !!uri

data/lib/twitter/place.rb

@@ -9,11 +9,11 @@ module Twitter
     attr_reader :attributes
     # @return [String]
     attr_reader :country, :full_name, :name
-    alias_method :woe_id, :id
-    alias_method :woeid, :id
+    alias woe_id id
+    alias woeid id
     object_attr_reader :GeoFactory, :bounding_box
     object_attr_reader :Place, :contained_within
-    alias_method :contained?, :contained_within?
+    alias contained? contained_within?
     uri_attr_reader :uri
 
     # Initializes a new place

data/lib/twitter/profile.rb

@@ -26,18 +26,18 @@ module Twitter
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'
     # @return [Addressable::URI]
     def profile_banner_uri(size = :web)
-      parse_encoded_uri(insecure_uri([@attrs[:profile_banner_url], size].join('/'))) unless @attrs[:profile_banner_url].nil?
+      parse_uri(insecure_uri([@attrs[:profile_banner_url], size].join('/'))) unless @attrs[:profile_banner_url].nil?
     end
-    alias_method :profile_banner_url, :profile_banner_uri
+    alias profile_banner_url profile_banner_uri
 
     # Return the secure URL to the user's profile banner image
     #
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'
     # @return [Addressable::URI]
     def profile_banner_uri_https(size = :web)
-      parse_encoded_uri([@attrs[:profile_banner_url], size].join('/')) unless @attrs[:profile_banner_url].nil?
+      parse_uri([@attrs[:profile_banner_url], size].join('/')) unless @attrs[:profile_banner_url].nil?
     end
-    alias_method :profile_banner_url_https, :profile_banner_uri_https
+    alias profile_banner_url_https profile_banner_uri_https
 
     # @return [Boolean]
     def profile_banner_uri?
@@ -51,9 +51,9 @@ module Twitter
     # @param size [String, Symbol] The size of the image. Must be one of: 'mini', 'normal', 'bigger' or 'original'
     # @return [Addressable::URI]
     def profile_image_uri(size = :normal)
-      parse_encoded_uri(insecure_uri(profile_image_uri_https(size))) unless @attrs[:profile_image_url_https].nil?
+      parse_uri(insecure_uri(profile_image_uri_https(size))) unless @attrs[:profile_image_url_https].nil?
     end
-    alias_method :profile_image_url, :profile_image_uri
+    alias profile_image_url profile_image_uri
 
     # Return the secure URL to the user's profile image
     #
@@ -66,9 +66,9 @@ module Twitter
       # https://a0.twimg.com/profile_images/1759857427/image1326743606.png
       # https://a0.twimg.com/profile_images/1759857427/image1326743606_mini.png
       # https://a0.twimg.com/profile_images/1759857427/image1326743606_bigger.png
-      parse_encoded_uri(@attrs[:profile_image_url_https].sub(PROFILE_IMAGE_SUFFIX_REGEX, profile_image_suffix(size))) unless @attrs[:profile_image_url_https].nil?
+      parse_uri(@attrs[:profile_image_url_https].sub(PROFILE_IMAGE_SUFFIX_REGEX, profile_image_suffix(size))) unless @attrs[:profile_image_url_https].nil?
     end
-    alias_method :profile_image_url_https, :profile_image_uri_https
+    alias profile_image_url_https profile_image_uri_https
 
     # @return [Boolean]
     def profile_image_uri?
@@ -79,8 +79,8 @@ module Twitter
 
   private
 
-    def parse_encoded_uri(uri)
-      Addressable::URI.parse(URI.encode(uri))
+    def parse_uri(uri)
+      Addressable::URI.parse(uri)
     end
 
     def insecure_uri(uri)

data/lib/twitter/rate_limit.rb

@@ -29,6 +29,6 @@ module Twitter
     def reset_in
       [(reset_at - Time.now).ceil, 0].max if reset_at
     end
-    alias_method :retry_after, :reset_in
+    alias retry_after reset_in
   end
 end

data/lib/twitter/rest/client.rb

@@ -12,7 +12,7 @@ module Twitter
   module REST
     class Client < Twitter::Client
       include Twitter::REST::API
-      BASE_URL = 'https://api.twitter.com'
+      BASE_URL = 'https://api.twitter.com'.freeze
       URL_PREFIX = BASE_URL
       ENDPOINT = BASE_URL
       attr_accessor :bearer_token

data/lib/twitter/rest/direct_messages.rb

@@ -128,9 +128,9 @@ module Twitter
         options[:text] = text
         perform_post_with_object('/1.1/direct_messages/new.json', options, Twitter::DirectMessage)
       end
-      alias_method :d, :create_direct_message
-      alias_method :m, :create_direct_message
-      alias_method :dm, :create_direct_message
+      alias d create_direct_message
+      alias m create_direct_message
+      alias dm create_direct_message
       deprecate_alias :direct_message_create, :create_direct_message
     end
   end

data/lib/twitter/rest/favorites.rb

@@ -50,7 +50,7 @@ module Twitter
       def unfavorite(*args)
         parallel_objects_from_response(Twitter::Tweet, :post, '/1.1/favorites/destroy.json', args)
       end
-      alias_method :destroy_favorite, :unfavorite
+      alias destroy_favorite unfavorite
       deprecate_alias :favorite_destroy, :unfavorite
 
       # Favorites the specified Tweets as the authenticating user
@@ -75,8 +75,8 @@ module Twitter
           end
         end.compact
       end
-      alias_method :fav, :favorite
-      alias_method :fave, :favorite
+      alias fav favorite
+      alias fave favorite
       deprecate_alias :favorite_create, :favorite
 
       # Favorites the specified Tweets as the authenticating user and raises an error if one has already been favorited
@@ -99,9 +99,9 @@ module Twitter
           perform_post_with_object('/1.1/favorites/create.json', arguments.options.merge(:id => extract_id(tweet)), Twitter::Tweet)
         end
       end
-      alias_method :create_favorite!, :favorite!
-      alias_method :fav!, :favorite!
-      alias_method :fave!, :favorite!
+      alias create_favorite! favorite!
+      alias fav! favorite!
+      alias fave! favorite!
       deprecate_alias :favorite_create!, :favorite!
     end
   end

data/lib/twitter/rest/friends_and_followers.rb

@@ -113,7 +113,7 @@ module Twitter
         end
         follow!(new_friends.value - existing_friends.value, arguments.options)
       end
-      alias_method :create_friendship, :follow
+      alias create_friendship follow
       deprecate_alias :friendship_create, :follow
 
       # Allows the authenticating user to follow the specified users
@@ -135,7 +135,7 @@ module Twitter
           perform_post_with_object('/1.1/friendships/create.json', merge_user(arguments.options, user), Twitter::User)
         end.compact
       end
-      alias_method :create_friendship!, :follow!
+      alias create_friendship! follow!
       deprecate_alias :friendship_create!, :follow!
 
       # Allows the authenticating user to unfollow the specified users
@@ -153,7 +153,7 @@ module Twitter
       def unfollow(*args)
         parallel_users_from_response(:post, '/1.1/friendships/destroy.json', args)
       end
-      alias_method :destroy_friendship, :unfollow
+      alias destroy_friendship unfollow
       deprecate_alias :friendship_destroy, :unfollow
 
       # Allows one to enable or disable retweets and device notifications from the specified user.
@@ -189,8 +189,8 @@ module Twitter
         options[:target_id] = options.delete(:target_user_id) unless options[:target_user_id].nil?
         perform_get_with_object('/1.1/friendships/show.json', options, Twitter::Relationship)
       end
-      alias_method :friendship_show, :friendship
-      alias_method :relationship, :friendship
+      alias friendship_show friendship
+      alias relationship friendship
 
       # Test for the existence of friendship between two users
       #
@@ -253,7 +253,7 @@ module Twitter
       def friends(*args)
         cursor_from_response_with_user(:users, Twitter::User, '/1.1/friends/list.json', args)
       end
-      alias_method :following, :friends
+      alias following friends
 
       # Returns a collection of user IDs that the currently authenticated user does not want to receive retweets from.
       # @see https://dev.twitter.com/rest/reference/get/friendships/no_retweets/ids
@@ -265,7 +265,7 @@ module Twitter
       def no_retweet_ids(options = {})
         perform_get('/1.1/friendships/no_retweets/ids.json', options).collect(&:to_i)
       end
-      alias_method :no_retweets_ids, :no_retweet_ids
+      alias no_retweets_ids no_retweet_ids
     end
   end
 end

data/lib/twitter/rest/lists.rb

@@ -14,7 +14,7 @@ module Twitter
       include Twitter::REST::Utils
       include Twitter::Utils
       MAX_USERS_PER_REQUEST = 100
-      URI_SUBSTRING = '://'
+      URI_SUBSTRING = '://'.freeze
 
       # Returns all lists the authenticating or specified user subscribes to, including their own
       #
@@ -33,7 +33,7 @@ module Twitter
       def lists(*args)
         objects_from_response_with_user(Twitter::List, :get, '/1.1/lists/list.json', args)
       end
-      alias_method :lists_subscribed_to, :lists
+      alias lists_subscribed_to lists
 
       # Show tweet timeline for members of the specified list
       #

data/lib/twitter/rest/media.rb

@@ -22,7 +22,7 @@ module Twitter
         conn = connection.dup
         conn.url_prefix = base_url
         headers = Twitter::Headers.new(self, :post, base_url + path, options).request_headers
-        options.merge!(:media => media)
+        options[:media] = media
         conn.post(path, options) { |request| request.headers.update(headers) }.env.body[:media_id]
       end
     end

data/lib/twitter/rest/oauth.rb

@@ -28,7 +28,7 @@ module Twitter
         options[:grant_type] ||= 'client_credentials'
         perform_post_with_object('/oauth2/token', options, Twitter::Token)
       end
-      alias_method :bearer_token, :token
+      alias bearer_token token
 
       # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.
       #

data/lib/twitter/rest/places_and_geo.rb

@@ -58,7 +58,7 @@ module Twitter
       def geo_search(options = {})
         perform_get_with_object('/1.1/geo/search.json', options, Twitter::GeoResults)
       end
-      alias_method :places_nearby, :geo_search
+      alias places_nearby geo_search
 
       # Locates places near the given coordinates which are similar in name
       #
@@ -77,7 +77,7 @@ module Twitter
       def similar_places(options = {})
         perform_get_with_object('/1.1/geo/similar_places.json', options, Twitter::GeoResults)
       end
-      alias_method :places_similar, :similar_places
+      alias places_similar similar_places
     end
   end
 end

data/lib/twitter/rest/request.rb

@@ -11,7 +11,7 @@ module Twitter
     class Request
       attr_accessor :client, :headers, :options, :rate_limit, :request_method,
                     :path, :uri
-      alias_method :verb, :request_method
+      alias verb request_method
 
       # @param client [Twitter::Client]
       # @param request_method [String, Symbol]

data/lib/twitter/rest/request/multipart_with_file.rb

@@ -4,7 +4,7 @@ module Twitter
   module REST
     class Request
       class MultipartWithFile < Faraday::Middleware
-        CONTENT_TYPE = 'Content-Type'
+        CONTENT_TYPE = 'Content-Type'.freeze
         BMP_REGEX = /\.bmp/i
         GIF_REGEX = /\.gif$/i
         JPEG_REGEX = /\.jpe?g/i

data/lib/twitter/rest/timelines.rb

@@ -25,7 +25,7 @@ module Twitter
       def mentions_timeline(options = {})
         perform_get_with_objects('/1.1/statuses/mentions_timeline.json', options, Twitter::Tweet)
       end
-      alias_method :mentions, :mentions_timeline
+      alias mentions mentions_timeline
 
       # Returns the 20 most recent Tweets posted by the specified user
       #
@@ -70,7 +70,7 @@ module Twitter
           user_timeline(user, opts)
         end
       end
-      alias_method :retweeted_by, :retweeted_by_user
+      alias retweeted_by retweeted_by_user
 
       # Returns the 20 most recent retweets posted by the authenticating user
       #

data/lib/twitter/rest/trends.rb

@@ -8,7 +8,7 @@ module Twitter
     module Trends
       include Twitter::REST::Utils
 
-      # Returns the top 10 trending topics for a specific WOEID
+      # Returns the top 50 trending topics for a specific WOEID
       #
       # @see https://dev.twitter.com/rest/reference/get/trends/place
       # @rate_limited Yes
@@ -23,8 +23,8 @@ module Twitter
         response = perform_get('/1.1/trends/place.json', options).first
         Twitter::TrendResults.new(response)
       end
-      alias_method :local_trends, :trends
-      alias_method :trends_place, :trends
+      alias local_trends trends
+      alias trends_place trends
 
       # Returns the locations that Twitter has trending topic information for
       #
@@ -37,7 +37,7 @@ module Twitter
       def trends_available(options = {})
         perform_get_with_objects('/1.1/trends/available.json', options, Twitter::Place)
       end
-      alias_method :trend_locations, :trends_available
+      alias trend_locations trends_available
 
       # Returns the locations that Twitter has trending topic information for, closest to a specified location.
       #

data/lib/twitter/rest/tweets.rb

@@ -100,7 +100,7 @@ module Twitter
           perform_post_with_object("/1.1/statuses/destroy/#{extract_id(tweet)}.json", arguments.options, Twitter::Tweet)
         end
       end
-      alias_method :destroy_tweet, :destroy_status
+      alias destroy_tweet destroy_status
       deprecate_alias :status_destroy, :destroy_status
       deprecate_alias :tweet_destroy, :destroy_status
 

data/lib/twitter/rest/users.rb

@@ -50,7 +50,7 @@ module Twitter
       def verify_credentials(options = {})
         perform_get_with_object('/1.1/account/verify_credentials.json', options, Twitter::User)
       end
-      alias_method :current_user, :verify_credentials
+      alias current_user verify_credentials
 
       # Sets which device Twitter delivers updates to for the authenticating user
       #

data/lib/twitter/rest/utils.rb

@@ -9,7 +9,7 @@ module Twitter
   module REST
     module Utils
       include Twitter::Utils
-      URI_SUBSTRING = '://'
+      URI_SUBSTRING = '://'.freeze
       DEFAULT_CURSOR = -1
 
     private
@@ -232,7 +232,7 @@ module Twitter
         hash
       end
 
-      def collect_user_ids_and_screen_names(users) # rubocop:disable MethodLength
+      def collect_user_ids_and_screen_names(users)
         user_ids = []
         screen_names = []
         users.flatten.each do |user|
@@ -240,11 +240,7 @@ module Twitter
           when Integer
             user_ids << user
           when String
-            if user[URI_SUBSTRING]
-              screen_names << user.split('/').last
-            else
-              screen_names << user
-            end
+            screen_names << (user[URI_SUBSTRING] ? user.split('/').last : user)
           when URI
             screen_names << user.path.split('/').last
           when Twitter::User

data/lib/twitter/search_results.rb

@@ -10,8 +10,8 @@ module Twitter
     include Twitter::Utils
     # @return [Hash]
     attr_reader :attrs
-    alias_method :to_h, :attrs
-    alias_method :to_hash, :to_h
+    alias to_h attrs
+    alias to_hash to_h
     deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new SearchResults object

data/lib/twitter/settings.rb

@@ -7,9 +7,16 @@ module Twitter
     # @return [String]
     attr_reader :language, :screen_name
     object_attr_reader :Place, :trend_location
-    predicate_attr_reader :always_use_https, :discoverable_by_email,
+    predicate_attr_reader :allow_contributor_request,
+                          :allow_dm_groups_from,
+                          :allow_dms_from,
+                          :always_use_https,
+                          :discoverable_by_email,
                           :discoverable_by_mobile_phone,
-                          :display_sensitive_media, :geo_enabled, :protected,
-                          :show_all_inline_media, :use_cookie_personalization
+                          :display_sensitive_media,
+                          :geo_enabled,
+                          :protected,
+                          :show_all_inline_media,
+                          :use_cookie_personalization
   end
 end

data/lib/twitter/size.rb

@@ -8,7 +8,7 @@ module Twitter
     attr_reader :h, :w
     # @return [String]
     attr_reader :resize
-    alias_method :height, :h
-    alias_method :width, :w
+    alias height h
+    alias width w
   end
 end

data/lib/twitter/streaming/client.rb

@@ -110,7 +110,7 @@ module Twitter
         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(method, uri + '?' + to_url_params(params), headers)
+        request = HTTP::Request.new(:verb => method, :uri => uri + '?' + to_url_params(params), :headers => headers)
         response = Streaming::Response.new do |data|
           if item = Streaming::MessageParser.parse(data) # rubocop:disable AssignmentInCondition
             yield(item)

data/lib/twitter/streaming/connection.rb

@@ -13,7 +13,7 @@ module Twitter
 
       def stream(request, response)
         client_context = OpenSSL::SSL::SSLContext.new
-        client         = @tcp_socket_class.new(Resolv.getaddress(request.uri.host), request.uri.port)
+        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

data/lib/twitter/streaming/event.rb

@@ -5,11 +5,11 @@ module Twitter
         :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
-      ]
+      ].freeze
 
       attr_reader :name, :source, :target, :target_object
 

data/lib/twitter/token.rb

@@ -7,9 +7,9 @@ module Twitter
 
     # @return [String]
     attr_reader :access_token, :token_type
-    alias_method :to_s, :access_token
+    alias to_s access_token
 
-    BEARER_TYPE = 'bearer'
+    BEARER_TYPE = 'bearer'.freeze
 
     # @return [Boolean]
     def bearer?

data/lib/twitter/trend.rb

@@ -5,7 +5,7 @@ module Twitter
   class Trend < Twitter::Base
     include Equalizer.new(:name)
     # @return [String]
-    attr_reader :events, :name, :query
+    attr_reader :events, :name, :query, :tweet_volume
     predicate_attr_reader :promoted_content
     uri_attr_reader :uri
   end

data/lib/twitter/trend_results.rb

@@ -12,8 +12,8 @@ module Twitter
     include Memoizable
     # @return [Hash]
     attr_reader :attrs
-    alias_method :to_h, :attrs
-    alias_method :to_hash, :to_h
+    alias to_h attrs
+    alias to_hash to_h
     deprecate_alias :to_hsh, :to_hash
 
     # Initializes a new TrendResults object

data/lib/twitter/tweet.rb

@@ -13,20 +13,20 @@ module Twitter
                 :retweet_count
     deprecate_alias :favorites_count, :favorite_count
     deprecate_alias :favoriters_count, :favorite_count
-    alias_method :in_reply_to_tweet_id, :in_reply_to_status_id
-    alias_method :reply?, :in_reply_to_user_id?
+    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
     object_attr_reader :Tweet, :retweeted_status
     object_attr_reader :Tweet, :quoted_status
-    alias_method :retweeted_tweet, :retweeted_status
-    alias_method :retweet?, :retweeted_status?
-    alias_method :retweeted_tweet?, :retweeted_status?
-    alias_method :quoted_tweet, :quoted_status
-    alias_method :quote?, :quoted_status?
-    alias_method :quoted_tweet?, :quoted_status?
+    alias retweeted_tweet retweeted_status
+    alias retweet? retweeted_status?
+    alias retweeted_tweet? retweeted_status?
+    alias quoted_tweet quoted_status
+    alias quote? quoted_status?
+    alias quoted_tweet? quoted_status?
     object_attr_reader :User, :user, :status
     predicate_attr_reader :favorited, :possibly_sensitive, :retweeted,
                           :truncated
@@ -48,7 +48,7 @@ module Twitter
       Addressable::URI.parse("https://twitter.com/#{user.screen_name}/status/#{id}") if user?
     end
     memoize :uri
-    alias_method :url, :uri
+    alias url uri
   end
   Status = Tweet
 end

data/lib/twitter/user.rb

@@ -20,12 +20,12 @@ module Twitter
                 :profile_background_color, :profile_link_color,
                 :profile_sidebar_border_color, :profile_sidebar_fill_color,
                 :profile_text_color, :time_zone
-    alias_method :favorites_count, :favourites_count
-    alias_method :tweets_count, :statuses_count
+    alias favorites_count favourites_count
+    alias tweets_count statuses_count
     object_attr_reader :Tweet, :status, :user
-    alias_method :tweet, :status
-    alias_method :tweet?, :status?
-    alias_method :tweeted?, :status?
+    alias tweet status
+    alias tweet? status?
+    alias tweeted? status?
     predicate_attr_reader :contributors_enabled, :default_profile,
                           :default_profile_image, :follow_request_sent,
                           :geo_enabled, :muting, :needs_phone_verification,
@@ -84,7 +84,7 @@ module Twitter
       Addressable::URI.parse("https://twitter.com/#{screen_name}") if screen_name?
     end
     memoize :uri
-    alias_method :url, :uri
+    alias url uri
 
     # @return [Addressable::URI] The URL to the user's website.
     def website

data/lib/twitter/version.rb

@@ -9,7 +9,7 @@ module Twitter
 
     # @return [Integer]
     def minor
-      15
+      16
     end
 
     # @return [Integer]
@@ -34,7 +34,7 @@ module Twitter
 
     # @return [Array]
     def to_a
-      to_h.values.compact
+      [major, minor, patch, pre].compact
     end
 
     # @return [String]

data/twitter.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'buftok', '~> 0.2.0'
   spec.add_dependency 'equalizer', '0.0.10'
   spec.add_dependency 'faraday', '~> 0.9.0'
-  spec.add_dependency 'http', ['>= 0.4', '< 0.10']
+  spec.add_dependency 'http', '~> 1.0'
   spec.add_dependency 'http_parser.rb', '~> 0.6.0'
   spec.add_dependency 'json', '~> 1.8'
   spec.add_dependency 'memoizable', '~> 0.4.0'

metadata

@@ -1,9 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twitter
-version: !ruby/object:Gem::Version 
-  version: 5.15.0
+version: !ruby/object:Gem::Version
+  version: 5.16.0
 platform: ruby
-authors: 
+authors:
 - Erik Michaels-Ober
 - John Nunemaker
 - Wynn Netherland
@@ -12,132 +12,170 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-09-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2016-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.3"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
   name: buftok
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
   name: equalizer
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.0.10
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.10
+- !ruby/object:Gem::Dependency
   name: faraday
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
   name: http
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.4"
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "0.10"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: http_parser.rb
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.8"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
   name: memoizable
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: naught
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - &id011 !ruby/object:Gem::Version 
-        version: "1.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: simple_oauth
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - *id011
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  requirement: *id012
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A Ruby interface to the Twitter API.
-email: 
+email:
 - sferik@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .yardopts
+files:
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE.md
@@ -232,32 +270,28 @@ files:
 - lib/twitter/version.rb
 - twitter.gemspec
 homepage: http://sferik.github.com/twitter/
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Twitter API.
 test_files: []
-
 has_rdoc: