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

Work in progress, combined PR #536

Closed
wants to merge 100 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
5214cc9
adding an image serializer to respect serializer behavior
Mar 29, 2020
81cff55
update news
Mar 29, 2020
f9d713d
Fix bug in setting openapi.json url when HTTP_REFERER is null #421
Apr 17, 2020
6fee9b9
come up with sensible solution for openapi server url
Apr 18, 2020
82d92b3
update tests
Apr 18, 2020
300f370
update r version
Apr 18, 2020
6fa4026
Update NEWS.md
meztez Apr 18, 2020
e79b5b7
Update NEWS.md
meztez Apr 18, 2020
d0a70e8
Update NEWS.md
meztez Apr 18, 2020
1111740
update doc R6, fix docs check
Apr 19, 2020
6569d8c
add libsodium-dev
Apr 19, 2020
cf01475
switch to remotes
Apr 19, 2020
66bee80
missed a file there
Apr 19, 2020
711a4f3
Merge branch 'master' into image_serializer
meztez Apr 19, 2020
9fc8b30
fix test
Apr 19, 2020
e30b9bb
fix test
Apr 19, 2020
1527bce
Merge branch 'image_serializer' of github.com:meztez/plumber into ima…
Apr 19, 2020
948a119
fix test
Apr 19, 2020
dc760a5
fix test
Apr 19, 2020
640909c
fix test
Apr 19, 2020
499bc1d
work on support for [] array syntax and object type
Apr 26, 2020
556695e
Added tests, finish adding features
Apr 27, 2020
22e0766
its the news
Apr 27, 2020
52d27bc
change minItems to match required
Apr 27, 2020
0047692
Added plumberExpression args metadata detection, support for file upl…
meztez Apr 29, 2020
5fa61bc
fix for linux
meztez Apr 29, 2020
877819f
generalize body parsing, big chunk
May 4, 2020
c1644e7
few tweaks, early morning, late night polish
May 4, 2020
574221e
rds parser and filename extension detection
meztez May 4, 2020
37a70db
perf improvement, recursive parseRaw for multipart
meztez May 5, 2020
f78e610
Tests, check encoding, EOL
May 7, 2020
1ab6a05
Merge branch 'docker_libsodiumdev' into to_from_openapi
May 7, 2020
1eca076
Merge branch 'R6_docs_roxygen2' into to_from_openapi
May 7, 2020
f13d9a8
fix conflict
May 7, 2020
5870ddd
Merge branch 'swagger_server_url' into to_from_openapi
May 7, 2020
a14dedf
toopenapi
May 7, 2020
f2be9ca
switch dev machine
meztez May 7, 2020
5c6036e
change check location for to account for multipart
meztez May 8, 2020
86e4035
Merge branch 'list_plumber_type' into to_from_openapi
meztez May 8, 2020
f90e55c
Removing swagger reference when working on openapi specification, emb…
meztez May 11, 2020
295434d
rename for better grouping
meztez May 11, 2020
b0a8c64
limit file upload
meztez May 12, 2020
d33b6de
fix conflict in news
meztez May 12, 2020
a9049b6
collate
meztez May 12, 2020
df14667
http status 405
meztez May 12, 2020
576659e
tests fix
meztez May 17, 2020
813580a
mostly adding redoc, reshape openapi/swagger in run
meztez May 19, 2020
006355b
declutter run
meztez May 19, 2020
f0bc437
double curl install?
meztez May 19, 2020
c0993fa
come on test
meztez May 19, 2020
b77d5de
Add PR number
schloerke Jun 8, 2020
20f150a
current state of dev
meztez Jun 8, 2020
645b10e
Update R/plumber-static.R
meztez Jun 8, 2020
47917d3
Update R/plumber-static.R
meztez Jun 8, 2020
14901cf
Breaking change
schloerke Jun 8, 2020
e09b6c9
Merge remote-tracking branch 'origin/master' into image_serializer
Jun 10, 2020
a05119c
Alternative image serialize fix and Content-Type casing
Jun 10, 2020
96d83bd
unlink, news link, :::
Jun 10, 2020
827618c
Update R/plumber-step.R
meztez Jun 10, 2020
0afb48f
Update R/plumber.R
meztez Jun 10, 2020
12474ef
Update R/session-cookie.R
meztez Jun 10, 2020
90c2c08
Update inst/examples/15-swagger-spec/plumber_custom_swagger_spec.R
meztez Jun 10, 2020
d84be4e
expand to full stage name
Jun 10, 2020
2e53352
resolve conflict
Jun 10, 2020
8548f8a
Merge remote-tracking branch 'upstream/master' into R6_docs_roxygen2
Jun 10, 2020
993087a
Remove `\cr`
schloerke Jun 10, 2020
b5526bb
Merge branch 'R6_docs_roxygen2' of github.com:meztez/plumber into R6_…
Jun 10, 2020
ef41f9e
Mistaken, it is preexec and postexec, not route
Jun 11, 2020
76839a8
add title to markdown file to prevent warning
Jun 11, 2020
35b2ecf
fix port test, quiet
Jun 11, 2020
ddb432e
warning fix
Jun 11, 2020
02a840b
and the Rd file
Jun 11, 2020
75bd3fa
News
Jun 11, 2020
cc3397e
Merge branch 'image_serializer' into to_from_openapi
Jun 11, 2020
1920646
update with R6_doc code
Jun 11, 2020
0959ef9
move to focal LTS R 4.0.1
Jun 11, 2020
9403797
import R version update
Jun 11, 2020
3f5e02f
pr review changes
Jun 11, 2020
e2d1b82
merge master
Jun 11, 2020
4c3ee8e
as discussed during pr review call
Jun 11, 2020
aac97b9
Merge branch 'master' into list_plumber_type
Jun 11, 2020
fb864e2
come on tests, check
Jun 11, 2020
7983f0b
hopefully fix oldrel
Jun 11, 2020
9225e54
merge master, moved 405 to proper execution location
Jun 12, 2020
0c629fd
coma, coma, coma, coma, coma chameleon
Jun 12, 2020
2a26e32
fix doc
Jun 12, 2020
eb463f4
Remove PR/Issue number from News
Jun 15, 2020
92787c5
merge master
Jun 15, 2020
61984e7
merge news
Jun 15, 2020
b6cce33
merge upstream master, remove 405
Jun 22, 2020
d80cb7b
remove magrittr stumb
Jun 22, 2020
07ca0fe
remove magriitr
Jun 22, 2020
44d8da5
remove plumber-options
Jun 22, 2020
2a93ac6
remove todo
Jun 22, 2020
2a362b0
remove yaml support
Jun 22, 2020
9a78482
remove from to openapi
Jun 22, 2020
500978e
mount one ui only
Jun 22, 2020
f35e53e
update doc
Jun 22, 2020
94515e4
remove duplicate test
Jun 22, 2020
cbe9376
expects_warning
Jun 22, 2020
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
21 changes: 13 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Authors@R: c(
person(family = "RStudio", role = c("cph", "fnd")),
person("Jeff", "Allen", role="cre", email="cran@trestletech.com"),
person("Barret", "Schloerke", role="aut", email="barret@rstudio.com"),
person("Bruno", "Tremblay", role="ctb", email="bruno.tremblay@lacapitale.com"),
person("Frans", "van Dunné", role="ctb", email="frans@ixpantia.com"),
person("Sebastiaan", "Vandewoude", role="ctb", email="sebastiaanvandewoude@gmail.com"),
person(family="SmartBear Software", role=c("ctb", "cph"), comment="swagger-ui"))
Expand Down Expand Up @@ -40,41 +41,45 @@ Suggests:
htmlwidgets,
visNetwork,
analogsea (>= 0.7.0),
later
later,
redoc
Remotes:
meztez/redoc,
rstudio/swagger
Collate:
'async.R'
'content-types.R'
'cookie-parser.R'
'parse-globals.R'
'plumb-globals.R'
'images.R'
'parse-block.R'
'plumb-block.R'
'globals.R'
'serializer-json.R'
'shared-secret-filter.R'
'post-body.R'
'query-string.R'
'parse-body.R'
'parse-query.R'
'plumber.R'
'default-handlers.R'
'digital-ocean.R'
'find-port.R'
'includes.R'
'json.R'
'new-rstudio-project.R'
'openapi-spec.R'
'openapi-types.R'
'parsers-body.R'
'paths.R'
'plumber-response.R'
'plumber-static.R'
'plumber-step.R'
'post-parsers.R'
'response.R'
'serializer-content-type.R'
'serializer-html.R'
'serializer-htmlwidget.R'
'serializer-rds.R'
'serializer-xml.R'
'serializer.R'
'session-cookie.R'
'swagger.R'
'ui.R'
'utf8.R'
'zzz.R'
RoxygenNote: 7.1.0
2 changes: 0 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ import(R6)
import(crayon)
import(promises)
import(stringi)
importFrom(httpuv,runServer)
importFrom(jsonlite,fromJSON)
importFrom(jsonlite,toJSON)
importFrom(jsonlite,validate)
importFrom(stats,runif)
importFrom(stringi,stri_match_first_regex)
importFrom(webutils,parse_multipart)
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ plumber 0.5.0

### New features

* Added Swagger support for array parameters using syntax `name:[type]` and new type `list` (synonym df, data.frame). (@meztez, #532)
* Added Swagger support for array parameters using syntax `name:[type]` and new type `list` (synonym df, data.frame). (@meztez, #532)

* Added support for promises in endpoints, filters, and hooks. (#248)

Expand Down Expand Up @@ -75,6 +75,8 @@ plumber 0.5.0

* Modified images serialization to use content-type serializer. Fixes issue with images pre/postserialize hooks (@meztez, #518).

* Fix bug in setting openapi.json url when HTTP_REFERER is null (@meztez, #528)

* Fix possible bugs due to mounted routers without leading slashes (@atheriel, #476 #501).

* Fix bug preventing error handling when a serializer fails (@antoine-sachet, #490)
Expand Down
1 change: 0 additions & 1 deletion R/content-types.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ getContentType <- function(ext, defaultType='application/octet-stream') {
return(ct)
}

#4x perf improvement when contentType is set
#' Request character set
#' @param contentType Request Content-Type header
#' @return Default to `UTF-8`. Otherwise return `charset` defined in request header.
Expand Down
2 changes: 1 addition & 1 deletion R/default-handlers.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' @include plumber.R
default404Handler <- function(req, res){
res$status <- 404
res$status <- 404L
list(error="404 - Resource Not Found")
}

Expand Down
1 change: 1 addition & 0 deletions R/globals.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.globals$serializers <- list()
.globals$processors <- new.env()
.globals$parsers <- list(func = list(), pattern = list())
.globals$interfaces <- list()
Loading