Fix Imports function loading

phillc73 · Jan 27, 2016 · 86fe06b · 86fe06b
1 parent fa8c9a0
commit 86fe06b
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 39 deletions.
diff --git a/R/b2CreateBucket.R b/R/b2CreateBucket.R
@@ -48,21 +48,21 @@ b2CreateBucket <- function(bucketName, bucketType) {
     httr::POST(
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_create_bucket", sep = ""
-      ), body = jsonlite::toJSON(unbox(vars), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(vars), pretty = TRUE), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
   }
 }
diff --git a/R/b2DeleteBucket.R b/R/b2DeleteBucket.R
@@ -38,21 +38,21 @@ b2DeleteBucket <- function(bucketId) {
     httr::POST(
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_delete_bucket", sep = ""
-      ), body = jsonlite::toJSON(unbox(vars), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(vars), pretty = TRUE), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
   }
 }
diff --git a/R/b2DeleteFileVersion.R b/R/b2DeleteFileVersion.R
@@ -44,21 +44,21 @@ b2DeleteFileVersion <- function(fileName, fileId) {
     httr::POST(
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_delete_file_version", sep = ""
-      ), body = jsonlite::toJSON(unbox(vars), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(vars), pretty = TRUE), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
   }
 }
diff --git a/R/b2DownloadFileById.R b/R/b2DownloadFileById.R
@@ -43,17 +43,17 @@ b2DownloadFileById <- function(fileId, overwrite = FALSE) {
       paste(
         accountAuthorization$downloadUrl,"/b2api/v1/b2_download_file_by_id", sep =
           ""
-      ), body = jsonlite::toJSON(unbox(fileId), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(fileId), pretty = TRUE), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
-      ), write_disk("tmp", overwrite = overwrite)
+      ), httr::write_disk("tmp", overwrite = overwrite)
     )
 
   # Alternative GET call
   # b2Return <- httr::GET(url = paste(accountAuthorization$downloadUrl,"/b2api/v1/b2_download_file_by_id?fileId=", fileId, sep=""), add_headers('Authorization' = as.character(accountAuthorization$authorizationToken)), write_disk("tmp", overwrite))
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message

diff --git a/R/b2DownloadFileByName.R b/R/b2DownloadFileByName.R
@@ -50,14 +50,14 @@ b2DownloadFileByName <-
         url = paste(
           accountAuthorization$downloadUrl,"/file/", bucketName, "/", fileName, sep =
             ""
-        ), add_headers(
+        ), httr::add_headers(
           'Authorization' = as.character(accountAuthorization$authorizationToken)
-        ), write_disk("tmp", overwrite = overwrite)
+        ), httr::write_disk("tmp", overwrite = overwrite)
       )
 
     # Check for bad authorisation and sent message
     if (httr::status_code(b2Return) != "200") {
-      badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+      badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
       stop(
         "\nSomething went wrong. Please check the function options to ensure valid values. \n",
         "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message

diff --git a/R/b2GetFileInfo.R b/R/b2GetFileInfo.R
@@ -36,22 +36,22 @@ b2GetFileInfo <- function(fileId) {
     httr::POST(
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_get_file_info", sep = ""
-      ), body = jsonlite::toJSON(unbox(fileId), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(fileId), pretty = TRUE), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
 
   }
 }
diff --git a/R/b2GetUploadUrl.R b/R/b2GetUploadUrl.R
@@ -37,21 +37,21 @@ b2GetUploadUrl <- function(bucketId) {
     httr::POST(
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_get_upload_url", sep = ""
-      ), body = jsonlite::toJSON(unbox(bucketId), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(bucketId), pretty = TRUE), httr::httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
   }
 }
diff --git a/R/b2HideFile.R b/R/b2HideFile.R
@@ -41,21 +41,21 @@ b2HideFile <- function(bucketId, fileName) {
     httr::POST(
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_hide_file", sep = ""
-      ), body = jsonlite::toJSON(unbox(vars), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(vars), pretty = TRUE), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
   }
 }
diff --git a/R/b2ListBuckets.R b/R/b2ListBuckets.R
@@ -31,22 +31,22 @@ b2ListBuckets <- function() {
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_list_buckets?accountId=",accountAuthorization$accountId,sep =
           ""
-      ), add_headers(
+      ), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    b2Return <- jsonlite::fromJSON(content(b2Return, type = "text"))
+    b2Return <- jsonlite::fromJSON(httr::content(b2Return, type = "text"))
     b2Return[[1]]
   }
 }
diff --git a/R/b2ListFileNames.R b/R/b2ListFileNames.R
@@ -61,22 +61,22 @@ b2ListFileNames <-
       httr::POST(
         paste(
           accountAuthorization$apiUrl,"/b2api/v1/b2_list_file_names", sep = ""
-        ), body = jsonlite::toJSON(unbox(vars), pretty = TRUE), add_headers(
+        ), body = jsonlite::toJSON(jsonlite::unbox(vars), pretty = TRUE), httr::add_headers(
           'Authorization' = as.character(accountAuthorization$authorizationToken)
         )
       )
 
     # Check for bad authorisation and sent message
     if (httr::status_code(b2Return) != "200") {
-      badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+      badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
       stop(
         "\nSomething went wrong. Please check the function options to ensure valid values. \n",
         "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
       )
 
     } else {
       # Output as dataframe
-      jsonlite::fromJSON(content(b2Return, type = "text"))
+      jsonlite::fromJSON(httr::content(b2Return, type = "text"))
 
     }
   }
diff --git a/R/b2ListFileVersions.R b/R/b2ListFileVersions.R
@@ -72,21 +72,21 @@ b2ListFileVersions <-
       httr::POST(
         paste(
           accountAuthorization$apiUrl,"/b2api/v1/b2_list_file_versions", sep = ""
-        ), body = jsonlite::toJSON(unbox(vars), pretty = TRUE), add_headers(
+        ), body = jsonlite::toJSON(jsonlite::unbox(vars), pretty = TRUE), httr::add_headers(
           'Authorization' = as.character(accountAuthorization$authorizationToken)
         )
       )
 
     # Check for bad authorisation and sent message
     if (httr::status_code(b2Return) != "200") {
-      badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+      badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
       stop(
         "\nSomething went wrong. Please check the function options to ensure valid values. \n",
         "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
       )
 
     } else {
       # Output as dataframe
-      jsonlite::fromJSON(content(b2Return, type = "text"))
+      jsonlite::fromJSON(httr::content(b2Return, type = "text"))
     }
   }
diff --git a/R/b2UpdateBucket.R b/R/b2UpdateBucket.R
@@ -48,21 +48,21 @@ b2UpdateBucket <- function(bucketId, bucketType) {
     httr::POST(
       paste(
         accountAuthorization$apiUrl,"/b2api/v1/b2_update_bucket", sep = ""
-      ), body = jsonlite::toJSON(unbox(vars), pretty = TRUE), add_headers(
+      ), body = jsonlite::toJSON(jsonlite::unbox(vars), pretty = TRUE), httr::add_headers(
         'Authorization' = as.character(accountAuthorization$authorizationToken)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
   }
 }
diff --git a/R/b2UploadFile.R b/R/b2UploadFile.R
@@ -61,21 +61,21 @@ b2UploadFile <- function(authToken, uploadUrl, fileName) {
   # API call
   b2Return <-
     httr::POST(
-      uploadUrl, body = upload_file(fileName), add_headers(
+      uploadUrl, body = httr::upload_file(fileName), httr::add_headers(
         'Authorization' = as.character(authToken), 'X-Bz-File-Name' = as.character(fileNameEncoded), 'Content-Type' = as.character(b2ContentType), 'Content-Length' = as.character(fileSize), 'X-Bz-Content-Sha1' = as.character(sha1Hash)
       )
     )
 
   # Check for bad authorisation and sent message
   if (httr::status_code(b2Return) != "200") {
-    badReturn <- jsonlite::fromJSON(content(b2Return,type = "text"))
+    badReturn <- jsonlite::fromJSON(httr::content(b2Return,type = "text"))
     stop(
       "\nSomething went wrong. Please check the function options to ensure valid values. \n",
       "\nStatus Code: ", badReturn$code, "\nMessage: ", badReturn$message
     )
 
   } else {
     # Output as dataframe
-    jsonlite::fromJSON(content(b2Return, type = "text"))
+    jsonlite::fromJSON(httr::content(b2Return, type = "text"))
   }
 }