Implemented "contentFor" and "block" helpers.

structure/requestdata.go

@@ -13,6 +13,7 @@ type RequestData struct {
 	CurrentIndexPage     int
 	CurrentPostIndex     int
 	CurrentTagIndex      int
-	CurrentHelperContext int // 0 = index, 1 = post, 2 = tag, 3 = author - used by block helpers
-	CurrentTemplate      int // 0 = index, 1 = post, 2 = tag, 3 = author - never changes during execution. Used by funcs like body_classFunc etc to output the correct class
+	CurrentHelperContext int      // 0 = index, 1 = post, 2 = tag, 3 = author - used by block helpers
+	CurrentTemplate      int      // 0 = index, 1 = post, 2 = tag, 3 = author - never changes during execution. Used by funcs like body_classFunc etc to output the correct class
+	ContentForHelpers    []Helper // contentFor helpers that are attached to the currently rendering helper
 }

templates/generation.go

@@ -170,10 +170,10 @@ func compileTemplate(data []byte, name string) *structure.Helper {
 	data, allHelpers = findHelper(data, allHelpers)
 	baseHelper.Block = data
 	baseHelper.Children = allHelpers
-	// Handle extend helper
+	// Handle extend and contentFor helpers
 	for index, child := range baseHelper.Children {
 		if child.Name == "body" {
-			baseHelper.BodyHelper = &baseHelper.Children[index]
+			baseHelper.BodyHelper = &baseHelper.Children[index] //TODO: This handles only one body helper per hbs file. That is a potential bug source, but no theme should be using more than one per file anyway.
 		}
 	}
 	return &baseHelper

templates/handlebars.go

@@ -43,6 +43,30 @@ func nullFunc(helper *structure.Helper, values *structure.RequestData) []byte {
 	return []byte{}
 }
 
+func contentForFunc(helper *structure.Helper, values *structure.RequestData) []byte {
+	// If there is no array attached to the request data already, make one
+	if values.ContentForHelpers == nil {
+		values.ContentForHelpers = make([]structure.Helper, 0)
+	}
+	// Collect all contentFor helpers to use them with a block helper
+	values.ContentForHelpers = append(values.ContentForHelpers, *helper)
+	return []byte{}
+}
+
+func blockFunc(helper *structure.Helper, values *structure.RequestData) []byte {
+	if len(helper.Arguments) != 0 {
+		// Loop through the collected contentFor helpers and execute the appropriate one
+		for index, _ := range values.ContentForHelpers {
+			if len(values.ContentForHelpers[index].Arguments) != 0 {
+				if values.ContentForHelpers[index].Arguments[0].Name == helper.Arguments[0].Name {
+					return executeHelper(&values.ContentForHelpers[index], values, values.CurrentHelperContext)
+				}
+			}
+		}
+	}
+	return []byte{}
+}
+
 func paginationDotTotalFunc(helper *structure.Helper, values *structure.RequestData) []byte {
 	if values.CurrentTemplate == 0 { // index
 		return []byte(strconv.FormatInt(values.Blog.PostCount, 10))

templates/helperfunctions.go

@@ -27,6 +27,8 @@ var helperFuctions = map[string]func(*structure.Helper, *structure.RequestData)
 	"plural":           pluralFunc,
 	"date":             dateFunc,
 	"image":            imageFunc,
+	"contentFor":       contentForFunc,
+	"block":            blockFunc,
 
 	// @blog functions
 	"@blog.title":       atBlogDotTitleFunc,

watcher/watcher.go

@@ -1,6 +1,7 @@
 package watcher
 
 import (
+	"github.com/kabukky/journey/helpers"
 	"gopkg.in/fsnotify.v1"
 	"log"
 	"os"
@@ -58,7 +59,7 @@ func createWatcher(extensionsFunctions map[string]func() error) (*fsnotify.Watch
 			case event := <-watcher.Events:
 				if event.Op&fsnotify.Write == fsnotify.Write {
 					for key, value := range extensionsFunctions {
-						if filepath.Ext(event.Name) == key {
+						if !helpers.IsDirectory(event.Name) && filepath.Ext(event.Name) == key {
 							// Call the function associated with this file extension
 							err := value()
 							if err != nil {