MWS.orders.next don`t clear last request next_token

lib/ruby-mws/api/base.rb

@@ -34,7 +34,7 @@ def #{name}(params={})
       def send_request(name, params, options)
         # prepare all required params...
         params = [params, options, @connection.to_hash].inject :merge
-        
+
         # default/common params
         params[:action]            ||= name.to_s.camelize
         params[:signature_method]  ||= 'HmacSHA256'
@@ -47,10 +47,19 @@ def send_request(name, params, options)
 
         query = Query.new params
         @response = Response.parse self.class.send(params[:verb], query.request_uri), name, params
-        if @response.respond_to?(:next_token) and @next[:token] = @response.next_token  # modifying, not comparing
+        after_response
+        @response
+      end
+
+      def after_response
+        @next.clear # clear last request states
+        if @response.respond_to?(:next_token) and @next[:token] = @response.next_token # modifying, not comparing
           @next[:action] = name.match(/_by_next_token/) ? name : "#{name}_by_next_token"
         end
-        @response
+      end
+
+      def next_token
+        @next[:token]
       end
 
       def has_next?

spec/ruby-mws/api/base_spec.rb

@@ -38,5 +38,20 @@ def self.test_params
       lambda{ @api.list_fake_objects }.should raise_error TestWorksError
     end
   end
-
+
+  context "next token should be nil" do
+
+    it "first request then no next_token" do
+      @api.after_response
+      @api.next_token.should be_nil
+    end
+
+    it "sencond request then no next_token" do
+      @api.instance_variable_set(:@next, {token: 'last request token'})
+      @api.after_response
+      @api.next_token.should be_nil
+    end
+
+  end
+
 end