Merge pull request #480 from shrektan/patch-1

Fix ceiling_date return type when unit = "week"

NEWS.md

@@ -36,6 +36,7 @@ Version 1.6.0
 
 ### BUG FIXES
 
+* [#479](https://github.com/hadley/lubridate/issues/479) Fix the inconsistent behavior in `ceiling_date` when `unit = "week"`
 * [#463](https://github.com/hadley/lubridate/issues/463) Fix NA subscripting error in %m+% when rollback is involved.
 * [#462](https://github.com/hadley/lubridate/issues/462) Non-numeric or non-character arguments are disallowed as arguments to `period` and `duration` constructors.
 * [#458](https://github.com/hadley/lubridate/issues/458) When year is missing in parsing, return consistently year 0.

R/round.r

@@ -137,7 +137,7 @@ round_date <- function(x, unit = "second") {
 }
 
 reclass_date_maybe <- function(new, orig, unit){
-  if(is.Date(orig) && !unit %in% c("day", "month", "year")) as.POSIXct(new)
+  if(is.Date(orig) && !unit %in% c("day", "week", "month", "year")) as.POSIXct(new)
   else reclass_date(new, orig)
 }
 

tests/testthat/test-round.R

@@ -260,6 +260,32 @@ test_that("Ceiling for partials (Date) rounds up on boundary", {
   expect_identical(ceiling_date(as.Date("2012-09-01"), '2 days'), ymd("2012-09-03"))
 })
 
+test_that("Ceiling for Date returns date when unit level is higher than day", {
+  expect_true(is.Date(ceiling_date(ymd("20160927"), "year")))
+  expect_true(is.Date(ceiling_date(ymd("20160927"), "halfyear")))
+  expect_true(is.Date(ceiling_date(ymd("20160927"), "quarter")))
+  expect_true(is.Date(ceiling_date(ymd("20160927"), "bimonth")))
+  expect_true(is.Date(ceiling_date(ymd("20160927"), "month")))
+  expect_true(is.Date(ceiling_date(ymd("20160927"), "week")))
+  expect_true(is.Date(ceiling_date(ymd("20160927"), "day")))
+  expect_true(is.POSIXct(ceiling_date(ymd("20160927"), "hour")))
+  expect_true(is.POSIXct(ceiling_date(ymd("20160927"), "minute")))
+  expect_true(is.POSIXct(ceiling_date(ymd("20160927"), "second")))
+})
+
+test_that("Ceiling for POSIXct always returns POSIXct", {
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "year")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "halfyear")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "quarter")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "bimonth")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "month")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "week")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "day")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "hour")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "minute")))
+  expect_true(is.POSIXct(ceiling_date(ymd_hms("20160927 00:00:00"), "second")))
+})
+
 test_that("ceiling_date does not round up dates that are already on a boundary",{
   expect_equal(ceiling_date(ymd_hms("2012-09-01 00:00:00"), 'month'), as.POSIXct("2012-09-01", tz = "UTC"))
   expect_equal(ceiling_date(ymd_hms("2012-01-01 00:00:00"), 'year'), as.POSIXct("2012-01-01", tz = "UTC"))