Merge pull request #23 from sckott/master

add OKmaps readme footer image

Author: njahn82

DESCRIPTION

@@ -6,7 +6,7 @@ Description: Client for the OpenAIRE API.
   that is it does not give direct access to publication files and it 
   does not provide access to the whole information space since the 
   number of total results returned by one query is limited to 10,000.
-Version: 0.1.6.9433
+Version: 0.1.7.9210
 Authors@R: c(
     person("Najko", "Jahn", role = c("aut", "cre"), 
       email = "[email protected]"),

R/roa_projects.R

@@ -28,8 +28,6 @@
 #' roa_projects(call_id = "FP7-PEOPLE-2010-IRSES")
 #' roa_projects(title = "open", size = 3)
 #' 
-#' roa_projects(dataset_id = "")
-#' 
 #' # formats
 #' roa_projects(org = "UGOE", size = 3, format = "tsv")
 #' roa_projects(org = "UGOE", size = 3, format = "csv")
@@ -68,22 +66,22 @@ roa_projects <- function(grant_id = NULL, publication_id = NULL,
 }
 
 xml_names <- c(
-  grantID = "//code",
-  acronym = "//acronym",
-  title = "//title",
-  startdate = "//startdate",
-  enddate = "//enddate",
-  callidentifier = "//callidentifier",
-  ecsc39 = "//ecsc39",
-  funding_level_0 = "//funding_level_0/name"
+  grantID = ".//code",
+  acronym = ".//acronym",
+  title = ".//title",
+  startdate = ".//startdate",
+  enddate = ".//enddate",
+  callidentifier = ".//callidentifier",
+  ecsc39 = ".//ecsc39",
+  funding_level_0 = ".//funding_level_0/name"
 )
 
 parse_project <- function(x) {
   x <- xml2::read_xml(x$content)
   results <- xml2::xml_find_all(x, xpath = '//results/result')
   lapply(results, function(z) {
     lapply(xml_names, function(w) {
-      xml2::xml_text(xml2::xml_find_all(z, w))
+      xml2::xml_text(xml2::xml_find_all(z, w)) %|m|% NA_character_
     })
   })
 }

R/utils.R

@@ -2,6 +2,10 @@
 oa_base <- function() "http://api.openaire.eu/"
 
 `%||%` <- function(x, y) if (is.null(x)) y else x
+`%|m|%` <- function(x, y) {
+  if (length(x) == 0) return(y)
+  if (is.null(x) || !nzchar(x)) y else x
+}
 
 comp <- function(x) Filter(Negate(is.null), x)
 

README.Rmd

@@ -82,3 +82,6 @@ roa_projects(org = "UGOE", size = 10)
 
 * Please [report any issues or bugs](https://github.com/njahn82/ropenaire/issues).
 * License: MIT ©Najko Jahn
+
+[![okmaps_footer](tools/github-banner-okmaps-contribution.png)](https://openknowledgemaps.org/)
+

README.md

@@ -170,3 +170,5 @@ roa_projects(org = "UGOE", size = 10)
 
 * Please [report any issues or bugs](https://github.com/njahn82/ropenaire/issues).
 * License: MIT ©Najko Jahn
+
+[![okmaps_footer](tools/github-banner-okmaps-contribution.png)](https://openknowledgemaps.org/)

man/roa_projects.Rd

@@ -8,7 +8,18 @@ test_that("roa_projects returns correct class", {
   expect_is(a, "data.frame")
   expect_is(a, "tbl_df")
   expect_is(a$grantID, "character")
-  expect_gt(NROW(a), 10) 
+  expect_named(a, c('grantID', 'acronym', 'title', 'startdate', 
+    'enddate', 'callidentifier', 'ecsc39', 'funding_level_0')) 
+})
+
+test_that("roa_projects works with eg that used to fail due to missing data", {
+  skip_on_cran()
+
+  a <- roa_projects(keywords = "open science", start_year = "2009")
+
+  expect_is(a, "data.frame")
+  expect_is(a, "tbl_df")
+  expect_gt(NROW(a), 0)
 })
 
 test_that("roa_projects fails well", {