[#95] Refactored server and client to be under rest package (#96)

 [#95] Refactored server and client to be under rest package.

Author: nandagopalan

rest/README.md

@@ -1,4 +1,4 @@
-package client
+package rest
 
 import (
 	"crypto/tls"

rest/client/rest_client.go renamed to rest/client.go

@@ -1,4 +1,4 @@
-package client
+package rest
 
 import (
 	"bytes"
@@ -14,7 +14,6 @@ import (
 
 	"oss.nandlabs.io/golly/codec"
 	"oss.nandlabs.io/golly/ioutils"
-	"oss.nandlabs.io/golly/rest"
 	"oss.nandlabs.io/golly/textutils"
 )
 
@@ -223,7 +222,7 @@ func (r *Request) toHttpRequest() (httpReq *http.Request, err error) {
 				httpReq, err = http.NewRequest(r.method, u.String(), r.bodyReader)
 				if r.header != nil {
 					if r.contentType != "" {
-						r.header.Set(rest.ContentTypeHeader, r.contentType)
+						r.header.Set(ContentTypeHeader, r.contentType)
 					}
 					httpReq.Header = r.header
 				}

rest/client/README.md

@@ -1,4 +1,4 @@
-package client
+package rest
 
 import (
 	"net/http"

rest/client/request.go renamed to rest/client_request.go

@@ -1,12 +1,11 @@
-package client
+package rest
 
 import (
 	"fmt"
 	"net/http"
 
 	"oss.nandlabs.io/golly/codec"
 	"oss.nandlabs.io/golly/ioutils"
-	"oss.nandlabs.io/golly/rest"
 )
 
 type Response struct {
@@ -34,7 +33,7 @@ func (r *Response) Decode(v interface{}) (err error) {
 	var c codec.Codec
 	if r.IsSuccess() {
 		defer ioutils.CloserFunc(r.raw.Body)
-		contentType := r.raw.Header.Get(rest.ContentTypeHeader)
+		contentType := r.raw.Header.Get(ContentTypeHeader)
 		c, err = codec.Get(contentType, r.client.codecOptions)
 		if err == nil {
 			err = c.Read(r.raw.Body, v)

rest/client/request_test.go renamed to rest/client_request_test.go

@@ -1,4 +1,4 @@
-package client
+package rest
 
 import (
 	"crypto/tls"

rest/client/response.go renamed to rest/client_response.go

@@ -1,19 +1,17 @@
-package client
+package rest
 
 import (
 	"fmt"
 	"io"
 	"mime/multipart"
 	"net/http"
 	"net/textproto"
-
-	"oss.nandlabs.io/golly/rest"
 )
 
 // CreateMultipartHeader creates a multipart header with the given parameters
 func CreateMultipartHeader(param, fileName, contentType string) textproto.MIMEHeader {
 	hdr := make(textproto.MIMEHeader)
-	hdr.Set(rest.ContentTypeHeader, "multipart/form-data")
+	hdr.Set(ContentTypeHeader, "multipart/form-data")
 	return hdr
 }
 

rest/client/rest_client_test.go renamed to rest/client_test.go

@@ -1,4 +1,4 @@
-package client
+package rest
 
 import (
 	"bytes"
@@ -7,8 +7,6 @@ import (
 	"net/http"
 	"strings"
 	"testing"
-
-	"oss.nandlabs.io/golly/rest"
 )
 
 // TestCreateMultipartHeader tests the CreateMultipartHeader function
@@ -18,8 +16,8 @@ func TestCreateMultipartHeader(t *testing.T) {
 	contentType := "text/plain"
 
 	hdr := CreateMultipartHeader(param, fileName, contentType)
-	if hdr.Get(rest.ContentTypeHeader) != "multipart/form-data" {
-		t.Errorf("CreateMultipartHeader() = %v, want %v", hdr.Get(rest.ContentTypeHeader), "multipart/form-data")
+	if hdr.Get(ContentTypeHeader) != "multipart/form-data" {
+		t.Errorf("CreateMultipartHeader() = %v, want %v", hdr.Get(ContentTypeHeader), "multipart/form-data")
 	}
 }
 
@@ -42,10 +40,10 @@ func TestWriteMultipartFormFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("http.NewRequest() error = %v", err)
 	}
-	req.Header.Set(rest.ContentTypeHeader, w.FormDataContentType())
+	req.Header.Set(ContentTypeHeader, w.FormDataContentType())
 
-	if req.Header.Get(rest.ContentTypeHeader) != w.FormDataContentType() {
-		t.Errorf("Content-Type header = %v, want %v", req.Header.Get(rest.ContentTypeHeader), w.FormDataContentType())
+	if req.Header.Get(ContentTypeHeader) != w.FormDataContentType() {
+		t.Errorf("Content-Type header = %v, want %v", req.Header.Get(ContentTypeHeader), w.FormDataContentType())
 	}
 }
 

rest/client/utils.go renamed to rest/client_utils.go

@@ -13,7 +13,7 @@ const (
 	YAMLContentType = "text/yaml"
 
 	// ProxyAuthorizationHeader
-	ProxyAuthorizatio = "Proxy-Authorization"
+	ProxyAuthorization = "Proxy-Authorization"
 	// AuthorizationHeader
 	Authorization
 	// AcceptHeader

rest/client/utils_test.go renamed to rest/client_utils_test.go

@@ -1,4 +1,4 @@
-package server
+package rest
 
 import "oss.nandlabs.io/golly/l3"