Ies update structs

client/client.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"io"
 	"net/http"
+	"fmt"
 )
 
 const ghBaseApiUrl = "https://api.github.com/"
@@ -84,6 +85,8 @@ func (ghc *GithubClient) RunRequest(req *http.Request, httpc *http.Client) (res
 		return
 	}
 
+	fmt.Printf("REQ %+v\n\n",req)
+	fmt.Printf("RESP %+v\n\n",resp)
 	res = newGithubResult(ghc, resp)
 
 	return

client/result.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	_ "fmt"
 )
 
 /* 
@@ -48,7 +49,7 @@ func (r *GithubResult) IsSuccess() bool {
 	return r.RawHttpResponse.StatusCode == 200
 }
 
-func (r *GithubResult) parseBody() (err error) {
+func (r *GithubResult) parseBody(in interface{}) (err error) {
 	if r.RawHttpResponse.ContentLength == 0 {
 		// EMPTY OBJECT
 		err = json.Unmarshal(([]byte)("[]"), &(r.jsonBody))
@@ -59,8 +60,15 @@ func (r *GithubResult) parseBody() (err error) {
 		if err != nil {
 			return err
 		}
-
-		r.jsonParseError = json.Unmarshal(data, &(r.jsonBody))
+
+		if in!=nil {
+			r.jsonParseError = json.Unmarshal(data, in)
+			if r.jsonParseError==nil {
+				r.jsonBody = in
+			}
+		} else {
+			r.jsonParseError = json.Unmarshal(data, &(r.jsonBody))
+		}
 		err = r.jsonParseError
 	}
 
@@ -76,10 +84,23 @@ func (r *GithubResult) parseHeader() {
 	return
 }
 
+//Parse body into a pointer to the appropriate struct
+func (r *GithubResult) JsonStruct(in interface{}) (j interface{}, err error) {
+	if r.jsonBody == nil && r.jsonParseError == nil {
+		err = r.parseBody(in)
+
+		if err != nil {
+			r.jsonParseError = err
+			return
+		}
+	}
+
+	return r.jsonBody, r.jsonParseError
+}
 // Lazily parse body as json and return unmarshalled results.
 func (r *GithubResult) Json() (j interface{}, err error) {
 	if r.jsonBody == nil && r.jsonParseError == nil {
-		err = r.parseBody()
+		err = r.parseBody(nil)
 
 		if err != nil {
 			r.jsonParseError = err

examples/gh_create_gist/main.go

@@ -7,8 +7,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	ghclient "github.com/alcacoop/go-github-client/client"
-	ghgists "github.com/alcacoop/go-github-client/gists"
+	ghclient "github.com/iansmith/go-github-client/client"
+	ghgists "github.com/iansmith/go-github-client/gists"
 )
 
 func main() {

examples/gh_get_gistslist/main.go

@@ -7,8 +7,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	ghclient "github.com/alcacoop/go-github-client/client"
-	ghgists "github.com/alcacoop/go-github-client/gists"
+	ghclient "github.com/iansmith/go-github-client/client"
+	ghgists "github.com/iansmith/go-github-client/gists"
 )
 
 func main() {

examples/gh_get_issueslist/main.go

@@ -8,8 +8,8 @@ import (
 	//	"encoding/json"
 	"flag"
 	"fmt"
-	ghclient "github.com/alcacoop/go-github-client/client"
-	ghissues "github.com/alcacoop/go-github-client/issues"
+	ghclient "github.com/iansmith/go-github-client/client"
+	ghissues "github.com/iansmith/go-github-client/issues"
 )
 
 func main() {

issues/issue.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	ghclient "github.com/alcacoop/go-github-client/client"
+	ghclient "github.com/iansmith/go-github-client/client"
 	"net/http"
 )
 

issues/issues.go

@@ -5,7 +5,7 @@
 package issues
 
 import (
-	ghclient "github.com/alcacoop/go-github-client/client"
+	ghclient "github.com/iansmith/go-github-client/client"
 )
 
 // Issues is a simplified github issues api client

issues/list.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	ghclient "github.com/alcacoop/go-github-client/client"
+	ghclient "github.com/iansmith/go-github-client/client"
 	"net/http"
 )
 

repos/repos.go

@@ -0,0 +1,103 @@
+// Copyright 2012 Alca Società Cooperativa. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package repos
+
+import (
+	ghclient "github.com/iansmith/go-github-client/client"
+	ghuser "github.com/iansmith/go-github-client/users"
+	"fmt"
+	"net/http"
+)
+
+
+type RepoDetail struct {
+	Id            int
+	Url           string
+	Html_url      string
+	Clone_url     string
+	Git_url       string
+	Ssh_url       string
+	Svn_url       string
+	Mirror_url    string
+	Parent        *RepoDetail
+	Source        *RepoDetail
+	Owner         *ghuser.UserShort
+	Name          string
+	Full_name     string
+	Description   string
+	Homepage      string
+	Language      string
+	Private       bool
+	Fork          bool
+	Forks         int
+	Hireable      bool
+	Watchers      int
+	Size          int
+	Master_branch string
+	Open_issues   int
+	Pushed_at     string
+	Created_at    string
+	Updated_at    string
+}
+
+// Repos is a simplified github repos api client.
+type Repos struct {
+	*ghclient.GithubClient
+	login string
+}
+
+// create a new github Repos client from an existent GithubClient
+func NewRepos(ghc *ghclient.GithubClient) *Repos {
+	repoc := new(Repos)
+	repoc.GithubClient = ghc
+	return repoc
+}
+
+func (self *Repos) readLogin() (error) {
+	if self.login!="" {
+		return nil
+	}
+	users := ghuser.NewUsers(self.GithubClient)
+	userDetail, err := users.GetAuthenticatedUserInfo()
+	if err!=nil {
+		return err
+	}
+	self.login = userDetail.Login
+	return nil
+}
+
+// Request the current autenticated user's repos.
+// It returns a RepoDetail, the ghclient.Result (for pagination info) and an error.
+func (self *Repos) GetAuthenticatedUserRepos() ([]*RepoDetail, *ghclient.GithubResult, error) {
+
+	req, err := self.NewAPIRequest("GET", "user/repos", nil)
+	if err != nil {
+		return nil, nil, err
+	}
+	httpc := new(http.Client)
+	res, err := self.RunRequest(req, httpc)
+
+	detail := []*RepoDetail{}
+	_, err = res.JsonStruct(&detail)
+	return detail, res, err
+
+}
+
+func (self *Repos) GetAuthenticatedUserPublicInfo(name string) (*RepoDetail, error) {
+	err := self.readLogin()
+	if err != nil {
+		return nil, err
+	}
+	req, err := self.NewAPIRequest("GET", fmt.Sprintf("repos/%s/%s", self.login, name), nil)
+	if err != nil {
+		return nil, err
+	}
+	httpc := new(http.Client)
+	res, err := self.RunRequest(req, httpc)
+
+	var detail RepoDetail
+	_, err = res.JsonStruct(&detail)
+	return &detail, err
+}

users/users.go

@@ -5,10 +5,58 @@
 package users
 
 import (
-	ghclient "github.com/alcacoop/go-github-client/client"
+	ghclient "github.com/iansmith/go-github-client/client"
 	"net/http"
 )
 
+type PlanDetail struct {
+	Name          string
+	Space         int
+	Collaborators int
+	Private_repos int
+}
+
+type UserShort struct {
+	Login       string
+	Id          int
+	Avatar_url  string
+	Gravatar_id string
+	Url         string
+}
+
+type UserDetail struct {
+	Id                  int
+	Login               string
+	Avatar_url          string
+	Gravatar_id         string
+	Url                 string
+	Received_events_url string
+	Type                string
+	Following           int
+	Site_admin          bool
+	Followers_url       string
+	Created_at          string
+	Plan                *PlanDetail
+	Following_url       string
+	Organizations_url   string
+	Events_url          string
+	Updated_at          string
+	Private_gists       int
+	Gists_url           string
+	Starred_url         string
+	Subscriptions_url   string
+	Disk_usage          int
+	Html_url            string
+	Repos_url           string
+	Followers           int
+	Public_gists        int
+	Total_private_repos int
+	Owned_private_repos int
+	Collaborators       int
+	Public_repos        int
+	Fork                bool
+}
+
 // Users is a simplified github users api client.
 type Users struct {
 	*ghclient.GithubClient
@@ -18,72 +66,40 @@ type Users struct {
 func NewUsers(ghc *ghclient.GithubClient) *Users {
 	userc := new(Users)
 	userc.GithubClient = ghc
-
 	return userc
 }
 
 // Request the current autenticated user info.
-// It returns a GithubResult and an error.
-func (ghc *Users) GetAuthenticatedUserInfo() (res *ghclient.GithubResult, err error) {
+// It returns a UserDetail and an error.
+func (ghc *Users) GetAuthenticatedUserInfo() (*UserDetail, error) {
 	req, err := ghc.NewAPIRequest("GET", "user", nil)
 
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	httpc := new(http.Client)
+	res, err := ghc.RunRequest(req, httpc)
 
-	res, err = ghc.RunRequest(req, httpc)
-
-	return
+	var detail UserDetail
+	_, err = res.JsonStruct(&detail)
+	return &detail, err
 }
 
 // Request github user info about a defined username.
-// It returns a GithubResult and an error.
-func (ghc *Users) GetUserInfo(username string) (res *ghclient.GithubResult, err error) {
+// It returns a UserDetail and an error.
+func (ghc *Users) GetUserInfo(username string) (*UserDetail, error) {
 	req, err := ghc.NewAPIRequest("GET", "users/"+username, nil)
 
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	httpc := new(http.Client)
 
-	res, err = ghc.RunRequest(req, httpc)
-
-	return
-}
+	res, err := ghc.RunRequest(req, httpc)
 
-// TODO: patch user info
-/*
-Update the authenticated user
-
-PATCH /user
-
-Input
-
-name
-    Optional string 
-email
-    Optional string - Publicly visible email address.
-blog
-    Optional string 
-company
-    Optional string 
-location
-    Optional string 
-hireable
-    Optional boolean 
-bio
-    Optional string 
-
-{
-  "name": "monalisa octocat",
-  "email": "octocat@github.com",
-  "blog": "https://github.com/blog",
-  "company": "GitHub",
-  "location": "San Francisco",
-  "hireable": true,
-  "bio": "There once..."
+	var detail UserDetail
+	_, err = res.JsonStruct(&detail)
+	return &detail, err
 }
-*/