removing auto-pluralization

Author: Derek Dowling

client/client.go

@@ -53,11 +53,13 @@ envolves concatting a pluralized resource name.
 */
 func setPath(url *url.URL, resource string) {
 
+	// ensure that path is "/" terminated before concatting resource
 	if url.Path != "" && !strings.HasSuffix(url.Path, "/") {
 		url.Path = url.Path + "/"
 	}
 
-	url.Path = fmt.Sprintf("%s%ss", url.Path, resource)
+	// don't pluralize resource automagically, JSON API spec is agnostic
+	url.Path = fmt.Sprintf("%s%s", url.Path, resource)
 }
 
 /*
@@ -67,6 +69,7 @@ ID specifier.
 func setIDPath(url *url.URL, resource string, id string) {
 	setPath(url, resource)
 
+	// concat "/:id" if not empty
 	if id != "" {
 		url.Path = strings.Join([]string{url.Path, id}, "/")
 	}

client/client_test.go

@@ -19,22 +19,22 @@ func TestClientRequest(t *testing.T) {
 			url := &url.URL{Host: "test"}
 
 			Convey("should format properly", func() {
-				setPath(url, "test")
+				setPath(url, "tests")
 				So(url.String(), ShouldEqual, "//test/tests")
 			})
 
 			Convey("should respect an existing path", func() {
 				url.Path = "admin"
 				setPath(url, "test")
-				So(url.String(), ShouldEqual, "//test/admin/tests")
+				So(url.String(), ShouldEqual, "//test/admin/test")
 			})
 		})
 
 		Convey("->setIDPath()", func() {
 			url := &url.URL{Host: "test"}
 
 			Convey("should format properly an id url", func() {
-				setIDPath(url, "test", "1")
+				setIDPath(url, "tests", "1")
 				So(url.String(), ShouldEqual, "//test/tests/1")
 			})
 		})

client/delete_test.go

@@ -1,7 +1,6 @@
 package jsc
 
 import (
-	"log"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -20,11 +19,9 @@ func TestDelete(t *testing.T) {
 		baseURL := server.URL
 
 		Convey("->Delete()", func() {
-			resp, err := Delete(baseURL, "test", "1")
+			resp, err := Delete(baseURL, "tests", "1")
 
 			So(err, ShouldBeNil)
-			log.Printf("patchErr = %+v\n", err)
-			log.Printf("resp = %+v\n", resp)
 			So(resp.StatusCode, ShouldEqual, http.StatusOK)
 		})
 	})

client/get_test.go

@@ -30,7 +30,7 @@ func TestGet(t *testing.T) {
 		Convey("->GetList()", func() {
 
 			Convey("should handle an object listing request", func() {
-				json, resp, err := List(baseURL, "test")
+				json, resp, err := List(baseURL, "tests")
 
 				So(err, ShouldBeNil)
 				So(resp.StatusCode, ShouldEqual, http.StatusOK)
@@ -42,7 +42,7 @@ func TestGet(t *testing.T) {
 		Convey("->GetObject()", func() {
 
 			Convey("should handle a specific object request", func() {
-				json, resp, err := Fetch(baseURL, "test", "1")
+				json, resp, err := Fetch(baseURL, "tests", "1")
 
 				So(err, ShouldBeNil)
 				So(resp.StatusCode, ShouldEqual, http.StatusOK)

client/patch_test.go

@@ -20,7 +20,7 @@ func TestPatch(t *testing.T) {
 		baseURL := server.URL
 
 		Convey("->Patch()", func() {
-			object, err := jsh.NewObject("2", "test", nil)
+			object, err := jsh.NewObject("2", "tests", nil)
 			So(err, ShouldBeNil)
 
 			json, resp, patchErr := Patch(baseURL, object)

client/post_test.go

@@ -22,7 +22,7 @@ func TestPost(t *testing.T) {
 	baseURL := server.URL
 
 	Convey("Post Tests", t, func() {
-		testObject, err := jsh.NewObject("", "test", attrs)
+		testObject, err := jsh.NewObject("", "tests", attrs)
 		So(err, ShouldBeNil)
 
 		_, resp, postErr := Post(baseURL, testObject)