renameAll method and refactor

Author: dahernan

facebox/facebox_rename.go

@@ -0,0 +1,87 @@
+package facebox
+
+import (
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/pkg/errors"
+)
+
+// Rename allows to change the name for a given face
+func (c *Client) Rename(id, name string) error {
+	if id == "" {
+		return errors.New("id can not be empty")
+	}
+	if name == "" {
+		return errors.New("name can not be empty")
+	}
+	u, err := url.Parse(c.addr + "/facebox/teach")
+	if err != nil {
+		return err
+	}
+	if !u.IsAbs() {
+		return errors.New("box address must be absolute")
+	}
+	form := url.Values{}
+	form.Set("name", name)
+
+	q := u.Query()
+	u.Path = u.Path + "/" + id
+	u.RawQuery = q.Encode()
+	req, err := http.NewRequest("PATCH", u.String(), strings.NewReader(form.Encode()))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Accept", "application/json; charset=utf-8")
+	resp, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	err = c.parseResponse(resp.Body)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// RenameAll changes the name for all the faces that match a given name
+func (c *Client) RenameAll(oldName, newName string) error {
+	if oldName == "" {
+		return errors.New("oldName can not be empty")
+	}
+	if newName == "" {
+		return errors.New("newName can not be empty")
+	}
+	u, err := url.Parse(c.addr + "/facebox/rename")
+	if err != nil {
+		return err
+	}
+	if !u.IsAbs() {
+		return errors.New("box address must be absolute")
+	}
+	form := url.Values{}
+	form.Set("from", oldName)
+	form.Set("to", newName)
+
+	q := u.Query()
+	u.RawQuery = q.Encode()
+	req, err := http.NewRequest("POST", u.String(), strings.NewReader(form.Encode()))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Accept", "application/json; charset=utf-8")
+	resp, err := c.HTTPClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	err = c.parseResponse(resp.Body)
+	if err != nil {
+		return err
+	}
+	return nil
+}

facebox/facebox_rename_test.go

@@ -0,0 +1,50 @@
+package facebox_test
+
+import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/machinebox/sdk-go/facebox"
+	"github.com/matryer/is"
+)
+
+func TestRename(t *testing.T) {
+	is := is.New(t)
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		is.Equal(r.URL.Path, "/facebox/teach/john1.jpg")
+		is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
+		is.Equal(r.Method, "PATCH")
+		is.Equal(r.FormValue("name"), "Sir John L")
+		io.WriteString(w, `{
+			"success": true
+		}`)
+	}))
+	defer srv.Close()
+
+	fb := facebox.New(srv.URL)
+	err := fb.Rename("john1.jpg", "Sir John L")
+	is.NoErr(err)
+}
+
+func TestRenameAll(t *testing.T) {
+	is := is.New(t)
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		is.Equal(r.URL.Path, "/facebox/rename")
+		is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
+		is.Equal(r.Method, "POST")
+		is.Equal(r.FormValue("from"), "John Lennon")
+		is.Equal(r.FormValue("to"), "Sir John Lennon")
+		io.WriteString(w, `{
+			"success": true
+		}`)
+	}))
+	defer srv.Close()
+
+	fb := facebox.New(srv.URL)
+	err := fb.RenameAll("John Lennon", "Sir John Lennon")
+	is.NoErr(err)
+}

facebox/facebox_teach.go

@@ -128,45 +128,6 @@ func (c *Client) Remove(id string) error {
 	return nil
 }
 
-// Rename allows to change the name for a given face
-func (c *Client) Rename(id, name string) error {
-	if id == "" {
-		return errors.New("id can not be empty")
-	}
-	if name == "" {
-		return errors.New("name can not be empty")
-	}
-	u, err := url.Parse(c.addr + "/facebox/teach")
-	if err != nil {
-		return err
-	}
-	if !u.IsAbs() {
-		return errors.New("box address must be absolute")
-	}
-	form := url.Values{}
-	form.Set("name", name)
-
-	q := u.Query()
-	u.Path = u.Path + "/" + id
-	u.RawQuery = q.Encode()
-	req, err := http.NewRequest("PATCH", u.String(), strings.NewReader(form.Encode()))
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Accept", "application/json; charset=utf-8")
-	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	err = c.parseResponse(resp.Body)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (c *Client) parseResponse(r io.Reader) error {
 	var response struct {
 		Success bool

facebox/facebox_teach_test.go

@@ -126,22 +126,3 @@ func TestRemove(t *testing.T) {
 	err := fb.Remove("john1.jpg")
 	is.NoErr(err)
 }
-
-func TestRename(t *testing.T) {
-	is := is.New(t)
-
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		is.Equal(r.URL.Path, "/facebox/teach/john1.jpg")
-		is.Equal(r.Header.Get("Accept"), "application/json; charset=utf-8")
-		is.Equal(r.Method, "PATCH")
-		is.Equal(r.FormValue("name"), "Sir John L")
-		io.WriteString(w, `{
-			"success": true
-		}`)
-	}))
-	defer srv.Close()
-
-	fb := facebox.New(srv.URL)
-	err := fb.Rename("john1.jpg", "Sir John L")
-	is.NoErr(err)
-}