set private_token param separately for each request

lib/gitlab/client/users.rb

@@ -69,6 +69,7 @@ def edit_user(user_id, options={})
     # @param  [String] email The email of a user.
     # @param  [String] password The password of a user.
     # @return [Gitlab::ObjectifiedHash]
+    # @note This method doesn't require private_token to be set.
     def session(email, password)
       post("/session", :body => {:email => email, :password => password})
     end

lib/gitlab/request.rb

@@ -9,6 +9,8 @@ class Request
     headers 'Accept' => 'application/json'
     parser Proc.new { |body, _| parse(body) }
 
+    attr_accessor :private_token
+
     # Converts the response body to an ObjectifiedHash.
     def self.parse(body)
       body = decode(body)
@@ -32,19 +34,23 @@ def self.decode(response)
     end
 
     def get(path, options={})
+      set_private_token_param(options)
       validate self.class.get(path, options)
     end
 
     def post(path, options={})
+      set_private_token_param(options, path)
       validate self.class.post(path, options)
     end
 
     def put(path, options={})
+      set_private_token_param(options)
       validate self.class.put(path, options)
     end
 
-    def delete(path)
-      validate self.class.delete(path)
+    def delete(path, options={})
+      set_private_token_param(options)
+      validate self.class.delete(path, options)
     end
 
     # Checks the response code for common errors.
@@ -65,15 +71,25 @@ def validate(response)
       response.parsed_response
     end
 
+    # Sets a private_token parameter for requests.
+    # @raise [Error::MissingCredentials] if private_token not set.
+    def set_private_token_param(options, path=nil)
+      # session doesn't require private_token param
+      return if path == '/session'
+
+      raise Error::MissingCredentials.new("Please set a private_token for user") unless @private_token
+      private_token_param = {:private_token => @private_token}
+      options[:query] = options[:query] ? options[:query].merge(private_token_param) : private_token_param
+    end
+
     # Sets a base_uri and default_params for requests.
-    # @raise [Error::MissingCredentials] if endpoint or private_token not set.
+    # @raise [Error::MissingCredentials] if endpoint not set.
     def set_request_defaults(endpoint, private_token, sudo=nil)
       raise Error::MissingCredentials.new("Please set an endpoint to API") unless endpoint
-      raise Error::MissingCredentials.new("Please set a private_token for user") unless private_token
+      @private_token = private_token
 
       self.class.base_uri endpoint
-      self.class.default_params :private_token => private_token, :sudo => sudo
-      self.class.default_params.delete(:sudo) if sudo.nil?
+      self.class.default_params :sudo => sudo unless sudo.nil?
     end
 
     private

spec/gitlab/client/users_spec.rb

@@ -89,18 +89,42 @@
   end
 
   describe ".session" do
+    after do
+      Gitlab.endpoint = 'https://api.example.com'
+      Gitlab.private_token = 'secret'
+    end
+
     before do
-      stub_post("/session", "session")
+      stub_request(:post, "#{Gitlab.endpoint}/session").
+        to_return(:body => load_fixture('session'), :status => 200)
       @session = Gitlab.session("email", "pass")
     end
 
-    it "should get the correct resource" do
-      a_post("/session").should have_been_made
+    context "when endpoint is not set" do
+      it "should raise Error::MissingCredentials" do
+        Gitlab.endpoint = nil
+        expect {
+          Gitlab.session("email", "pass")
+        }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
+      end
+    end
+
+    context "when private_token is not set" do
+      it "should not raise Error::MissingCredentials" do
+        Gitlab.private_token = nil
+        expect { Gitlab.session("email", "pass") }.to_not raise_error
+      end
     end
 
-    it "should return information about a created session" do
-      @session.email.should == "[email protected]"
-      @session.private_token.should == "qEsq1pt6HJPaNciie3MG"
+    context "when endpoint is set" do
+      it "should get the correct resource" do
+        a_request(:post, "#{Gitlab.endpoint}/session")
+      end
+
+      it "should return information about a created session" do
+        @session.email.should == "[email protected]"
+        @session.private_token.should == "qEsq1pt6HJPaNciie3MG"
+      end
     end
   end