Merge branch 'master' of github.com:eblondel/zen4R

eblondel · Feb 27, 2025 · 3fcbcb4 · 3fcbcb4
2 parents cf8f5bf + 8b25167
commit 3fcbcb4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: zen4R
-Version: 0.10
-Date: 2024-06-05
+Version: 0.10.1
+Date: 2025-02-05
 Title: Interface to 'Zenodo' REST API
 Authors@R: c(
   person("Emmanuel", "Blondel", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-5870-5762")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,6 @@
 # Change log
 
-## [zen4R 0.10](https://github.com/eblondel/zen4R) | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-unavailable-red.svg)](https://cran.r-project.org/package=zen4R)
+## [zen4R 0.10](https://github.com/eblondel/zen4R) | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-published-blue.svg)](https://cran.r-project.org/package=zen4R)
 
 **Enhancements**
 

diff --git a/R/ZenodoRecord.R b/R/ZenodoRecord.R
@@ -821,7 +821,7 @@ ZenodoRecord <-  R6Class("ZenodoRecord",
         )
         if(!is.null(resource_type)) {
           zenodo = ZenodoManager$new()
-          res = ZENODO$getResourceTypeById(resource_type)
+          res = zenodo$getResourceTypeById(resource_type)
           if(!is.null(res)){
             new_rel$resource_type = list(id = resource_type)
           }
@@ -909,7 +909,7 @@ ZenodoRecord <-  R6Class("ZenodoRecord",
     #' @description Set subjects
     #' @param subjects a vector or list of subjects to set for the record
     setSubjects = function(subjects){
-      if(is.null(self$metadata$subjects)) self$metadata$subjects <- list()
+      self$metadata$subjects <- list()
       for(subject in subjects){
         self$addSubject(subject)
       }
@@ -1282,7 +1282,7 @@ ZenodoRecord <-  R6Class("ZenodoRecord",
     exportAs = function(format, filename, append_format = TRUE){
       zenodo_url <- self$links$record_html
       if(is.null(zenodo_url)) zenodo_url <- self$links$self_html
-      if(is.null(zenodo_url)){
+      if(self$is_draft){
         stop("Ups, this record seems a draft, can't export metadata until it is published!")
       }
       metadata_export_url <- switch(format,

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://github.com/eblondel/zen4R/actions/workflows/r-cmd-check.yml/badge.svg?branch=master)](https://github.com/eblondel/zen4R/actions/workflows/r-cmd-check.yml)
-[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/zen4R)](https://cran.r-project.org/package=zen4R)
-[![Github_Status_Badge](https://img.shields.io/badge/Github-0.10-blue.svg)](https://github.com/eblondel/zen4R)
+[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/zen4R)](https://cran.r-project.org/package=zen4R)
+[![Github_Status_Badge](https://img.shields.io/badge/Github-0.10.1-blue.svg)](https://github.com/eblondel/zen4R)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2547036.svg)](https://doi.org/10.5281/zenodo.2547036)
 
 **zen4R – R Interface to Zenodo REST API**

diff --git a/zen4R.Rproj b/zen4R.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: d92a0b8d-3a34-4931-9b4b-d592676d6104
 
 RestoreWorkspace: Default
 SaveWorkspace: Default