Remove override and update specs

Author: timhall

UtcConverter.bas

@@ -1,6 +1,6 @@
 Attribute VB_Name = "UtcConverter"
 ''
-' VBA-UTC v0.0.0
+' VBA-UTC v0.5.0
 ' (c) Tim Hall - https://github.com/VBA-tools/VBA-UtcConverter
 '
 ' UTC/ISO 8601 Converter for VBA
@@ -46,9 +46,6 @@ Private Type utc_TIME_ZONE_INFORMATION
 End Type
 #End If
 
-Public utc_UtcOffsetMinutes As Long
-Public utc_Override As Boolean
-
 ' ============================================= '
 ' Public Methods
 ' ============================================= '
@@ -60,9 +57,6 @@ Public utc_Override As Boolean
 ' @return {Date} Local date
 ' -------------------------------------- '
 Public Function ParseUtc(utc_UtcDate As Date) As Date
-    If utc_Override Then
-        ParseUtc = utc_UtcDate + VBA.TimeSerial(0, utc_UtcOffsetMinutes, 0)
-    Else
 #If Mac Then
     ' TODO
 #Else
@@ -74,7 +68,6 @@ Public Function ParseUtc(utc_UtcDate As Date) As Date
 
     ParseUtc = SystemTimeToDate(utc_LocalDate)
 #End If
-    End If
 End Function
 
 ''
@@ -84,9 +77,6 @@ End Function
 ' @return {Date} UTC date
 ' -------------------------------------- '
 Public Function ConvertToUtc(utc_LocalDate As Date) As Date
-    If utc_Override Then
-        ConvertToUtc = utc_LocalDate - VBA.TimeSerial(0, utc_UtcOffsetMinutes, 0)
-    Else
 #If Mac Then
     ' TODO
 #Else
@@ -98,7 +88,6 @@ Public Function ConvertToUtc(utc_LocalDate As Date) As Date
 
     ConvertToUtc = SystemTimeToDate(utc_UtcDate)
 #End If
-    End If
 End Function
 
 ''

specs/Specs.bas

@@ -1,12 +1,31 @@
 Attribute VB_Name = "Specs"
+Private pOffsetMinutes As Long
+Private pOffsetLoaded As Boolean
+Public Property Get OffSetMinutes() As Long
+    If Not pOffsetLoaded Then
+        Dim InputValue As String
+        InputValue = VBA.InputBox("Enter UTC Offset (in minutes)" & vbNewLine & vbNewLine & _
+            "Example:" & vbNewLine & _
+            "EST (UTC-5:00) and DST (+1:00)" & vbNewLine & _
+            "= UTC-4:00" & vbNewLine & _
+            "= -240", "Enter UTC Offset", 0)
+        
+        If InputValue <> "" Then: pOffsetMinutes = CLng(InputValue)
+        
+        pOffsetLoaded = True
+    End If
+    
+    OffSetMinutes = pOffsetMinutes
+End Property
+Public Property Let OffSetMinutes(Value As Long)
+    pOffsetMinutes = Value
+    pOffsetLoaded = True
+End Property
+
 Public Function Specs() As SpecSuite
     Set Specs = New SpecSuite
     Specs.Description = "VBA-UTC"
 
-    ' Override UTC Offset for specs
-    UtcConverter.utc_Override = True
-    UtcConverter.utc_UtcOffsetMinutes = -4 * 60
-    
     Dim LocalDate As Date
     Dim LocalIso As String
     Dim UtcDate As Date
@@ -17,47 +36,49 @@ Public Function Specs() As SpecSuite
     LocalIso = "2004-05-06T19:08:09.000Z"
 
     ' May 6, 2004 11:08:09 PM
-    UtcDate = 38113.9639930556
-    UtcIso = "2004-05-06T23:08:09.000Z"
+    UtcDate = LocalDate - OffSetMinutes / 60 / 24
+    UtcIso = VBA.Format$(UtcDate, "yyyy-mm-ddTHH:mm:ss.000Z")
 
     ' ============================================= '
     ' ParseUTC
     ' ============================================= '
     With Specs.It("should parse UTC")
-        .Expect(VBA.Format$(UtcConverter.ParseUtc(UtcDate), "yyyy-mm-ddTHH:mm:ss.000Z")).ToEqual LocalIso
+        .Expect(DateToString(UtcConverter.ParseUtc(UtcDate))).ToEqual DateToString(LocalDate)
     End With
 
     ' ============================================= '
     ' ConvertToUTC
     ' ============================================= '
     With Specs.It("should convert to UTC")
-        .Expect(VBA.Format$(UtcConverter.ConvertToUtc(LocalDate), "yyyy-mm-ddTHH:mm:ss.000Z")).ToEqual UtcIso
+        .Expect(DateToString(UtcConverter.ConvertToUtc(LocalDate))).ToEqual DateToString(UtcDate)
     End With
 
     ' ============================================= '
     ' ParseISO
     ' ============================================= '
     With Specs.It("should parse ISO 8601")
-        .Expect(VBA.Format$(UtcConverter.ParseIso(UtcIso), "yyyy-mm-ddTHH:mm:ss.000Z")).ToEqual LocalIso
+        .Expect(DateToString(UtcConverter.ParseIso(UtcIso))).ToEqual "2004-05-06T19:08:09"
     End With
 
     With Specs.It("should parse ISO 8601 with offset")
-        .Expect(VBA.Format$(UtcConverter.ParseIso("2004-05-06T12:08:09+04:05:06"), "yyyy-mm-ddTHH:mm:ss")).ToEqual "2004-05-06T16:13:15"
-        .Expect(VBA.Format$(UtcConverter.ParseIso("2004-05-06T12:08:09-04:05:06"), "yyyy-mm-ddTHH:mm:ss")).ToEqual "2004-05-06T08:03:03"
+        .Expect(DateToString(UtcConverter.ParseIso("2004-05-06T12:08:09+04:05:06"))).ToEqual "2004-05-06T16:13:15"
+        .Expect(DateToString(UtcConverter.ParseIso("2004-05-06T12:08:09-04:05:06"))).ToEqual "2004-05-06T08:03:03"
     End With
 
     With Specs.It("should parse ISO 8601 with varying time format")
-        .Expect(VBA.Format$(UtcConverter.ParseIso("2004-05-06T12+04"), "yyyy-mm-ddTHH:mm:ss")).ToEqual "2004-05-06T16:00:00"
-        .Expect(VBA.Format$(UtcConverter.ParseIso("2004-05-06T12:08+04:05"), "yyyy-mm-ddTHH:mm:ss")).ToEqual "2004-05-06T16:13:00"
-        .Expect(VBA.Format$(UtcConverter.ParseIso("2004-05-06T12Z"), "yyyy-mm-ddTHH:mm:ss")).ToEqual "2004-05-06T08:00:00"
-        .Expect(VBA.Format$(UtcConverter.ParseIso("2004-05-06T12:08Z"), "yyyy-mm-ddTHH:mm:ss")).ToEqual "2004-05-06T08:08:00"
+        .Expect(DateToString(UtcConverter.ParseIso("2004-05-06T12+04"))).ToEqual "2004-05-06T16:00:00"
+        .Expect(DateToString(UtcConverter.ParseIso("2004-05-06T12:08+04:05"))).ToEqual "2004-05-06T16:13:00"
+        .Expect(DateToString(UtcConverter.ParseIso("2004-05-06T12Z"))).ToEqual _
+            DateToString(DateSerial(2004, 5, 6) + TimeSerial(12, 0, 0) + OffSetMinutes / 60 / 24)
+        .Expect(DateToString(UtcConverter.ParseIso("2004-05-06T12:08Z"))).ToEqual _
+            DateToString(DateSerial(2004, 5, 6) + TimeSerial(12, 8, 0) + OffSetMinutes / 60 / 24)
     End With
 
     ' ============================================= '
     ' ConvertToISO
     ' ============================================= '
     With Specs.It("should convert to ISO 8601")
-        .Expect(VBA.Format$(UtcConverter.ConvertToIso(LocalDate), "yyyy-mm-ddTHH:mm:ss.000Z")).ToEqual UtcIso
+        .Expect(UtcConverter.ConvertToIso(LocalDate)).ToEqual UtcIso
     End With
 
     ' ============================================= '
@@ -77,3 +98,7 @@ Public Sub RunSpecs()
 
     DisplayRunner.RunSuite Specs
 End Sub
+
+Private Function DateToString(Value As Date) As String
+    DateToString = VBA.Format$(Value, "yyyy-mm-ddTHH:mm:ss")
+End Function