ready for CRAN update

DESCRIPTION

@@ -1,33 +1,33 @@
-Package: eeptools
-Type: Package
-Title: Convenience Functions for Education Data
-Version: 1.2.5
-Authors@R: c(person(c("Jason", "P."), "Becker", role = c("ctb"),
-    email = "jason+sitemail@jbecker.co"),
-    person(c("Jared", "E."), "Knowles", role=c("aut", "cre"),
-    email="jknowles@gmail.com"))
-Description: Collection of convenience functions to make working with
-    administrative records easier and more consistent. Includes functions to
-    clean strings, and identify cut points. Also includes three example data 
-    sets of administrative education records for learning how to process records 
-    with errors.
-License: GPL-3
-Depends:
-    R (>= 3.5.3),
-    ggplot2
-Imports:
-    arm,
-    data.table,
-    vcd
-Suggests:
-    testthat,
-    stringr,
-    knitr,
-    rmarkdown,
-    MASS
-LazyData: true
-Encoding: UTF-8
-VignetteBuilder: knitr
-RoxygenNote: 7.0.2
-URL: https://github.com/jknowles/eeptools
-BugReports: https://github.com/jknowles/eeptools/issues
+Package: eeptools
+Type: Package
+Title: Convenience Functions for Education Data
+Version: 1.2.5
+Authors@R: c(person(c("Jason", "P."), "Becker", role = c("ctb"),
+    email = "jason+sitemail@jbecker.co"),
+    person(c("Jared", "E."), "Knowles", role=c("aut", "cre"),
+    email="jknowles@gmail.com"))
+Description: Collection of convenience functions to make working with
+    administrative records easier and more consistent. Includes functions to
+    clean strings, and identify cut points. Also includes three example data 
+    sets of administrative education records for learning how to process records 
+    with errors.
+License: GPL-3
+Depends:
+    R (>= 3.5.3),
+    ggplot2
+Imports:
+    arm,
+    data.table,
+    vcd
+Suggests:
+    testthat,
+    stringr,
+    knitr,
+    rmarkdown,
+    MASS
+LazyData: true
+Encoding: UTF-8
+VignetteBuilder: knitr
+RoxygenNote: 7.2.3
+URL: https://github.com/jknowles/eeptools
+BugReports: https://github.com/jknowles/eeptools/issues

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2: do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 S3method(autoplot,lm)
 export(age_calc)
@@ -9,12 +9,10 @@ export(cutoff)
 export(decomma)
 export(defac)
 export(gelmansim)
-export(ggmapmerge)
 export(isid)
 export(lag_data)
 export(leading_zero)
 export(makenum)
-export(mapmerge)
 export(max_mis)
 export(moves_calc)
 export(nth_max)
@@ -32,7 +30,6 @@ import(arm)
 import(data.table)
 import(ggplot2)
 import(vcd)
-importFrom(maptools,spCbind)
 importFrom(stats,as.formula)
 importFrom(stats,complete.cases)
 importFrom(stats,contrasts)

NEWS.md

@@ -2,7 +2,7 @@
 
 ## eeptools 1.2.5
 
-- Removed depcrecated mapping functionms to address #45
+- Removed deprecated mapping functions to address #45 the sunsetting of `maptools` 
 
 ## eeptools 1.2.3
 

R/modsims.R

@@ -61,7 +61,7 @@ gelmansim <- function(mod, newdata, n.sims, na.omit=TRUE){
   # Get factors
   facs <- mod$model[,sapply(mod$model, not.numeric)]
   if(length(facs) != 0){
-  if(class(facs) == "data.frame"){
+  if(inherits(facs, "data.frame")){
     contr.tmp <- lapply(facs, unique)
     for(i in names(contr.tmp)){
       newdata[, i] <- factor(newdata[, i], levels=unlist(contr.tmp[i]))