Modifications in response to CRAN comments; this is 0.3.5 on CRAN. Removed lme4.0 tidiers, and from SUGGESTS. Removed 'require("maptools")' line.

Author: dgrtwo

DESCRIPTION

@@ -36,11 +36,9 @@ Suggests:
     multcomp,
     testthat,
     lme4,
-    lme4.0,
     zoo,
     ggplot2
 URL: http://github.com/dgrtwo/broom
 BugReports: http://github.com/dgrtwo/broom/issues
 VignetteBuilder: knitr
 License: MIT + file LICENSE
-Additional_repositories: http://lme4.r-forge.r-project.org/repos

NAMESPACE

@@ -7,7 +7,6 @@ S3method(augment,default)
 S3method(augment,felm)
 S3method(augment,kmeans)
 S3method(augment,lm)
-S3method(augment,mer)
 S3method(augment,merMod)
 S3method(augment,nls)
 S3method(augment,rowwise_df)
@@ -29,7 +28,6 @@ S3method(glance,glmnet)
 S3method(glance,htest)
 S3method(glance,kmeans)
 S3method(glance,lm)
-S3method(glance,mer)
 S3method(glance,merMod)
 S3method(glance,nls)
 S3method(glance,pyears)
@@ -72,7 +70,6 @@ S3method(tidy,kmeans)
 S3method(tidy,lm)
 S3method(tidy,manova)
 S3method(tidy,map)
-S3method(tidy,mer)
 S3method(tidy,merMod)
 S3method(tidy,nls)
 S3method(tidy,pairwise.htest)

NEWS.md

@@ -1,7 +1,6 @@
 broom 0.3.5
 -----------
 
-* Added tidiers for `mer` objects from lme4.0 and versions of lme4 prior to 1.1-7.
 * Fixed small bug in `felm` where the `.fitted` and `.resid` columns were matrices rather than vectors.
 * Added tidiers for `rlm` (robust linear model) and `gam` (generalized additive model) objects, including adjustments to "lm" tidiers in order to handle them. See `?rlm_tidiers` and `?gam_tidiers` for more.
 * Removed rownames from `tidy.cv.glmnet` output

R/lme4_tidiers.R

@@ -1,8 +1,7 @@
 #' Tidying methods for mixed effects models
 #' 
 #' These methods tidy the coefficients of mixed effects models, particularly
-#' responses of the \code{merMod} and \code{mer} (from lme4.0 and versions prior
-#' to 1.1-7)
+#' responses of the \code{merMod} class
 #' 
 #' @param x An object of class \code{merMod}, such as those from \code{lmer},
 #' \code{glmer}, or \code{nlmer}
@@ -162,47 +161,3 @@ glance.merMod <- function(x, ...) {
     ret <- unrowname(data.frame(sigma = lme4::sigma(x)))
     finish_glance(ret, x)
 }
-
-
-## "mer" methods
-
-
-#' @rdname lme4_tidiers
-#' 
-#' @export
-tidy.mer <- function(x, effects = "random", ...) {
-    # pass directly on to lme4 method
-    effects <- match.arg(effects, c("random", "fixed"))
-    if (effects == "fixed") {
-        # return tidied fixed effects rather than random
-        ret <- coef(lme4.0::summary(x))
-        
-        # p-values may or may not be included
-        nn <- c("estimate", "std.error", "statistic", "p.value")[1:ncol(ret)]
-        return(fix_data_frame(ret, newnames = nn, newcol = "term"))
-    }
-
-    # for random effects, can pass on to lme4 method
-    tidy.merMod(x, effects = "random", ...)
-}
-
-
-#' @rdname lme4_tidiers
-#' 
-#' @export
-augment.mer <- function(x, data = model.frame(x), newdata, ...) {    
-    if (missing(newdata)) {
-        newdata <- NULL
-    }
-    ret <- augment_columns(x, data, newdata, se.fit = NULL)
-    ret
-}
-
-
-#' @rdname lme4_tidiers
-#' 
-#' @export
-glance.mer <- function(x, ...) {
-    ret <- unrowname(data.frame(sigma = lme4.0::sigma(x)))
-    finish_glance(ret, x)
-}

R/sp_tidiers.R

@@ -34,7 +34,6 @@ tidy.SpatialPolygonsDataFrame <- function(x, region = NULL, ...) {
         message("Regions defined for each Polygons")
     } else {
         cp <- sp::polygons(x)
-        require("maptools")
 
         # Union together all polygons that make up a region
         unioned <- maptools::unionSpatialPolygons(cp, attr[, region])

cran-comments.md

@@ -1,20 +1,15 @@
+## Resubmission
+This is a resubmission. In this version I have
+
+* Removed 'require("maptools")' call that led to a NOTE on R-devel
+
 ## Test environments
 * local OS X install, R 3.1.2
 * ubuntu 12.04 (on travis-ci), R 3.1.2
 * win-builder (devel and release)
 
 ## R CMD check results
-There were no ERRORs or WARNINGs. 
-
-There was 1 NOTE:
-
-* checking package dependencies ... NOTE
-  Package suggested but not available for checking: ‘lme4.0’
-  
-  This is available from R-forge, and an appropriate repository has been
-  included in the additional repositories field in DESCRIPTION.
-
-  R6 is a build-time dependency.
+There were no ERRORs, WARNINGs or NOTEs.
 
 ## Reverse dependencies
 Broom has no reverse dependencies.

man/lme4_tidiers.Rd

@@ -1,12 +1,9 @@
 % Generated by roxygen2 (4.1.0): do not edit by hand
 % Please edit documentation in R/lme4_tidiers.R
 \name{lme4_tidiers}
-\alias{augment.mer}
 \alias{augment.merMod}
-\alias{glance.mer}
 \alias{glance.merMod}
 \alias{lme4_tidiers}
-\alias{tidy.mer}
 \alias{tidy.merMod}
 \title{Tidying methods for mixed effects models}
 \usage{
@@ -15,12 +12,6 @@
 \method{augment}{merMod}(x, data = model.frame(x), newdata, ...)
 
 \method{glance}{merMod}(x, ...)
-
-\method{tidy}{mer}(x, effects = "random", ...)
-
-\method{augment}{mer}(x, data = model.frame(x), newdata, ...)
-
-\method{glance}{mer}(x, ...)
 }
 \arguments{
 \item{x}{An object of class \code{merMod}, such as those from \code{lmer},
@@ -75,8 +66,7 @@ are values from the response object within the model (of type
 }
 \description{
 These methods tidy the coefficients of mixed effects models, particularly
-responses of the \code{merMod} and \code{mer} (from lme4.0 and versions prior
-to 1.1-7)
+responses of the \code{merMod} class
 }
 \details{
 When the modeling was performed with \code{na.action = "na.omit"}