merge back from neuhausi/cx (#60)

cb4ds · Nov 15, 2018 · 4e0142f · 4e0142f
1 parent 17a6051
commit 4e0142f
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 43 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 +19,8 @@ BugReports:
 Depends:
     R (>= 3.3.0)
 Imports:
-    htmlwidgets (>= 0.8)
+    htmlwidgets (>= 0.8),
+    httr
 RoxygenNote: 6.0.1
 Suggests:
     shiny (>= 0.13.2),

diff --git a/R/canvasXpress.R b/R/canvasXpress.R
@@ -67,9 +67,19 @@ canvasXpress <- function(data = NULL,
     z             <- NULL
     dataframe     <- "columns"
     precalc.names <- c("iqr1", "qtl1", "median", "qtl3", "iqr3", "outliers")
-
-
-    if (graphType == "Venn") {
+
+	# Implement data in URL
+	if (is.character(data)) {
+		if (httr::http_error(data)) {
+			stop("Not a valid URL!")
+		}
+		# CanvasXpress Object
+		cx_object <- list(data        = data,
+				          config      = config, 
+				          events      = events, 
+				          afterRender = afterRender)
+	}
+	else if (graphType == "Venn") {
         vdata <- NULL
         if (is.null(data)) {
             if (inherits(config$vennData, "list")) {

diff --git a/R/internal_functionality.R b/R/internal_functionality.R
@@ -16,8 +16,14 @@ assertDataCorrectness <- function(data, graphType, config) {
              paste(validGraphTypes, collapse = ", "), ">")
     }
 
-    # for backwards compatibility we accept both data and vennData
-    if (graphType == "Venn") {
+    # Implement data in URL
+	if (is.character(data)) {
+		if (httr::http_error(data)) {
+			stop("Not a valid URL!")
+		}
+	}
+	# for backwards compatibility we accept both data and vennData
+	else if (graphType == "Venn") {
         vdata <- data
 
         if (is.null(vdata)) {
@@ -72,12 +78,12 @@ assertDataCorrectness <- function(data, graphType, config) {
             stop("edgeData cannot be NULL!")
         }
 
-        if (!inherits(ndata, c("data.frame", "matrix"))) {
-            stop("nodeData must be a data.frame or matrix")
+        if (!inherits(ndata, c("data.frame", "matrix", "list"))) {
+            stop("nodeData must be a data.frame or matrix or named list")
         }
 
-        if (!inherits(edata, c("data.frame", "matrix"))) {
-            stop("edgeData must be a data.frame or matrix")
+        if (!inherits(edata, c("data.frame", "matrix", "list"))) {
+            stop("edgeData must be a data.frame or matrix or named list")
         }
     }
     else if (!(graphType %in% noDataNecessary)) {