Made 409's throw exceptions

-Added more detail to error messages

GITLAB-721 (GITLAB-116)

lib/gitlab/error.rb

@@ -21,6 +21,9 @@ class Forbidden < Error; end
     # Raised when API endpoint returns the HTTP status code 404.
     class NotFound < Error; end
 
+    # Raised when API endpoint returns the HTTP status code 409.
+    class Conflict < Error; end
+
     # Raised when API endpoint returns the HTTP status code 500.
     class InternalServerError < Error; end
 

lib/gitlab/request.rb

@@ -4,9 +4,9 @@ module Gitlab
   # @private
   class Request
     include HTTParty
-    format  :json
+    format :json
     headers 'Accept' => 'application/json'
-    parser  Proc.new {|body, _| parse(body)}
+    parser Proc.new { |body, _| parse(body) }
 
     # Converts the response body to an ObjectifiedHash.
     def self.parse(body)
@@ -15,7 +15,7 @@ def self.parse(body)
       if body.is_a? Hash
         ObjectifiedHash.new body
       elsif body.is_a? Array
-        body.collect! {|e| ObjectifiedHash.new(e)}
+        body.collect! { |e| ObjectifiedHash.new(e) }
       else
         raise Error::Parsing.new "Couldn't parse a response body"
       end
@@ -53,20 +53,32 @@ def delete(path)
     # Checks the response code for common errors.
     # Returns parsed response for successful requests.
     def validate(response)
-      message = "Server responsed with code #{response.code}"
       case response.code
-      when 400; raise Error::BadRequest.new message
-      when 401; raise Error::Unauthorized.new message
-      when 403; raise Error::Forbidden.new message
-      when 404; raise Error::NotFound.new message
-      when 500; raise Error::InternalServerError.new message
-      when 502; raise Error::BadGateway.new message
-      when 503; raise Error::ServiceUnavailable.new message
+        when 400;
+          raise Error::BadRequest.new(error_message(response))
+        when 401;
+          raise Error::Unauthorized.new(error_message(response))
+        when 403;
+          raise Error::Forbidden.new(error_message(response))
+        when 404;
+          raise Error::NotFound.new(error_message(response))
+        when 409;
+          raise Error::Conflict.new(error_message(response))
+        when 500;
+          raise Error::InternalServerError.new(error_message(response))
+        when 502;
+          raise Error::BadGateway.new(error_message(response))
+        when 503;
+          raise Error::ServiceUnavailable.new(error_message(response))
       end
 
       response.parsed_response
     end
 
+    def error_message(response)
+      "Server responded with code #{response.code}, message: #{response.parsed_response.message}"
+    end
+
     # Sets a base_uri and private_token parameter for requests.
     # @raise [Error::MissingCredentials] if endpoint or private_token not set.
     def set_request_defaults(endpoint, private_token)

spec/fixtures/error_already_exists.json

@@ -0,0 +1 @@
+{"message": "409 Already exists"}

spec/gitlab/client/user_teams_spec.rb

@@ -83,18 +83,29 @@
   end
 
   describe ".add_user_team_member" do
-    before do
-      stub_post("/user_teams/3/members", "user_team_member")
-      @team_member = Gitlab.add_user_team_member(3, 1, 40)
-    end
+    context 'successful add' do
+      before do
+        stub_post("/user_teams/3/members", "user_team_member")
+        @team_member = Gitlab.add_user_team_member(3, 1, 40)
+      end
 
-    it "should get the correct resource" do
-      a_post("/user_teams/3/members").
-          with(:body => {:user_id => '1', :access_level => '40'}).should have_been_made
+      it "should get the correct resource" do
+        a_post("/user_teams/3/members").
+            with(:body => {:user_id => '1', :access_level => '40'}).should have_been_made
+      end
+
+      it "should return information about an added team member" do
+        @team_member.name.should == "John Smith"
+      end
     end
 
-    it "should return information about an added team member" do
-      @team_member.name.should == "John Smith"
+    context 'unsuccessful add' do
+      it "should throw an exception if the team already exists" do
+        stub_request(:post, "#{Gitlab.endpoint}/user_teams/3/members").
+            with(:query => {:private_token => Gitlab.private_token}).
+            to_return({:body => load_fixture("error_already_exists"), :status => 409})
+        expect {Gitlab.add_user_team_member(3, 1, 40)}.to raise_error(Gitlab::Error::Conflict) {|e|e.message.should == "Server responded with code 409, message: 409 Already exists"}
+      end
     end
   end