Fixes for CRAN

.Rbuildignore

@@ -3,11 +3,11 @@
 ^.*\.pdf$
 README.Rmd
 README.md
-figure/
 CONTRIBUTING.md
 Makefile
 .travis.yml
-neokit/
 ^[^/]*\.sh$
 ^neo4j.*
+^figure$
+^neokit$
 target

DESCRIPTION

@@ -1,26 +1,25 @@
 Package: RNeo4j
-Title: Neo4j Driver for R
+Title: 'Neo4j' Driver for R
 LazyData: true
 Version: 1.7.0
-Date: 2016-08-27
 Author: Nicole White
 License: MIT + file LICENSE
 Imports:
  httr (>= 1.1.0),
  jsonlite,
  rstudioapi
 Maintainer: Nicole White <nmwhite0131@gmail.com>
-Description: Neo4j, a graph database, allows users to store their data as a
+Description: 'Neo4j', a graph database, allows users to store their data as a
  property graph. A graph consists of nodes that are connected by relationships;
- both nodes and relationships can have properties, or key-value pairs. RNeo4j
- is Neo4j's R driver. It allows users to read and write data from and to Neo4j
+ both nodes and relationships can have properties, or key-value pairs. 'RNeo4j'
+ is the 'Neo4j' R driver. It allows users to read and write data from and to 'Neo4j'
  directly from their R environment by exposing an interface for interacting with
  nodes, relationships, paths, and more. Most notably, it allows users to retrieve
- Cypher query results as R data frames, where Cypher is Neo4j's graph query
- language. Visit <http://www.neo4j.com> to learn more about Neo4j.
+ 'Cypher' query results as R data frames, where 'Cypher' is the 'Neo4j' graph query
+ language. Visit <http://www.neo4j.com> to learn more about 'Neo4j'.
 URL: http://github.com/nicolewhite/RNeo4j
 BugReports: https://github.com/nicolewhite/RNeo4j/issues
 Suggests:
  testthat
-RoxygenNote: 5.0.1
-SystemRequirements: cargo, rustc, clang, libneo4j-client-dev
+RoxygenNote: 6.1.1
+SystemRequirements: GNU make, cargo, rustc, clang, libneo4j-client-dev

NAMESPACE

@@ -24,7 +24,7 @@ S3method(dijkstra,node)
 S3method(dropConstraint,graph)
 S3method(dropIndex,graph)
 S3method(dropLabel,node)
-S3method(endNode,path)
+S3method(endNode,neopath)
 S3method(endNode,relationship)
 S3method(getConstraint,graph)
 S3method(getID,boltEntity)
@@ -52,21 +52,21 @@ S3method(getUniqueNode,graph)
 S3method(importSample,graph)
 S3method(incomingRels,node)
 S3method(newTransaction,graph)
-S3method(nodes,path)
+S3method(nodes,neopath)
 S3method(outgoingRels,node)
 S3method(print,boltGraph)
 S3method(print,boltNode)
 S3method(print,boltPath)
 S3method(print,boltRelationship)
 S3method(print,graph)
+S3method(print,neopath)
 S3method(print,node)
-S3method(print,path)
 S3method(print,relationship)
-S3method(rels,path)
+S3method(rels,neopath)
 S3method(shortestPath,node)
 S3method(startGraph,default)
 S3method(startNode,boltRelationship)
-S3method(startNode,path)
+S3method(startNode,neopath)
 S3method(startNode,relationship)
 S3method(summary,boltGraph)
 S3method(summary,graph)
@@ -116,6 +116,5 @@ export(startGraph)
 export(startNode)
 export(updateProp)
 importFrom(utils,URLencode)
-importFrom(utils,assignInNamespace)
 importFrom(utils,browseURL)
-useDynLib(RNeo4j)
+useDynLib(RNeo4j, .registration = TRUE)

R/RNeo4j.R

@@ -7,5 +7,5 @@
 #' \href{https://github.com/nicolewhite/RNeo4j/issues}{create a new GitHub issue}.
 #' For support, please \href{http://stackoverflow.com/questions/tagged/r-neo4j}{create a question on StackOverflow}.
 #'
-#' @useDynLib RNeo4j
+#' @useDynLib RNeo4j, .registration = TRUE
 NULL

R/endNode.R

@@ -49,7 +49,7 @@ startNode.boltRelationship = function(object) {
 }
 
 #' @export
-endNode.path = function(object) {
+endNode.neopath = function(object) {
  url = attr(object, "end")
  result = http_request(url, "GET")
  node = configure_result(result)

R/getPaths.R

@@ -43,7 +43,7 @@ getPaths.graph = function(graph, query, ...) {
 
  for(i in 1:length(result)) {
  result[[i]] = result[[i]][[1]]
- if(!("path" %in% class(result[[i]]))) {
+ if(!("neopath" %in% class(result[[i]]))) {
  stop("At least one entity returned is not a path. Check that your query is returning paths.")
  }
  }

R/getSinglePath.R

@@ -44,12 +44,12 @@ getSinglePath.graph = function(graph, query, ...) {
 
  result = result[[1]][[1]]
 
- if(!("path" %in% class(result))) {
+ if(!("neopath" %in% class(result))) {
  stop("The entity returned is not a path. Check that your query is returning a path.")
  }
 
  return(result)
 }
 
 #' @export
-getSinglePath.boltGraph = getSinglePath.graph;
+getSinglePath.boltGraph = getSinglePath.graph

R/internal.R

@@ -2,15 +2,6 @@ version = function() {
  return("1.7.0")
 }
 
-#' @importFrom utils assignInNamespace
-.onLoad = function(libname, pkgname) {
- length.path = function(obj) {
- return(length(unclass(obj)))
- }
-
- assignInNamespace('length.path', length.path, 'httr')
-}
-
 configure_result = function(result) {
  if(is.character(result) | is.numeric(result)) {
  return(result)
@@ -89,7 +80,7 @@ configure_result = function(result) {
  attr(result, "end") = end
  attr(result, "nodes") = nodes
  attr(result, "relationships") = rels
- class(result) = "path"
+ class(result) = "neopath"
  }
 
  return(result)

R/nodes.R

@@ -34,7 +34,7 @@
 nodes = function(path) UseMethod("nodes")
 
 #' @export
-nodes.path = function(path) {
+nodes.neopath = function(path) {
  urls = attr(path, "nodes")
 
  FUN <- function(x) {

R/print.R

@@ -44,12 +44,12 @@ print.relationship = function(x, ...) {
 print.boltRelationship = print.relationship;
 
 #' @export
-print.path = function(x, ...) {
+print.neopath = function(x, ...) {
  cat("< Path > \n")
  if(suppressWarnings(any(!is.na(names(x))))) {
  invisible(lapply(names(x), function(y) {print(x[y])}))
  }
 }
 
 #' @export
-print.boltPath = print.path;
+print.boltPath = print.neopath;

R/rels.R

@@ -34,7 +34,7 @@
 rels = function(path) UseMethod("rels")
 
 #' @export
-rels.path = function(path) {
+rels.neopath = function(path) {
  urls = attr(path, "relationships")
 
  FUN <- function(x) {

R/startNode.R

@@ -49,7 +49,7 @@ startNode.boltRelationship = function(object) {
 }
 
 #' @export
-startNode.path = function(object) {
+startNode.neopath = function(object) {
  url = attr(object, "start")
  result = http_request(url, "GET")
  node = configure_result(result)