Skip to content

Commit da168db

Browse files
committed
small doc fixes for CRAN release
1 parent 1059c90 commit da168db

8 files changed

+60
-46
lines changed

.Rbuildignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
^CRAN-RELEASE$
12
^appveyor\.yml$
23
^\.travis\.yml$
34
^README\.Rmd$
45
^LICENSE\.md$
56
^.*\.Rproj$
67
^\.Rproj\.user$
7-
^\.Rproj\.user$

CRAN-RELEASE

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This package was submitted to CRAN on 2019-02-05.
2+
Once it is accepted, delete this file and tag the release (commit 1059c9021a).

DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: shinyhttr
22
Type: Package
3-
Title: Progress Bars For Downloads In Shiny Apps
3+
Title: Progress Bars for Downloads in Shiny Apps
44
Version: 1.0.0
55
Author: Athos Petri Damiani <[email protected]>
66
Maintainer: Athos Petri Damiani <[email protected]>
7-
Description: This package modifies the httr::progress function to let it
8-
send output to shinyWidgets::progressBar. It is just a tweak at the
7+
Description: Modifies the `httr::progress()` function to let it
8+
send output to `shinyWidgets::progressBar()`. It is just a tweak at the
99
original functions from httr to make it smooth for shiny developers.
1010
License: MIT + file LICENSE
1111
BugReports: https://github.com/curso-r/shinyhttr/issues

R/progress.R

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
#' Add a progress bar compatible with shinyWidgets::progressBar.
1+
#' Add a progress bar compatible with `shinyWidgets::updateProgressBar()`.
22
#'
3-
#' Add a progress bar to request just like the vanilla httr::progress but with capability to talk to shinyWidgets::progressBar by giving the session and id arguments to it.
3+
#' Add a progress bar to request just like the vanilla `httr::progress()` but with capability to talk to `shinyWidgets::updateProgressBar()` by giving the session and id arguments to it.
44
#'
5-
#' @param session (from shinyWidgets::updateProgressBar doc) The 'session' object passed to function given to shinyServer.
6-
#' @param id (from shinyWidgets::updateProgressBar doc) An id used to update the progress bar.
7-
#' @param type (from httr::progress doc) Type of progress to display: either number of bytes uploaded or downloaded.
8-
#' @param con (from httr::progress doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
9-
#' @param title (from shinyWidgets::updateProgressBar doc) character, optional title.
10-
#' @param status (from shinyWidgets::updateProgressBar doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
11-
#' @param range_value (from shinyWidgets::updateProgressBar doc) Default is to display percentage ([0, 100]), but you can specify a custom range, e.g. -50, 50.
12-
#' @param unit_mark (from shinyWidgets::updateProgressBar doc) Unit for value displayed on the progress bar, default to "\%".
5+
#' @param session (from `shinyWidgets::updateProgressBar()`` doc) The 'session' object passed to function given to shinyServer.
6+
#' @param id (from `shinyWidgets::updateProgressBar()` doc) An id used to update the progress bar.
7+
#' @param type (from `httr::progress()`` doc) Type of progress to display: either number of bytes uploaded or downloaded.
8+
#' @param con (from `httr::progress()` doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
9+
#' @param title (from `shinyWidgets::updateProgressBar()` doc) character, optional title.
10+
#' @param status (from `shinyWidgets::updateProgressBar()` doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
11+
#' @param range_value (from `shinyWidgets::updateProgressBar()` doc) Default is to display percentage ([0, 100]), but you can specify a custom range, e.g. -50, 50.
12+
#' @param unit_mark (from `shinyWidgets::updateProgressBar()` doc) Unit for value displayed on the progress bar, default to "\%".
1313
#'
1414
#' @export
1515
#'
@@ -92,21 +92,21 @@ progress <- function (
9292

9393
#' progress_bar
9494
#'
95-
#' same as httr:::progress_bar but with capability to talk to shinyWidgets::progressBar.
95+
#' Same as `httr:::progress_bar()` but with capability to talk to `shinyWidgets::progressBar()`.
9696
#'
97-
#' @param type (from httr::progress doc) Type of progress to display: either number of bytes uploaded or downloaded.
98-
#' @param con (from httr::progress doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
99-
#' @param session (from shinyWidgets::updateProgressBar doc) The 'session' object passed to function given to shinyServer.
100-
#' @param id (from shinyWidgets::updateProgressBar doc) An id used to update the progress bar.
101-
#' @param title (from shinyWidgets::updateProgressBar doc) character, optional title.
102-
#' @param status (from shinyWidgets::updateProgressBar doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
103-
#' @param range_value (from shinyWidgets::updateProgressBar doc) Default is to display percentage ([0, 100]), but you can specify a custom range, e.g. -50, 50.
104-
#' @param unit_mark (from shinyWidgets::updateProgressBar doc) Unit for value displayed on the progress bar, default to "\%".
97+
#' @param type (from `httr::progress()` doc) Type of progress to display: either number of bytes uploaded or downloaded.
98+
#' @param con (from `httr::progress()` doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
99+
#' @param session (from `shinyWidgets::updateProgressBar()` doc) The 'session' object passed to function given to shinyServer.
100+
#' @param id (from `shinyWidgets::updateProgressBar()` doc) An id used to update the progress bar.
101+
#' @param title (from `shinyWidgets::updateProgressBar()` doc) character, optional title.
102+
#' @param status (from `shinyWidgets::updateProgressBar()` doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
103+
#' @param range_value (from `shinyWidgets::updateProgressBar()` doc) Default is to display percentage ([0, 100]), but you can specify a custom range, e.g. -50, 50.
104+
#' @param unit_mark (from `shinyWidgets::updateProgressBar()` doc) Unit for value displayed on the progress bar, default to "\%".
105105
#'
106106
#'
107107
#' @return a function with rules to print out the progress.
108108
#'
109-
#' @seealso \code{\link{progress}}
109+
#' @seealso \code{\link{progress}}, \code{\link[shinyWidgets]{progressBar}}
110110
#'
111111
progress_bar <- function (
112112
type,

README.Rmd

+7-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ httr::GET("http://download.com/large_file.txt",
3737

3838
## Installation
3939

40-
`shinyhttr` is not on CRAN yet. To install it, you may use `devtools`:
40+
From CRAN:
41+
42+
```{r, eval=FALSE}
43+
install.packages("shinyhttr")
44+
```
45+
46+
From github:
4147

4248
```{r, eval=FALSE}
4349
devtools::install_github("curso-r/shinyhttr")

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ httr::GET("http://download.com/large_file.txt",
3030

3131
## Installation
3232

33-
`shinyhttr` is not on CRAN yet. To install it, you may use `devtools`:
33+
From CRAN:
34+
35+
``` r
36+
install.packages("shinyhttr")
37+
```
38+
39+
From github:
3440

3541
``` r
3642
devtools::install_github("curso-r/shinyhttr")

man/progress.Rd

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/progress_bar.Rd

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)