Merge branch 'pr/84'

Change-Id: I2c41b0394bf7438c76bfdf04e6afb58e63e3c48c

Author: skriptble

bson/element_test.go

@@ -1135,7 +1135,7 @@ func TestElement(t *testing.T) {
 				})
 			}
 		})
-		t.Run("UTC dateTime", func(t *testing.T) {
+		t.Run("UTC dateTime as time.Time", func(t *testing.T) {
 			var empty time.Time
 			testCases := []struct {
 				name  string
@@ -1163,6 +1163,50 @@ func TestElement(t *testing.T) {
 				},
 			}
 
+			for _, tc := range testCases {
+				t.Run(tc.name, func(t *testing.T) {
+					defer func() {
+						fault := recover()
+						if fault != tc.fault {
+							t.Errorf("Did not return the correct error for panic. got %v; want %v", fault, tc.fault)
+						}
+					}()
+
+					val := tc.elem.value.Time()
+					if val != tc.val {
+						t.Errorf("Did not return correct value. got %v; want %v", val, tc.val)
+					}
+				})
+			}
+		})
+		t.Run("UTC dateTime", func(t *testing.T) {
+			var empty int64
+			testCases := []struct {
+				name  string
+				elem  *Element
+				val   int64
+				fault error
+			}{
+				{"Nil Value", &Element{nil}, empty, ErrUninitializedElement},
+				{"Empty Element value",
+					&Element{&Value{start: 0, offset: 0, data: nil}}, empty, ErrUninitializedElement,
+				},
+				{"Empty Element data",
+					&Element{&Value{start: 0, offset: 2, data: nil}}, empty, ErrUninitializedElement,
+				},
+				{"Not UTC dateTime",
+					&Element{&Value{start: 0, offset: 2, data: []byte{0x01, 0x00}}}, empty,
+					ElementTypeError{"compact.Element.dateTime", Type(0x01)},
+				},
+				{"Success",
+					&Element{&Value{
+						start: 0, offset: 2,
+						data: []byte{0x09, 0x00, 0x80, 0x38, 0x17, 0xB0, 0x60, 0x01, 0x00, 0x00},
+					}},
+					1514782800000, nil,
+				},
+			}
+
 			for _, tc := range testCases {
 				t.Run(tc.name, func(t *testing.T) {
 					defer func() {

bson/value.go

@@ -598,19 +598,34 @@ func (v *Value) BooleanOK() (bool, bool) {
 	return v.Boolean(), true
 }
 
-// DateTime returns the BSON datetime value the Value represents. It panics if the value is a BSON
-// type other than datetime.
-func (v *Value) DateTime() time.Time {
+// DateTime returns the BSON datetime value the Value represents as a
+// unix timestamp. It panics if the value is a BSON type other than datetime.
+func (v *Value) DateTime() int64 {
 	if v == nil || v.offset == 0 || v.data == nil {
 		panic(ErrUninitializedElement)
 	}
 	if v.data[v.start] != '\x09' {
 		panic(ElementTypeError{"compact.Element.dateTime", Type(v.data[v.start])})
 	}
-	i := v.getUint64()
+	return int64(v.getUint64())
+}
+
+// Time returns the BSON datetime value the Value represents. It panics if the value is a BSON
+// type other than datetime.
+func (v *Value) Time() time.Time {
+	i := v.DateTime()
 	return time.Unix(int64(i)/1000, int64(i)%1000*1000000)
 }
 
+// TimeOK is the same as Time, except it returns a boolean instead of
+// panicking.
+func (v *Value) TimeOK() (time.Time, bool) {
+	if v == nil || v.offset == 0 || v.data == nil || Type(v.data[v.start]) != TypeDateTime {
+		return time.Time{}, false
+	}
+	return v.Time(), true
+}
+
 // Regex returns the BSON regex value the Value represents. It panics if the value is a BSON
 // type other than regex.
 func (v *Value) Regex() (pattern, options string) {
@@ -638,9 +653,9 @@ func (v *Value) Regex() (pattern, options string) {
 
 // DateTimeOK is the same as DateTime, except it returns a boolean instead of
 // panicking.
-func (v *Value) DateTimeOK() (time.Time, bool) {
+func (v *Value) DateTimeOK() (int64, bool) {
 	if v == nil || v.offset == 0 || v.data == nil || Type(v.data[v.start]) != TypeDateTime {
-		return time.Time{}, false
+		return 0, false
 	}
 	return v.DateTime(), true
 }