Conversion cleanup and ZonedDateTime support. Closes #4

Project.toml

@@ -1,13 +1,15 @@
 name = "UnixTimes"
 uuid = "ab1a18e7-b408-4913-896c-624bb82ed7f4"
 authors = ["Christian Rorvik <christian.rorvik@gmail.com>"]
-version = "0.4.0"
+version = "1.0.0"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 
 [compat]
 julia = "1"
+TimeZones = "1"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/UnixTimes.jl

@@ -1,6 +1,7 @@
 module UnixTimes
 
 using Dates
+using TimeZones
 
 export UnixTime
 export unix_now
@@ -40,18 +41,27 @@ function Base.:+(x::UnixTime, p::Union{Month, Year})
     convert(UnixTime, convert(DateTime, x) + p) + Nanosecond(trunc_ns)
 end
 
-function Base.convert(::Type{DateTime}, x::UnixTime)
+function Dates.DateTime(x::UnixTime)
     instant_ms = Dates.UNIXEPOCH + div(x.instant.periods.value, 1_000_000)
     DateTime(Dates.UTM(instant_ms))
 end
 
-Base.convert(::Type{Date}, x::UnixTime) = Date(DateTime(x))
+Dates.Date(x::UnixTime) = Date(DateTime(x))
 
-function Base.convert(::Type{UnixTime}, x::DateTime)
+Base.convert(::Type{DateTime}, x::UnixTime) = DateTime(x)
+
+function UnixTime(x::DateTime)
     instant_ns = (Dates.value(x) - Dates.UNIXEPOCH) * 1_000_000
     UnixTime(Dates.UTInstant(Nanosecond(instant_ns)))
 end
 
+UnixTime(x::Date) = UnixTime(DateTime(x))
+
+Base.convert(::Type{UnixTime}, x::DateTime) = UnixTime(x)
+
+UnixTime(x::ZonedDateTime) = UnixTime(DateTime(x, UTC))
+ZonedDateTime(x::UnixTime, tz::TimeZone) = ZonedDateTime(DateTime(x), tz; from_utc = true)
+
 function Base.show(io::IO, x::UnixTime)
     xdt = convert(DateTime, x)
     print(io, Dates.format(xdt, dateformat"yyyy-mm-ddTHH:MM:SS.sss"))

test/runtests.jl

@@ -1,5 +1,6 @@
 using UnixTimes
 using Dates
+using TimeZones
 using Test
 
 @testset "UnixTime" begin
@@ -77,4 +78,15 @@ end
     @test t2 > t1
 end
 
+@testset "conversion" begin
+    @test UnixTime(DateTime(2020, 1, 2, 3)) == UnixTime(2020, 1, 2, 3)
+    @test DateTime(UnixTime(2020, 1, 2, 3)) == DateTime(2020, 1, 2, 3)
+    @test Date(UnixTime(2020, 1, 2, 3)) == Date(2020, 1, 2)
+    @test UnixTime(Date(2020, 1, 2)) == UnixTime(2020, 1, 2)
+    @test convert(UnixTime, DateTime(2020, 1, 2, 3)) == UnixTime(2020, 1, 2, 3)
+    @test convert(DateTime, UnixTime(2020, 1, 2, 3)) == DateTime(2020, 1, 2, 3)
+    @test UnixTime(ZonedDateTime(2020, 1, 2, 3, tz"UTC-4")) == UnixTime(2020, 1, 2, 7)
+    @test ZonedDateTime(UnixTime(2020, 1, 2, 7), tz"UTC-4") == ZonedDateTime(2020, 1, 2, 3, tz"UTC-4")
+end
+
 end