compatibility with ggplot2 >= 3.2.2

fixes #3

Author: Stefan Fleck

DESCRIPTION

@@ -2,7 +2,7 @@ Type: Package
 Package: dint
 Title: A Toolkit for Year-Quarter, Year-Month and Year-Isoweek
     Dates
-Version: 2.1.1
+Version: 2.1.2
 Authors@R: 
     person(given = "Stefan",
            family = "Fleck",
@@ -32,7 +32,7 @@ VignetteBuilder:
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.0.1.9000
+RoxygenNote: 7.0.2.9000
 Collate: 
     'accessors.R'
     'arithmetic.R'

NEWS.md

@@ -1,3 +1,8 @@
+# dint 2.1.2
+
+* Updated all `scale_date_*()` functions for comptability with ggplot2 >= 3.2.2
+
+
 # dint 2.1.1
 
 * `format.date_xx()` now used `%V` for isoweeks instead of `%W` 

R/scale_date_xx.R

@@ -129,7 +129,7 @@ scale_date_yq <- function(
     name = name,
     palette = identity,
     labels = labels,
-    guide = "none",
+    guide = default_guide(),
     trans = date_yq_trans,
     super = ggplot2::ScaleContinuousDate,
     position = position,
@@ -203,7 +203,7 @@ scale_date_ym <- function(
     breaks = breaks,
     palette = identity,
     labels = labels,
-    guide = "none",
+    guide = default_guide(),
     trans = date_ym_trans,
     super = ggplot2::ScaleContinuousDate,
     position = position,
@@ -272,7 +272,7 @@ scale_date_yw <- function(
     name = name,
     breaks = breaks,
     palette = identity,
-    guide = "none",
+    guide = default_guide(),
     labels = labels,
     trans = date_yw_trans,
     super = ggplot2::ScaleContinuousDate,
@@ -486,3 +486,13 @@ round_frac <- function(
 ){
   (x %/% 1) + round((x %% 1) * denom) / denom
 }
+
+
+
+default_guide <- function(){
+  if (utils::packageVersion("ggplot2") >= "3.2.1.9000") {
+    ggplot2::waiver()
+  } else {
+    "none"
+  }
+}

R/zoo-compat.R

@@ -64,7 +64,7 @@ as_yearqtr.yearqtr <- function(x){
 #' @noRd
 #'
 yearqtr <- function(x){
-  assert(all((x %% 1) %in% c(0, 0.25, 0.5, 0.75)))
+  assert(all((x %% 1) %in% c(NA_real_, 0, 0.25, 0.5, 0.75)))
   structure(x, class = c("yearqtr", "numeric"))
 }
 
@@ -111,7 +111,7 @@ as_yearmon.yearmon <- function(x){
 yearmon <- function(x){
   x <- as.numeric(x)
   assert(
-    all(round(x %% 1, 5) %in% round(seq(0, 1, by = 1/12), 5))
+    all(round(x %% 1, 5) %in% c(NA_real_, round(seq(0, 1, by = 1/12), 5)))
   )
   structure(x, class = c("yearmon", "numeric"))
 }
@@ -161,7 +161,7 @@ as_yearweek.yearweek <- function(x){
 yearweek <- function(x){
   x <- as.numeric(x)
   assert(
-    all(round(x %% 1, 5) %in% round(seq(0, 1, by = 1/53), 5))
+    all(round(x %% 1, 5) %in% c(NA_real_, round(seq(0, 1, by = 1/53), 5)))
   )
   structure(x, class = c("yearweek", "numeric"))
 }

README.Rmd

@@ -55,7 +55,6 @@ devtools::install_github("s-fleck/dint")
 
 
 
-
 ## Example
 
 ```{r example}

README.md

@@ -1,21 +1,32 @@
 
 <!-- README.md is generated from README.Rmd. Please edit that file -->
-dint
-====
 
-[![CRAN status](https://www.r-pkg.org/badges/version/dint)](https://cran.r-project.org/package=dint) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable) [![Travis build status](https://travis-ci.org/s-fleck/dint.svg?branch=master)](https://travis-ci.org/s-fleck/dint) [![Coverage status](https://codecov.io/gh/s-fleck/dint/branch/master/graph/badge.svg)](https://codecov.io/github/s-fleck/dint?branch=master)
+# dint
+
+[![CRAN
+status](https://www.r-pkg.org/badges/version/dint)](https://cran.r-project.org/package=dint)
+[![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable)
+[![Travis build
+status](https://travis-ci.org/s-fleck/dint.svg?branch=master)](https://travis-ci.org/s-fleck/dint)
+[![Coverage
+status](https://codecov.io/gh/s-fleck/dint/branch/master/graph/badge.svg)](https://codecov.io/github/s-fleck/dint?branch=master)
 
 A Toolkit for Year-Quarter, Year-Month and Year-Isoweek Dates
 
-S3 classes and methods to create and work with year-quarter and year-month vectors. Basic arithmetic operations (such as adding and subtracting) are supported, as well as formatting and converting to and from standard R Date types. For more info please refer to the [package vignette](https://CRAN.R-project.org/package=dint/vignettes/dint.html) or the [documentation](https://s-fleck.github.io/dint/)
+S3 classes and methods to create and work with year-quarter and
+year-month vectors. Basic arithmetic operations (such as adding and
+subtracting) are supported, as well as formatting and converting to and
+from standard R Date types. For more info please refer to the [package
+vignette](https://CRAN.R-project.org/package=dint/vignettes/dint.html)
+or the [documentation](https://s-fleck.github.io/dint/)
 
-Dependencies
-------------
+## Dependencies
 
-dint is implemented strictly in base R and will **always stay dependency-free**. The optional dependencies in Suggests are to ensure interoperability with these packages if you are already using them.
+dint is implemented strictly in base R and will **always stay
+dependency-free**. The optional dependencies in Suggests are to ensure
+interoperability with these packages if you are already using them.
 
-Installation
-------------
+## Installation
 
 Install the release version of dint from CRAN:
 
@@ -30,8 +41,7 @@ Or install the development version from GitHub with:
 devtools::install_github("s-fleck/dint")
 ```
 
-Example
--------
+## Example
 
 ``` r
 library(dint)
@@ -85,7 +95,7 @@ last_of_quarter(q)
 first_of_quarter(q)
 #> [1] "2014-10-01"
 first_of_month(Sys.Date())
-#> [1] "2018-12-01"
+#> [1] "2020-01-01"
 first_of_isoweek(w)
 #> [1] "2016-12-26"
 last_of_isoweek(w)

cran-comments.md

@@ -10,4 +10,4 @@
 
 ## resubmission 
 
-* fixes `\concept{\link{date_xx} subclasses}` in `date_y.Rd`
+* compatibility with ggplot2 >= 3.2.2