chore: Adds additional test cases

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: orbweaver
 Title: Fast and Efficient Graph Data Structures
-Version: 0.6.1
+Version: 0.10.1
 Authors@R: 
     c(person(given = "ixpantia, SRL",
              role = "cph",
@@ -18,7 +18,7 @@ Description: Empower your data analysis with 'orbweaver', an R package
     package, 'orbweaver' ensures that mutations and changes to
     the graph are performed in place, streamlining your
     workflow for optimal productivity.
-URL: https://github.com/ixpantia/orbweaver
+URL: https://github.com/ixpantia/orbweaver-r
 BugReports: https://github.com/ixpantia/orbweaver-r/issues
 License: MIT + file LICENSE
 Encoding: UTF-8

Makefile

@@ -1,4 +1,4 @@
-.PHONY: vendor document
+.PHONY: vendor document covr
 
 vendor:
 	$(MAKE) -C src/rust vendor
@@ -12,3 +12,5 @@ install: document
 test:
 	Rscript -e "devtools::test()"
 
+covr:
+	Rscript -e "covr::report()"

NAMESPACE

@@ -24,7 +24,7 @@ S3method(has_children,DirectedAcyclicGraph)
 S3method(has_children,DirectedGraph)
 S3method(has_parents,DirectedAcyclicGraph)
 S3method(has_parents,DirectedGraph)
-S3method(least_common_parents,AcyclicDirectedGraph)
+S3method(least_common_parents,DirectedAcyclicGraph)
 S3method(least_common_parents,DirectedGraph)
 S3method(length,DirectedAcyclicGraph)
 S3method(length,DirectedGraph)
@@ -52,7 +52,7 @@ export(graph_to_bin)
 export(has_children)
 export(has_parents)
 export(least_common_parents)
-export(new_directed_graph)
+export(nodes)
 export(parents)
 export(populate_edges)
 useDynLib(orbweaver, .registration = TRUE)

R/bin.R

@@ -11,7 +11,8 @@ graph_to_bin <- function(graph, path) {
 }
 
 #' @title Read the graph from a binary blob
-#' @param path Path to a file containing a graph binary
+#' @param path (Optional) Path to a file containing a graph binary
+#' @param bin (Optional) The raw binary of the graph
 #' @param type The type of graph the JSON represents
 #' @return A graph object
 #' @export
@@ -20,10 +21,12 @@ graph_from_bin <- function(path, bin, type = c("directed", "dag")) {
     rlang::abort("Invalid argument `type`")
   }
   if (!missing(bin)) {
-    switch(
-      type[1],
-      "directed" = DirectedGraph$from_bin_mem(bin),
-      "dag" = DirectedAcyclicGraph$from_bin_mem(bin)
+    return(
+      switch(
+        type[1],
+        "directed" = DirectedGraph$from_bin_mem(bin),
+        "dag" = DirectedAcyclicGraph$from_bin_mem(bin)
+      )
     )
   }
   if (missing(path)) {

R/extendr-wrappers.R

@@ -39,8 +39,6 @@ DirectedGraph$subset <- function(node_id) .Call(wrap__DirectedGraph__subset, sel
 
 DirectedGraph$print <- function() invisible(.Call(wrap__DirectedGraph__print, self))
 
-DirectedGraph$find_all_paths <- function(`_from`, `_to`) .Call(wrap__DirectedGraph__find_all_paths, self, `_from`, `_to`)
-
 DirectedGraph$to_bin_disk <- function(path) .Call(wrap__DirectedGraph__to_bin_disk, self, path)
 
 DirectedGraph$to_bin_mem <- function() .Call(wrap__DirectedGraph__to_bin_mem, self)
@@ -49,6 +47,12 @@ DirectedGraph$from_bin_disk <- function(path) .Call(wrap__DirectedGraph__from_bi
 
 DirectedGraph$from_bin_mem <- function(bin) .Call(wrap__DirectedGraph__from_bin_mem, bin)
 
+DirectedGraph$nodes <- function() .Call(wrap__DirectedGraph__nodes, self)
+
+DirectedGraph$length <- function() .Call(wrap__DirectedGraph__length, self)
+
+DirectedGraph$find_all_paths <- function(`_from`, `_to`) .Call(wrap__DirectedGraph__find_all_paths, self, `_from`, `_to`)
+
 #' @export
 `$.DirectedGraph` <- function (self, name) { func <- DirectedGraph[[name]]; environment(func) <- environment(); func }
 
@@ -81,8 +85,6 @@ DirectedAcyclicGraph$subset <- function(node_id) .Call(wrap__DirectedAcyclicGrap
 
 DirectedAcyclicGraph$print <- function() invisible(.Call(wrap__DirectedAcyclicGraph__print, self))
 
-DirectedAcyclicGraph$find_all_paths <- function(from, to) .Call(wrap__DirectedAcyclicGraph__find_all_paths, self, from, to)
-
 DirectedAcyclicGraph$to_bin_disk <- function(path) .Call(wrap__DirectedAcyclicGraph__to_bin_disk, self, path)
 
 DirectedAcyclicGraph$to_bin_mem <- function() .Call(wrap__DirectedAcyclicGraph__to_bin_mem, self)
@@ -91,6 +93,12 @@ DirectedAcyclicGraph$from_bin_disk <- function(path) .Call(wrap__DirectedAcyclic
 
 DirectedAcyclicGraph$from_bin_mem <- function(bin) .Call(wrap__DirectedAcyclicGraph__from_bin_mem, bin)
 
+DirectedAcyclicGraph$nodes <- function() .Call(wrap__DirectedAcyclicGraph__nodes, self)
+
+DirectedAcyclicGraph$length <- function() .Call(wrap__DirectedAcyclicGraph__length, self)
+
+DirectedAcyclicGraph$find_all_paths <- function(from, to) .Call(wrap__DirectedAcyclicGraph__find_all_paths, self, from, to)
+
 #' @export
 `$.DirectedAcyclicGraph` <- function (self, name) { func <- DirectedAcyclicGraph[[name]]; environment(func) <- environment(); func }
 

R/get_leaves.R

@@ -44,4 +44,3 @@ get_all_leaves.DirectedGraph <- function(graph, ...) {
 get_all_leaves.DirectedAcyclicGraph <- function(graph, ...) {
   graph$get_all_leaves()
 }
-

R/get_roots.R

@@ -14,17 +14,11 @@ get_roots_over <- function(graph, nodes) {
 
 #' @export
 get_roots_over.DirectedGraph <- function(graph, nodes) {
-  if (missing(nodes)) {
-    return(graph$get_roots_over())
-  }
   graph$get_roots_over(nodes)
 }
 
 #' @export
 get_roots_over.DirectedAcyclicGraph <- function(graph, nodes) {
-  if (missing(nodes)) {
-    return(graph$get_roots_over())
-  }
   graph$get_roots_over(nodes)
 }
 

R/least_common_parents.R

@@ -16,6 +16,6 @@ least_common_parents.DirectedGraph <- function(graph, selected) {
 }
 
 #' @export
-least_common_parents.AcyclicDirectedGraph <- function(graph, selected) {
+least_common_parents.DirectedAcyclicGraph <- function(graph, selected) {
   graph$least_common_parents(selected)
 }

R/length.R

@@ -1,14 +1,15 @@
 #' @export
 length.DirectedGraph <- function(x) {
-  1
+  x$length()
 }
 
 #' @export
 length.DirectedAcyclicGraph <- function(x) {
-  1
+  x$length()
 }
 
 #' @export
 length.DirectedGraphBuilder <- function(x) {
+  rlang::warn("Length of a graph builder is always 1")
   1
 }

R/nodes.R

@@ -0,0 +1,9 @@
+#' @title Get the nodes in the graph
+#' @description Returns the unique nodes in the graph
+#' @param graph A directed or directed acyclic graph
+#' @param ... Reserved for later use
+#' @return A character vector with the nodes
+#' @export
+nodes <- function(graph, ...) {
+  graph$nodes()
+}

src/rust/Cargo.toml

@@ -9,4 +9,4 @@ name = 'orbweaver'
 
 [dependencies]
 extendr-api = { version = "0.6", features = ["serde"] }
-orbweaver = { version = "0.9.0" }
+orbweaver = { version = "0.10.1" }