Merge pull request #34 from cooklang/feat/recipe-reference

Feat/recipe reference

Author: dubadub

src/analysis/event_consumer.rs

@@ -577,13 +577,19 @@ impl<'i> RecipeCollector<'i, '_> {
         let located_ingredient = ingredient.clone();
         let (ingredient, location) = ingredient.take_pair();
 
-        let name = ingredient.name.text_trimmed();
+        let mut name = ingredient.name.text_trimmed();
+        let reference = parse_reference(&name);
+
+        if let Some(reference) = &reference {
+            name = reference.name.clone().into();
+        }
 
         let mut new_igr = Ingredient {
             name: name.into_owned(),
             alias: ingredient.alias.map(|t| t.text_trimmed().into_owned()),
             quantity: ingredient.quantity.clone().map(|q| self.quantity(q, true)),
             note: ingredient.note.map(|n| n.text_trimmed().into_owned()),
+            reference,
             modifiers: ingredient.modifiers.into_inner(),
             relation: IngredientRelation::definition(
                 Vec::new(),
@@ -1488,3 +1494,84 @@ fn yaml_find_key_position(text: &str, key: &str) -> Option<usize> {
     }
     None
 }
+
+fn parse_reference(name: &str) -> Option<RecipeReference> {
+    if name.starts_with("./") || name.starts_with("../") || name.starts_with(".\\") || name.starts_with("..\\") {
+        let path = name.replace('\\', "/");
+        let mut components: Vec<String> = path.split('/').map(String::from).skip(1).collect();
+        let file_stem = components.pop().unwrap();
+        Some(RecipeReference {
+            components,
+            name: file_stem.into()
+        })
+    } else {
+        None
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_reference() {
+        // Test Unix-style paths
+        assert_eq!(
+            parse_reference("./pasta/spaghetti"),
+            Some(RecipeReference {
+                components: vec!["pasta".to_string()],
+                name: "spaghetti".into()
+            })
+        );
+
+        assert_eq!(
+            parse_reference("../sauces/tomato"),
+            Some(RecipeReference {
+                components: vec!["sauces".to_string()],
+                name: "tomato".into()
+            })
+        );
+
+        // Test Windows-style paths
+        assert_eq!(
+            parse_reference(r#".\pasta\spaghetti"#),
+            Some(RecipeReference {
+                components: vec!["pasta".to_string()],
+                name: "spaghetti".into()
+            })
+        );
+
+        assert_eq!(
+            parse_reference(r#"..\sauces\tomato"#),
+            Some(RecipeReference {
+                components: vec!["sauces".to_string()],
+                name: "tomato".into()
+            })
+        );
+
+        // Test deeper paths
+        assert_eq!(
+            parse_reference("./recipes/italian/pasta/spaghetti"),
+            Some(RecipeReference {
+                components: vec!["recipes".to_string(), "italian".to_string(), "pasta".to_string()],
+                name: "spaghetti".into()
+            })
+        );
+
+        // Test paths with no components (just file)
+        assert_eq!(
+            parse_reference("./spaghetti"),
+            Some(RecipeReference {
+                components: vec![],
+                name: "spaghetti".into()
+            })
+        );
+
+        // Test non-path names (should return None)
+        assert_eq!(parse_reference("spaghetti"), None);
+        assert_eq!(parse_reference("pasta/spaghetti"), None);
+        assert_eq!(parse_reference("pasta\\spaghetti"), None);
+        assert_eq!(parse_reference("/pasta/spaghetti"), None);
+        assert_eq!(parse_reference("\\pasta\\spaghetti"), None);
+    }
+}

src/model.rs

@@ -163,6 +163,12 @@ pub enum Item {
     },
 }
 
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+pub struct RecipeReference {
+    pub name: String,
+    pub components: Vec<String>
+}
+
 /// A recipe ingredient
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct Ingredient<V: QuantityValue = Value> {
@@ -176,6 +182,8 @@ pub struct Ingredient<V: QuantityValue = Value> {
     pub quantity: Option<Quantity<V>>,
     /// Note
     pub note: Option<String>,
+    /// Recipe reference
+    pub reference: Option<RecipeReference>,
     /// How the cookware is related to others
     pub relation: IngredientRelation,
     pub(crate) modifiers: Modifiers,

src/scale.rs

@@ -273,6 +273,7 @@ impl Scale for Ingredient<ScalableValue> {
             alias: self.alias,
             quantity,
             note: self.note,
+            reference: self.reference,
             relation: self.relation,
             modifiers: self.modifiers,
         };
@@ -285,6 +286,7 @@ impl Scale for Ingredient<ScalableValue> {
             alias: self.alias,
             quantity: self.quantity.map(Quantity::default_scale),
             note: self.note,
+            reference: self.reference,
             relation: self.relation,
             modifiers: self.modifiers,
         }