From 20da49f37fda804536cb5a202b69dfbe17971235 Mon Sep 17 00:00:00 2001
From: stephen mcquay <stephen@mcquay.me>
Date: Tue, 1 Mar 2016 23:41:44 -0800
Subject: [PATCH] renamed SimpleStore receiver.

Fixes #12

Change-Id: If22752568e38843be48f25d9126dd9fd4d81c076
---
 api_test.go | 17 +++++++++++++++++
 storage.go  | 54 ++++++++++++++++++++++++++---------------------------
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/api_test.go b/api_test.go
index f553ca1..e440f30 100644
--- a/api_test.go
+++ b/api_test.go
@@ -224,6 +224,23 @@ func TestBadJson(t *testing.T) {
 	}
 }
 
+func TestBadVcs(t *testing.T) {
+	ms := NewSimpleStore("")
+	s := &Server{
+		storage: ms,
+	}
+	ts := httptest.NewServer(s)
+	url := fmt.Sprintf("%s/foo", ts.URL)
+	resp, err := http.Post(url, "application/json", strings.NewReader(`{"vcs": "bitbucket", "repo": "https://s.mcquay.me/sm/vain"}`))
+	if err != nil {
+		t.Errorf("couldn't POST: %v", err)
+	}
+	resp.Body.Close()
+	if got, want := resp.StatusCode, http.StatusBadRequest; got != want {
+		t.Errorf("should have reported bad vcs specified; got %v, want %v", http.StatusText(got), http.StatusText(want))
+	}
+}
+
 func TestUnsupportedMethod(t *testing.T) {
 	ms := NewSimpleStore("")
 	s := &Server{
diff --git a/storage.go b/storage.go
index e1b0493..15baf78 100644
--- a/storage.go
+++ b/storage.go
@@ -50,14 +50,14 @@ func (ms *SimpleStore) Contains(name string) bool {
 }
 
 // Add adds p to the SimpleStore.
-func (ms *SimpleStore) Add(p Package) error {
-	ms.l.Lock()
-	ms.p[p.path] = p
-	ms.l.Unlock()
+func (ss *SimpleStore) Add(p Package) error {
+	ss.l.Lock()
+	ss.p[p.path] = p
+	ss.l.Unlock()
 	m := ""
-	if err := ms.Save(); err != nil {
+	if err := ss.Save(); err != nil {
 		m = fmt.Sprintf("unable to store db: %v", err)
-		if err := ms.Remove(p.path); err != nil {
+		if err := ss.Remove(p.path); err != nil {
 			m = fmt.Sprintf("%s\nto add insult to injury, could not delete package: %v\n", m, err)
 		}
 		return errors.New(m)
@@ -66,49 +66,49 @@ func (ms *SimpleStore) Add(p Package) error {
 }
 
 // Remove removes p from the SimpleStore.
-func (ms *SimpleStore) Remove(path string) error {
-	ms.l.Lock()
-	delete(ms.p, path)
-	ms.l.Unlock()
+func (ss *SimpleStore) Remove(path string) error {
+	ss.l.Lock()
+	delete(ss.p, path)
+	ss.l.Unlock()
 	return nil
 }
 
 // All returns all current packages.
-func (ms *SimpleStore) All() []Package {
+func (ss *SimpleStore) All() []Package {
 	r := []Package{}
-	ms.l.RLock()
-	for _, p := range ms.p {
+	ss.l.RLock()
+	for _, p := range ss.p {
 		r = append(r, p)
 	}
-	ms.l.RUnlock()
+	ss.l.RUnlock()
 	return r
 }
 
 // Save writes the db to disk.
-func (ms *SimpleStore) Save() error {
+func (ss *SimpleStore) Save() error {
 	// running in-memory only
-	if ms.path == "" {
+	if ss.path == "" {
 		return nil
 	}
-	ms.dbl.Lock()
-	defer ms.dbl.Unlock()
-	f, err := os.Create(ms.path)
+	ss.dbl.Lock()
+	defer ss.dbl.Unlock()
+	f, err := os.Create(ss.path)
 	if err != nil {
 		return err
 	}
 	defer f.Close()
-	return json.NewEncoder(f).Encode(ms.p)
+	return json.NewEncoder(f).Encode(ss.p)
 }
 
-// Load reads the db from disk and populates ms.
-func (ms *SimpleStore) Load() error {
+// Load reads the db from disk and populates ss.
+func (ss *SimpleStore) Load() error {
 	// running in-memory only
-	if ms.path == "" {
+	if ss.path == "" {
 		return nil
 	}
-	ms.dbl.Lock()
-	defer ms.dbl.Unlock()
-	f, err := os.Open(ms.path)
+	ss.dbl.Lock()
+	defer ss.dbl.Unlock()
+	f, err := os.Open(ss.path)
 	if err != nil {
 		return err
 	}
@@ -120,7 +120,7 @@ func (ms *SimpleStore) Load() error {
 	}
 	for k, v := range in {
 		v.path = k
-		ms.p[k] = v
+		ss.p[k] = v
 	}
 	return nil
 }