Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to 0.4.2 #147

Merged
merged 7 commits into from
Jul 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion R/plumber.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

<img align="right" src="https://plumber.trestletech.com/components/images/plumber.png" />
<img align="right" src="https://www.rplumber.io/components/images/plumber.png" />

> ## WARNING
> Plumber 0.4.0 will include breaking changes to the API.
Expand Down Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion inst/swagger-ui/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<!-- File obtained from swagger-ui project. Copyright 2017 SmartBear Software. See https://github.com/swagger-api/swagger-ui -->
<!-- File obtained from swagger-ui project. Copyright 2017 SmartBear Software. See https://github.com/swagger-api/swagger-ui
Changes to this file include:
1. Resolve default swagger.json URL using window.location, and inject query string params to help resolve to the client's view of things.
All other assets served unmodified via CDN.
-->
<!-- HTML for static distribution bundle build -->
<!DOCTYPE html>
<html lang="en">
Expand Down
2 changes: 1 addition & 1 deletion man/plumber.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tests/testthat/test-plumber.R
Original file line number Diff line number Diff line change
Expand Up @@ -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(){})
Expand Down
3 changes: 3 additions & 0 deletions tests/testthat/test-serializer-htmlwidgets.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down