Merge pull request #166 from szimmer/print-summary-width

Improve printing for survey objects to respect width

R/survey_vars.r

@@ -31,14 +31,17 @@ print.survey_vars <- function(x, all = FALSE, ...) {
   cat("Sampling variables:\n")
   lapply(seq_along(x), function(y) {
     if (!is.null(x[[y]])) {
-      if (length(x[[y]]) > 7 & !all) {
-        num_vars <- length(x[[y]])
-        print_vars <- x[[y]][1:5]
-        cat(paste0(" - ", names(x[y]), ": ", paste(print_vars, collapse = ", "),
-                   ", ... (", num_vars - 5, " more)\n"))
-      } else {
-        cat(paste0(" - ", names(x[y]), ": ", paste(x[[y]], collapse = ", "),
-                   "\n"))
+      if (!is.null(x[[y]])) {
+        fixcarriage <- function(x){
+          # remove carriage return in repweights and extra space
+          out <- gsub("\\n    ", "", x)
+          if (is.symbol(x)){
+            as.symbol(out)
+          } else{
+            out
+          }
+        }
+        cat(wrap(paste0(" - ", names(x[y]), ": ", paste(lapply(x[[y]], fixcarriage), collapse=", ")), indent=2), "\n")
       }
     }
   })

R/tbl-svy.r

@@ -48,8 +48,8 @@ print.tbl_svy <- function (x, varnames = TRUE, all_survey_vars = FALSE, ...) {
     print(survey_vars(x), all_survey_vars)
   }
   if(length(groups(x)) != 0) {
-    cat("Grouping variables: ")
-    cat(paste0(deparse_all(groups(x)), collapse = ", "))
+    cat("Grouping variables: \n")
+    cat(wrap(paste0("- ", deparse_all(groups(x)), collapse = ", "), indent=2))
     cat("\n")
   }
 
@@ -63,7 +63,8 @@ print.tbl_svy <- function (x, varnames = TRUE, all_survey_vars = FALSE, ...) {
     }
 
     var_types <- paste0(vars, " (", types, ")", collapse = ", ")
-    cat(wrap("Data variables: ", var_types), "\n", sep = "")
+    cat("Data variables: \n")
+    cat(wrap(" - ", var_types, indent = 2), "\n", sep = "")
     invisible(x)
   }
 }