Fix S3 methods for dplyr generics

Author: wch

DESCRIPTION

@@ -46,4 +46,4 @@ Suggests:
 Encoding: UTF-8
 License: GPL-2 | file LICENSE
 LazyData: true
-RoxygenNote: 5.0.1
+RoxygenNote: 6.1.0.9000

NAMESPACE

@@ -8,6 +8,8 @@ S3method(apply_scale_defaults,scale_datetime)
 S3method(apply_scale_defaults,scale_nominal)
 S3method(apply_scale_defaults,scale_numeric)
 S3method(apply_scale_defaults,scale_ordinal)
+S3method(arrange_,ggvis)
+S3method(arrange_,reactive)
 S3method(as.character,prop_band)
 S3method(as.character,prop_constant)
 S3method(as.character,prop_reactive)
@@ -63,11 +65,15 @@ S3method(constant_vars,grouped_df)
 S3method(data_range,character)
 S3method(data_range,default)
 S3method(data_range,factor)
+S3method(distinct_,ggvis)
+S3method(distinct_,reactive)
 S3method(empty,default)
 S3method(explain,ggvis)
 S3method(extract_reactives,default)
 S3method(extract_reactives,ggvis_props)
 S3method(extract_reactives,prop_reactive)
+S3method(filter_,ggvis)
+S3method(filter_,reactive)
 S3method(format,ggvis_axis)
 S3method(format,ggvis_legend)
 S3method(format,ggvis_props)
@@ -88,8 +94,14 @@ S3method(formula,prop)
 S3method(fullseq,Date)
 S3method(fullseq,POSIXt)
 S3method(fullseq,numeric)
+S3method(group_by_,ggvis)
+S3method(group_by_,reactive)
+S3method(groups,ggvis)
+S3method(groups,reactive)
 S3method(max_rows,data.frame)
 S3method(max_rows,grouped_df)
+S3method(mutate_,ggvis)
+S3method(mutate_,reactive)
 S3method(new_prop,band)
 S3method(new_prop,call)
 S3method(new_prop,default)
@@ -130,14 +142,26 @@ S3method(prop_vega,prop_variable)
 S3method(remove_missing,data.frame)
 S3method(remove_missing,default)
 S3method(remove_missing,split_df)
+S3method(rename_,ggvis)
+S3method(rename_,reactive)
 S3method(rep,singular)
 S3method(scale_countable,default)
 S3method(scale_countable,scale_datetime)
 S3method(scale_countable,scale_logical)
 S3method(scale_countable,scale_nominal)
 S3method(scale_countable,scale_numeric)
 S3method(scale_countable,scale_ordinal)
+S3method(select_,ggvis)
+S3method(select_,reactive)
+S3method(slice_,ggvis)
+S3method(slice_,reactive)
+S3method(summarise_,ggvis)
+S3method(summarise_,reactive)
 S3method(to_csv,data.frame)
+S3method(transmute_,ggvis)
+S3method(transmute_,reactive)
+S3method(ungroup,ggvis)
+S3method(ungroup,reactive)
 S3method(value,default)
 S3method(value,reactive)
 S3method(vector_type,"NULL")
@@ -171,8 +195,6 @@ export(add_props)
 export(add_relative_scales)
 export(add_scale)
 export(add_tooltip)
-export(arrange_.ggvis)
-export(arrange_.reactive)
 export(auto_group)
 export(axis_props)
 export(band)
@@ -190,8 +212,6 @@ export(compute_tabulate)
 export(create_broker)
 export(create_input)
 export(default_options)
-export(distinct_.ggvis)
-export(distinct_.reactive)
 export(emit_arcs)
 export(emit_images)
 export(emit_paths)
@@ -202,8 +222,6 @@ export(emit_text)
 export(explain)
 export(export_png)
 export(export_svg)
-export(filter_.ggvis)
-export(filter_.reactive)
 export(fullseq)
 export(get_data)
 export(ggvis)
@@ -212,10 +230,6 @@ export(ggvisOutput)
 export(ggvis_message)
 export(ggvis_scale)
 export(group_by)
-export(group_by_.ggvis)
-export(group_by_.reactive)
-export(groups.ggvis)
-export(groups.reactive)
 export(handle_brush)
 export(handle_click)
 export(handle_hover)
@@ -266,16 +280,12 @@ export(legend_props)
 export(linked_brush)
 export(mainTopPanel)
 export(mark)
-export(mutate_.ggvis)
-export(mutate_.reactive)
 export(padding)
 export(plot_height)
 export(plot_width)
 export(prop)
 export(propname_to_scale)
 export(props)
-export(rename_.ggvis)
-export(rename_.reactive)
 export(resolution)
 export(save_spec)
 export(scale_datetime)
@@ -285,8 +295,6 @@ export(scale_numeric)
 export(scale_ordinal)
 export(scale_singular)
 export(scaled_value)
-export(select_.ggvis)
-export(select_.reactive)
 export(set_default_scale)
 export(set_dscale)
 export(set_options)
@@ -295,23 +303,27 @@ export(show_tooltip)
 export(sidebarBottomPage)
 export(sidebarBottomPanel)
 export(singular)
-export(slice_.ggvis)
-export(slice_.reactive)
-export(summarise_.ggvis)
-export(summarise_.reactive)
-export(transmute_.ggvis)
-export(transmute_.reactive)
-export(ungroup.ggvis)
-export(ungroup.reactive)
 export(up_down)
 export(vector_type)
 export(view_dynamic)
 export(view_static)
 export(waggle)
 export(zero_range)
 import(assertthat)
+importFrom(dplyr,arrange_)
+importFrom(dplyr,distinct_)
 importFrom(dplyr,explain)
+importFrom(dplyr,filter_)
 importFrom(dplyr,group_by)
+importFrom(dplyr,group_by_)
+importFrom(dplyr,groups)
+importFrom(dplyr,mutate_)
+importFrom(dplyr,rename_)
+importFrom(dplyr,select_)
+importFrom(dplyr,slice_)
+importFrom(dplyr,summarise_)
+importFrom(dplyr,transmute_)
+importFrom(dplyr,ungroup)
 importFrom(htmltools,knit_print.html)
 importFrom(htmltools,knit_print.shiny.tag)
 importFrom(htmltools,knit_print.shiny.tag.list)

R/dplyr.R

@@ -53,12 +53,14 @@ NULL
 
 # Methods for ggvis objects ----------------------------------------------------
 
+#' @importFrom dplyr groups
 #' @export
 #' @rdname dplyr-ggvis
 groups.ggvis <- function(x) {
   shiny::isolate(dplyr::groups(x$cur_data()))
 }
 
+#' @importFrom dplyr group_by_
 #' @export
 #' @rdname dplyr-ggvis
 group_by_.ggvis <- function(.data, ..., .dots, add = FALSE) {
@@ -71,6 +73,7 @@ group_by_.ggvis <- function(.data, ..., .dots, add = FALSE) {
   })
 }
 
+#' @importFrom dplyr ungroup
 #' @export
 #' @rdname dplyr-ggvis
 ungroup.ggvis <- function(x) {
@@ -80,6 +83,7 @@ ungroup.ggvis <- function(x) {
 }
 
 
+#' @importFrom dplyr summarise_
 #' @rdname dplyr-ggvis
 #' @export
 summarise_.ggvis <- function(.data, ..., .dots) {
@@ -91,6 +95,7 @@ summarise_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr mutate_
 #' @rdname dplyr-ggvis
 #' @export
 mutate_.ggvis <- function(.data, ..., .dots) {
@@ -102,6 +107,7 @@ mutate_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr arrange_
 #' @rdname dplyr-ggvis
 #' @export
 arrange_.ggvis <- function(.data, ..., .dots) {
@@ -113,6 +119,7 @@ arrange_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr select_
 #' @rdname dplyr-ggvis
 #' @export
 select_.ggvis <- function(.data, ..., .dots) {
@@ -124,6 +131,7 @@ select_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr filter_
 #' @rdname dplyr-ggvis
 #' @export
 filter_.ggvis <- function(.data, ..., .dots) {
@@ -135,6 +143,7 @@ filter_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr distinct_
 #' @rdname dplyr-ggvis
 #' @export
 distinct_.ggvis <- function(.data, ..., .dots) {
@@ -146,6 +155,7 @@ distinct_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr slice_
 #' @rdname dplyr-ggvis
 #' @export
 slice_.ggvis <- function(.data, ..., .dots) {
@@ -157,6 +167,7 @@ slice_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr rename_
 #' @rdname dplyr-ggvis
 #' @export
 rename_.ggvis <- function(.data, ..., .dots) {
@@ -168,6 +179,7 @@ rename_.ggvis <- function(.data, ..., .dots) {
   })
 }
 
+#' @importFrom dplyr transmute_
 #' @rdname dplyr-ggvis
 #' @export
 transmute_.ggvis <- function(.data, ..., .dots) {