Merge pull request #119 from eddelbuettel/118-asdate-does-not-handle-…

…the-case-where-tz-is-a-vector

'as.Date' forces use of 'tz' and can handle 'tz' as a vector; closes …

ChangeLog

@@ -1,3 +1,20 @@
+2023-09-26  Leonardo Silvestri  <lsilvestri@ztsdb.org>
+
+	* R/nanotime.R: Further refinement for default UTC timezone
+	* inst/tinytest/test_nanotime.R: Idem
+
+2023-09-22  Dirk Eddelbuettel  <edd@debian.org>
+
+	* R/nanotime.R: Provide default UTC timezone in 'as.Date()'
+	* tests/simpleTests.R: Adjist a test accordingly
+	* inst/tinytest/test_nanotime.R: Idem
+
+2023-09-21  Leonardo Silvestri  <lsilvestri@ztsdb.org>
+
+	* DESCRIPTION (Version, Date): Roll minor version
+	* R/nanotime.R: Fixed 'as.Date' to force use of timezone and to
+	allow the timezone argument to be a vector
+
 2023-07-11  Dirk Eddelbuettel  <edd@debian.org>
 
 	* README.md: Add r-universe badge

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: nanotime
 Type: Package
 Title: Nanosecond-Resolution Time Support for R
-Version: 0.3.7.3
-Date: 2023-07-06
+Version: 0.3.7.4
+Date: 2023-09-21
 Author: Dirk Eddelbuettel and Leonardo Silvestri
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
 Description: Full 64-bit resolution date and time functionality with

R/nanotime.R

@@ -338,7 +338,18 @@ setAs("nanotime", "POSIXlt", function(from) as.POSIXlt.nanotime(from))
 
 ##' @rdname nanotime
 as.Date.nanotime <- function(x, ...) {
-    as.Date(as.POSIXct(x))
+    arguments <- list(...)
+    if (!("tz" %in% names(args))) {
+        arguments <- c(arguments, list(tz="UTC"))
+    }
+    other_args <- setdiff(names(arguments), list('x', 'tz'))
+    if (length(other_args) > 0) {
+        stop(paste("'as.Date' called with arguments other than 'tz': ",
+                   paste0("'", other_args, "'", collapse=", ")))
+    }
+    as.Date(ISOdate(year = nano_year(x, arguments$tz),
+                    month = nano_month(x, arguments$tz),
+                    day = nano_mday(x, arguments$tz)))
 }
 
 setAs("nanotime", "Date", function(from) as.Date(as.POSIXct(from)))

inst/NEWS.Rd

@@ -11,6 +11,8 @@
     \item New \code{accurate} parameter for conversion from \code{POSIXct} to
     \code{nanotime} (Davor Josipovic and Leonardo in \ghpr{116} closing
     \ghit{115})
+    \item The \code{as.Date()} function is now vectorized and can take a TZ
+    argument (Leonardo and Dirk in \ghpr{119} closing \ghit{118})
   }
 }
 

inst/tinytest/test_nanotime.R

@@ -344,7 +344,19 @@ expect_equal(p, as.POSIXct("1970-01-01 00:00:00", tz="UTC"), check.tzone=FALSE)
 options(nanotimeTz=oldTz)
 
 ##test_as_Date <- function() {
-expect_identical(as.Date(nanotime(0)), as.Date("1970-01-01"))
+## test scalar
+nanotime_scalar <- nanotime("2023-09-21T22:00:00 America/New_York")
+expect_identical(as.Date(nanotime_scalar, tz="UTC"), as.Date("2023-09-22"))
+## test vector
+nanotime_vec <- rep(nanotime("2023-09-21T22:00:00 America/New_York"), 2)
+tz_vec <- c("UTC", "America/New_York")
+expect_identical(as.Date(nanotime_vec, tz=tz_vec), as.Date(c("2023-09-22", "2023-09-21")))
+## test missing argument 'tz': now UTC filled in
+expect_silent(as.Date(nanotime_vec))
+expect_identical(as.Date(nanotime_vec), as.Date(nanotime_vec, tz="UTC"))
+## test exception for extraneous argument:
+expect_error(as.Date(nanotime_vec, y=2, z=3), "'as.Date' called with arguments other than 'tz':  'y', 'z'")
+expect_silent(as.Date(x=nanotime_vec))  # check we can still name 'x' without an exception
 
 
 ## c, subset, subassign and binds

tests/simpleTests.R

@@ -35,6 +35,7 @@ as.POSIXct(x+1000)
 as.POSIXlt(x)
 as.POSIXlt(x+1000)
 as.Date(x)
+as.Date(x, tz="UTC")
 options("digits.secs"=od)