diff --git a/DESCRIPTION b/DESCRIPTION index f2ea7197c..091d09c25 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,8 +2,8 @@ Encoding: UTF-8 Package: plumber Type: Package Title: An API Generator for R -Version: 0.4.1 -Date: 2017-07-20 +Version: 0.4.2 +Date: 2017-07-24 Roxygen: list(markdown = TRUE) Authors@R: c( person(family="Trestle Technology, LLC", role="aut", email="cran@trestletech.com"), diff --git a/R/plumber.R b/R/plumber.R index 9d224dc11..63d0e6bc5 100644 --- a/R/plumber.R +++ b/R/plumber.R @@ -119,7 +119,7 @@ hookable <- R6Class( #' taking an incoming request, submitting it through the appropriate filters and #' eventually to a corresponding endpoint, if one is found. #' -#' See \url{http://plumber.trestletech.com/docs/programmatic/} for additional +#' See \url{http://www.rplumber.io/docs/programmatic/} for additional #' details on the methods available on this object. #' @param file The file to parse as the plumber router definition #' @param dir The directory containing the `plumber.R` file to parse as the diff --git a/README.md b/README.md index b72f30e0a..12f6f2886 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/plumber?color=brightgreen)](https://www.r-pkg.org/pkg/plumber) [![codecov](https://codecov.io/gh/trestletech/plumber/branch/master/graph/badge.svg)](https://codecov.io/gh/trestletech/plumber) - + > ## WARNING > Plumber 0.4.0 will include breaking changes to the API. @@ -86,11 +86,12 @@ library(plumber) ## Hosting -If you're just getting started with hosting cloud servers, the DigitalOcean integration included in plumber will be the best way to get started. You'll be able to get a server hosting your custom API in just two R commands. Full documentation is available at https://plumber.trestletech.com/docs/digitalocean/. +If you're just getting started with hosting cloud servers, the DigitalOcean integration included in plumber will be the best way to get started. You'll be able to get a server hosting your custom API in just two R commands. Full documentation is available at https://www.rplumber.io/docs/digitalocean/. A couple of other approaches to hosting plumber are also made available: - - PM2 - https://plumber.trestletech.com/docs/hosting/ - - Docker - https://plumber.trestletech.com/docs/docker/ + + - PM2 - https://www.rplumber.io/docs/hosting/ + - Docker - https://www.rplumber.io/docs/docker/ ## Related Projects diff --git a/inst/swagger-ui/index.html b/inst/swagger-ui/index.html index 8adb95ac3..20a69308e 100644 --- a/inst/swagger-ui/index.html +++ b/inst/swagger-ui/index.html @@ -1,4 +1,8 @@ - + diff --git a/man/plumber.Rd b/man/plumber.Rd index 2703d7139..0e207d464 100644 --- a/man/plumber.Rd +++ b/man/plumber.Rd @@ -25,7 +25,7 @@ taking an incoming request, submitting it through the appropriate filters and eventually to a corresponding endpoint, if one is found. } \details{ -See \url{http://plumber.trestletech.com/docs/programmatic/} for additional +See \url{http://www.rplumber.io/docs/programmatic/} for additional details on the methods available on this object. } \keyword{datasets} diff --git a/tests/testthat/test-plumber.R b/tests/testthat/test-plumber.R index 4fec92c91..2ccf96a84 100644 --- a/tests/testthat/test-plumber.R +++ b/tests/testthat/test-plumber.R @@ -139,6 +139,8 @@ test_that("mounts can be read correctly", { }) test_that("prints correctly", { + skip_on_cran() + pr <- plumber$new() pr$handle("GET", "/nested/path/here", function(){}) pr$handle("POST", "/nested/path/here", function(){}) diff --git a/tests/testthat/test-serializer-htmlwidgets.R b/tests/testthat/test-serializer-htmlwidgets.R index db1feafc6..f6e6c2c48 100644 --- a/tests/testthat/test-serializer-htmlwidgets.R +++ b/tests/testthat/test-serializer-htmlwidgets.R @@ -12,6 +12,9 @@ renderWidget <- function(){ } test_that("htmlwidgets serialize properly", { + # Solaris doesn't have htmlwidgets available for some reason. + skip_on_cran() + w <- renderWidget() val <- serializer_htmlwidget()(w, list(), PlumberResponse$new(), stop) expect_equal(val$status, 200L)