Fixes for CRAN submission; added globals.R to avoid notes, changed description to title case, added README.md and man-roxygen to .Rbuildignore.

Author: dgrtwo

.Rbuildignore

@@ -1,2 +1,5 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
+^NEWS\.md$
+^man-roxygen$
+cran-comments.md

.gitignore

@@ -4,3 +4,4 @@
 .RData
 vignettes/*cache
 inst/doc
+cran-comments.md

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: broom
 Type: Package
-Title: Convert statistical analysis objects from R into tidy format
+Title: Convert Statistical Analysis Objects Into Tidy Data Frames
 Version: 0.3.4
 Date: 2014-09-11
 Authors@R: as.person(c(
@@ -10,7 +10,7 @@ Authors@R: as.person(c(
     "Hadley Wickham <hadley@rstudio.com> [ctb]"
     ))
 Maintainer: David Robinson <admiral.david@gmail.com>
-Description: Convert statistical analysis objects from R into tidy format,
+Description: Convert statistical analysis objects from R into tidy data frames,
     so that they can more easily be combined, reshaped and otherwise processed
     with tools like dplyr, tidyr and ggplot2. The package provides three S3
     generics: tidy, which summarizes a model's statistical findings such as

NEWS.md

@@ -1,7 +1,7 @@
 broom 0.3.4
 -----------
 
-* The behavior of `augment`, particularly with regard to missing data and the `na.exclude` argument, has through the use of the \code{augment_columns} function been made consistent across the following models:
+* The behavior of `augment`, particularly with regard to missing data and the `na.exclude` argument, has through the use of the `augment_columns` function been made consistent across the following models:
     * `lm`
     * `glm`
     * `nls`
@@ -18,7 +18,9 @@ broom 0.3.4
 
     See `?rowwise_df_tidiers` for more.
 * Added `tidy` and `glance` methods for `Arima` objects, and `tidy` for `pairwise.htest` objects.
-* This is the version originally submitted to CRAN.
+* Fixes for CRAN: change package description to title case, removed NOTES, mostly by adding `globals.R` to declare global variables.
+* This is the original version published on CRAN.
+
 
 broom 0.3
 ---------

R/felm_tidiers.R

@@ -71,17 +71,17 @@ tidy.felm <- function(x, conf.int=FALSE, conf.level=.95, fe = FALSE, fe.error =
 
     if (fe){
       ret <- mutate(ret, N = NA, comp = NA)
-      object <- getfe(x)
+      object <- lfe::getfe(x)
       if (fe.error){
         nn <- c("estimate", "std.error", "N", "comp")
-        ret_fe <- getfe(x, se = TRUE, bN = 100) %>%
+        ret_fe <- lfe::getfe(x, se = TRUE, bN = 100) %>%
                   select(effect, se, obs, comp) %>%
                   fix_data_frame(nn) %>%
                   mutate(statistic = estimate/std.error) %>%
                   mutate(p.value = 2*(1-pt(statistic, df = N))) 
       } else{
         nn <- c("estimate", "N", "comp")
-        ret_fe <- getfe(x) %>%
+        ret_fe <- lfe::getfe(x) %>%
                   select(effect, obs, comp) %>%
                   fix_data_frame(nn)  %>% 
                   mutate(statistic = NA, p.value = NA) 
@@ -124,7 +124,7 @@ augment.felm <- function(x, data = NULL, ...) {
     y <- eval(x$call$formula[[2]], envir = data)
     data$.fitted <- x$fitted.values
     data$.resid <- x$residuals
-    object <-  getfe(x)
+    object <-  lfe::getfe(x)
     if (!is.null(object)){
         fe_list <- levels(object$fe)
         object <- object %>% mutate(effect = as.numeric(effect))%>% mutate(fe = as.character(fe))

R/globals.R

@@ -0,0 +1,4 @@
+globalVariables(c(".", "estimate", "std.error", "statistic", "term", "p.value",
+                "effect", "se", "objs", "comp", "N", "lambda", "GCV", "obs",
+                ".id", "level", "group1", "group2", "series", "value",
+                "index"))

R/rowwise_df_tidiers.R

@@ -19,7 +19,7 @@ wrap_rowwise_df_ <- function(func) {
 
 wrap_rowwise_df <- function(func) {
     function(x, data, ...) {
-        n <- tidyr:::col_name(substitute(data), "object")
+        n <- col_name(substitute(data))
         func(x, n, ...)
     }
 }

R/sp_tidiers.R

@@ -37,7 +37,7 @@ tidy.SpatialPolygonsDataFrame <- function(x, region = NULL, ...) {
         require("maptools")
 
         # Union together all polygons that make up a region
-        unioned <- unionSpatialPolygons(cp, attr[, region])
+        unioned <- maptools::unionSpatialPolygons(cp, attr[, region])
         coords <- tidy(unioned)
         coords$order <- 1:nrow(coords)
     }

R/utilities.R

@@ -257,3 +257,17 @@ inflate <- function(.data, ..., stringsAsFactors = FALSE) {
     ret
 }
 
+
+# utility function from tidyr::col_name
+col_name <- function (x, default = stop("Please supply column name", call. = FALSE)) 
+{
+    if (is.character(x)) 
+        return(x)
+    if (identical(x, quote(expr = ))) 
+        return(default)
+    if (is.name(x)) 
+        return(as.character(x))
+    if (is.null(x)) 
+        return(x)
+    stop("Invalid column specification", call. = FALSE)
+}