remove hardcoded paths

Author: elchead

blog/article.go

@@ -13,15 +13,6 @@ type Article struct {
 	baseDir string
 }
 
-// constructor ensures that path is always provided for safety
-func NewArticleWithPath(meta Metadata,path string) *Article {
-	return &Article{Meta:meta,path:path}
-}
-
-func NewArticle(meta Metadata) *Article {
-	return &Article{Meta:meta, baseDir: obsidianVault}
-}
-
 func NewArticleWithBaseDir(meta Metadata,baseDir string) *Article {
 	return &Article{Meta:meta,baseDir:baseDir}
 }

blog/article_test.go

@@ -10,8 +10,8 @@ import (
 
 
 func TestArticleFilePath(t *testing.T) {
-	sut := NewArticle(Metadata{Title: "Article title"})
-	assert.Equal(t, filepath.Join(obsidianVault,articleDir, "Article title.md"), sut.Path())
+	sut := NewArticleWithBaseDir(Metadata{Title: "Article title"},"/")
+	assert.Equal(t, filepath.Join("/",articleDir, "Article title.md"), sut.Path())
 }
 
 

blog/blog.go

@@ -11,8 +11,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/afero"
 )
-const obsidianVault = "/Users/adria/Library/Mobile Documents/iCloud~md~obsidian/Documents/Second_brain"
-
 
 func GetFilepath(articleTitle,folderPath string) string {
 	return path.Join(folderPath,articleTitle+".md")

blog/blog_test.go

@@ -93,6 +93,6 @@ func TestBlog(t *testing.T) {
 }
 
 func TestLink(t *testing.T) {
-	post := blog.NewArticleWithPath(blog.Metadata{Title:"Examples are good"},"")
+	post := blog.NewArticleWithBaseDir(blog.Metadata{Title:"Examples are good"},"/")
 	assert.Equal(t,"posts/examples-are-good",blog.ConstructPostLink(post))
 }

blog/book.go

@@ -15,15 +15,6 @@ type Book struct {
 	baseDir string
 }
 
-// constructor ensures that path is always provided for safety
-func NewBookWithPath(meta Metadata,path string) *Book {
-	return &Book{Meta:meta,path:path}
-}
-
-func NewBook(meta Metadata) *Book {
-	return &Book{Meta:meta, baseDir:obsidianVault}
-}
-
 func NewBookWithBaseDir(meta Metadata,baseDir string) *Book {
 	return &Book{Meta:meta,baseDir:baseDir}
 }

blog/letter.go

@@ -1,32 +1,29 @@
 package blog
 
-import "io"
+import (
+	"io"
+	"path/filepath"
+)
 
 const letterCategory = "Letters"
-const letterDir = obsidianVault +"/Letters"
+const letterDir = "/Letters"
 
 
 type Letter struct {
 	TemplateFile io.Reader
 	Meta Metadata
-	path string
+	baseDir string
 }
 
-// constructor ensures that path is always provided for safety
-func NewLetter(meta Metadata) *Letter {
-	return &Letter{Meta:meta}
-}
-
-
-func NewLetterWithPath(meta Metadata, path string) *Letter {
-	return &Letter{Meta:meta,path:path}
+func NewLetterWithBaseDir(meta Metadata, baseDir string) *Letter {
+	return &Letter{Meta:meta,baseDir:baseDir}
 }
 
 func (b Letter) Title() string {
 	return b.Meta.Title
 }
 
-func (b Letter) Path() string { return GetFilepath(b.Meta.Title,letterDir)}
+func (b Letter) Path() string { return GetFilepath(b.Meta.Title,filepath.Join(b.baseDir,letterDir))}
 
 func (a Letter) Write(file io.Writer) {
 	io.WriteString(file,a.Meta.String())

blog/letter_test.go

@@ -10,6 +10,6 @@ import (
 
 
 func TestLetterFilePath(t *testing.T) {
-	sut := NewLetter(Metadata{Title: "Letter title"})
+	sut := NewLetterWithBaseDir(Metadata{Title: "Letter title"},"/")
 	assert.Equal(t, filepath.Join(letterDir,"Letter title.md"), sut.Path())
 }

blog/post.go

@@ -41,7 +41,7 @@ func (f PostFactory) NewPost(meta Metadata) (post Post,err error) {
 		book.TemplateFile = f.BookTemplate
 		return book, nil
 	case contains(meta.Categories,letterCategory):
-		return NewLetter(meta),nil
+		return NewLetterWithBaseDir(meta,f.BaseDir),nil
 	default:
 		return NewArticleWithBaseDir(meta,f.BaseDir),nil
 	}	

git/blogpush_test.go

@@ -40,6 +40,6 @@ func (r *fakeRepo) RepoPath() string {
 func TestPushOrder(t *testing.T) {
 	fakeRepo := &fakeRepo{repoPath:""}
 	sut := BlogPush{fakeRepo}
-	sut.Push(blog.NewArticleWithPath(blog.Metadata{},""))
+	sut.Push(blog.NewArticleWithBaseDir(blog.Metadata{},"/"))
 	assert.Equal(t, []string{"StageAll", "Commit", "Pull", "Push"}, fakeRepo.callOrder)
 }