Skip to content

Commit

Permalink
small doc fixes for CRAN release
Browse files Browse the repository at this point in the history
  • Loading branch information
Athospd committed Feb 7, 2019
1 parent 1059c90 commit da168db
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
^CRAN-RELEASE$
^appveyor\.yml$
^\.travis\.yml$
^README\.Rmd$
^LICENSE\.md$
^.*\.Rproj$
^\.Rproj\.user$
^\.Rproj\.user$
2 changes: 2 additions & 0 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This package was submitted to CRAN on 2019-02-05.
Once it is accepted, delete this file and tag the release (commit 1059c9021a).
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: shinyhttr
Type: Package
Title: Progress Bars For Downloads In Shiny Apps
Title: Progress Bars for Downloads in Shiny Apps
Version: 1.0.0
Author: Athos Petri Damiani <[email protected]>
Maintainer: Athos Petri Damiani <[email protected]>
Description: This package modifies the httr::progress function to let it
send output to shinyWidgets::progressBar. It is just a tweak at the
Description: Modifies the `httr::progress()` function to let it
send output to `shinyWidgets::progressBar()`. It is just a tweak at the
original functions from httr to make it smooth for shiny developers.
License: MIT + file LICENSE
BugReports: https://github.com/curso-r/shinyhttr/issues
Expand Down
40 changes: 20 additions & 20 deletions R/progress.R
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#' Add a progress bar compatible with shinyWidgets::progressBar.
#' Add a progress bar compatible with `shinyWidgets::updateProgressBar()`.
#'
#' 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.
#' 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.
#'
#' @param session (from shinyWidgets::updateProgressBar doc) The 'session' object passed to function given to shinyServer.
#' @param id (from shinyWidgets::updateProgressBar doc) An id used to update the progress bar.
#' @param type (from httr::progress doc) Type of progress to display: either number of bytes uploaded or downloaded.
#' @param con (from httr::progress doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
#' @param title (from shinyWidgets::updateProgressBar doc) character, optional title.
#' @param status (from shinyWidgets::updateProgressBar doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
#' @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.
#' @param unit_mark (from shinyWidgets::updateProgressBar doc) Unit for value displayed on the progress bar, default to "\%".
#' @param session (from `shinyWidgets::updateProgressBar()`` doc) The 'session' object passed to function given to shinyServer.
#' @param id (from `shinyWidgets::updateProgressBar()` doc) An id used to update the progress bar.
#' @param type (from `httr::progress()`` doc) Type of progress to display: either number of bytes uploaded or downloaded.
#' @param con (from `httr::progress()` doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
#' @param title (from `shinyWidgets::updateProgressBar()` doc) character, optional title.
#' @param status (from `shinyWidgets::updateProgressBar()` doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
#' @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.
#' @param unit_mark (from `shinyWidgets::updateProgressBar()` doc) Unit for value displayed on the progress bar, default to "\%".
#'
#' @export
#'
Expand Down Expand Up @@ -92,21 +92,21 @@ progress <- function (

#' progress_bar
#'
#' same as httr:::progress_bar but with capability to talk to shinyWidgets::progressBar.
#' Same as `httr:::progress_bar()` but with capability to talk to `shinyWidgets::progressBar()`.
#'
#' @param type (from httr::progress doc) Type of progress to display: either number of bytes uploaded or downloaded.
#' @param con (from httr::progress doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
#' @param session (from shinyWidgets::updateProgressBar doc) The 'session' object passed to function given to shinyServer.
#' @param id (from shinyWidgets::updateProgressBar doc) An id used to update the progress bar.
#' @param title (from shinyWidgets::updateProgressBar doc) character, optional title.
#' @param status (from shinyWidgets::updateProgressBar doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
#' @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.
#' @param unit_mark (from shinyWidgets::updateProgressBar doc) Unit for value displayed on the progress bar, default to "\%".
#' @param type (from `httr::progress()` doc) Type of progress to display: either number of bytes uploaded or downloaded.
#' @param con (from `httr::progress()` doc) Connection to send output too. Usually \code{stdout()} or \code{stderr}.
#' @param session (from `shinyWidgets::updateProgressBar()` doc) The 'session' object passed to function given to shinyServer.
#' @param id (from `shinyWidgets::updateProgressBar()` doc) An id used to update the progress bar.
#' @param title (from `shinyWidgets::updateProgressBar()` doc) character, optional title.
#' @param status (from `shinyWidgets::updateProgressBar()` doc) Color, must be a valid Bootstrap status : primary, info, success, warning, danger.
#' @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.
#' @param unit_mark (from `shinyWidgets::updateProgressBar()` doc) Unit for value displayed on the progress bar, default to "\%".
#'
#'
#' @return a function with rules to print out the progress.
#'
#' @seealso \code{\link{progress}}
#' @seealso \code{\link{progress}}, \code{\link[shinyWidgets]{progressBar}}
#'
progress_bar <- function (
type,
Expand Down
8 changes: 7 additions & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ httr::GET("http://download.com/large_file.txt",

## Installation

`shinyhttr` is not on CRAN yet. To install it, you may use `devtools`:
From CRAN:

```{r, eval=FALSE}
install.packages("shinyhttr")
```

From github:

```{r, eval=FALSE}
devtools::install_github("curso-r/shinyhttr")
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ httr::GET("http://download.com/large_file.txt",

## Installation

`shinyhttr` is not on CRAN yet. To install it, you may use `devtools`:
From CRAN:

``` r
install.packages("shinyhttr")
```

From github:

``` r
devtools::install_github("curso-r/shinyhttr")
Expand Down
20 changes: 10 additions & 10 deletions man/progress.Rd

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

20 changes: 10 additions & 10 deletions man/progress_bar.Rd

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

0 comments on commit da168db

Please sign in to comment.