merge with master

Author: cpsievert

.push_test_table.sh

@@ -38,6 +38,7 @@ git checkout gh-pages
 
 mv ../code_commits.csv .
 cat code_commits.csv
+touch table.R
 make
 
 # add, commit, push to gh-pages branch of plotly-test-table

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.23
+Version: 0.5.24
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",

NEWS

@@ -1,7 +1,11 @@
-0.5.23 -- 10 March 2015.
+0.5.24 -- 10 March 2015
 
 Implemented #167
 
+0.5.23 -- 10 March 2015.
+
+geom_ribbon now respects alpha transparency
+
 0.5.22 -- 2 March 2015.
 
 Fixes for ylim() #171.

R/trace_generation.R

@@ -613,7 +613,8 @@ geom2trace <- list(
          type="scatter",
          line=paramORdefault(params, aes2line, ribbon.line.defaults),
          fill="tonexty",
-         fillcolor=toFill(params$fill))
+         fillcolor=toFill(params$fill, ifelse(is.null(params$alpha), 1,
+                                              params$alpha)))
   },
   abline=function(data, params) {
     list(x=c(params$xstart, params$xend),

tests/testthat/test-ggplot-ribbon.R

@@ -14,3 +14,13 @@ test_that("sanity check for geom_ribbon", {
 })
 
 save_outputs(rb, "ribbon")
+
+rb2 <- ggplot(huron, aes(x=year)) + 
+  geom_ribbon(aes(ymin=level-1, ymax=level+1), alpha = 0.1)
+L2 <- gg2list(rb2)
+
+test_that("geom_ribbon respects alpha transparency", {
+  expect_match(L2[[1]]$fillcolor, "0.1)", fixed=TRUE)
+})
+
+save_outputs(rb2, "ribbon-alpha")