add unmarshal to uri

prismelabs · Sep 5, 2024 · 5f95b13 · 5f95b13
1 parent b060c95
commit 5f95b13
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/pkg/uri/uri.go b/pkg/uri/uri.go
@@ -122,3 +122,15 @@ func (u Uri) String() string {
 func (u Uri) MarshalJSON() ([]byte, error) {
 	return json.Marshal(u.String())
 }
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (u *Uri) UnmarshalJSON(b []byte) error {
+	str := ""
+	err := json.Unmarshal(b, &str)
+	if err != nil {
+		return err
+	}
+
+	*u, err = Parse(str)
+	return err
+}
diff --git a/pkg/uri/uri_test.go b/pkg/uri/uri_test.go
@@ -1,6 +1,8 @@
 package uri
 
 import (
+	"encoding/json"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -87,4 +89,30 @@ func TestUri(t *testing.T) {
 			require.Equal(t, "https://www.example.com/?q=foo#bar", uri.String())
 		})
 	})
+
+	t.Run("Json", func(t *testing.T) {
+		t.Run("Marshal", func(t *testing.T) {
+			uri, err := Parse("https://www.example.com?q=foo#bar")
+			require.NoError(t, err)
+
+			jsonUri, err := json.Marshal(uri)
+			require.NoError(t, err)
+
+			require.Equal(t, fmt.Sprintf("%q", uri.String()), string(jsonUri))
+		})
+
+		t.Run("Unmarshal", func(t *testing.T) {
+			uri, err := Parse("https://www.example.com?q=foo#bar")
+			require.NoError(t, err)
+
+			jsonUri, err := json.Marshal(uri)
+			require.NoError(t, err)
+
+			uri2 := Uri{}
+			err = json.Unmarshal(jsonUri, &uri2)
+			require.NoError(t, err)
+
+			require.Equal(t, uri, uri2)
+		})
+	})
 }