updated to use c3 0.6.7. closes issue #12

mrjoh3 · Sep 6, 2018 · 65dbf12 · 65dbf12
1 parent 45ba66f
commit 65dbf12
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 43 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -5,7 +5,7 @@ Description: Create interactive charts with the 'C3.js' <http://c3js.org/> chart
     types in 'C3.js' are available and include line, bar, scatter, and mixed geometry plots. Plot 
     annotations, labels and axis are highly adjustable. Interactive web based charts can be embedded 
     in R Markdown documents or Shiny web applications. 
-Version: 0.2.0
+Version: 0.2.1
 Authors@R: c(
     person("Matt", "Johnson", email = "[email protected]",
     role = c("aut", "cre"))
@@ -25,7 +25,7 @@ BugReports: https://github.com/mrjoh3/c3/issues
 License: GPL (>= 3)
 LazyData: TRUE
 Encoding: UTF-8
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.0
 Suggests: testthat,
     RColorBrewer,
     knitr,

diff --git a/inst/htmlwidgets/c3.yaml b/inst/htmlwidgets/c3.yaml
@@ -4,8 +4,8 @@ dependencies:
     src: htmlwidgets/lib/d3-5.4.0
     script: d3.min.js
   - name: c3
-    version: 0.6.1
-    src: htmlwidgets/lib/c3-0.6.1
+    version: 0.6.7
+    src: htmlwidgets/lib/c3-0.6.7
     script: c3.min.js
     stylesheet: c3.min.css
 
diff --git a/inst/htmlwidgets/lib/c3-0.6.7/c3.min.css b/inst/htmlwidgets/lib/c3-0.6.7/c3.min.css
diff --git a/inst/htmlwidgets/lib/c3-0.6.7/c3.min.js b/inst/htmlwidgets/lib/c3-0.6.7/c3.min.js
diff --git a/man/RColorBrewer.c3.Rd b/man/RColorBrewer.c3.Rd
diff --git a/man/c3.Rd b/man/c3.Rd
diff --git a/man/c3_chart_size.Rd b/man/c3_chart_size.Rd
diff --git a/man/c3_donut.Rd b/man/c3_donut.Rd
diff --git a/man/c3_gauge.Rd b/man/c3_gauge.Rd
diff --git a/man/c3_line.Rd b/man/c3_line.Rd
diff --git a/man/c3_pie.Rd b/man/c3_pie.Rd
diff --git a/man/c3_selection.Rd b/man/c3_selection.Rd
diff --git a/man/grid.c3.Rd b/man/grid.c3.Rd
diff --git a/man/legend.c3.Rd b/man/legend.c3.Rd
diff --git a/man/pipe.Rd b/man/pipe.Rd
diff --git a/man/point_options.Rd b/man/point_options.Rd
diff --git a/man/region.c3.Rd b/man/region.c3.Rd
diff --git a/man/subchart.c3.Rd b/man/subchart.c3.Rd
diff --git a/man/tickAxis.Rd b/man/tickAxis.Rd
diff --git a/man/tooltip.c3.Rd b/man/tooltip.c3.Rd
diff --git a/man/xAxis.c3.Rd b/man/xAxis.c3.Rd
diff --git a/man/zoom.c3.Rd b/man/zoom.c3.Rd
diff --git a/tests/testthat/test_c3.R b/tests/testthat/test_c3.R
@@ -221,3 +221,17 @@ test_that('zoom settings work', {
   expect_is(zm, "htmlwidget")
 
 })
+
+
+context('Tibble Compatibility')
+
+test_that('Tibble x axis can be defined', {
+
+  d <- dplyr::as_tibble(d)
+
+  cp <- c3(d, x = 'date')
+
+  expect_is(cp, "c3")
+  expect_is(cp, "htmlwidget")
+
+})