ensure file:// URIs have leading slash if creating from scheme-less URI

file_test.go

@@ -8,9 +8,10 @@ import (
 func TestFileURI(t *testing.T) {
 
 	ctx := context.Background()
-	
+
 	candidates := []string{
 		"/tmp/example.jpg",
+		"tmp/example.jpg",		
 		"file:///tmp/example.jpg",
 	}
 
@@ -36,5 +37,5 @@ func TestFileURI(t *testing.T) {
 			t.Fatalf("Unexpected target for '%s': '%s'", str_uri, target)
 		}
 	}
-	
+
 }

idsecret_test.go

@@ -2,17 +2,17 @@ package uri
 
 import (
 	"context"
-	"testing"
+	"fmt"
 	"net/url"
-	"regexp"
 	"path/filepath"
-	"fmt"
+	"regexp"
+	"testing"
 )
 
 func TestIdSecretURI(t *testing.T) {
 
 	ctx := context.Background()
-	
+
 	candidates := []string{
 		"idsecret:///tmp/example.jpg?id=1234",
 	}
@@ -33,9 +33,9 @@ func TestIdSecretURI(t *testing.T) {
 
 		net_q := net_u.Query()
 
-		id := net_q.Get("id")		
+		id := net_q.Get("id")
 		secret := net_q.Get("secret")
-		secret_o := net_q.Get("secret_o")		
+		secret_o := net_q.Get("secret_o")
 
 		if id != "1234" {
 			t.Fatalf("Unexpected id value for '1234': '%s'", id)
@@ -51,10 +51,10 @@ func TestIdSecretURI(t *testing.T) {
 
 		format := "jpg"
 		label := "x"
-		
+
 		values := &url.Values{}
 		values.Set("format", format)
-		values.Set("label", label)		
+		values.Set("label", label)
 		target, err := u.Target(values)
 
 		if err != nil {
@@ -65,22 +65,22 @@ func TestIdSecretURI(t *testing.T) {
 
 		root := filepath.Dir(target)
 		fname := filepath.Base(target)
-		
+
 		if root != tree {
 			t.Fatalf("Unexpected root: '%s'", root)
 		}
-		
+
 		fname_pat := fmt.Sprintf("%s_([^_]+)_%s.%s", id, label, format)
 		fname_re, err := regexp.Compile(fname_pat)
 
 		if err != nil {
 			t.Fatalf("Failed to compile fname pattern, %v", err)
 		}
-		
-		if !fname_re.MatchString(fname){
+
+		if !fname_re.MatchString(fname) {
 			t.Fatalf("Filename failed pattern match: '%s'", fname)
 		}
-		
+
 	}
-	
+
 }

rewrite_test.go

@@ -8,7 +8,7 @@ import (
 func TestRewriteURI(t *testing.T) {
 
 	ctx := context.Background()
-	
+
 	candidates := []string{
 		"rewrite:///tmp/bob.jpg?target=alice.jpg",
 	}
@@ -35,5 +35,5 @@ func TestRewriteURI(t *testing.T) {
 			t.Fatalf("Unexpected target for '%s': '%s'", str_uri, target)
 		}
 	}
-	
+
 }

uri.go

@@ -79,8 +79,14 @@ func NewURI(ctx context.Context, uri string) (URI, error) {
 	scheme := u.Scheme
 
 	if scheme == "" {
+
 		scheme = "file"
 		u.Scheme = scheme
+
+		if !strings.HasPrefix(u.Path, "/") {
+			u.Path = fmt.Sprintf("/%s", u.Path)
+		}
+
 		uri = u.String()
 	}
 

uri_test.go

@@ -8,12 +8,12 @@ import (
 func TestNewURI(t *testing.T) {
 
 	ctx := context.Background()
-	
+
 	candidates := []string{
 		"/tmp/example.jpg",
 		"file:///tmp/example.jpg",
 		"idsecret:///tmp/example.jpg?id=1234",
-		"rewrite:///tmp/example.jpg?target=bob.jpg",	
+		"rewrite:///tmp/example.jpg?target=bob.jpg",
 	}
 
 	for _, str_uri := range candidates {