twitter 5.12.0 → 5.13.0

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/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 5
-    MINOR = 12
+    MINOR = 13
     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.13.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: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -203,6 +203,7 @@ 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
@@ -216,7 +217,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 +227,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

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