improve API usage

Author: rande

gitlab.go

@@ -57,7 +57,14 @@ func (g *Gitlab) ResourceUrl(url string, params map[string]string) string {
 		}
 	}
 
-	url = g.BaseUrl + g.ApiPath + url + "?private_token=" + g.Token
+	url = g.BaseUrl + g.ApiPath + url
+
+	if strings.Contains(url, "?") {
+		url = url + "&private_token=" + g.Token
+	} else {
+		url = url + "?private_token=" + g.Token
+	}
+
 	return url
 }
 

public_keys.go

@@ -7,9 +7,10 @@ import (
 
 const (
 	// ID
-	user_keys        = "/user/keys"     // Get current user keys
-	user_key         = "/user/keys/:id" // Get user key by id
-	custom_user_keys = "/user/:id/keys" // Create key for user with :id
+	user_keys        = "/user/keys"       // Get current user keys
+	user_key         = "/user/keys/:id"   // Get user key by id
+	list_keys        = "/users/:uid/keys" // Get keys for the user id
+	custom_user_keys = "/user/:id/keys"   // Create key for user with :id
 )
 
 type PublicKey struct {
@@ -29,6 +30,17 @@ func (g *Gitlab) UserKeys() ([]*PublicKey, error) {
 	return keys, err
 }
 
+func (g *Gitlab) ListKeys(id string) ([]*PublicKey, error) {
+	url := g.ResourceUrl(list_keys, map[string]string{":uid": id})
+	var keys []*PublicKey
+	contents, err := g.buildAndExecRequest("GET", url, nil)
+	if err == nil {
+		err = json.Unmarshal(contents, &keys)
+	}
+	return keys, err
+}
+
+
 func (g *Gitlab) UserKey(id string) (*PublicKey, error) {
 	url := g.ResourceUrl(user_key, map[string]string{":id": id})
 	var key *PublicKey

public_keys_test.go

@@ -14,6 +14,15 @@ func TestGetUserKeys(t *testing.T) {
 	defer ts.Close()
 }
 
+func TestListKeys(t *testing.T) {
+	ts, gitlab := Stub("stubs/public_keys/index.json")
+	keys, err := gitlab.ListKeys("1")
+
+	assert.Equal(t, err, nil)
+	assert.Equal(t, len(keys), 2)
+	defer ts.Close()
+}
+
 func TestGetUserKey(t *testing.T) {
 	ts, gitlab := Stub("stubs/public_keys/show.json")
 	key, err := gitlab.UserKey("1")

users.go

@@ -2,12 +2,13 @@ package gogitlab
 
 import (
 	"encoding/json"
+	"strconv"
 )
 
 const (
-	users_url        = "/users"     // Get users list
-	user_url         = "/users/:id" // Get a single user.
-	current_user_url = "/user"      // Get current user
+	users_url        = "/users?page=:page&per_page=:per_page"     // Get users list
+	user_url         = "/users/:id"                               // Get a single user.
+	current_user_url = "/user"                                    // Get current user
 )
 
 type User struct {
@@ -27,9 +28,9 @@ type User struct {
 	ColorSchemeId int    `json:"color_scheme_id,color_scheme_id"`
 }
 
-func (g *Gitlab) Users() ([]*User, error) {
+func (g *Gitlab) Users(page, per_page int) ([]*User, error) {
 
-	url := g.ResourceUrl(user_url, nil)
+	url := g.ResourceUrl(users_url, map[string]string{":page": strconv.Itoa(page), ":per_page": strconv.Itoa(per_page)})
 
 	var users []*User
 

users_test.go

@@ -7,7 +7,7 @@ import (
 
 func TestUsers(t *testing.T) {
 	ts, gitlab := Stub("stubs/users/index.json")
-	users, err := gitlab.Users()
+	users, err := gitlab.Users(0, 0)
 
 	assert.Equal(t, err, nil)
 	assert.Equal(t, len(users), 2)