Move Twitter::Request into Twitter::REST namespace

etc/erd.dot

@@ -58,13 +58,13 @@ digraph classes {
 	Twitter__Place [label="Twitter::Place"]
 	Twitter__ProfileBanner [label="Twitter::ProfileBanner"]
 	Twitter__REST__Client [label="Twitter::REST::Client"]
+	Twitter__REST__Request [label="Twitter::REST::Request"]
 	Twitter__REST__Request__MultipartWithFile [label="Twitter::REST::Request::MultipartWithFile"]
 	Twitter__REST__Response__ParseErrorJson [label="Twitter::REST::Response::ParseErrorJson"]
 	Twitter__REST__Response__ParseJson [label="Twitter::REST::Response::ParseJson"]
 	Twitter__REST__Response__RaiseError [label="Twitter::REST::Response::RaiseError"]
 	Twitter__RateLimit [label="Twitter::RateLimit"]
 	Twitter__Relationship [label="Twitter::Relationship"]
-	Twitter__Request [label="Twitter::Request"]
 	Twitter__SavedSearch [label="Twitter::SavedSearch"]
 	Twitter__SearchResults [label="Twitter::SearchResults"]
 	Twitter__Settings [label="Twitter::Settings"]
@@ -142,13 +142,13 @@ digraph classes {
 	Twitter__Place -> Twitter__Identity
 	Twitter__ProfileBanner -> Twitter__Base
 	Twitter__REST__Client -> Twitter__Client
+	Twitter__REST__Request -> Object
 	Twitter__REST__Request__MultipartWithFile -> Faraday__Middleware
 	Twitter__REST__Response__ParseErrorJson -> Twitter__REST__Response__ParseJson
 	Twitter__REST__Response__ParseJson -> Faraday__Response__Middleware
 	Twitter__REST__Response__RaiseError -> Faraday__Response__Middleware
 	Twitter__RateLimit -> Twitter__Base
 	Twitter__Relationship -> Twitter__Base
-	Twitter__Request -> Object
 	Twitter__SavedSearch -> Twitter__Identity
 	Twitter__SearchResults -> Object
 	Twitter__Settings -> Twitter__Base

lib/twitter/cursor.rb

@@ -1,5 +1,5 @@
 require 'twitter/enumerable'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/utils'
 
 module Twitter
@@ -17,7 +17,7 @@ class Cursor
     # @param attrs [Hash]
     # @param key [String, Symbol] The key to fetch the data from the response
     # @param klass [Class] The class to instantiate objects in the response
-    # @param request [Twitter::Request]
+    # @param request [Twitter::REST::Request]
     # @return [Twitter::Cursor]
     def initialize(attrs, key, klass, request)
       @key = key.to_sym
@@ -45,7 +45,7 @@ def last?
 
     # @return [Hash]
     def fetch_next_page
-      response = Twitter::Request.new(@client, @request_method, @path, @options.merge(:cursor => next_cursor)).perform
+      response = Twitter::REST::Request.new(@client, @request_method, @path, @options.merge(:cursor => next_cursor)).perform
       self.attrs = response
     end
 

lib/twitter/rest/direct_messages.rb

@@ -1,6 +1,5 @@
 require 'twitter/arguments'
 require 'twitter/direct_message'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/user'
 require 'twitter/utils'

lib/twitter/rest/favorites.rb

@@ -1,6 +1,5 @@
 require 'twitter/arguments'
 require 'twitter/error'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/user'

lib/twitter/rest/friends_and_followers.rb

@@ -1,7 +1,6 @@
 require 'twitter/arguments'
 require 'twitter/cursor'
 require 'twitter/relationship'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/user'
 require 'twitter/utils'

lib/twitter/rest/help.rb

@@ -1,6 +1,5 @@
 require 'twitter/configuration'
 require 'twitter/language'
-require 'twitter/request'
 require 'twitter/rest/utils'
 
 module Twitter

lib/twitter/rest/lists.rb

@@ -2,7 +2,6 @@
 require 'twitter/cursor'
 require 'twitter/error'
 require 'twitter/list'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/user'

lib/twitter/rest/oauth.rb

@@ -1,4 +1,3 @@
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/rest/response/parse_error_json'
 require 'twitter/token'

lib/twitter/rest/places_and_geo.rb

@@ -1,6 +1,5 @@
 require 'twitter/geo_results'
 require 'twitter/place'
-require 'twitter/request'
 require 'twitter/rest/utils'
 
 module Twitter

lib/twitter/rest/request.rb

@@ -0,0 +1,51 @@
+require 'twitter/cursor'
+require 'twitter/rate_limit'
+
+module Twitter
+  module REST
+    class Request
+      attr_accessor :client, :rate_limit, :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::REST::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
+        response = @client.send(@request_method, @path, @options)
+        @rate_limit = Twitter::RateLimit.new(response.response_headers)
+        response.body
+      end
+
+      # @param klass [Class]
+      # @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
+end

lib/twitter/rest/request/multipart_with_file.rb

@@ -2,7 +2,7 @@
 
 module Twitter
   module REST
-    module Request
+    class Request
       class MultipartWithFile < Faraday::Middleware
         CONTENT_TYPE = 'Content-Type'
         GIF_REGEX = /\.gif$/i

lib/twitter/rest/saved_searches.rb

@@ -1,5 +1,4 @@
 require 'twitter/arguments'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/saved_search'
 require 'twitter/utils'

lib/twitter/rest/search.rb

@@ -1,4 +1,4 @@
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/search_results'
 
 module Twitter
@@ -27,7 +27,7 @@ module Search
       # @return [Twitter::SearchResults] Return tweets that match a specified query with search metadata
       def search(q, options = {})
         options[:count] ||= MAX_TWEETS_PER_REQUEST
-        request = Twitter::Request.new(self, :get, '/1.1/search/tweets.json', options.merge(:q => q))
+        request = Twitter::REST::Request.new(self, :get, '/1.1/search/tweets.json', options.merge(:q => q))
         response = get(request.path, request.options).body
         Twitter::SearchResults.new(response, request)
       end

lib/twitter/rest/spam_reporting.rb

@@ -1,4 +1,3 @@
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/user'
 

lib/twitter/rest/suggested_users.rb

@@ -1,5 +1,4 @@
 require 'twitter/arguments'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/suggestion'
 require 'twitter/user'

lib/twitter/rest/timelines.rb

@@ -1,4 +1,3 @@
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/user'

lib/twitter/rest/trends.rb

@@ -1,5 +1,4 @@
 require 'twitter/place'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/trend_results'
 

lib/twitter/rest/tweets.rb

@@ -1,7 +1,6 @@
 require 'twitter/arguments'
 require 'twitter/error'
 require 'twitter/oembed'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/utils'

lib/twitter/rest/users.rb

@@ -1,7 +1,6 @@
 require 'twitter/arguments'
 require 'twitter/error'
 require 'twitter/profile_banner'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/settings'
 require 'twitter/user'

lib/twitter/rest/utils.rb

@@ -1,6 +1,6 @@
 require 'addressable/uri'
 require 'twitter/arguments'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/user'
 require 'twitter/utils'
 
@@ -49,7 +49,7 @@ def post_with_object(path, options, klass)
       # @param options [Hash]
       # @param klass [Class]
       def request_with_object(request_method, path, options, klass)
-        request = Twitter::Request.new(self, request_method, path, options)
+        request = Twitter::REST::Request.new(self, request_method, path, options)
         request.perform_with_object(klass)
       end
 
@@ -72,7 +72,7 @@ def post_with_objects(path, options, klass)
       # @param options [Hash]
       # @param klass [Class]
       def request_with_objects(request_method, path, options, klass)
-        request = Twitter::Request.new(self, request_method, path, options)
+        request = Twitter::REST::Request.new(self, request_method, path, options)
         request.perform_with_objects(klass)
       end
 
@@ -82,7 +82,7 @@ def request_with_objects(request_method, path, options, klass)
       # @param klass [Class]
       def get_with_cursor(path, options, collection_name, klass = nil)
         merge_default_cursor!(options)
-        request = Twitter::Request.new(self, :get, path, options)
+        request = Twitter::REST::Request.new(self, :get, path, options)
         request.perform_with_cursor(collection_name.to_sym, klass)
       end
 
@@ -93,7 +93,7 @@ def get_with_cursor(path, options, collection_name, klass = nil)
       # @param klass [Class]
       def request_with_cursor(request_method, path, options, collection_name, klass = nil) # rubocop:disable ParameterLists
         merge_default_cursor!(options)
-        request = Twitter::Request.new(self, request_method, path, options)
+        request = Twitter::REST::Request.new(self, request_method, path, options)
         request.perform_with_cursor(collection_name.to_sym, klass)
       end
 

lib/twitter/search_results.rb

@@ -1,6 +1,6 @@
 require 'cgi'
 require 'twitter/enumerable'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/utils'
 require 'uri'
 
@@ -17,7 +17,7 @@ class SearchResults
     # Initializes a new SearchResults object
     #
     # @param attrs [Hash]
-    # @param request [Twitter::Request]
+    # @param request [Twitter::REST::Request]
     # @return [Twitter::SearchResults]
     def initialize(attrs, request)
       @client = request.client
@@ -50,7 +50,7 @@ def next_page
 
     # @return [Hash]
     def fetch_next_page
-      response = Twitter::Request.new(@client, @request_method, @path, next_page).perform
+      response = Twitter::REST::Request.new(@client, @request_method, @path, next_page).perform
       self.attrs = response
     end