julianfssen
diff --git a/‎lib/tweetkit/client.rb‎
Lines changed: 3 additions & 2 deletions b/‎lib/tweetkit/client.rb‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎lib/tweetkit/connection.rb‎
Lines changed: 6 additions & 8 deletions b/‎lib/tweetkit/connection.rb‎
Lines changed: 6 additions & 8 deletions
diff --git a/‎lib/tweetkit/response.rb‎
Lines changed: 7 additions & 2 deletions b/‎lib/tweetkit/response.rb‎
Lines changed: 7 additions & 2 deletions
@@ -1,10 +1,11 @@
 require 'tweetkit/configurable'
-require 'tweetkit/connection'
+require 'tweetkit/default'
+require 'tweetkit/response'
 require 'tweetkit/client/tweets'
 
 module Tweetkit
   class Client
-    include Tweetkit::Connection
+    include Tweetkit::Response
     include Tweetkit::Client::Tweets
 
     attr_accessor :access_token, :access_token_secret, :bearer_token, :consumer_key, :consumer_secret, :email, :password
 
@@ -1,15 +1,12 @@
 require 'faraday'
 require 'faraday_middleware'
 require 'tweetkit/auth'
-require 'tweetkit/default'
-require 'tweetkit/response'
 
 module Tweetkit
   module Connection
     include Tweetkit::Auth
-    include Tweetkit::Response
 
-    attr_accessor :saved_params, :saved_url
+    attr_accessor :previous_query, :previous_url
 
     BASE_URL = 'https://api.twitter.com/2/'
 
@@ -19,8 +16,9 @@ def get(endpoint, **options)
 
     def request(method, endpoint, data, **options)
       auth_type = options.delete(:auth_type)
-      @saved_url = URI.parse("#{BASE_URL}#{endpoint}")
-      @saved_params = data
+      url = URI.parse("#{BASE_URL}#{endpoint}")
+      @previous_url = url
+      @previous_query = data
 
       if method == :get
         conn = Faraday.new(params: data) do |c|
@@ -30,14 +28,14 @@ def request(method, endpoint, data, **options)
             c.authorization :Bearer, @bearer_token
           end
         end
-        response = conn.get(saved_url)
+        response = conn.get(url)
       else
         conn = Faraday.new do |f|
         end
         response = conn.post(url)
       end
       conn.close
-      Tweetkit::Response::Tweets.new(response)
+      Tweetkit::Response::Tweets.new response, twitter_request: { previous_url: @previous_url, previous_query: @previous_query }
     rescue StandardError => e
       raise e
     end
 
@@ -1,19 +1,23 @@
 require 'json'
 require 'pry'
+require 'tweetkit/connection'
 
 module Tweetkit
   module Response
+    include Tweetkit::Connection
+
     class Tweets
       include Enumerable
 
-      attr_accessor :meta, :original_response, :resources, :tweets
+      attr_accessor :meta, :original_response, :resources, :tweets, :twitter_request
 
-      def initialize(response)
+      def initialize(response, **options)
         @original_response = response.body
         response = JSON.parse(@original_response)
         @tweets = response['data'] ? response['data'].collect { |tweet| Tweetkit::Response::Tweets::Tweet.new(tweet) } : []
         @meta = Tweetkit::Response::Tweets::Meta.new(response['meta'])
         @resources = response['includes']
+        @twitter_request = options[:twitter_request]
       end
 
       def each(*args, &block)
@@ -25,6 +29,7 @@ def last
       end
 
       def next
+        binding.pry
       end
 
       def prev