16827: Don't append '/' to requests with query params. Bump version

Also remove package-cross loading with "source" that generated warnings.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/sdk/R/DESCRIPTION b/sdk/R/DESCRIPTION
index 878a70901452b47e2710a52be85504179767ea38..75ac892b4ba6680a7af4c91e47f1e770fcd7020c 100644 (file)
--- a/sdk/R/DESCRIPTION
+++ b/sdk/R/DESCRIPTION
@@ -1,9 +1,9 @@
 Package: ArvadosR
 Type: Package
 Title: Arvados R SDK
 Package: ArvadosR
 Type: Package
 Title: Arvados R SDK

-Version: 0.0.5
-Authors@R: person("Fuad", "Muhic", role = c("aut", "cre"), email = "fmuhic@capeannenterprises.com")
-Maintainer: Ward Vandewege <wvandewege@veritasgenetics.com>
+Version: 0.0.6
+Authors@R: c(person("Fuad", "Muhic", role = c("aut", "ctr"), email = "fmuhic@capeannenterprises.com"),
+             person("Peter", "Amstutz", role = c("cre"), email = "peter.amstutz@curii.com"))

 Description: This is the Arvados R SDK
 URL: http://doc.arvados.org
 License: Apache-2.0
 Description: This is the Arvados R SDK
 URL: http://doc.arvados.org
 License: Apache-2.0

diff --git a/sdk/R/R/ArvadosFile.R b/sdk/R/R/ArvadosFile.R
index 70bb4450eccca6efd453002dc7a0962c904fb0d0..fb1d3b335cba00df4db898de20b917334b7e4610 100644 (file)
--- a/sdk/R/R/ArvadosFile.R
+++ b/sdk/R/R/ArvadosFile.R
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
 #
 # SPDX-License-Identifier: Apache-2.0
 

-source("./R/util.R")
-

 #' ArvadosFile
 #'
 #' ArvadosFile class represents a file inside Arvados collection.
 #' ArvadosFile
 #'
 #' ArvadosFile class represents a file inside Arvados collection.

diff --git a/sdk/R/R/Collection.R b/sdk/R/R/Collection.R
index 8869d7be67846b449200fe2c675936dd1c4133db..1440836547253bc96871c651e666ec8608af243a 100644 (file)
--- a/sdk/R/R/Collection.R
+++ b/sdk/R/R/Collection.R
@@ -2,11 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
 #
 # SPDX-License-Identifier: Apache-2.0
 

-source("./R/Subcollection.R")
-source("./R/ArvadosFile.R")
-source("./R/RESTService.R")
-source("./R/util.R")
-

 #' Collection
 #'
 #' Collection class provides interface for working with Arvados collections.
 #' Collection
 #'
 #' Collection class provides interface for working with Arvados collections.

diff --git a/sdk/R/R/CollectionTree.R b/sdk/R/R/CollectionTree.R
index 5f7a29455ae4a58aaae6792f6dd1eb26ae30ae4e..e01e7e8de9dc1f36ac462a0c3730c525926a1555 100644 (file)
--- a/sdk/R/R/CollectionTree.R
+++ b/sdk/R/R/CollectionTree.R
@@ -2,10 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
 #
 # SPDX-License-Identifier: Apache-2.0
 

-source("./R/Subcollection.R")
-source("./R/ArvadosFile.R")
-source("./R/util.R")
-

 CollectionTree <- R6::R6Class(
     "CollectionTree",
     public = list(
 CollectionTree <- R6::R6Class(
     "CollectionTree",
     public = list(

diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index 07defca90f4c99e8be9f8a73f7412f398ab1a701..18b36f96898c2fa1be1d2e512a2fb158ac94294a 100644 (file)
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
 #
 # SPDX-License-Identifier: Apache-2.0
 

-source("./R/util.R")
-

 HttpRequest <- R6::R6Class(
 
     "HttrRequest",
 HttpRequest <- R6::R6Class(
 
     "HttrRequest",


@@ -54,7 +52,7 @@ HttpRequest <- R6::R6Class(
             {
                 query <- paste0(names(query), "=", query, collapse = "&")
 
             {
                 query <- paste0(names(query), "=", query, collapse = "&")
 

-                return(paste0("/?", query))
+                return(paste0("?", query))

             }
 
             return("")
             }
 
             return("")

diff --git a/sdk/R/R/Subcollection.R b/sdk/R/R/Subcollection.R
index 17a9ef3ee3ba6180546763da637a8824905d66dc..981bd687a2fbcb68f8eb0deafa7caed619dd3628 100644 (file)
--- a/sdk/R/R/Subcollection.R
+++ b/sdk/R/R/Subcollection.R
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
 #
 # SPDX-License-Identifier: Apache-2.0
 

-source("./R/util.R")
-

 #' Subcollection
 #'
 #' Subcollection class represents a folder inside Arvados collection.
 #' Subcollection
 #'
 #' Subcollection class represents a folder inside Arvados collection.

diff --git a/sdk/R/tests/testthat/test-HttpRequest.R b/sdk/R/tests/testthat/test-HttpRequest.R
index eb58d033b5fefdb3f7082f8a4b2838e9dcfec330..c1b6f1039cfc28e0e7b4f62087f3919acaa7c0b3 100644 (file)
--- a/sdk/R/tests/testthat/test-HttpRequest.R
+++ b/sdk/R/tests/testthat/test-HttpRequest.R
@@ -20,7 +20,7 @@ test_that("createQuery generates and encodes query portion of http", {
     queryParams$limit <- 20
     queryParams$offset <- 50
     expect_that(http$createQuery(queryParams),
     queryParams$limit <- 20
     queryParams$offset <- 50
     expect_that(http$createQuery(queryParams),

-                equals(paste0("/?filters=%5B%5B%22color%22%2C%22%3D%22%2C%22red",
+                equals(paste0("?filters=%5B%5B%22color%22%2C%22%3D%22%2C%22red",

                               "%22%5D%5D&limit=20&offset=50")))
 })
 
                               "%22%5D%5D&limit=20&offset=50")))
 })