v1.5.2

msberends · May 25, 2021 · 9a4f79f · 9a4f79f
1 parent 0f5299f
commit 9a4f79f
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 44 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: cleaner
 Title: Fast and Easy Data Cleaning
-Version: 1.5.1.9000
-Date: 2021-04-12
+Version: 1.5.2
+Date: 2021-05-24
 Authors@R: 
   person(
     given = c("Matthijs", "S."),

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,6 @@
-# cleaner 1.5.1.9000
+# cleaner 1.5.2
 
+* Fix for latest R-devel, that does not allow `digits = 0` for `format()`
 * `clean_Date()` now supports month-year format for which it sets the day as 1:
   ```r
   clean_Date("March")

diff --git a/R/freq.R b/R/freq.R
@@ -538,7 +538,7 @@ format_header <- function(x, markdown = FALSE, decimal.mark = ".", big.mark = ",
     na_txt <- paste0(format(header$na_length, decimal.mark = decimal.mark, big.mark = big.mark), " = ",
                      sub("NaN", "0", percentage(header$na_length / header$length, 
                                                 digits = getdecimalplaces(header$na_length / header$length,
-                                                                          minimum = 0, 
+                                                                          minimum = 1, 
                                                                           maximum = digits),
                                                 decimal.mark = decimal.mark), 
                          fixed = TRUE))
@@ -554,7 +554,7 @@ format_header <- function(x, markdown = FALSE, decimal.mark = ".", big.mark = ",
   header$available <- paste0(format(header$available, decimal.mark = decimal.mark, big.mark = big.mark),
                              " (", trimws(percentage(header$available / header$length, 
                                                      digits = getdecimalplaces(header$available / header$length,
-                                                                               minimum = 0, 
+                                                                               minimum = 1, 
                                                                                maximum = digits),
                                                      decimal.mark = decimal.mark)),
                              na_txt, ")")

diff --git a/R/helpers.R b/R/helpers.R
@@ -42,7 +42,7 @@ gsub_warn_on_error <- function(pattern, replacement, x, ignore.case = FALSE, per
 
 # works exactly like round(), but rounds `round(44.55, 1)` as 44.6 instead of 44.5
 # and adds decimal zeroes until `digits` is reached when force_zero = TRUE
-round2 <- function(x, digits = 0, force_zero = TRUE) {
+round2 <- function(x, digits = 1, force_zero = TRUE) {
   x <- as.double(x)
   # https://stackoverflow.com/a/12688836/4575331
   val <- (trunc((abs(x) * 10 ^ digits) + 0.5) / 10 ^ digits) * sign(x)
@@ -62,7 +62,7 @@ round2 <- function(x, digits = 0, force_zero = TRUE) {
   as.double(val)
 }
 
-getdecimalplaces <- function(x, minimum = 0, maximum = 3) {
+getdecimalplaces <- function(x, minimum = 1, maximum = 3) {
   if (maximum < minimum) {
     maximum <- minimum
   }

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -2,5 +2,5 @@ pandoc: 2.11.2
 pkgdown: 1.6.1
 pkgdown_sha: ~
 articles: {}
-last_built: 2021-04-12T09:05Z
+last_built: 2021-05-24T14:28Z
 
diff --git a/docs/reference/clean.html b/docs/reference/clean.html
diff --git a/docs/reference/currency.html b/docs/reference/currency.html
diff --git a/docs/reference/format_datetime.html b/docs/reference/format_datetime.html
diff --git a/docs/reference/format_names.html b/docs/reference/format_names.html
diff --git a/docs/reference/format_p_value.html b/docs/reference/format_p_value.html
diff --git a/docs/reference/freq.html b/docs/reference/freq.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/na_replace.html b/docs/reference/na_replace.html
diff --git a/docs/reference/percentage.html b/docs/reference/percentage.html
diff --git a/docs/reference/rdate.html b/docs/reference/rdate.html
diff --git a/docs/reference/regex_true_false.html b/docs/reference/regex_true_false.html
diff --git a/docs/reference/unclean.html b/docs/reference/unclean.html