added timezone to time function

Author: bradrydzewski

funcmap_test.go

@@ -6,24 +6,21 @@ package funcmap
 
 import (
 	"bytes"
-	"testing"
 	"text/template"
 )
 
-func TestSomething(t *testing.T) {
-	buf := new(bytes.Buffer)
-	tmpl, _ := template.New("_").Funcs(Funcs).Parse(testT)
-	err := tmpl.Execute(buf, map[string]interface{}{
-		"Num": float64(32.5),
-	})
+// helper function parses and applies the template and returns the
+// results in string format.
+func execute(text string, data map[string]interface{}) (string, error) {
+	var buf bytes.Buffer
+	t, err := template.New("_").Funcs(Funcs).Parse(text)
 	if err != nil {
-		t.Error(err)
+		return buf.String(), err
 	}
-	println(buf.String())
+	err = t.Execute(&buf, data)
+	return buf.String(), err
 }
 
-var testT = `{{ printf "hello %s %s world" (upper "foo" ) (lower .Num ) }}`
-
 // https://github.com/leekchan/gtf
 // https://github.com/Masterminds/sprig
 

time.go

@@ -4,16 +4,31 @@
 
 package funcmap
 
-import "time"
+import (
+	"fmt"
+	"time"
+)
 
 // Time converts the textual representation of the datetime
 // string into a time.Time interface.
-func Time(v interface{}) (interface{}, error) {
+func Time(v interface{}, args ...interface{}) (interface{}, error) {
 	t, err := toTimeE(v)
 	if err != nil {
 		return nil, err
 	}
 
+	if len(args) > 0 {
+		locStr, err := toStringE(args[0])
+		if err != nil {
+			return nil, err
+		}
+		loc, err := time.LoadLocation(locStr)
+		if err != nil {
+			return nil, err
+		}
+		return t.In(loc), nil
+	}
+	fmt.Println(t)
 	return t, nil
 }
 
@@ -22,6 +37,7 @@ func Time(v interface{}) (interface{}, error) {
 // the time.Time value. These are formatted with the layout
 // string
 func TimeFormat(layout string, v interface{}) (string, error) {
+	println("TIMEFORMAT")
 	t, err := toTimeE(v)
 	if err != nil {
 		return "", err

time_test.go

@@ -3,3 +3,66 @@
 // license that can be found in the LICENSE file.
 
 package funcmap
+
+import (
+	"testing"
+)
+
+func TestTime(t *testing.T) {
+	tests := []struct {
+		data map[string]interface{}
+		text string
+		want string
+	}{
+		{
+			data: map[string]interface{}{"Timestamp": "2021-09-03 07:13:02 -0700 MST"},
+			text: `{{ time .Timestamp }}`,
+			want: "2021-09-03 07:13:02 -0700 MST",
+		},
+		{
+			data: map[string]interface{}{"Timestamp": 1630678382},
+			text: `{{ time .Timestamp "UTC" }}`,
+			want: "2021-09-03 14:13:02 +0000 UTC",
+		},
+		{
+			data: map[string]interface{}{"Timestamp": 1630678382},
+			text: `{{ time .Timestamp "MST" }}`,
+			want: "2021-09-03 07:13:02 -0700 MST",
+		},
+	}
+	for _, test := range tests {
+		out, err := execute(test.text, test.data)
+		if err != nil {
+			t.Error(err)
+		} else if out != test.want {
+			t.Errorf("Want template result %s, got %s", test.want, out)
+		}
+	}
+}
+
+func TestTimeFormat(t *testing.T) {
+	tests := []struct {
+		data map[string]interface{}
+		text string
+		want string
+	}{
+		{
+			data: map[string]interface{}{"Timestamp": "2021-09-03 07:13:02 -0700 MST"},
+			text: `{{ dateFormat "2006-01-02" .Timestamp }}`,
+			want: "2021-09-03",
+		},
+		{
+			data: map[string]interface{}{"Timestamp": 1630678382},
+			text: `{{ dateFormat "2006-01-02" .Timestamp }}`,
+			want: "2021-09-03",
+		},
+	}
+	for _, test := range tests {
+		out, err := execute(test.text, test.data)
+		if err != nil {
+			t.Error(err)
+		} else if out != test.want {
+			t.Errorf("Want template result %s, got %s", test.want, out)
+		}
+	}
+}