Merge pull request #37 from github/newbatchapi

Support new batch API

Author: rubyist

harbour_test.go

@@ -85,7 +85,7 @@ func TestGetMetaAuthed(t *testing.T) {
 		t.Fatalf("expected to see a size of `%d`, got: `%d`", contentSize, meta.Size)
 	}
 
-	download := meta.Links["download"]
+	download := meta.Actions["download"]
 	if download.Href != "http://localhost:8080/bilbo/repo/objects/"+contentOid {
 		t.Fatalf("expected download link, got %s", download.Href)
 	}
@@ -140,11 +140,11 @@ func TestPostAuthedNewObject(t *testing.T) {
 		t.Fatalf("expected to see a size of `1234`, got: `%d`", meta.Size)
 	}
 
-	if download, ok := meta.Links["download"]; ok {
+	if download, ok := meta.Actions["download"]; ok {
 		t.Fatalf("expected POST to not contain a download link, got %s", download.Href)
 	}
 
-	upload, ok := meta.Links["upload"]
+	upload, ok := meta.Actions["upload"]
 	if !ok {
 		t.Fatal("expected upload link to be present")
 	}
@@ -186,12 +186,12 @@ func TestPostAuthedExistingObject(t *testing.T) {
 		t.Fatalf("expected to see a size of `%d`, got: `%d`", contentSize, meta.Size)
 	}
 
-	download := meta.Links["download"]
+	download := meta.Actions["download"]
 	if download.Href != "http://localhost:8080/bilbo/repo/objects/"+contentOid {
 		t.Fatalf("expected download link, got %s", download.Href)
 	}
 
-	upload, ok := meta.Links["upload"]
+	upload, ok := meta.Actions["upload"]
 	if !ok {
 		t.Fatalf("expected upload link to be present")
 	}

server.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/gorilla/context"
 	"github.com/gorilla/mux"
@@ -25,7 +26,8 @@ type RequestVars struct {
 }
 
 type BatchVars struct {
-	Objects []*RequestVars `json:"objects"`
+	Operation string         `json:"operation"`
+	Objects   []*RequestVars `json:"objects"`
 }
 
 // MetaObject is object metadata as seen by the object and metadata stores.
@@ -37,9 +39,15 @@ type MetaObject struct {
 
 // Representation is object medata as seen by clients of the lfs server.
 type Representation struct {
-	Oid   string           `json:"oid"`
-	Size  int64            `json:"size"`
-	Links map[string]*link `json:"_links"`
+	Oid     string           `json:"oid"`
+	Size    int64            `json:"size"`
+	Actions map[string]*link `json:"actions"`
+	Error   *ObjectError     `json:"error,omitempty"`
+}
+
+type ObjectError struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
 }
 
 // ObjectLink builds a URL linking to the object.
@@ -55,8 +63,9 @@ func (v *RequestVars) ObjectLink() string {
 
 // link provides a structure used to build a hypermedia representation of an HTTP link.
 type link struct {
-	Href   string            `json:"href"`
-	Header map[string]string `json:"header,omitempty"`
+	Href      string            `json:"href"`
+	Header    map[string]string `json:"header,omitempty"`
+	ExpiresAt time.Time         `json:"expires_at,omitempty"`
 }
 
 // App links a Router, ContentStore, and MetaStore to provide the LFS server.
@@ -239,9 +248,9 @@ func (a *App) PutHandler(w http.ResponseWriter, r *http.Request) {
 // for json encoding
 func (a *App) Represent(rv *RequestVars, meta *MetaObject, download, upload bool) *Representation {
 	rep := &Representation{
-		Oid:   meta.Oid,
-		Size:  meta.Size,
-		Links: make(map[string]*link),
+		Oid:     meta.Oid,
+		Size:    meta.Size,
+		Actions: make(map[string]*link),
 	}
 
 	header := make(map[string]string)
@@ -250,11 +259,11 @@ func (a *App) Represent(rv *RequestVars, meta *MetaObject, download, upload bool
 		header["Authorization"] = rv.Authorization
 	}
 	if download {
-		rep.Links["download"] = &link{Href: rv.ObjectLink(), Header: header}
+		rep.Actions["download"] = &link{Href: rv.ObjectLink(), Header: header}
 	}
 
 	if upload {
-		rep.Links["upload"] = &link{Href: rv.ObjectLink(), Header: header}
+		rep.Actions["upload"] = &link{Href: rv.ObjectLink(), Header: header}
 	}
 	return rep
 }