Re-exports done right

.Rbuildignore

@@ -1,3 +1,4 @@
+^CRAN-RELEASE$
 ^README\.Rmd$
 ^README\.html$
 ^cran-comments\.md$

CRAN-RELEASE

@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2019-02-07.
+Once it is accepted, delete this file and tag the release (commit 51661cd1b0).

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: desctable
 Title: Produce Descriptive and Comparative Tables Easily
-Version: 0.1.4
+Version: 0.1.5
 Authors@R: person("Maxime", "Wack", email = "maximewack@free.fr", role = c("aut", "cre"))
 Description: Easily create descriptive and comparative tables.
     It makes use and integrates directly with the tidyverse family of packages, and pipes.
@@ -23,5 +23,5 @@ Suggests:
     knitr,
     rmarkdown,
     survival
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.1
 VignetteBuilder: knitr

NEWS

@@ -1,3 +1,7 @@
+Version 0.1.5
+
+- Correct way to re-export `group_by` and `%>%`
+
 Version 0.1.4
 
 - Documentation fix for group_by import (dplyr 0.8)

R/imports.R

@@ -1,20 +1,9 @@
-#' Pipe operator
-#'
-#' @name %>%
-#' @rdname pipe
-#' @keywords internal
-#' @export
 #' @importFrom dplyr %>%
-#' @usage lhs \%>\% rhs
-NULL
+#' @export
+dplyr::`%>%`
 
 
-#' Group a tbl by one or more variables.
-#'
-#' @name group_by
-#' @keywords internal
-#' @export
 #' @importFrom dplyr group_by
-#' @usage group_by(.data, ..., add = FALSE, .drop = FALSE)
-NULL
+#' @export
+dplyr::group_by
 

man/chisq.test.Rd

@@ -16,8 +16,8 @@ chisq.test(x, y, correct, p, rescale.p, simulate.p.value, B)
   simulate.p.value = FALSE, B = 2000)
 
 \method{chisq.test}{formula}(x, y = NULL, correct = T,
-  p = rep(1/length(x), length(x)), rescale.p = F, simulate.p.value = F,
-  B = 2000)
+  p = rep(1/length(x), length(x)), rescale.p = F,
+  simulate.p.value = F, B = 2000)
 }
 \arguments{
 \item{x}{a numeric vector, or matrix, or formula of the form \code{lhs ~ rhs} where \code{lhs} and \code{rhs} are factors. \code{x} and \code{y} can also both be factors.}

man/datatable.Rd

@@ -9,9 +9,9 @@
 datatable(data, ...)
 
 \method{datatable}{default}(data, options = list(), class = "display",
-  callback = DT::JS("return table;"), caption = NULL, filter = c("none",
-  "bottom", "top"), escape = TRUE, style = "default", width = NULL,
-  height = NULL, elementId = NULL,
+  callback = DT::JS("return table;"), caption = NULL,
+  filter = c("none", "bottom", "top"), escape = TRUE,
+  style = "default", width = NULL, height = NULL, elementId = NULL,
   fillContainer = getOption("DT.fillContainer", NULL),
   autoHideNavigation = getOption("DT.autoHideNavigation", NULL),
   selection = c("multiple", "single", "none"), extensions = list(),
@@ -20,14 +20,14 @@ datatable(data, ...)
 \method{datatable}{desctable}(data, options = list(paging = F, info = F,
   search = F, dom = "Brtip", fixedColumns = T, fixedHeader = T, buttons =
   c("copy", "excel")), class = "display",
-  callback = DT::JS("return table;"), caption = NULL, filter = c("none",
-  "bottom", "top"), escape = FALSE, style = "default", width = NULL,
-  height = NULL, elementId = NULL,
+  callback = DT::JS("return table;"), caption = NULL,
+  filter = c("none", "bottom", "top"), escape = FALSE,
+  style = "default", width = NULL, height = NULL, elementId = NULL,
   fillContainer = getOption("DT.fillContainer", NULL),
   autoHideNavigation = getOption("DT.autoHideNavigation", NULL),
-  selection = c("multiple", "single", "none"), extensions = c("FixedHeader",
-  "FixedColumns", "Buttons"), plugins = NULL, rownames = F, digits = 2,
-  ...)
+  selection = c("multiple", "single", "none"),
+  extensions = c("FixedHeader", "FixedColumns", "Buttons"),
+  plugins = NULL, rownames = F, digits = 2, ...)
 }
 \arguments{
 \item{data}{a data object (either a matrix or a data frame)}
@@ -98,7 +98,8 @@ select cells}
 extensions (\url{https://datatables.net/extensions/index})}
 
 \item{plugins}{a character vector of the names of DataTables plug-ins
-(\url{https://rstudio.github.io/DT/plugins.html})}
+(\url{https://rstudio.github.io/DT/plugins.html}).  Note that only those
+plugins supported by the \code{DT} package can be used here.}
 
 \item{rownames}{\code{TRUE} (show row names) or \code{FALSE} (hide row names)
 or a character vector of row names; by default, the row names are displayed

man/desctable.Rd

@@ -8,10 +8,11 @@
 \usage{
 desctable(data, stats, tests, labels)
 
-\method{desctable}{default}(data, stats = stats_auto, tests, labels = NULL)
-
-\method{desctable}{grouped_df}(data, stats = stats_auto, tests = tests_auto,
+\method{desctable}{default}(data, stats = stats_auto, tests,
   labels = NULL)
+
+\method{desctable}{grouped_df}(data, stats = stats_auto,
+  tests = tests_auto, labels = NULL)
 }
 \arguments{
 \item{data}{The dataframe to analyze}

man/fisher.test.Rd

@@ -11,9 +11,9 @@ fisher.test(x, y, workspace, hybrid, control, or, alternative, conf.int,
 
 \method{fisher.test}{default}(x, ...)
 
-\method{fisher.test}{formula}(x, y = NULL, workspace = 2e+05, hybrid = F,
-  control = list(), or = 1, alternative = "two.sided", conf.int = T,
-  conf.level = 0.95, simulate.p.value = F, B = 2000)
+\method{fisher.test}{formula}(x, y = NULL, workspace = 200000,
+  hybrid = F, control = list(), or = 1, alternative = "two.sided",
+  conf.int = T, conf.level = 0.95, simulate.p.value = F, B = 2000)
 }
 \arguments{
 \item{x}{either a two-dimensional contingency table in matrix form, a factor object, or a formula of the form \code{lhs ~ rhs} where \code{lhs} and \code{rhs} are factors.}

man/group_by.Rd

@@ -1,12 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/imports.R
-\name{group_by}
-\alias{group_by}
-\title{Group a tbl by one or more variables.}
-\usage{
-group_by(.data, ..., add = FALSE)
-}
-\description{
-Group a tbl by one or more variables.
-}
-\keyword{internal}

man/pander.desctable.Rd

@@ -4,8 +4,9 @@
 \alias{pander.desctable}
 \title{Pander method for desctable}
 \usage{
-pander.desctable(x = NULL, digits = 2, justify = "left", missing = "",
-  keep.line.breaks = T, split.tables = Inf, emphasize.rownames = F, ...)
+pander.desctable(x = NULL, digits = 2, justify = "left",
+  missing = "", keep.line.breaks = T, split.tables = Inf,
+  emphasize.rownames = F, ...)
 }
 \arguments{
 \item{x}{A desctable}

man/pipe.Rd

@@ -1,12 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/imports.R
-\name{\%>\%}
-\alias{\%>\%}
-\title{Pipe operator}
-\usage{
-lhs \%>\% rhs
-}
-\description{
-Pipe operator
-}
-\keyword{internal}

man/reexports.Rd

@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/imports.R
+\docType{import}
+\name{reexports}
+\alias{reexports}
+\alias{\%>\%}
+\alias{group_by}
+\title{Objects exported from other packages}
+\keyword{internal}
+\description{
+These objects are imported from other packages. Follow the links
+below to see their documentation.
+
+\describe{
+  \item{dplyr}{\code{\link[dplyr]{\%>\%}}, \code{\link[dplyr]{group_by}}}
+}}
+