Merge pull request #231 from rruckley/bug-derivepanic-228

Bug: Remove panic for derive macros
rruckley · Jan 29, 2025 · 56790b1 · 56790b1
2 parents 0f10ed2 + eab95be
commit 56790b1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,3 @@
-[workspace]
-allow_dirty = true
-
 [package]
 name = "tmflib"
 version = "0.1.26"
@@ -219,8 +216,8 @@ serde = { version = "1.0.217", features = ["derive"]}
 serde_json = "1.0.138"
 sha256 = { version = "1.5", default-features = false }
 uuid = { version = "1.12.1", features = ["v4"]}
-tmflib-derive = { version = "0.1.30" }
-# tmflib-derive = { path = "tmflib-derive"}
+# tmflib-derive = { version = "0.1.30" }
+tmflib-derive = { path = "tmflib-derive"}
 hex = "0.4.3"
 base32 = "0.5.1"
 openapiv3 = "2.0.0"

diff --git a/src/tmf629/customer.rs b/src/tmf629/customer.rs
@@ -429,5 +429,13 @@ mod test {
         assert_eq!(segment.is_some(),true);
         assert_eq!(segment.unwrap(),CUSTOMER_SEGMENT);
     }
+
+    #[test]
+    fn test_customer_noid() {
+        let customer = Customer::default();
+
+        assert_eq!(customer.get_id(),String::default());
+        assert_eq!(customer.get_href(),String::default());
+    }
 }
 
diff --git a/tmflib-derive/Cargo.lock b/tmflib-derive/Cargo.lock
diff --git a/tmflib-derive/Cargo.toml b/tmflib-derive/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "tmflib-derive"
-version = "0.1.30"
+version = "0.1.31"
 edition = "2021"
 authors = ["Ryan Ruckley <[email protected]>"]
 description = "Derive macro for the tmflib::HasId trait"

diff --git a/tmflib-derive/src/lib.rs b/tmflib-derive/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright [2024] [Ryan Ruckley]
+// Copyright [2025] [Ryan Ruckley]
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -53,10 +53,16 @@ pub fn hasid_derive(input: TokenStream) -> TokenStream {
                 self.href = href.into();
             }
             fn get_id(&self) -> String {
-                self.id.as_ref().unwrap().clone()
+                match self.id.as_ref() {
+                    Some(i) => i.clone(),
+                    None => String::default(),
+                }
             }
             fn get_href(&self) -> String {
-                self.href.as_ref().unwrap().clone()
+                match self.href.as_ref() {
+                    Some(h) => h.clone(),
+                    None => String::default(),
+                }
             }
             fn get_class() -> String {
                 CLASS_PATH.to_string()