fixed a few tests, fixed parsing bug in name_usage, bumped dev ver

DESCRIPTION

@@ -7,7 +7,7 @@ Description: A programmatic interface to the Web Service methods
     taxonomic names, retrieving information on data providers,
     getting species occurrence records, and getting counts of
     occurrence records.
-Version: 0.9.2.9700
+Version: 0.9.2.9740
 License: MIT + file LICENSE
 Authors@R: c(
     person("Scott", "Chamberlain", role = c("aut", "cre"), email = "myrmecocystus@gmail.com"),

R/name_usage.r

@@ -130,7 +130,17 @@ name_usage_parse <- function(x, y) {
     } else {
       (outtt <- data.table::setDF(
         data.table::rbindlist(
-          lapply(x$results, function(x) lapply(x, function(x) if (length(x) == 0) NA else x)),
+          lapply(x$results, function(x) {
+            lapply(x, function(x) {
+              if (length(x) == 0) {
+                NA
+              } else if (length(x) > 1) {
+                paste0(x, collapse = ",")
+              } else {
+                x
+              }
+            })
+          }),
           use.names = TRUE, fill = TRUE)))
     }
   } else {

tests/testthat/test-wkt_large.R

@@ -36,8 +36,11 @@ test_that("wkt is detected/parsed as planned", {
   expect_is(wkt, "character")
   expect_gt(nchar(wkt), 2000)
   expect_match(wkt, "POLYGON")
-  expect_message(geometry_handler(wkt),
+
+  expect_message(geometry_handler(wkt), NA)
+  expect_message(geometry_handler(wkt, geom_big = "bbox"),
                  "geometry is big, querying BBOX, then pruning results to polygon")
+
   expect_is(suppressMessages(geometry_handler(wkt)), "character")
   expect_match(suppressMessages(geometry_handler(wkt)), "POLYGON")
 
@@ -46,7 +49,7 @@ test_that("wkt is detected/parsed as planned", {
   expect_is(wkt, "character")
   expect_lt(nchar(wkt), 100)
   expect_match(wkt, "POLYGON")
-  expect_that(geometry_handler(wkt), not(shows_message()))
+  expect_message(geometry_handler(wkt), NA)
   expect_is(geometry_handler(wkt), "character")
   expect_match(geometry_handler(wkt), "POLYGON")
   expect_equal(geometry_handler(wkt), wkt)
@@ -55,15 +58,20 @@ test_that("wkt is detected/parsed as planned", {
   bbox <- c(-125.0,38.4,-121.8,40.9)
   expect_is(bbox, "numeric")
   expect_equal(length(bbox), 4)
-  expect_that(geometry_handler(bbox), not(shows_message()))
+  expect_message(geometry_handler(bbox), NA)
   expect_is(geometry_handler(bbox), "character")
   expect_match(geometry_handler(bbox), "POLYGON")
 })
 
 test_that("wkt is used correctly in querying GBIF - occ_data", {
   skip_on_cran()
 
-  res <- suppressMessages(occ_data(geometry = wkt, limit = 100))
+  # by default too large WKT will fail with 413, request entity too large
+  expect_error(occ_data(geometry = wkt, limit = 100),
+               "Request Entity Too Large")
+
+  # setting to bbox will work
+  res <- suppressMessages(occ_data(geometry = wkt, limit = 100, geom_big = "bbox"))
 
   # returns the correct class
   expect_is(res, "gbif_data")
@@ -77,7 +85,12 @@ test_that("wkt is used correctly in querying GBIF - occ_data", {
 test_that("wkt is used correctly in querying GBIF - occ_search", {
   skip_on_cran()
 
-  res <- suppressMessages(occ_search(geometry = wkt, limit = 100))
+  # by default too large WKT will fail with 413, request entity too large
+  expect_error(occ_search(geometry = wkt, limit = 100),
+               "Request Entity Too Large")
+
+  # setting to bbox will work
+  res <- suppressMessages(occ_search(geometry = wkt, limit = 100, geom_big = "bbox"))
 
   # returns the correct class
   expect_is(res, "gbif")