Merge pull request #8 from muschellij2/master

Fixed Checks
MarkEdmondson1234 · May 24, 2017 · 3038d3d · 3038d3d
2 parents 32fe79a + 8ce0e16
commit 3038d3d
Show file tree

Hide file tree

Showing 44 changed files with 70 additions and 64 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -5,3 +5,4 @@ cran-comments\.md
 .httr-oauth
 .httr-oauth-SUSPENDED
 stripeR_form.png
+Readme\.md
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: stripeR
 Type: Package
 Title: Interface for Stripe API for R
 Description: Allow users to pay in Shiny apps using Stripe payment portal.
-Version: 0.0.9001
+Version: 0.0.9002
 Authors@R: c(person("Mark", "Edmondson",email = "r@sunholo.com",
                   role = c("aut", "cre")))
 URL: https://github.com/MarkEdmondson1234/stripeR
@@ -11,11 +11,13 @@ Depends:
     R (>= 3.2.0)
 Imports:
     httr (>= 1.0.0),
-    jsonlite (>= 0.9.16)
-Suggests:
     shiny (>= 0.13.0),
+    jsonlite (>= 0.9.16),
+    stats, 
+    utils
+Suggests:
     knitr
 License: MIT + file LICENSE
 LazyData: true
 VignetteBuilder: knitr
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
diff --git a/NAMESPACE b/NAMESPACE
@@ -26,3 +26,26 @@ export(stripeR_init)
 export(update_charge)
 export(update_customer)
 export(update_subscription)
+importFrom(httr,GET)
+importFrom(httr,POST)
+importFrom(httr,add_headers)
+importFrom(httr,authenticate)
+importFrom(httr,content)
+importFrom(httr,modify_url)
+importFrom(jsonlite,fromJSON)
+importFrom(shiny,actionButton)
+importFrom(shiny,br)
+importFrom(shiny,column)
+importFrom(shiny,fluidRow)
+importFrom(shiny,h4)
+importFrom(shiny,helpText)
+importFrom(shiny,numericInput)
+importFrom(shiny,observeEvent)
+importFrom(shiny,p)
+importFrom(shiny,reactiveValues)
+importFrom(shiny,renderUI)
+importFrom(shiny,strong)
+importFrom(shiny,tagList)
+importFrom(shiny,textInput)
+importFrom(stats,runif)
+importFrom(utils,str)
diff --git a/R/charge.R b/R/charge.R
@@ -21,10 +21,12 @@
 #'   a source belonging to the customer.
 #'
 #' If you do not pass a customer ID,
-#'   the source you provide must be a token from \link{create_token}
+#'   the source you provide must be a token from \code{\link{create_card_token}}
 #'
 #' @family charges
 #' @export
+#' @importFrom httr POST
+#'
 charge_card <- function(amount,
                         currency,
                         idempotency,
@@ -162,7 +164,7 @@ capture_charge <- function(chargeId,
 #' @param ending_before A cursor used for pagination
 #' @param limit between 1 and 100 objects
 #' @param source A filter based on the source of the charge
-#' @param starting_after A cursor used for pagination
+#' @param starting_before A cursor used for pagination
 #'
 #'
 #' @return A charge object

diff --git a/R/customer.R b/R/customer.R
@@ -88,12 +88,12 @@ get_customer <- function(customerId){
 #' @param description Arbitary string
 #' @param email customer's email address
 #' @param metadata A named list
-#' @param plan ID of the plan to subscribe customer to
-#' @param quantity Quantity you'd like to apply to subscription. Needs plan.
+#' # @param plan ID of the plan to subscribe customer to
+#' # @param quantity Quantity you'd like to apply to subscription. Needs plan.
 #' @param shipping Optional dictionary
 #' @param source A token from \link{get_token}
-#' @param tax_percent A positive decimal. Percentage added as tax.
-#' @param trail_end Unix timestamp when trial period ends. Needs plan.
+#' # @param tax_percent A positive decimal. Percentage added as tax.
+#' # @param trail_end Unix timestamp when trial period ends. Needs plan.
 #'
 #' @details
 #'   Setting \code{account_balance} to negative means the customer will have a credit.
@@ -162,12 +162,13 @@ delete_customer <- function(customerId){
 #' @param created filter on created
 #' @param ending_before filter for pagination
 #' @param limit Between 1 and 100
-#' @param starting_after filter for pagination
+#' @param starting_before filter for pagination
 #'
 #' @return List object
 #'
 #' @family customers
 #' @export
+#' @importFrom httr GET
 list_customers <- function(created=NULL,
                            ending_before=NULL,
                            limit=10,
@@ -183,7 +184,7 @@ list_customers <- function(created=NULL,
   url <- httr::modify_url("https://api.stripe.com/v1/customers",
                           query = params)
 
-  req <- do_request(url,"GET", limit=limit)
+  req <- do_request(url, "GET", limit=limit)
 
   content <- req$data
 

diff --git a/R/requests.R b/R/requests.R
@@ -59,6 +59,7 @@ stripeR_init <- function(live=FALSE){
 #' @return the request content or NULL
 #'
 #' @keywords internal
+#' @importFrom httr modify_url add_headers authenticate
 do_request <- function(url,
                        request_type,
                        idempotency=NULL,
@@ -150,9 +151,12 @@ do_request <- function(url,
 #' @return content if it is there, or NULL
 #'
 #' @keywords internal
+#' @importFrom httr content
+#' @importFrom jsonlite fromJSON
 checkRequest <- function(req){
 
-  content <- httr::content(req, as = "text", type = "application/json",encoding = "UTF-8")
+  content <- httr::content(req, as = "text", type = "application/json",
+                           encoding = "UTF-8")
 
   if(!is.null(content)){
     content <- jsonlite::fromJSON(content, simplifyVector = FALSE, flatten = TRUE)
@@ -187,6 +191,7 @@ checkRequest <- function(req){
 #' @param f A function of a http request
 #'
 #' @keywords internal
+#' @importFrom stats runif
 retryRequest <- function(f){
   the_request <- try(f)
 
@@ -196,7 +201,7 @@ retryRequest <- function(f){
     if(the_request[["status_code"]] %in% c(429, 500, 501, 502, 503, 504)){
       for(i in 1:5){
         warning("Trying again: ", i, " of 5")
-        Sys.sleep((2 ^ i) + runif(n = 1, min = 0, max = 1))
+        Sys.sleep((2 ^ i) + stats::runif(n = 1, min = 0, max = 1))
         the_request <- try(f)
         if(!is.error(the_request)) break
       }

diff --git a/R/shiny.R b/R/shiny.R
@@ -32,12 +32,15 @@ stripeRShinyUI <- function(id){
 #' @param formText reactive - Custom text for form
 #' @param bottom_left What to see in the bottom left of form
 #' @param thanks What to see once the form is successfully submitted
+#' @param currency The currency the amount is in
 #' @param live Whether to charge against the live Stripe account.
 #' @param metadata reactive - A named list of other data to send into stripeR
 #'
 #' @return A reactive status object
 #'
 #' @export
+#' @importFrom shiny p fluidRow renderUI column h4 strong helpText
+#' @importFrom shiny numericInput textInput br actionButton tagList observeEvent
 stripeRShiny <- function(input, output, session,
                          amount,
                          plan,
@@ -219,6 +222,7 @@ stripeRShiny <- function(input, output, session,
 #'
 #' @family shiny
 #' @keywords internal
+#' @importFrom shiny reactiveValues
 stripeShinyInit <- function(){
 
   shiny::reactiveValues(charged=FALSE,
@@ -241,8 +245,9 @@ stripeShinyInit <- function(){
 #'
 #' @family shiny
 #' @keywords internal
+#' @importFrom utils str
 updateStatus <- function(attempt, status){
-  str(attempt)
+  utils::str(attempt)
   if(is.error(attempt)){
     warning(error.message(attempt))
     status$charge_message <- error.message(attempt)

diff --git a/R/subscriptions.R b/R/subscriptions.R
@@ -166,7 +166,7 @@ cancel_subscription <- function(customerId, subscriptionId, at_period_end=FALSE)
 #' @param customerId The ID of the customer
 #' @param ending_before filter for pagination
 #' @param limit Between 1 and 100
-#' @param starting_after filter for pagination
+#' @param starting_before filter for pagination
 #'
 #' @return List object
 #'

diff --git a/Readme.md b/Readme.md
@@ -1,5 +1,7 @@
 # stripeR
 
+[![Travis-CI Build Status](https://travis-ci.org/MarkEdmondson1234/stripeR.svg?branch=master)](https://travis-ci.org/MarkEdmondson1234/stripeR)
+
 An interface with the [Stripe](https://stripe.com) API for user payments.
 
 [API docs](https://stripe.com/docs/api/curl)

diff --git a/man/balance.Rd b/man/balance.Rd
diff --git a/man/balance_history.Rd b/man/balance_history.Rd
diff --git a/man/balance_transaction.Rd b/man/balance_transaction.Rd
diff --git a/man/cancel_subscription.Rd b/man/cancel_subscription.Rd
diff --git a/man/capture_charge.Rd b/man/capture_charge.Rd
diff --git a/man/charge_card.Rd b/man/charge_card.Rd
diff --git a/man/checkRequest.Rd b/man/checkRequest.Rd
diff --git a/man/create_bank_token.Rd b/man/create_bank_token.Rd
diff --git a/man/create_card_token.Rd b/man/create_card_token.Rd
diff --git a/man/create_customer.Rd b/man/create_customer.Rd
diff --git a/man/create_subscription.Rd b/man/create_subscription.Rd
diff --git a/man/delete_customer.Rd b/man/delete_customer.Rd
diff --git a/man/do_request.Rd b/man/do_request.Rd
diff --git a/man/error.message.Rd b/man/error.message.Rd
diff --git a/man/get_charge.Rd b/man/get_charge.Rd
diff --git a/man/get_customer.Rd b/man/get_customer.Rd
diff --git a/man/get_subscription.Rd b/man/get_subscription.Rd
diff --git a/man/get_token.Rd b/man/get_token.Rd
diff --git a/man/idempotency.Rd b/man/idempotency.Rd
diff --git a/man/is.error.Rd b/man/is.error.Rd
diff --git a/man/list_charges.Rd b/man/list_charges.Rd
diff --git a/man/list_customers.Rd b/man/list_customers.Rd
diff --git a/man/list_subscriptions.Rd b/man/list_subscriptions.Rd
diff --git a/man/make_meta.Rd b/man/make_meta.Rd
diff --git a/man/retryRequest.Rd b/man/retryRequest.Rd
diff --git a/man/stripeRShiny.Rd b/man/stripeRShiny.Rd
diff --git a/man/stripeRShinyUI.Rd b/man/stripeRShinyUI.Rd
diff --git a/man/stripeR_auth.Rd b/man/stripeR_auth.Rd