automated and cleaned build/imports (#553)

Author: flying-sheep

.gitignore

@@ -64,7 +64,6 @@ bower_components
 *.log
 node_modules/
 npm-debug.*
-*.Rproj
 .Rproj.user
 .Rhistory
 .watch

kernel-r/declarativewidgets/DESCRIPTION

@@ -20,13 +20,14 @@ Imports:
     uuid,
     jsonlite,
     R6
-Collate:
-    'widget.r'
-    'widget_function.r'
-    'widget_channels.r'
-    'widget_dataframe.r'
+Collate: 
     'explore.r'
-    'serializer.r'
-    'serializers.r'
+    'queriers.r'
     'querier.r'
-    'queriers.r'
+    'serializers.r'
+    'serializer.r'
+    'widget_dataframe.r'
+    'widget_function.r'
+    'widget_channels.r'
+    'widget.r'
+RoxygenNote: 6.0.1.9000

kernel-r/declarativewidgets/NAMESPACE

@@ -1,9 +1,14 @@
-export(initWidgets)
+# Generated by roxygen2: do not edit by hand
+
 export(Serializer)
+export(Widget)
 export(channel)
 export(explore)
-import(IRdisplay)
-import(IRkernel)
-import(uuid)
-import(jsonlite)
-import(R6)
+export(initWidgets)
+importClassesFrom(IRkernel,Comm)
+importFrom(IRdisplay,display_javascript)
+importFrom(IRkernel,comm_manager)
+importFrom(IRkernel,log_error)
+importFrom(IRkernel,log_info)
+importFrom(R6,R6Class)
+importFrom(jsonlite,fromJSON)

kernel-r/declarativewidgets/R/explore.r

@@ -58,6 +58,7 @@ stringify_bindings <- function(bindings) {
 #' @param channel  The channel to bind to defaulted to default
 #' @param properties  The properties e.g. properties <- list("selection-as-object"=FALSE, foo=5)
 #' @param bindings  The bindings e.g. bindings <- list(selection='sel')
+#' @export
 explore <- function(df, channel='default', properties=list(), bindings=list()) {
     unique_df_name <- paste("the_literal_template_df_name_", get_unique_explore_id(), sep = "")
     register_explore_df <- function(df) {

kernel-r/declarativewidgets/R/queriers.r

@@ -39,23 +39,23 @@ Spark_DataFrame_Querier <- R6Class(
         inherit = Querier,
         public = list(
         handle_sort = function(df, sort_expr) {
-            return (arrange(df, sort_expr$by, decreasing=(sort_expr$ascending == "FALSE")))
+            return (SparkR::arrange(df, sort_expr$by, decreasing=(sort_expr$ascending == "FALSE")))
         },
         handle_filter = function(df, filter_expr) {
             return (filter(df, filter_expr))
         },
         handle_group = function(df, grp_expr) {
             agg_args <- list()
             col_names <- list()
-            by_arg <- groupBy(df, as.character(grp_expr$by))
+            by_arg <- SparkR::groupBy(df, as.character(grp_expr$by))
             agg_args <- append(agg_args, by_arg)
             for (i in 1:length(grp_expr$agg$op)) {
                 temp_expr <- paste(grp_expr$agg[1][,1][i], "(", grp_expr$agg[2][,1][i], ")", sep="")
-                agg_args <- append(agg_args, expr(temp_expr))
+                agg_args <- append(agg_args, SparkR::expr(temp_expr))
                 temp_name <- paste(grp_expr$agg[1][,1][i], "_", grp_expr$agg[2][,1][i], sep="")
                 col_names <- append(col_names, temp_name)
             }
-            new_df <- do.call(agg, agg_args)
+            new_df <- do.call(SparkR::agg, agg_args)
             col_names <- append(names(new_df)[1], col_names)
             names(new_df) <- col_names
             return (new_df)

kernel-r/declarativewidgets/R/serializer.r

@@ -1,6 +1,7 @@
 #' @include serializers.r
 NULL
 
+#' @export
 Serializer <- R6Class(
     'Serializer',
     public = list(

kernel-r/declarativewidgets/R/serializers.r

@@ -15,7 +15,7 @@ serialize_element <- function(elem) {
 }
 
 get_df_column_types <- function(df) {
-    class_info <- lapply(aDataFrame, class)
+    class_info <- lapply(df, class)
     type_info <- list()
     for (klass in class_info) {
         switch(
@@ -36,7 +36,6 @@ DataFrame_Serializer <- R6Class(
     inherit = Serializer,
     public = list(
         klass = function() {
-            library(base)
             data_frame_class_name <- "data.frame"
             #package_contents <- ls("package:base")
             #index_found <- match(data_frame_class_name, package_contents)
@@ -64,14 +63,7 @@ DataFrame_Serializer <- R6Class(
             json[['index']] <- as.numeric(rownames(obj))
             return (json)
         },
-        check_packages = function() {
-            tryCatch({
-                library(base)
-                return (TRUE)
-            }, error = function(e) {
-            })
-            return (FALSE)
-        },
+        check_packages = function() TRUE,
         initialize = function() {
             #initialize must exists on this class
         }
@@ -83,7 +75,6 @@ Spark_DataFrame_Serializer <- R6Class(
     inherit = Serializer,
     public = list(
         klass = function() {
-            library(SparkR)
             return ("DataFrame")
         },
         df_to_lists = function(df) {
@@ -98,22 +89,15 @@ Spark_DataFrame_Serializer <- R6Class(
             return (rows)
         },
         serialize = function(obj, row_limit=100) {
-            df <- collect(limit(obj, row_limit))
+            df <- SparkR::collect(self$limit(obj, row_limit))
             json <- list()
             json[['columns']] <- colnames(df)
             json[['columnTypes']] <- get_df_column_types(df)
             json[['data']] <- self$df_to_lists(df)
             json[['index']] <- list(1:nrow(df))
             return (json)
         },
-        check_packages = function() {
-            tryCatch({
-                library(SparkR)
-                return (TRUE)
-            }, error = function(e) {
-            })
-            return (FALSE)
-        },
+        check_packages = function() requireNamespace('SparkR', quietly = TRUE),
         initialize = function() {
             #initialize must exists on this class
         }
@@ -125,7 +109,6 @@ Time_Series_Serializer <- R6Class(
     inherit = Serializer,
     public = list(
         klass = function() {
-            library(base)
             return("ts")
         },
         index_to_list = function(a_ts) {
@@ -143,14 +126,7 @@ Time_Series_Serializer <- R6Class(
             json[['index']] <- self$index_to_list(obj)
             return (json)
         },
-        check_packages = function() {
-            tryCatch({
-                library(base)
-                return (TRUE)
-            }, error = function(e) {
-            })
-            return (FALSE)
-        },
+        check_packages = function() TRUE,
         initialize = function() {
             #initialize must exists on this class
         }

kernel-r/declarativewidgets/R/widget.r

@@ -1,12 +1,15 @@
 #' @include widget_channels.r widget_function.r widget_dataframe.r serializer.r querier.r
 NULL
 
+#' @importClassesFrom IRkernel Comm
 setClassUnion('CommOrNULL', members = c('Comm', 'NULL'))
 
 #' Widget
 #'
 #' Base Widget class
 #'
+#' @importFrom R6 R6Class
+#' @importFrom IRkernel log_info log_error
 #' @export
 Widget <- R6Class("Widget",
     public = list(
@@ -114,6 +117,8 @@ create_widget_instance <- function(class_name, comm, serializer, querier) {
 
 #' Initialise and run the widget
 #'
+#' @importFrom IRkernel comm_manager
+#' @importFrom IRdisplay display_javascript
 #' @export
 initWidgets <- function() {
     serializer <- Serializer$new()
@@ -124,8 +129,6 @@ initWidgets <- function() {
         #create the widget instance
         widget <- create_widget_instance(widget_class, comm, serializer, querier)
     }
-    library(IRdisplay)
-    library(IRkernel)
     #Set log to info level in IRkernel (1 -> log_error, 2 -> log_info, 3 -> log_debug)
     options(jupyter.log_level = 2L)
 

kernel-r/declarativewidgets/R/widget_dataframe.r

@@ -3,6 +3,7 @@ NULL
 #' Widget_Dataframe
 #'
 #' Description
+#' @importFrom jsonlite fromJSON
 Widget_Dataframe <- R6Class(
     'Widget_Dataframe',
     inherit = Widget,
@@ -87,7 +88,7 @@ Widget_Dataframe <- R6Class(
         },
         register_query = function(query) {
             self$query <- fromJSON(query)
-            response <- self$serialize_and_send(name, self$limit, self$query)
+            response <- self$serialize_and_send(self$variable_name, self$limit, self$query)
             self$handle_function_response(response)
         },
         initialize = function(comm, serializer, querier) {

kernel-r/declarativewidgets/R/widget_function.r

@@ -155,7 +155,7 @@ Widget_Function <- R6Class(
                     )
                 }
             }, error = function(e) {
-                log_error(err_msg)
+                log_error(toString(e))
                 log_error(paste("Error getting signature of function:", func_name))
             })
             return (names)