add constructor for Record

biopragmatics · Dec 15, 2023 · 4c596c7 · 4c596c7
1 parent e772c35
commit 4c596c7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -15,16 +15,16 @@
     <a href="https://github.com/biopragmatics/curies.rs/blob/main/LICENSE">
         <img alt="MIT license" src="https://img.shields.io/badge/License-MIT-brightgreen.svg" />
     </a>
-    <!-- a href="https://codecov.io/gh/biopragmatics/curies.rs/branch/main">
+    <a href="https://codecov.io/gh/biopragmatics/curies.rs/branch/main">
         <img src="https://codecov.io/gh/biopragmatics/curies.rs/branch/main/graph/badge.svg" alt="Codecov status" />
-    </a -->
+    </a>
 </p>
 
 Idiomatic conversion between URIs and compact URIs (CURIEs) in Rust.
 
 ## 📥 Install dependencies
 
-[Rust](https://www.rust-lang.org/tools/install) is required for development.
+[Rust](https://www.rust-lang.org/tools/install), python 3.8+ and npm are required for development.
 
 ```bash
 rustup update

diff --git a/js/src/curies.rs b/js/src/curies.rs
@@ -27,7 +27,6 @@ impl RecordJs {
     ) -> Result<RecordJs, JsValue> {
         let prefix_synonyms_set: HashSet<String> = prefix_synonyms.into_iter().collect();
         let uri_prefix_synonyms_set: HashSet<String> = uri_prefix_synonyms.into_iter().collect();
-
         Ok(Self {
             prefix,
             uri_prefix,

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -22,6 +22,17 @@ pub struct Record {
     // TODO: pattern: Option<String>,
 }
 
+impl Record {
+    fn new(prefix: &str, uri_prefix: &str) -> Self {
+        Record {
+            prefix: prefix.to_string(),
+            uri_prefix: uri_prefix.to_string(),
+            prefix_synonyms: HashSet::from([]),
+            uri_prefix_synonyms: HashSet::from([]),
+        }
+    }
+}
+
 /// A `Converter` is composed of 2 HashMaps (one for prefixes, one for URIs),
 /// and a trie search to find the longest URI
 /// # Examples
@@ -55,6 +66,7 @@ pub struct Converter {
     trie_builder: TrieBuilder<u8>,
     trie: Trie<u8>,
     // TODO: pattern_map: HashMap<String, String>
+    // delimiter: char
 }
 
 impl Converter {
@@ -100,12 +112,7 @@ impl Converter {
     pub fn from_prefix_map(prefix_map: HashMap<String, String>) -> Result<Self, CuriesError> {
         let mut converter = Converter::default();
         for (prefix, uri_prefix) in prefix_map {
-            converter.add_record(Record {
-                prefix,
-                uri_prefix,
-                prefix_synonyms: HashSet::from([]),
-                uri_prefix_synonyms: HashSet::from([]),
-            })?;
+            converter.add_record(Record::new(&prefix, &uri_prefix))?;
         }
         Ok(converter)
     }
@@ -135,21 +142,11 @@ impl Converter {
             }
             match value {
                 Value::String(uri) => {
-                    converter.add_record(Record {
-                        prefix: key.clone(),
-                        uri_prefix: uri.clone(),
-                        prefix_synonyms: HashSet::from([]),
-                        uri_prefix_synonyms: HashSet::from([]),
-                    })?;
+                    converter.add_record(Record::new(key, uri))?;
                 }
                 Value::Object(map) if map.get("@prefix") == Some(&Value::Bool(true)) => {
                     if let Some(Value::String(uri)) = map.get("@id") {
-                        converter.add_record(Record {
-                            prefix: key.clone(),
-                            uri_prefix: uri.clone(),
-                            prefix_synonyms: HashSet::from([]),
-                            uri_prefix_synonyms: HashSet::from([]),
-                        })?;
+                        converter.add_record(Record::new(key, uri))?;
                     }
                 }
                 _ => continue,
@@ -315,10 +312,3 @@ impl DataSource for &Path {
 //     prefix: String,
 //     identifier: String,
 // }
-
-// pub struct Record {
-//     curie_prefix: String,
-//     uri_prefix: String,
-//     curie_prefix_synonyms: Vec<String>,
-//     uri_prefix_synonyms: Vec<String>,
-// }