Restructure application

pkg/bookmarks/bookmarks.go

@@ -0,0 +1,71 @@
+package bookmarks
+
+import (
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+
+	"github.com/BurntSushi/toml"
+	"github.com/mitchellh/go-homedir"
+)
+
+type Bookmark struct {
+	Url      string `json:"url"`      // Postgres connection URL
+	Host     string `json:"host"`     // Server hostname
+	Port     string `json:"port"`     // Server port
+	User     string `json:"user"`     // Database user
+	Password string `json:"password"` // User password
+	Database string `json:"database"` // Database name
+	Ssl      string `json:"ssl"`      // Connection SSL mode
+}
+
+func readServerConfig(path string) (Bookmark, error) {
+	bookmark := Bookmark{}
+
+	buff, err := ioutil.ReadFile(path)
+	if err != nil {
+		return bookmark, err
+	}
+
+	_, err = toml.Decode(string(buff), &bookmark)
+	return bookmark, err
+}
+
+func fileBasename(path string) string {
+	filename := filepath.Base(path)
+	return strings.Replace(filename, filepath.Ext(path), "", 1)
+}
+
+func Path() string {
+	path, _ := homedir.Dir()
+	return fmt.Sprintf("%s/.pgweb/bookmarks", path)
+}
+
+func ReadAll(path string) (map[string]Bookmark, error) {
+	results := map[string]Bookmark{}
+
+	files, err := ioutil.ReadDir(path)
+	if err != nil {
+		return results, err
+	}
+
+	for _, file := range files {
+		if filepath.Ext(file.Name()) != ".toml" {
+			continue
+		}
+
+		fullPath := path + "/" + file.Name()
+		key := fileBasename(file.Name())
+		config, err := readServerConfig(fullPath)
+
+		if err != nil {
+			fmt.Printf("%s parse error: %s\n", fullPath, err)
+			continue
+		}
+
+		results[key] = config
+	}
+
+	return results, nil
+}

pkg/bookmarks/bookmarks_test.go

@@ -0,0 +1,71 @@
+package bookmarks
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_Invalid_Bookmark_Files(t *testing.T) {
+	_, err := readServerConfig("foobar")
+	assert.Error(t, err)
+
+	_, err = readServerConfig("./data/invalid.toml")
+	assert.Error(t, err)
+	assert.Equal(t, "Near line 1, key 'invalid encoding': Near line 2: Expected key separator '=', but got '\\n' instead.", err.Error())
+
+	_, err = readServerConfig("./data/invalid_port.toml")
+	assert.Error(t, err)
+	assert.Equal(t, "Type mismatch for 'main.Bookmark.Port': Expected string but found 'int64'.", err.Error())
+}
+
+func Test_Bookmark(t *testing.T) {
+	bookmark, err := readServerConfig("./data/bookmark.toml")
+
+	assert.Equal(t, nil, err)
+	assert.Equal(t, "localhost", bookmark.Host)
+	assert.Equal(t, "5432", bookmark.Port)
+	assert.Equal(t, "postgres", bookmark.User)
+	assert.Equal(t, "mydatabase", bookmark.Database)
+	assert.Equal(t, "disable", bookmark.Ssl)
+	assert.Equal(t, "", bookmark.Password)
+	assert.Equal(t, "", bookmark.Url)
+}
+
+func Test_Bookmark_URL(t *testing.T) {
+	bookmark, err := readServerConfig("./data/bookmark_url.toml")
+
+	assert.Equal(t, nil, err)
+	assert.Equal(t, "postgres://username:password@host:port/database?sslmode=disable", bookmark.Url)
+	assert.Equal(t, "", bookmark.Host)
+	assert.Equal(t, "", bookmark.Port)
+	assert.Equal(t, "", bookmark.User)
+	assert.Equal(t, "", bookmark.Database)
+	assert.Equal(t, "", bookmark.Ssl)
+	assert.Equal(t, "", bookmark.Password)
+}
+
+func Test_Bookmarks_Path(t *testing.T) {
+	assert.NotEqual(t, "/.pgweb/bookmarks", bookmarksPath())
+}
+
+func Test_Basename(t *testing.T) {
+	assert.Equal(t, "filename", fileBasename("filename.toml"))
+	assert.Equal(t, "filename", fileBasename("path/filename.toml"))
+	assert.Equal(t, "filename", fileBasename("~/long/path/filename.toml"))
+	assert.Equal(t, "filename", fileBasename("filename"))
+}
+
+func Test_ReadBookmarks_Invalid(t *testing.T) {
+	bookmarks, err := readAllBookmarks("foobar")
+
+	assert.Error(t, err)
+	assert.Equal(t, 0, len(bookmarks))
+}
+
+func Test_ReadBookmarks(t *testing.T) {
+	bookmarks, err := readAllBookmarks("./data")
+
+	assert.Equal(t, nil, err)
+	assert.Equal(t, 2, len(bookmarks))
+}