twitter 5.12.0 → 5.14.0

data/lib/twitter/rest/users.rb

@@ -1,7 +1,7 @@
 require 'twitter/arguments'
 require 'twitter/error'
 require 'twitter/profile_banner'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/rest/utils'
 require 'twitter/settings'
 require 'twitter/user'
@@ -32,7 +32,7 @@ module Twitter
       # @option options [String] :lang The language which Twitter should render in for this user. The language must be specified by the appropriate two letter ISO 639-1 representation. Currently supported languages are provided by {https://dev.twitter.com/docs/api/1.1/get/help/languages GET help/languages}.
       def settings(options = {})
         request_method = options.size.zero? ? :get : :post
-        response = send(request_method.to_sym, '/1.1/account/settings.json', options).body
+        response = perform_request(request_method.to_sym, '/1.1/account/settings.json', options)
         # https://dev.twitter.com/issues/59
         response.update(:trend_location => response.fetch(:trend_location, []).first)
         Twitter::Settings.new(response)
@@ -48,7 +48,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean, String, Integer] :skip_status Do not include user's Tweets when set to true, 't' or 1.
       def verify_credentials(options = {})
-        perform_with_object(:get, '/1.1/account/verify_credentials.json', options, Twitter::User)
+        perform_get_with_object('/1.1/account/verify_credentials.json', options, Twitter::User)
       end
       alias_method :current_user, :verify_credentials
 
@@ -62,7 +62,7 @@ module Twitter
       # @param device [String] Must be one of: 'sms', 'none'.
       # @param options [Hash] A customizable set of options.
       def update_delivery_device(device, options = {})
-        perform_with_object(:post, '/1.1/account/update_delivery_device.json', options.merge(:device => device), Twitter::User)
+        perform_post_with_object('/1.1/account/update_delivery_device.json', options.merge(:device => device), Twitter::User)
       end
 
       # Sets values that users are able to set under the "Account" tab of their settings page
@@ -79,7 +79,7 @@ module Twitter
       # @option options [String] :location The city or country describing where the user of the account is located. The contents are not normalized or geocoded in any way. Maximum of 30 characters.
       # @option options [String] :description A description of the user owning the account. Maximum of 160 characters.
       def update_profile(options = {})
-        perform_with_object(:post, '/1.1/account/update_profile.json', options, Twitter::User)
+        perform_post_with_object('/1.1/account/update_profile.json', options, Twitter::User)
       end
 
       # Updates the authenticating user's profile background image
@@ -93,7 +93,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean] :tile Whether or not to tile the background image. If set to true the background image will be displayed tiled. The image will not be tiled otherwise.
       def update_profile_background_image(image, options = {})
-        perform_with_object(:post, '/1.1/account/update_profile_background_image.json', options.merge(:image => image), Twitter::User)
+        perform_post_with_object('/1.1/account/update_profile_background_image.json', options.merge(:image => image), Twitter::User)
       end
 
       # Sets one or more hex values that control the color scheme of the authenticating user's profile
@@ -110,7 +110,7 @@ module Twitter
       # @option options [String] :profile_sidebar_fill_color Profile sidebar's background color.
       # @option options [String] :profile_sidebar_border_color Profile sidebar's border color.
       def update_profile_colors(options = {})
-        perform_with_object(:post, '/1.1/account/update_profile_colors.json', options, Twitter::User)
+        perform_post_with_object('/1.1/account/update_profile_colors.json', options, Twitter::User)
       end
 
       # Updates the authenticating user's profile image
@@ -125,7 +125,7 @@ module Twitter
       # @param image [File] The avatar image for the profile, base64-encoded. Must be a valid GIF, JPG, or PNG image of less than 700 kilobytes in size. Images with width larger than 500 pixels will be scaled down. Animated GIFs will be converted to a static GIF of the first frame, removing the animation.
       # @param options [Hash] A customizable set of options.
       def update_profile_image(image, options = {})
-        perform_with_object(:post, '/1.1/account/update_profile_image.json', options.merge(:image => image), Twitter::User)
+        perform_post_with_object('/1.1/account/update_profile_image.json', options.merge(:image => image), Twitter::User)
       end
 
       # Returns an array of user objects that the authenticating user is blocking
@@ -138,7 +138,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean, String, Integer] :skip_status Do not include user's Tweets when set to true, 't' or 1.
       def blocked(options = {})
-        perform_with_cursor(:get, '/1.1/blocks/list.json', options, :users, Twitter::User)
+        perform_get_with_cursor('/1.1/blocks/list.json', options, :users, Twitter::User)
       end
       deprecate_alias :blocking, :blocked
 
@@ -154,7 +154,7 @@ module Twitter
       def blocked_ids(*args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
-        perform_with_cursor(:get, '/1.1/blocks/ids.json', arguments.options, :ids)
+        perform_get_with_cursor('/1.1/blocks/ids.json', arguments.options, :ids)
       end
 
       # Returns true if the authenticating user is blocking a target user
@@ -226,12 +226,10 @@ module Twitter
       # @overload users(*users, options)
       #   @param users [Enumerable<Integer, String, Twitter::User>] A collection of Twitter user IDs, screen names, or objects.
       #   @param options [Hash] A customizable set of options.
-      #   @option options [Symbol, String] :method Requests users via a GET request instead of the standard POST request if set to ':get'.
       def users(*args)
         arguments = Twitter::Arguments.new(args)
-        request_method = arguments.options.delete(:method) || :post
         flat_pmap(arguments.each_slice(MAX_USERS_PER_REQUEST)) do |users|
-          perform_with_objects(request_method, '/1.1/users/lookup.json', merge_users(arguments.options, users), Twitter::User)
+          perform_post_with_objects('/1.1/users/lookup.json', merge_users(arguments.options, users), Twitter::User)
         end
       end
 
@@ -255,7 +253,7 @@ module Twitter
         arguments = Twitter::Arguments.new(args)
         if arguments.last || user_id?
           merge_user!(arguments.options, arguments.pop || user_id)
-          perform_with_object(:get, '/1.1/users/show.json', arguments.options, Twitter::User)
+          perform_get_with_object('/1.1/users/show.json', arguments.options, Twitter::User)
         else
           verify_credentials(arguments.options)
         end
@@ -270,7 +268,7 @@ module Twitter
       # @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
       def user?(user, options = {})
         merge_user!(options, user)
-        get('/1.1/users/show.json', options)
+        perform_get('/1.1/users/show.json', options)
         true
       rescue Twitter::Error::NotFound
         false
@@ -288,7 +286,7 @@ module Twitter
       # @option options [Integer] :count The number of people to retrieve. Maxiumum of 20 allowed per page.
       # @option options [Integer] :page Specifies the page of results to retrieve.
       def user_search(query, options = {})
-        perform_with_objects(:get, '/1.1/users/search.json', options.merge(:q => query), Twitter::User)
+        perform_get_with_objects('/1.1/users/search.json', options.merge(:q => query), Twitter::User)
       end
 
       # Returns an array of users that the specified user can contribute to
@@ -336,7 +334,7 @@ module Twitter
       # @return [nil]
       # @param options [Hash] A customizable set of options.
       def remove_profile_banner(options = {})
-        post('/1.1/account/remove_profile_banner.json', options).body
+        perform_post('/1.1/account/remove_profile_banner.json', options)
         true
       end
       deprecate_alias :profile_banner_remove, :remove_profile_banner
@@ -359,7 +357,7 @@ module Twitter
       # @option options [Integer] :offset_left The number of pixels by which to offset the uploaded image from the left. Use with height, width, and offset_top to select the desired region of the image to use.
       # @option options [Integer] :offset_top The number of pixels by which to offset the uploaded image from the top. Use with height, width, and offset_left to select the desired region of the image to use.
       def update_profile_banner(banner, options = {})
-        post('/1.1/account/update_profile_banner.json', options.merge(:banner => banner)).body
+        perform_post('/1.1/account/update_profile_banner.json', options.merge(:banner => banner))
         true
       end
 
@@ -377,7 +375,7 @@ module Twitter
       def profile_banner(*args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop || user_id) unless arguments.options[:user_id] || arguments.options[:screen_name]
-        perform_with_object(:get, '/1.1/users/profile_banner.json', arguments.options, Twitter::ProfileBanner)
+        perform_get_with_object('/1.1/users/profile_banner.json', arguments.options, Twitter::ProfileBanner)
       end
 
       # Mutes the users specified by the authenticating user
@@ -422,7 +420,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean, String, Integer] :skip_status Do not include user's Tweets when set to true, 't' or 1.
       def muted(options = {})
-        perform_with_cursor(:get, '/1.1/mutes/users/list.json', options, :users, Twitter::User)
+        perform_get_with_cursor('/1.1/mutes/users/list.json', options, :users, Twitter::User)
       end
       deprecate_alias :muting, :muted
 
@@ -438,7 +436,7 @@ module Twitter
       def muted_ids(*args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
-        perform_with_cursor(:get, '/1.1/mutes/users/ids.json', arguments.options, :ids)
+        perform_get_with_cursor('/1.1/mutes/users/ids.json', arguments.options, :ids)
       end
     end
   end

data/lib/twitter/rest/utils.rb

@@ -1,6 +1,7 @@
 require 'addressable/uri'
 require 'twitter/arguments'
-require 'twitter/request'
+require 'twitter/cursor'
+require 'twitter/rest/request'
 require 'twitter/user'
 require 'twitter/utils'
 
@@ -30,32 +31,81 @@ module Twitter
         end
       end
 
+      # @param path [String]
+      # @param options [Hash]
+      def perform_get(path, options = {})
+        perform_request(:get, path, options)
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_post(path, options = {})
+        perform_request(:post, path, options)
+      end
+
       # @param request_method [Symbol]
+      # @param path [String]
+      # @param options [Hash]
+      def perform_request(request_method, path, options = {})
+        Twitter::REST::Request.new(self, request_method, path, options).perform
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_get_with_object(path, options, klass)
+        perform_request_with_object(:get, path, options, klass)
+      end
+
       # @param path [String]
       # @param options [Hash]
       # @param klass [Class]
-      def perform_with_object(request_method, path, options, klass)
-        request = Twitter::Request.new(self, request_method, path, options)
-        request.perform_with_object(klass)
+      def perform_post_with_object(path, options, klass)
+        perform_request_with_object(:post, path, options, klass)
       end
 
       # @param request_method [Symbol]
       # @param path [String]
       # @param options [Hash]
       # @param klass [Class]
-      def perform_with_objects(request_method, path, options, klass)
-        request = Twitter::Request.new(self, request_method, path, options)
-        request.perform_with_objects(klass)
+      def perform_request_with_object(request_method, path, options, klass)
+        response = perform_request(request_method, path, options)
+        klass.new(response)
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_get_with_objects(path, options, klass)
+        perform_request_with_objects(:get, path, options, klass)
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_post_with_objects(path, options, klass)
+        perform_request_with_objects(:post, path, options, klass)
       end
 
       # @param request_method [Symbol]
       # @param path [String]
       # @param options [Hash]
       # @param klass [Class]
-      def perform_with_cursor(request_method, path, options, collection_name, klass = nil) # rubocop:disable ParameterLists
+      def perform_request_with_objects(request_method, path, options, klass)
+        perform_request(request_method, path, options).collect do |element|
+          klass.new(element)
+        end
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @collection_name [Symbol]
+      # @param klass [Class]
+      def perform_get_with_cursor(path, options, collection_name, klass = nil)
         merge_default_cursor!(options)
-        request = Twitter::Request.new(self, request_method, path, options)
-        request.perform_with_cursor(collection_name.to_sym, klass)
+        request = Twitter::REST::Request.new(self, :get, path, options)
+        Twitter::Cursor.new(collection_name.to_sym, klass, request)
       end
 
       # @param request_method [Symbol]
@@ -65,7 +115,7 @@ module Twitter
       def parallel_users_from_response(request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         pmap(arguments) do |user|
-          perform_with_object(request_method, path, merge_user(arguments.options, user), Twitter::User)
+          perform_request_with_object(request_method, path, merge_user(arguments.options, user), Twitter::User)
         end
       end
 
@@ -76,7 +126,7 @@ module Twitter
       def users_from_response(request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop || user_id) unless arguments.options[:user_id] || arguments.options[:screen_name]
-        perform_with_objects(request_method, path, arguments.options, Twitter::User)
+        perform_request_with_objects(request_method, path, arguments.options, Twitter::User)
       end
 
       # @param klass [Class]
@@ -87,7 +137,7 @@ module Twitter
       def objects_from_response_with_user(klass, request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
-        perform_with_objects(request_method, path, arguments.options, klass)
+        perform_request_with_objects(request_method, path, arguments.options, klass)
       end
 
       # @param klass [Class]
@@ -98,20 +148,19 @@ module Twitter
       def parallel_objects_from_response(klass, request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         pmap(arguments) do |object|
-          perform_with_object(request_method, path, arguments.options.merge(:id => extract_id(object)), klass)
+          perform_request_with_object(request_method, path, arguments.options.merge(:id => extract_id(object)), klass)
         end
       end
 
       # @param collection_name [Symbol]
       # @param klass [Class]
-      # @param request_method [Symbol]
       # @param path [String]
       # @param args [Array]
       # @return [Twitter::Cursor]
-      def cursor_from_response_with_user(collection_name, klass, request_method, path, args) # rubocop:disable ParameterLists
+      def cursor_from_response_with_user(collection_name, klass, path, args) # rubocop:disable ParameterLists
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop || user_id) unless arguments.options[:user_id] || arguments.options[:screen_name]
-        perform_with_cursor(request_method, path, arguments.options, collection_name, klass)
+        perform_get_with_cursor(path, arguments.options, collection_name, klass)
       end
 
       def user_id

data/lib/twitter/search_results.rb

@@ -1,5 +1,6 @@
 require 'cgi'
 require 'twitter/enumerable'
+require 'twitter/rest/request'
 require 'twitter/utils'
 require 'uri'
 
@@ -15,16 +16,15 @@ module Twitter
 
     # Initializes a new SearchResults object
     #
-    # @param attrs [Hash]
-    # @param request [Twitter::Request]
+    # @param request [Twitter::REST::Request]
     # @return [Twitter::SearchResults]
-    def initialize(attrs, request)
+    def initialize(request)
       @client = request.client
       @request_method = request.verb
       @path = request.path
       @options = request.options
       @collection = []
-      self.attrs = attrs
+      self.attrs = request.perform
     end
 
   private
@@ -49,7 +49,7 @@ module Twitter
 
     # @return [Hash]
     def fetch_next_page
-      response = @client.send(@request_method, @path, next_page).body
+      response = Twitter::REST::Request.new(@client, @request_method, @path, next_page).perform
       self.attrs = response
     end
 

data/lib/twitter/streaming/client.rb

@@ -1,6 +1,7 @@
 require 'http/request'
 require 'twitter/arguments'
 require 'twitter/client'
+require 'twitter/headers'
 require 'twitter/streaming/connection'
 require 'twitter/streaming/response'
 require 'twitter/streaming/message_parser'
@@ -106,8 +107,9 @@ module Twitter
 
       def request(method, uri, params)
         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)
+        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)
         response = Streaming::Response.new do |data|
           if item = Streaming::MessageParser.parse(data) # rubocop:disable AssignmentInCondition, IfUnlessModifier
             yield(item)

data/lib/twitter/user.rb

@@ -21,7 +21,6 @@ module Twitter
                 :profile_sidebar_border_color, :profile_sidebar_fill_color,
                 :profile_text_color, :time_zone
     alias_method :favorites_count, :favourites_count
-    remove_method :favourites_count
     alias_method :tweets_count, :statuses_count
     object_attr_reader :Tweet, :status, :user
     alias_method :tweet, :status

data/lib/twitter/value.rb

@@ -0,0 +1,40 @@
+module Twitter
+  class Value
+    def self.new(*fields, &block)
+      Class.new do
+        attr_reader(:hash, *fields)
+
+        const_set :VALUE_ATTRS, fields
+
+        define_method(:initialize) do |hash|
+          unexpected_keys = hash.keys - self::VALUE_ATTRS
+          if unexpected_keys.any?
+            fail ArgumentError.new("Unexpected hash keys: #{unexpected_keys}")
+          end
+
+          hash.values_at(*self::VALUE_ATTRS).zip(hash.values) do |field, value|
+            instance_variable_set(:"@#{field}", value)
+          end
+
+          @hash = self.class.hash ^ hash.values.hash
+
+          freeze
+        end
+
+        def ==(other)
+          eql?(other)
+        end
+
+        def eql?(other)
+          self.class == other.class && values == other.values
+        end
+
+        def values
+          self.class::VALUE_ATTRS.map { |field| send(field) }
+        end
+
+        class_eval(&block) if block
+      end
+    end
+  end
+end

data/lib/twitter/variant.rb

@@ -0,0 +1,12 @@
+require 'twitter/base'
+
+module Twitter
+  class Variant < Twitter::Base
+    # @return [Integer]
+    attr_reader :bitrate
+
+    # @return [String]
+    attr_reader :content_type
+    uri_attr_reader :uri
+  end
+end

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 5
-    MINOR = 12
+    MINOR = 14
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.14.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -203,10 +203,14 @@ files:
 - lib/twitter/geo/polygon.rb
 - lib/twitter/geo_factory.rb
 - lib/twitter/geo_results.rb
+- lib/twitter/headers.rb
 - lib/twitter/identity.rb
 - lib/twitter/language.rb
 - lib/twitter/list.rb
+- lib/twitter/media/animated_gif.rb
 - lib/twitter/media/photo.rb
+- lib/twitter/media/video.rb
+- lib/twitter/media/video_info.rb
 - lib/twitter/media_factory.rb
 - lib/twitter/metadata.rb
 - lib/twitter/null_object.rb
@@ -216,7 +220,6 @@ files:
 - lib/twitter/profile_banner.rb
 - lib/twitter/rate_limit.rb
 - lib/twitter/relationship.rb
-- lib/twitter/request.rb
 - lib/twitter/rest/api.rb
 - lib/twitter/rest/client.rb
 - lib/twitter/rest/direct_messages.rb
@@ -227,6 +230,7 @@ files:
 - 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
@@ -262,6 +266,8 @@ files:
 - lib/twitter/tweet.rb
 - lib/twitter/user.rb
 - lib/twitter/utils.rb
+- lib/twitter/value.rb
+- lib/twitter/variant.rb
 - lib/twitter/version.rb
 - twitter.gemspec
 homepage: http://sferik.github.com/twitter/
@@ -284,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Twitter API.

data/lib/twitter/request.rb

@@ -1,47 +0,0 @@
-require 'twitter/cursor'
-
-module Twitter
-  class Request
-    attr_accessor :client, :request_method, :path, :options
-    alias_method :verb, :request_method
-
-    # @param client [Twitter::Client]
-    # @param request_method [String, Symbol]
-    # @param path [String]
-    # @param options [Hash]
-    # @return [Twitter::Request]
-    def initialize(client, request_method, path, options = {})
-      @client = client
-      @request_method = request_method.to_sym
-      @path = path
-      @options = options
-    end
-
-    # @return [Hash]
-    def perform
-      @client.send(@request_method, @path, @options).body
-    end
-
-    # @param klass [Class]
-    # @param request [Twitter::Request]
-    # @return [Object]
-    def perform_with_object(klass)
-      klass.new(perform)
-    end
-
-    # @param collection_name [Symbol]
-    # @param klass [Class]
-    # @return [Twitter::Cursor]
-    def perform_with_cursor(collection_name, klass = nil)
-      Twitter::Cursor.new(perform, collection_name.to_sym, klass, self)
-    end
-
-    # @param klass [Class]
-    # @return [Array]
-    def perform_with_objects(klass)
-      perform.collect do |element|
-        klass.new(element)
-      end
-    end
-  end
-end