More UT

Author: matm

cloudinary/main.go

@@ -63,7 +63,7 @@ func (c *Config) handleEnvVars() error {
 			if err != nil {
 				return err
 			}
-			c.PrependPath = ensureTrailingSlash(ptag)
+			c.PrependPath = cloudinary.EnsureTrailingSlash(ptag)
 		}
 	}
 
@@ -103,7 +103,7 @@ func LoadConfig(path string) (*Config, error) {
 
 	// An optional remote prepend path
 	if prepend, err := c.String("cloudinary", "prepend"); err == nil {
-		settings.PrependPath = ensureTrailingSlash(prepend)
+		settings.PrependPath = cloudinary.EnsureTrailingSlash(prepend)
 	}
 	settings.ProdTag, _ = c.String("global", "prodtag")
 

cloudinary/vars.go

@@ -42,12 +42,3 @@ func handleQuery(uri *url.URL) (*url.URL, error) {
 	}
 	return wuri, nil
 }
-
-// ensureTrailingSlash adds any missing trailing / at the end
-// of a directory.
-func ensureTrailingSlash(dirname string) string {
-	if !strings.HasSuffix(dirname, "/") {
-		dirname += "/"
-	}
-	return dirname
-}

service.go

@@ -216,6 +216,7 @@ func (s *Service) DefaultUploadURI() *url.URL {
 //   new/css/default
 func cleanAssetName(path, basePath, prependPath string) string {
 	var name string
+	path, basePath, prependPath = strings.TrimSpace(path), strings.TrimSpace(basePath), strings.TrimSpace(prependPath)
 	basePath, err := filepath.Abs(basePath)
 	if err != nil {
 		basePath = ""
@@ -237,9 +238,24 @@ func cleanAssetName(path, basePath, prependPath string) string {
 			name = name[1:]
 		}
 	}
+	if prependPath != "" {
+		if prependPath[0] == os.PathSeparator {
+			prependPath = prependPath[1:]
+		}
+		prependPath = EnsureTrailingSlash(prependPath)
+	}
 	return prependPath + name[:len(name)-len(filepath.Ext(name))]
 }
 
+// EnsureTrailingSlash adds a missing trailing / at the end
+// of a directory name.
+func EnsureTrailingSlash(dirname string) string {
+	if !strings.HasSuffix(dirname, "/") {
+		dirname += "/"
+	}
+	return dirname
+}
+
 func (s *Service) walkIt(path string, info os.FileInfo, err error) error {
 	if info.IsDir() {
 		return nil

service_test.go

@@ -16,7 +16,7 @@ func TestDial(t *testing.T) {
 
 	// Not a cloudinary:// URL scheme
 	if _, err := Dial("http://localhost"); err == nil {
-		t.Error("should fail if URL scheme different of cloudinary://")
+		t.Error("should fail if URL scheme different from cloudinary://")
 	}
 
 	// Missing API secret (password)?
@@ -83,5 +83,30 @@ func TestUseDatabase(t *testing.T) {
 	if err := s.UseDatabase("baduri::"); err == nil {
 		t.Error("should fail on bad uri")
 	}
+	// Bad scheme
+	if err := s.UseDatabase("http://localhost"); err == nil {
+		t.Error("should fail if URL scheme different from mongodb://")
+	}
+	if err := s.UseDatabase("mongodb://localhost/cloudinary"); err != nil {
+		t.Error("please ensure you have a running MongoDB server on localhost")
+	}
+	if s.dbSession == nil || s.col == nil {
+		t.Error("service's dbSession and col should not be nil")
+	}
+}
 
+func TestCleanAssetName(t *testing.T) {
+	assets := [][4]string{
+		// order: path, basepath, prepend, expected result
+		{"/tmp/css/default.css", "/tmp/", "new", "new/css/default"},
+		{"/a/b/c.png", "/a", "", "b/c"},
+		{"/a/b/c.png", "/a ", "  ", "b/c"}, // With spaces
+		{"/a/b/c.png", "", "/x", "x/a/b/c"},
+	}
+	for _, p := range assets {
+		c := cleanAssetName(p[0], p[1], p[2])
+		if c != p[3] {
+			t.Errorf("wrong cleaned name. Expect '%s', got '%s'", p[3], c)
+		}
+	}
 }