RO-Crate should now handle null values gracefully

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ro-crate-rs"
-version = "0.4.4"
+version = "0.4.5"
 edition = "2021"
 repository = "https://github.com/intbio-ncl/ro-crate-rs"
 authors = ["Matt Burridge <[email protected]>"]

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rocraters"
-version = "0.3.0"
+version = "0.4.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

cli/src/main.rs

@@ -327,8 +327,10 @@ fn create_default_crate(mut rocrate: RoCrate) -> RoCrate {
     let root_data_entity = root::RootDataEntity {
         id: "./".to_string(),
         type_: DataType::Term("Dataset".to_string()),
-        date_published: Option::Some(Utc::now().to_rfc3339()),
-        license: Option::Some(License::Description(String::from("Private"))),
+        date_published: Utc::now().to_rfc3339(),
+        name: "Default Crate Name".to_string(),
+        description: "Default crate description".to_string(),
+        license: License::Description(String::from("Private")),
         dynamic_entity: None,
     };
 

python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rocraters-python"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 authors = ["Matt Burridge <[email protected]>"]
 description = "Lightweight Python library for RO-Crate manipulation implemented in Rust"

python/src/utils.rs

@@ -238,9 +238,15 @@ pub fn convert_dynamic_entity_to_pyobject(py: Python, value: &DynamicEntity) ->
         DynamicEntity::NestedDynamicEntity(boxed_entity) => {
             convert_dynamic_entity_to_pyobject(py, boxed_entity)
         }
-        DynamicEntity::Fallback(value) => {
+        DynamicEntity::Fallback(value_option) => {
             // Convert serde_json::Value to PyObject
-            convert_serde_json_value_to_pyobject(py, value)
+            if let Some(value) = value_option {
+                // Convert serde_json::Value to PyObject when there's a value
+                convert_serde_json_value_to_pyobject(py, value)
+            } else {
+                // Handle the case where Fallback contains None (i.e., represents null)
+                convert_serde_json_value_to_pyobject(py, &serde_json::Value::Null)
+            }
         }
     }
 }

src/ro_crate/constraints.rs

@@ -82,7 +82,7 @@ pub enum DynamicEntity {
     EntityObject(HashMap<String, DynamicEntity>),
     EntityVecObject(Vec<HashMap<String, DynamicEntity>>),
     NestedDynamicEntity(Box<DynamicEntity>),
-    Fallback(serde_json::Value),
+    Fallback(Option<serde_json::Value>),
 }
 
 /// Tests
@@ -138,10 +138,11 @@ mod tests {
     #[test]
     fn test_dynamic_entity_fallback() {
         let json_value = json!({"unexpected": "data"});
-        let entity = DynamicEntity::Fallback(json_value.clone());
+        let entity = DynamicEntity::Fallback(Some(json_value.clone()));
+
         match entity {
-            DynamicEntity::Fallback(value) => assert_eq!(value, json_value),
-            _ => panic!("Fallback variant expected"),
+            DynamicEntity::Fallback(Some(value)) => assert_eq!(value, json_value),
+            _ => panic!("Fallback variant with expected value was not found"),
         }
     }
 

src/ro_crate/modify.rs

@@ -200,7 +200,9 @@ pub trait DynamicEntityManipulation: Serialize {
             for key in fallback_keys_to_modify {
                 if let Some(DynamicEntity::Fallback(fallback_value)) = dynamic_entity.get_mut(&key)
                 {
-                    remove_matching_value_from_json(fallback_value, target_id);
+                    if let Some(fallback_value) = fallback_value.as_mut() {
+                        remove_matching_value_from_json(fallback_value, target_id);
+                    }
                 }
             }