feat(time): embed time struct

This way functions like .Year() are available to the user without
having to run `t.Time.Year()`. now all they need to do is call
`t.Year()`.

Author: Matthew

time/time.go

@@ -11,17 +11,17 @@ const PyOpenSSLTimeDateTimeFormat = "2006-01-02T15:04:05"
 
 // Time represents the standard datetime format used across the Deis Platform.
 type Time struct {
-	time.Time
+	*time.Time
 }
 
 func (t *Time) format() string {
-	return t.Time.Format(DeisDatetimeFormat)
+	return t.Format(DeisDatetimeFormat)
 }
 
 // MarshalJSON implements the json.Marshaler interface.
 // The time is a quoted string in Deis' datetime format.
 func (t *Time) MarshalJSON() ([]byte, error) {
-	return []byte(t.Time.Format(`"` + DeisDatetimeFormat + `"`)), nil
+	return []byte(t.Format(`"` + DeisDatetimeFormat + `"`)), nil
 }
 
 // UnmarshalText implements the encoding.TextUnmarshaler interface.
@@ -31,7 +31,7 @@ func (t *Time) UnmarshalText(data []byte) error {
 	if _, ok := err.(*time.ParseError); ok {
 		tt, err = time.Parse(PyOpenSSLTimeDateTimeFormat, string(data))
 	}
-	*t = Time{tt}
+	*t = Time{&tt}
 	return err
 }
 
@@ -43,6 +43,6 @@ func (t *Time) UnmarshalJSON(data []byte) error {
 	if _, ok := err.(*time.ParseError); ok {
 		tt, err = time.Parse(`"`+PyOpenSSLTimeDateTimeFormat+`"`, string(data))
 	}
-	*t = Time{tt}
+	*t = Time{&tt}
 	return err
 }

time/time_test.go

@@ -1,20 +1,40 @@
 package time
 
 import (
+	"fmt"
 	"testing"
 )
 
 func TestUnMarshalText(t *testing.T) {
 	dummyTime := Time{}
 
-	goodTimeFormats := []string{
+	standardTimeFormats := []string{
 		"2006-01-02T15:04:05MST",
-		"2006-01-02T15:04:05",
+		"2006-01-02T15:04:05UTC",
+		"2006-01-02T15:04:05PST",
 	}
-	for _, goodTime := range goodTimeFormats {
+	for _, goodTime := range standardTimeFormats {
 		if dummyTime.UnmarshalText([]byte(goodTime)) != nil {
 			t.Error("expected " + goodTime + " to be marshal-able.")
 		}
+		if dummyTime.Year() != 2006 {
+			t.Error(fmt.Sprintf("expected year to be 2006; got %d.", dummyTime.Year()))
+		}
+	}
+
+	alternateTimeFormats := []string{
+		"2007-01-02T15:04:05",
+		"2007-01-02T15:04:05",
+		"2007-01-02T15:04:05",
+	}
+
+	for _, goodTime := range alternateTimeFormats {
+		if dummyTime.UnmarshalText([]byte(goodTime)) != nil {
+			t.Error("expected " + goodTime + " to be marshal-able.")
+		}
+		if dummyTime.Year() != 2007 {
+			t.Error(fmt.Sprintf("expected year to be 2007; got %d.", dummyTime.Year()))
+		}
 	}
 
 	badTime := "this is a bad time, isn't it?"