From 544e5113cfd225e5e49c3d018604c9e29ff0db0b Mon Sep 17 00:00:00 2001
From: Jacob Long <jacob.long@sc.edu>
Date: Mon, 8 Jan 2024 09:19:27 -0500
Subject: [PATCH] Linting and tidying

---
 .gitignore        |  2 ++
 R/simple_slopes.R | 35 ++++++++++++++++++++++++-----------
 cran-comments.md  |  2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e7fc27..c7153a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ Meta
 
 .DS_Store
 .vscode/launch.json
+/doc/
+/Meta/
diff --git a/R/simple_slopes.R b/R/simple_slopes.R
index 7f72438..4d8f7cb 100644
--- a/R/simple_slopes.R
+++ b/R/simple_slopes.R
@@ -154,9 +154,11 @@ sim_slopes <- function(model, pred, modx, mod2 = NULL, modx.values = NULL,
 
   # Warn user if interaction term is absent
   if (!check_interactions(as.formula(formula(model)), c(pred, modx, mod2))) {
-    warn_wrap(paste(c(pred, modx, mod2), collapse = " and "),
-              " are not included in an interaction with one another in the
-              model.")
+    warn_wrap("Automated checks indicate that ", 
+              paste(c(pred, modx, mod2), collapse = " and "),
+              " may not be included in an interaction with one another in the 
+               model. Double-check to ensure the model is specified correctly.
+              This message may be a false positive.")
   }
 
   if (length(dots) > 0) { # See if there were any extra args
@@ -200,15 +202,18 @@ sim_slopes <- function(model, pred, modx, mod2 = NULL, modx.values = NULL,
   pred_names <- c(pred, bt(pred))
   pred_factor <- FALSE
   # Check for factor predictor
-  if (is.factor(d[[pred]]) | is.character(d[[pred]])) {
+  if (is.factor(d[[pred]]) || is.character(d[[pred]])) {
     # Need to know what the coefficients will be called (name + level)
     if (is.factor(d[[pred]])) {
-      pred_names <- c(sapply(pred_names, function(x) {paste0(x, colnames(contrasts(d[[pred]])))}))
+      pred_names <- 
+        c(sapply(pred_names, function(x) {paste0(x, colnames(contrasts(d[[pred]])))}))
     } else {
-    pred_names <- 
-      c(sapply(pred_names, function(x) paste0(x, ulevels(d[[pred]]))))
+      pred_names <- 
+        c(sapply(pred_names, function(x) paste0(x, ulevels(d[[pred]]))))
     }
     pred_factor <- TRUE
+  } else if (is.logical(d[[pred]])) {
+    pred_names <- c(sapply(pred_names, function (x) paste0(x, c(FALSE, TRUE))))
   }
   # Only keep the ones represented among the coefficients
   if (!is.null(attr(class(model), "package")) && "lme4" %in%
@@ -217,15 +222,17 @@ sim_slopes <- function(model, pred, modx, mod2 = NULL, modx.values = NULL,
   } else {
     pred_names <- pred_names %just% names(coef(model))
   }
-  if (is.null(pred_names) | length(pred_names) == 0) {
+
+  if (is.null(pred_names) || length(pred_names) == 0) {
     pred_names <- c(pred, bt(pred))
     if (pred_factor) {
     # Need to know what the coefficients will be called (name + level)
       if (is.factor(d[[pred]])) {
-        pred_names <- c(sapply(pred_names, function(x) {paste0(x, colnames(contrasts(d[[pred]])))}))
+        pred_names <- 
+          c(sapply(pred_names, function(x) {paste0(x, colnames(contrasts(d[[pred]])))}))
       } else {
-      pred_names <- 
-        c(sapply(pred_names, function(x) paste0(x, ulevels(d[[pred]]))))
+        pred_names <- 
+          c(sapply(pred_names, function(x) paste0(x, ulevels(d[[pred]]))))
       }
     }
     tidied <- tryCatch(generics::tidy(model), 
@@ -234,6 +241,12 @@ sim_slopes <- function(model, pred, modx, mod2 = NULL, modx.values = NULL,
     packages, install and load the broom.mixed package and try again. Make sure
     you have the broom package installed and loaded otherwise."))
     pred_names <- pred_names %just% tidied$term
+    if (length(pred_names) == 0) {
+      stop_wrap("Could not find the focal predictor in the model. If it was
+                 transformed (e.g. logged or turned into a factor), put the
+                 transformation into the 'pred' argument. For example,
+                 pred = 'as.numeric(x)'.")
+    }
   }
 
   wname <- get_weights(model, d)$weights_name
diff --git a/cran-comments.md b/cran-comments.md
index 5a4058c..0cd5b02 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1,5 +1,5 @@
 ## Test environments
-* Local macOS install, R 4.1.3
+* Local macOS install, R 4.3.2
 * ubuntu-latest (via Github Actions), R-release, R-devel, oldrel-1
 * macOS-latest (via Github Actions), R-release
 * windows-latest (via Github Actions), R-release