From cad8a6d1257b74b236e4dab8ac2e0532908532b8 Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Wed, 14 May 2025 08:42:53 +0300
Subject: [PATCH] refactor: Remove branch specification from sal dependency

- Removed the branch specification from the `sal` dependency in
  `doctree/Cargo.toml` and `webbuilder/Cargo.toml`. This simplifies
  the dependency management and relies on the default branch of the
  repository.
- Updated `.gitignore` to ignore `sccache.log` to prevent it from
  being committed to the repository.
- Updated example commands in `example_commands.sh` to use a different
  collection name (`grid1` instead of `grid_documentation`) for testing
  purposes.  This avoids potential conflicts with pre-existing data.
- Improved code structure and organization in `doctree/src/lib.rs`.
---
 .gitignore            |  1 +
 doctree/Cargo.toml    |  2 +-
 doctree/src/lib.rs    | 20 ++++++++------------
 example_commands.sh   |  6 +++---
 webbuilder/Cargo.toml |  2 +-
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8ff770..6baefde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ docusaurus.config.ts
 sidebars.ts
 
 tsconfig.json
+sccache.log
\ No newline at end of file
diff --git a/doctree/Cargo.toml b/doctree/Cargo.toml
index c70d03c..7e5adf4 100644
--- a/doctree/Cargo.toml
+++ b/doctree/Cargo.toml
@@ -15,7 +15,7 @@ toml = "0.7.3"
 serde = { version = "1.0", features = ["derive"] }
 redis = { version = "0.23.0", features = ["tokio-comp"] }
 tokio = { version = "1.28.0", features = ["full"] }
-sal = { git = "https://git.ourworld.tf/herocode/sal.git", branch = "main" }
+sal = { git = "https://git.ourworld.tf/herocode/sal.git" }
 chacha20poly1305 = "0.10.1"
 blake3 = "1.3.1"
 csv = "1.1"
diff --git a/doctree/src/lib.rs b/doctree/src/lib.rs
index 0867cc4..f1b4afc 100644
--- a/doctree/src/lib.rs
+++ b/doctree/src/lib.rs
@@ -5,33 +5,29 @@
 
 // Import lazy_static for global state
 
-mod error;
-mod storage;
-mod utils;
 mod collection;
 mod doctree;
+mod error;
 mod include;
+mod storage;
+mod utils;
 
-pub use error::{DocTreeError, Result};
-pub use storage::RedisStorage;
 pub use collection::{Collection, CollectionBuilder};
-pub use doctree::{DocTree, DocTreeBuilder, new, from_directory};
+pub use doctree::{DocTree, DocTreeBuilder, from_directory, new};
+pub use error::{DocTreeError, Result};
 pub use include::process_includes;
+pub use storage::RedisStorage;
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    
 
     #[test]
     fn test_doctree_builder() {
         // Create a storage instance
-        let storage = RedisStorage::new("dummy_url").unwrap();
+        let storage = RedisStorage::new("redis://localhost:6379").unwrap();
 
-        let doctree = DocTree::builder()
-            .with_storage(storage)
-            .build()
-            .unwrap();
+        let doctree = DocTree::builder().with_storage(storage).build().unwrap();
 
         assert_eq!(doctree.collections.len(), 0);
         assert_eq!(doctree.default_collection, None);
diff --git a/example_commands.sh b/example_commands.sh
index d7d8db2..28c3ec6 100755
--- a/example_commands.sh
+++ b/example_commands.sh
@@ -13,13 +13,13 @@ echo -e "\n=== Listing Collections ==="
 cargo run -- list
 
 echo -e "\n=== Getting Document (Markdown) ==="
-cargo run -- get -c grid_documentation -p introduction.md
+cargo run -- get -c grid1 -p introduction.md
 
 echo -e "\n=== Getting Document (HTML) ==="
-cargo run -- get -c grid_documentation -p introduction.md -f html
+cargo run -- get -c grid1 -p introduction.md -f html
 
 echo -e "\n=== Deleting Collection ==="
-cargo run -- delete grid_documentation
+cargo run -- delete grid1
 
 echo -e "\n=== Listing Remaining Collections ==="
 cargo run -- list
diff --git a/webbuilder/Cargo.toml b/webbuilder/Cargo.toml
index c70d03c..7e5adf4 100644
--- a/webbuilder/Cargo.toml
+++ b/webbuilder/Cargo.toml
@@ -15,7 +15,7 @@ toml = "0.7.3"
 serde = { version = "1.0", features = ["derive"] }
 redis = { version = "0.23.0", features = ["tokio-comp"] }
 tokio = { version = "1.28.0", features = ["full"] }
-sal = { git = "https://git.ourworld.tf/herocode/sal.git", branch = "main" }
+sal = { git = "https://git.ourworld.tf/herocode/sal.git" }
 chacha20poly1305 = "0.10.1"
 blake3 = "1.3.1"
 csv = "1.1"