rename R package to curies and ConverterR to Converter

lib/docs/docs/r.md

@@ -23,7 +23,7 @@ Initialize a converter, then use it to `compress` URIs to CURIEs, or `expand` CU
 ```r title="curies_conversion.R"
 library(curiesr)
 
-converter <- ConverterR$new()
+converter <- Converter$new()
 
 curie <- converter$compress("http://purl.obolibrary.org/obo/DOID_1234")
 uri <- converter$expand("doid:1234")

r/DESCRIPTION

@@ -1,4 +1,4 @@
-Package: curiesr
+Package: curies
 Title: Idiomatic conversion between URIs and compact URIs (CURIEs)
 Version: 0.1.0
 Authors@R: c(

r/NAMESPACE

@@ -1,5 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method("$",ConverterR)
-S3method("[[",ConverterR)
-useDynLib(curiesr, .registration = TRUE)
+S3method("$",Converter)
+S3method("[[",Converter)
+useDynLib(curies, .registration = TRUE)

r/R/extendr-wrappers.R

@@ -4,26 +4,26 @@
 
 #
 # This file was created with the following call:
-#   .Call("wrap__make_curiesr_wrappers", use_symbols = TRUE, package_name = "curiesr")
+#   .Call("wrap__make_curies_wrappers", use_symbols = TRUE, package_name = "curies")
 
 #' @docType package
 #' @usage NULL
-#' @useDynLib curiesr, .registration = TRUE
+#' @useDynLib curies, .registration = TRUE
 NULL
 
-ConverterR <- new.env(parent = emptyenv())
+Converter <- new.env(parent = emptyenv())
 
-ConverterR$new <- function() .Call(wrap__ConverterR__new)
+Converter$new <- function() .Call(wrap__Converter__new)
 
-ConverterR$compress <- function(uri) .Call(wrap__ConverterR__compress, self, uri)
+Converter$compress <- function(uri) .Call(wrap__Converter__compress, self, uri)
 
-ConverterR$expand <- function(curie) .Call(wrap__ConverterR__expand, self, curie)
+Converter$expand <- function(curie) .Call(wrap__Converter__expand, self, curie)
 
 #' @export
-`$.ConverterR` <- function (self, name) { func <- ConverterR[[name]]; environment(func) <- environment(); func }
+`$.Converter` <- function (self, name) { func <- Converter[[name]]; environment(func) <- environment(); func }
 
 #' @export
-`[[.ConverterR` <- `$.ConverterR`
+`[[.Converter` <- `$.Converter`
 
 
 # nolint end

r/README.md

@@ -69,7 +69,7 @@ After installation, the following should work:
 
 ```r
 library(curiesr)
-converter <- ConverterR$new()
+converter <- Converter$new()
 curie <- converter$compress("http://purl.obolibrary.org/obo/DOID_1234")
 print(curie)
 ```

r/src/Makevars

@@ -1,7 +1,7 @@
 TARGET_DIR = ./rust/target
 LIBDIR = $(TARGET_DIR)/release
-STATLIB = $(LIBDIR)/libcuriesr.a
-PKG_LIBS = -L$(LIBDIR) -lcuriesr -lssl
+STATLIB = $(LIBDIR)/libcuries.a
+PKG_LIBS = -L$(LIBDIR) -lcuries -lssl
 
 all: C_clean
 

r/src/Makevars.win

@@ -2,8 +2,8 @@ TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
 
 TARGET_DIR = ./rust/target
 LIBDIR = $(TARGET_DIR)/$(TARGET)/release
-STATLIB = $(LIBDIR)/libcuriesr.a
-PKG_LIBS = -L$(LIBDIR) -lcuriesr -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll -lCrypt32 -lSecur32
+STATLIB = $(LIBDIR)/libcuries.a
+PKG_LIBS = -L$(LIBDIR) -lcuries -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll -lCrypt32 -lSecur32
 
 all: C_clean
 

r/src/curiesr-win.def

@@ -1,2 +1,2 @@
 EXPORTS
-R_init_curiesr
+R_init_curies

r/src/entrypoint.c

@@ -1,8 +1,8 @@
 // We need to forward routine registration from C to Rust
 // to avoid the linker removing the static library.
 
-void R_init_curiesr_extendr(void *dll);
+void R_init_curies_extendr(void *dll);
 
-void R_init_curiesr(void *dll) {
-    R_init_curiesr_extendr(dll);
+void R_init_curies(void *dll) {
+    R_init_curies_extendr(dll);
 }

r/src/rust/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
-name = 'curiesr'
+name = 'curies-r'
 publish = false
 version = '0.3.0'
 edition = '2021'
 license-file.workspace = true
 
 [lib]
 crate-type = [ 'staticlib' ]
-name = 'curiesr'
+name = 'curies'
 
 [dependencies]
 curies.workspace = true

r/src/rust/src/lib.rs

@@ -1,17 +1,17 @@
 use extendr_api::prelude::*;
 
-use ::curies::{sources::get_bioregistry_converter, Converter};
+use ::curies::{sources::get_bioregistry_converter, Converter as RsConverter};
 use tokio::runtime::Runtime;
 
 /// Converter struct for R
 /// @export
-pub struct ConverterR {
-    converter: Converter,
+pub struct Converter {
+    converter: RsConverter,
     pub name: String,
 }
 
 #[extendr]
-impl ConverterR {
+impl Converter {
     fn new() -> Result<Self> {
         // Building from empty converter works
         // let mut converter = Converter::default();
@@ -41,16 +41,15 @@ impl ConverterR {
 }
 
 /// Initialize converter
-fn init_converter() -> Converter {
+fn init_converter() -> RsConverter {
     let rt = Runtime::new().unwrap();
     rt.block_on(async { get_bioregistry_converter().await.unwrap() })
 }
 
-// Macro to generate exports. This ensures exported functions are registered with R.
-// See corresponding C code in `entrypoint.c`.
+// Macro to generate exports. This ensures exported functions are registered with R. See corresponding C code in `entrypoint.c`.
 extendr_module! {
-    mod curiesr;
-    impl ConverterR;
+    mod curies;
+    impl Converter;
     // fn hello_world;
 }
 

r/tests/test-curies.R

@@ -1,8 +1,8 @@
 library(testthat)
-library(curiesr)
+library(curies)
 
-test_that("Create curiesr default converter, compress and expand", {
-  converter <- ConverterR$new()
+test_that("Create curies default converter, compress and expand", {
+  converter <- Converter$new()
   expect_equal(converter$compress("http://purl.obolibrary.org/obo/DOID_1234"), "doid:1234")
   expect_equal(converter$expand("doid:1234"), "http://purl.obolibrary.org/obo/DOID_1234")