Merge pull request christophergandrud#4 from christophergandrud/master

rebase test

.Rbuildignore

@@ -6,3 +6,4 @@
 ^.*\.o$
 ^README\.Rmd$
 ^README-.*\.png$
+dev

.gitignore

@@ -4,3 +4,4 @@
 .DS_Store
 .sass-cache
 .*.Rnb.cached
+dev/*

DESCRIPTION

@@ -3,8 +3,8 @@ Type: Package
 Title: D3 JavaScript Network Graphs from R
 Description: Creates 'D3' 'JavaScript' network, tree, dendrogram, and Sankey
     graphs from 'R'.
-Version: 0.4
-Date: 2017-03-18
+Version: 0.4.9000
+Date: 2017-06-18
 Authors@R: c(
     person("J.J.", "Allaire", role = "aut"),
     person("Peter", "Ellis", role = "ctb"),
@@ -16,20 +16,22 @@ Authors@R: c(
     person("Kenton", "Russell", role = "aut"),
     person("Jennifer","Rogers", role = "ctb"),
     person("Charles", "Sese", role = "ctb"),
-    person("CJ", "Yetman", role = "aut")
+    person("CJ", "Yetman", email = "[email protected]", role = "aut")
     )
 URL: https://CRAN.R-project.org/package=networkD3
 BugReports: https://github.com/christophergandrud/networkD3/issues
 License: GPL (>= 3)
 Depends:
     R (>= 3.0.0)
 Imports:
+    data.tree,
     htmlwidgets (>= 0.3.2),
     igraph,
+    jsonlite,
     magrittr
 Suggests:
     htmltools (>= 0.2.6),
-    jsonlite,
+    tibble
 Enhances: knitr, shiny
 LazyData: true
 RoxygenNote: 6.0.1

NAMESPACE

@@ -1,7 +1,15 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(as_treenetdf,Node)
+S3method(as_treenetdf,data.frame)
+S3method(as_treenetdf,hclust)
+S3method(as_treenetdf,igraph)
+S3method(as_treenetdf,list)
+S3method(as_treenetdf,phylo)
+S3method(as_treenetdf,tbl_graph)
 export(JS)
 export(as.radialNetwork)
+export(as_treenetdf)
 export(chordNetwork)
 export(chordNetworkOutput)
 export(dendroNetwork)
@@ -19,21 +27,31 @@ export(renderForceNetwork)
 export(renderRadialNetwork)
 export(renderSankeyNetwork)
 export(renderSimpleNetwork)
+export(renderTreeNetwork)
 export(renderchordNetwork)
 export(sankeyNetwork)
 export(sankeyNetworkOutput)
 export(saveNetwork)
 export(simpleNetwork)
 export(simpleNetworkOutput)
+export(treeNetwork)
+export(treeNetworkOutput)
+importFrom(data.tree,ToDataFrameNetwork)
+importFrom(htmlwidgets,createWidget)
 importFrom(htmlwidgets,shinyRenderWidget)
 importFrom(htmlwidgets,shinyWidgetOutput)
+importFrom(htmlwidgets,sizingPolicy)
 importFrom(igraph,V)
 importFrom(igraph,as_data_frame)
 importFrom(igraph,cluster_walktrap)
 importFrom(igraph,graph.data.frame)
 importFrom(igraph,membership)
 importFrom(igraph,simplify)
+importFrom(jsonlite,toJSON)
 importFrom(magrittr,"%>%")
 importFrom(stats,as.dendrogram)
+importFrom(stats,na.exclude)
+importFrom(stats,na.omit)
 importFrom(stats,setNames)
+importFrom(utils,installed.packages)
 importFrom(utils,modifyList)

NetworkD3.Rproj

@@ -6,7 +6,7 @@ AlwaysSaveHistory: Default
 
 EnableCodeIndexing: Yes
 UseSpacesForTab: Yes
-NumSpacesForTab: 2
+NumSpacesForTab: 4
 Encoding: UTF-8
 
 RnwWeave: Sweave