git push origin masterMerge branch 'larmarange-labelled_2'

DESCRIPTION

@@ -4,8 +4,7 @@ Authors@R: c(person("Julien", "Barnier", email="julien.barnier@ens-lyon.fr",
     role=c("aut","cre")), person("François", "Briatte",
     email="f.briatte@gmail.com", role="aut"), person("Joseph", "Larmarange",
     email="joseph@larmarange.net", role="aut"))
-Version: 0.6.4
-Date: 2018-07-20
+Version: 0.7.0
 License: GPL (>= 2)
 Encoding: UTF-8
 Title: Functions to Make Surveys Processing Easier
@@ -25,7 +24,7 @@ Imports:
     graphics,
     stats,
     utils,
-    labelled (>= 1.0.0)
+    labelled (>= 2.0.0)
 Suggests:
     memisc,
     testthat,
@@ -39,4 +38,4 @@ SystemRequirements: xclip (Linux)
 VignetteBuilder: knitr
 URL: https://juba.github.io/questionr/
 BugReports: https://github.com/juba/questionr/issues
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.1

NAMESPACE

@@ -12,7 +12,7 @@ S3method(describe,character)
 S3method(describe,data.frame)
 S3method(describe,default)
 S3method(describe,factor)
-S3method(describe,labelled)
+S3method(describe,haven_labelled)
 S3method(describe,numeric)
 S3method(format,proptab)
 S3method(odds.ratio,factor)

NEWS.md

@@ -1,6 +1,8 @@
-questionr 0.6.4
+questionr 0.7.0
 ---------------
 
+* Compatibility with `labelled` 2.0.0
+
 
 questionr 0.6.3
 ---------------

R/describe.R

@@ -80,9 +80,9 @@
       res <- paste0("[", length(x), " obs.] ")
     res <- paste0(res, labelled::var_label(x), "\n")
 
-    if (inherits(x, "labelled_spss")) 
+    if (inherits(x, "haven_labelled_spss")) 
       cl <- paste("labelled_spss", typeof(x))
-    else if (inherits(x, "labelled")) 
+    else if (inherits(x, "haven_labelled")) 
       cl <- paste("labelled", typeof(x))
     else 
       cl <- class(x)
@@ -124,9 +124,9 @@
       res <- paste0("[", length(x), " obs.] ")
     res <- paste0(res, labelled::var_label(x), "\n")
 
-    if (inherits(x, "labelled_spss")) 
+    if (inherits(x, "haven_labelled_spss")) 
       cl <- paste("labelled_spss", typeof(x))
-    else if (inherits(x, "labelled")) 
+    else if (inherits(x, "haven_labelled")) 
       cl <- paste("labelled", typeof(x))
     else 
       cl <- class(x)
@@ -189,12 +189,12 @@
 
 
 #' @rdname describe
-#' @aliases describe.labelled
+#' @aliases describe.haven_labelled
 #' @examples 
 #' data(fecondite)
 #' describe(femmes$milieu)
 #' @export
-`describe.labelled` <- 
+`describe.haven_labelled` <- 
   function(x, n = 10, show.length = TRUE, freq.n.max = 10, ...) {
     if (is.numeric(x)) {
       res <- describe.numeric(x, n = n, show.length = show.length, freq.n.max = 0, ...)

R/lookfor.R

@@ -99,7 +99,7 @@ lookfor <- function(data,
         res$type[i] <- paste(typeof(data[[v]]), collapse = ", ")
         if (is.factor(data[[v]]))
           res$levels[i] <- paste(levels(data[[v]]), collapse = "; ")
-        if (inherits(data[[v]], "labelled")) {
+        if (inherits(data[[v]], "haven_labelled")) {
           res$value_labels[i] <- paste(names(labelled::val_labels(data[[v]], prefixed=TRUE)), collapse = "; ")
           res$na_values[i] <- paste(labelled::na_values(data[[v]]), collapse = ", ")
           res$na_range[i] <- paste(labelled::na_range(data[[v]]), collapse = "-")

R/recode.R

@@ -55,7 +55,7 @@ function (var, nbclass, include.lowest=TRUE, right=FALSE, dig.lab=5, ...) {
 #' freq(recode.na(hdv2003$trav.satisf, "Equilibre"))
 #' ## Truncate a count variable (recommends numeric conversion).
 #' freq(recode.na(hdv2003$freres.soeurs, 5:22))
-#' @export
+#' @export recode.na
 
 recode.na <- function(x, ..., verbose = FALSE, regex = TRUE, as.numeric = FALSE) {
   if(!is.factor(x)) x = factor(x)