merge with master

Author: cpsievert

.travis.yml

@@ -8,11 +8,10 @@ addons:
     packages:
       - r-base-dev
       - r-recommended
-      - qpdf
 
 env:
   global:
-    - R_LIBS_USER=~/R/library NOT_CRAN=true
+    - R_LIBS_USER=~/R/library NOT_CRAN=true R_PKG="$(basename $TRAVIS_REPO_SLUG)"
     # plotly_api_key (for posting to plot.ly)
     - secure: "jlIAFoBGaDWUQDh6oGNb2BgU31/80iioM4y4xwx35yWkGKkNIID1eMEuiIn+/ipLvOVHkPTDS6DYnOtD8EIBpROgAKHFY33gM1h7P6NRxVszzC6WLP2ASnq95DWq36DAC2Oevy05V7nwSRFilPwSt6JLppYUInG+WdaZ+QOSRi4="
     # GITHUB_PAT (for pushing to plotly-test-table)
@@ -30,15 +29,17 @@ before_script:
   - git clone https://github.com/cpsievert/plotly-test-table.git ../plotly-test-table
   - "wget -q -O - https://github.com/yihui/crandalf/raw/master/inst/scripts/install-pandoc | bash"
   - Rscript -e 'if (length(find.package("devtools", quiet = TRUE)) == 0L) { install.packages("devtools", repos = "http://cran.rstudio.com") }'
-  - Rscript -e 'library(devtools);update_packages("devtools", repos = "http://cran.rstudio.com")'
-  - Rscript -e 'library(devtools);install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)'
+  - Rscript -e 'devtools::update_packages("devtools", repos = "http://cran.rstudio.com")'
+  - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)'
+  - cd ..; rm -f *.tar.gz; R CMD build $R_PKG
+  - R CMD INSTALL ${R_PKG}_*.tar.gz
 
 script:
   # run R CMD check on the non-pull request build
-  - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi"
+  - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then R CMD check ${R_PKG}_*.tar.gz --no-manual; fi"
   # we do some fancy stuff on the pull request build that confuses R CMD check
-  - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'devtools::install(); source(\"tests/testthat.R\", chdir = T)'; fi"
+  - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"plotly/tests/testthat.R\", chdir = T)'; fi"
 
 after_success:
-  - cd ../plotly-test-table
+  - cd plotly-test-table
   - Rscript ../plotly/inst/build-push-comment.R

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
-Version: 2.3.1
+Version: 2.3.2
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "cpsievert1@gmail.com"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,6 +1,10 @@
-2.3.1 -- 20 Jan 2015
+2.3.2 -- 25 Jan 2015
 
-more accurate list of data_array properties. fixes #415
+More accurate list of data_array properties. Fixes #415
+
+2.3.1 -- 25 Jan 2015
+
+More accurate conversion of path width. Fixes #373.
 
 2.3.0 -- 19 Jan 2015
 

R/trace_generation.R

@@ -565,7 +565,7 @@ geom2trace <- list(
     # when converting ggplot2 size to plotly size, we assume size is an _area_,
     # but "size" for lines really means linewidth, so size is a _length_ in this case
     # (see aesConverters$size)
-    params$size <- sqrt(params$size)
+    params$size <- ifelse(params$size < 1, params$size ^ 2, sqrt(params$size))
     list(x=data$x,
          y=data$y,
          name=params$name,