Merge branch 'master' of github.com:grunwaldlab/metacoder

Author: zachary-foster

R/parsers.R

@@ -61,7 +61,7 @@ parse_phyloseq <- function(obj, class_regex = "(.*)",
   # Parse sample data
   if (! is.null(obj@sam_data)) {
     sam_data <- as.data.frame(as.list(obj@sam_data), stringsAsFactors = FALSE)
-    if (! is.null(rownames(obj@sam_data))) {
+    if (! is.null(rownames(obj@sam_data)) & !"sample_id" %in% colnames(obj@sam_data)) {
       sam_data <- cbind(sample_id = rownames(obj@sam_data), sam_data)
     }
     sam_data[] <- lapply(sam_data, as.character)

R/startup.R

@@ -6,7 +6,7 @@
 startup_msg <- function() {
   my_version <- utils::packageVersion("metacoder")
   is_devel <- stringr::str_count(as.character(my_version), "\\.") == 3
-  paste0('This is metacoder verison ', my_version, ' ',
+  paste0('This is metacoder version ', my_version, ' ',
          ifelse(is_devel, crayon::bold("(development version)"), "(stable)"))#,
          # '. If you use metacoder for published research, please cite our paper:\n\n',
          # 'Foster Z, Sharpton T and Grunwald N (2017). "Metacoder: An R package for',