Merge pull request #83 from bentranter/formatting-nil-time

Format nil time.Time's without panicking

Author: dinever

.travis.yml

@@ -1,9 +1,11 @@
 language: go
 
 go:
-  - 1.4
-  - 1.5
-  - 1.6
+  - 1.7
+  - 1.8
+  - 1.9
+  - "1.10"
+  - tip
 
 install:
   - go get -t ./...

app/handler/auth_test.go

@@ -187,8 +187,8 @@ func TestUserWithoutAuthentication(t *testing.T) {
 			ctx := mockContext(nil, "GET", "/admin/")
 			ctx.App.ServeHTTP(ctx.Response, ctx.Request)
 
-			Convey("Status code should be 301 redirection", func() {
-				So(ctx.Response.(*httptest.ResponseRecorder).Code, ShouldEqual, 301)
+			Convey("Status code should be 302 redirection", func() {
+				So(ctx.Response.(*httptest.ResponseRecorder).Code, ShouldEqual, 302)
 			})
 		})
 

app/utils/date.go

@@ -56,6 +56,10 @@ var conversion = map[rune]string{
 //		%z		numbers representing the timezone, ex: "-0700"
 //		%L		milliseconds, ex: ".000"
 func DateFormat(t *time.Time, format string) string {
+	if t == nil {
+		return ""
+	}
+
 	retval := make([]byte, 0, len(format))
 	for i, ni := 0, 0; i < len(format); i = ni + 2 {
 		ni = strings.IndexByte(format[i:], '%')

app/utils/date_test.go

@@ -2,9 +2,10 @@ package utils
 
 import (
 	"fmt"
-	. "github.com/smartystreets/goconvey/convey"
 	"testing"
 	"time"
+
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func ExampleDateFormat() {
@@ -22,4 +23,11 @@ func TestDateFormat(t *testing.T) {
 			So(dateFmt, ShouldEqual, "2009-11-10 23:00")
 		})
 	})
+
+	Convey("It should not panic when trying to format nil dates", t, func() {
+		dateFmt := DateFormat(nil, "%Y-%m-%d %H:%M")
+		Convey("Test DateFormat", func() {
+			So(dateFmt, ShouldEqual, "")
+		})
+	})
 }

app/utils/file.go

@@ -107,13 +107,13 @@ func CopyDir(source string, dest string) (err error) {
 		if entry.IsDir() {
 			err = CopyDir(sfp, dfp)
 			if err != nil {
-				log.Println("[Error]: %v", err)
+				log.Printf("[Error]: %v", err)
 			}
 		} else {
 			// perform copy
 			err = CopyFile(sfp, dfp)
 			if err != nil {
-				log.Println("[Error]: %v", err)
+				log.Printf("[Error]: %v", err)
 			}
 		}