items in rss feed. #3

post.go

@@ -33,6 +33,10 @@ func (post Post) UrlPath() string {
 	return post.user.UrlPath() + "posts/" + post.id + "/"
 }
 
+func (post Post) FullUrl() string {
+	return post.user.FullUrl() + "posts/" + post.id + "/"
+}
+
 func (post Post) UrlMediaPath(filename string) string {
 	return post.UrlPath() + "media/" + filename
 }

post_test.go

@@ -34,6 +34,17 @@ func TestPostUrlPath(t *testing.T) {
 	}
 }
 
+func TestPostFullUrl(t *testing.T) {
+	user := getTestUser()
+	post, _ := user.CreateNewPost("testpost")
+	expected := "http://localhost:8080/user/" + user.Name() + "/posts/" + post.Id() + "/"
+	if !(post.FullUrl() == expected) {
+		t.Error("Wrong url path")
+		t.Error("Expected: " + expected)
+		t.Error("     Got: " + post.FullUrl())
+	}
+}
+
 func TestPostUrlMediaPath(t *testing.T) {
 	user := getTestUser()
 	post, _ := user.CreateNewPost("testpost")

repository.go

@@ -113,9 +113,9 @@ func (repo Repository) UserUrlPath(user User) string {
 	return "/user/" + user.name + "/"
 }
 
-func (repo Repository) FullUserUrl(user User) string {
+func (repo Repository) FullUrl() string {
 	config, _ := repo.Config()
-	return config.Domain + repo.UserUrlPath(user)
+	return config.Domain
 }
 
 func (repo Repository) Template() (string, error) {

rss.go

@@ -19,10 +19,10 @@ type RSSChannel struct {
 }
 
 type RSSItem struct {
-	Title       string `xml:"title"`
+	Guid    string `xml:"guid"`
-	Link        string `xml:"link"`
+	Title   string `xml:"title"`
-	Description string `xml:"description"`
+	Link    string `xml:"link"`
-	PubDate     string `xml:"pubDate"`
+	PubDate string `xml:"pubDate"`
 }
 
 func RenderRSSFeed(user User) (string, error) {
@@ -33,21 +33,27 @@ func RenderRSSFeed(user User) (string, error) {
 		Version: "2.0",
 		Channel: RSSChannel{
 			Title:       config.Title,
-			Link:        user.repo.FullUserUrl(user),
+			Link:        user.FullUrl(),
 			Description: config.SubTitle,
 			Items:       make([]RSSItem, 0),
 		},
 	}
 
-	// posts, _ := user.Posts()
+	posts, _ := user.Posts()
-	// for _, post := range posts {
+	for _, postId := range posts {
-	// 	rss.Channel.Items = append(rss.Channel.Items, RSSItem{
+		post, _ := user.GetPost(postId)
-	// 		Title:       post.Title(),
+		_, meta := post.MarkdownData()
-	// 		Link:        post.Link(),
+		date, ok := meta["date"]
-	// 		Description: post.Description(),
+		if !ok {
-	// 		PubDate:     post.PubDate(),
+			date = ""
-	// 	})
+		}
-	// }
+		rss.Channel.Items = append(rss.Channel.Items, RSSItem{
+			Guid:    postId,
+			Title:   post.Title(),
+			Link:    post.FullUrl(),
+			PubDate: date.(string),
+		})
+	}
 
 	buf := new(bytes.Buffer)
 	err := xml.NewEncoder(buf).Encode(rss)

rss_test.go

@@ -2,6 +2,7 @@ package owl_test
 
 import (
 	"h4kor/owl-blogs"
+	"os"
 	"strings"
 	"testing"
 )
@@ -47,3 +48,53 @@ func TestRenderRSSFeedUserData(t *testing.T) {
 		t.Error("SubTitle not rendered. Got: " + res)
 	}
 }
+
+func TestRenderRSSFeedPostData(t *testing.T) {
+	user := getTestUser()
+	post, _ := user.CreateNewPost("testpost")
+
+	content := "---\n"
+	content += "title: Test Post\n"
+	content += "date: 2015-01-01\n"
+	content += "---\n"
+	content += "This is a test"
+	os.WriteFile(post.ContentFile(), []byte(content), 0644)
+
+	res, err := owl.RenderRSSFeed(user)
+	if err != nil {
+		t.Error("Error rendering RSS feed: " + err.Error())
+		return
+	}
+	if !strings.Contains(res, "Test Post") {
+		t.Error("Title not rendered. Got: " + res)
+	}
+	if !strings.Contains(res, post.FullUrl()) {
+		t.Error("SubTitle not rendered. Got: " + res)
+	}
+	if !strings.Contains(res, "2015-01-01") {
+		t.Error("Date not rendered. Got: " + res)
+	}
+}
+
+func TestRenderRSSFeedPostDataWithoutDate(t *testing.T) {
+	user := getTestUser()
+	post, _ := user.CreateNewPost("testpost")
+
+	content := "---\n"
+	content += "title: Test Post\n"
+	content += "---\n"
+	content += "This is a test"
+	os.WriteFile(post.ContentFile(), []byte(content), 0644)
+
+	res, err := owl.RenderRSSFeed(user)
+	if err != nil {
+		t.Error("Error rendering RSS feed: " + err.Error())
+		return
+	}
+	if !strings.Contains(res, "Test Post") {
+		t.Error("Title not rendered. Got: " + res)
+	}
+	if !strings.Contains(res, post.FullUrl()) {
+		t.Error("SubTitle not rendered. Got: " + res)
+	}
+}

user.go

@@ -3,6 +3,7 @@ package owl
 import (
 	"fmt"
 	"io/ioutil"
+	"net/url"
 	"os"
 	"path"
 	"time"
@@ -29,6 +30,11 @@ func (user User) UrlPath() string {
 	return user.repo.UserUrlPath(user)
 }
 
+func (user User) FullUrl() string {
+	url, _ := url.JoinPath(user.repo.FullUrl(), user.UrlPath())
+	return url
+}
+
 func (user User) PostDir() string {
 	return path.Join(user.Dir(), "public")
 }

user_test.go

@@ -145,3 +145,10 @@ func TestUserUrlPath(t *testing.T) {
 		t.Error("Wrong url path, Expected: " + "/user/" + user.Name() + "/" + " Got: " + user.UrlPath())
 	}
 }
+
+func TestUserFullUrl(t *testing.T) {
+	user := getTestUser()
+	if !(user.FullUrl() == "http://localhost:8080/user/"+user.Name()+"/") {
+		t.Error("Wrong url path, Expected: " + "http://localhost:8080/user/" + user.Name() + "/" + " Got: " + user.FullUrl())
+	}
+}