Add uri parser

src/common.rs

@@ -1,5 +1,6 @@
 pub static VERSION: &str = "0.3.0";
-pub static APP_PATH: &str = "/pub/pubky.app/";
+pub static PUBLIC_PATH: &str = "/pub/";
+pub static APP_PATH: &str = "pubky.app/";
 pub static PROTOCOL: &str = "pubky://";
 
 #[cfg(target_arch = "wasm32")]

src/lib.rs

@@ -2,10 +2,11 @@ mod common;
 mod models;
 pub mod traits;
 mod types;
+mod uri_parser;
 mod utils;
 
 // Re-export domain types
-pub use common::{APP_PATH, PROTOCOL, VERSION};
+pub use common::{APP_PATH, PROTOCOL, PUBLIC_PATH, VERSION};
 pub use models::bookmark::PubkyAppBookmark;
 pub use models::feed::{PubkyAppFeed, PubkyAppFeedLayout, PubkyAppFeedReach, PubkyAppFeedSort};
 pub use models::file::PubkyAppFile;
@@ -17,6 +18,7 @@ pub use models::post::{PubkyAppPost, PubkyAppPostEmbed, PubkyAppPostKind};
 pub use models::tag::PubkyAppTag;
 pub use models::user::{PubkyAppUser, PubkyAppUserLink};
 pub use types::PubkyId;
+pub use uri_parser::ParsedUri;
 pub use utils::*;
 
 // Our WASM module

src/models/bookmark.rs

@@ -1,7 +1,7 @@
 use crate::{
     common::timestamp,
     traits::{HasPath, HashId, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 
@@ -65,8 +65,10 @@ impl HashId for PubkyAppBookmark {
 }
 
 impl HasPath for PubkyAppBookmark {
+    const PATH_SEGMENT: &'static str = "bookmarks/";
+
     fn create_path(&self) -> String {
-        format!("{}bookmarks/{}", APP_PATH, self.create_id())
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, &self.create_id()].concat()
     }
 }
 
@@ -101,7 +103,7 @@ mod tests {
             created_at: 1627849723,
         };
         let expected_id = bookmark.create_id();
-        let expected_path = format!("{}bookmarks/{}", APP_PATH, expected_id);
+        let expected_path = format!("{}{}bookmarks/{}", PUBLIC_PATH, APP_PATH, expected_id);
         let path = bookmark.create_path();
         assert_eq!(path, expected_path);
     }

src/models/feed.rs

@@ -1,7 +1,7 @@
 use crate::{
     common::timestamp,
     traits::{HasPath, HashId, Validatable},
-    PubkyAppPostKind, APP_PATH,
+    PubkyAppPostKind, APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
@@ -179,8 +179,10 @@ impl HashId for PubkyAppFeed {
 }
 
 impl HasPath for PubkyAppFeed {
+    const PATH_SEGMENT: &'static str = "feeds/";
+
     fn create_path(&self) -> String {
-        format!("{}feeds/{}", APP_PATH, self.create_id())
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, &self.create_id()].concat()
     }
 }
 

src/models/file.rs

@@ -1,7 +1,7 @@
 use crate::{
     common::timestamp,
     traits::{HasPath, TimestampId, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use mime::Mime;
 use serde::{Deserialize, Serialize};
@@ -104,8 +104,10 @@ impl PubkyAppFile {
 impl TimestampId for PubkyAppFile {}
 
 impl HasPath for PubkyAppFile {
+    const PATH_SEGMENT: &'static str = "files/";
+
     fn create_path(&self) -> String {
-        format!("{}files/{}", APP_PATH, self.create_id())
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, &self.create_id()].concat()
     }
 }
 
@@ -208,7 +210,7 @@ mod tests {
         let path = file.create_path();
 
         // Check if the path starts with the expected prefix
-        let prefix = format!("{}files/", APP_PATH);
+        let prefix = format!("{}{}files/", PUBLIC_PATH, APP_PATH);
         assert!(path.starts_with(&prefix));
 
         let expected_path_len = prefix.len() + file_id.len();

src/models/file_blob.rs

@@ -1,6 +1,6 @@
 use crate::{
     traits::{HasPath, HashId, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 
@@ -67,8 +67,10 @@ impl HashId for PubkyAppBlob {
 }
 
 impl HasPath for PubkyAppBlob {
+    const PATH_SEGMENT: &'static str = "blobs/";
+
     fn create_path(&self) -> String {
-        format!("{}blobs/{}", APP_PATH, self.create_id())
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, &self.create_id()].concat()
     }
 }
 

src/models/follow.rs

@@ -1,7 +1,7 @@
 use crate::{
     common::timestamp,
     traits::{HasPubkyIdPath, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 
@@ -61,8 +61,10 @@ impl Validatable for PubkyAppFollow {
 }
 
 impl HasPubkyIdPath for PubkyAppFollow {
+    const PATH_SEGMENT: &'static str = "follows/";
+
     fn create_path(&self, pubky_id: &str) -> String {
-        format!("{}follows/{}", APP_PATH, pubky_id)
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, pubky_id].concat()
     }
 }
 

src/models/last_read.rs

@@ -1,7 +1,7 @@
 use crate::{
     common::timestamp,
     traits::{HasPath, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 
@@ -54,8 +54,10 @@ impl Validatable for PubkyAppLastRead {
 }
 
 impl HasPath for PubkyAppLastRead {
+    const PATH_SEGMENT: &'static str = "last_read";
+
     fn create_path(&self) -> String {
-        format!("{}last_read", APP_PATH)
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT].concat()
     }
 }
 
@@ -76,7 +78,7 @@ mod tests {
     fn test_create_path() {
         let last_read = PubkyAppLastRead::new();
         let path = last_read.create_path();
-        assert_eq!(path, format!("{}last_read", APP_PATH));
+        assert_eq!(path, format!("{}{}last_read", PUBLIC_PATH, APP_PATH));
     }
 
     #[test]

src/models/mute.rs

@@ -1,7 +1,7 @@
 use crate::{
     common::timestamp,
     traits::{HasPubkyIdPath, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 
@@ -55,8 +55,10 @@ impl Validatable for PubkyAppMute {
 }
 
 impl HasPubkyIdPath for PubkyAppMute {
+    const PATH_SEGMENT: &'static str = "mutes/";
+
     fn create_path(&self, pubky_id: &str) -> String {
-        format!("{}mutes/{}", APP_PATH, pubky_id)
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, pubky_id].concat()
     }
 }
 

src/models/post.rs

@@ -1,6 +1,6 @@
 use crate::{
     traits::{HasPath, TimestampId, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 use std::{fmt, str::FromStr};
@@ -175,8 +175,10 @@ impl PubkyAppPost {
 impl TimestampId for PubkyAppPost {}
 
 impl HasPath for PubkyAppPost {
+    const PATH_SEGMENT: &'static str = "posts/";
+
     fn create_path(&self) -> String {
-        format!("{}posts/{}", APP_PATH, self.create_id())
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, &self.create_id()].concat()
     }
 }
 
@@ -266,7 +268,7 @@ impl Validatable for PubkyAppPost {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::traits::Validatable;
+    use crate::{traits::Validatable, PUBLIC_PATH};
 
     #[test]
     fn test_create_id() {
@@ -312,7 +314,7 @@ mod tests {
         let path = post.create_path();
 
         // Check if the path starts with the expected prefix
-        let prefix = format!("{}posts/", APP_PATH);
+        let prefix = format!("{}{}posts/", PUBLIC_PATH, APP_PATH);
         assert!(path.starts_with(&prefix));
 
         let expected_path_len = prefix.len() + post_id.len();

src/models/tag.rs

@@ -1,7 +1,7 @@
 use crate::{
     common::timestamp,
     traits::{HasPath, HashId, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -75,8 +75,10 @@ impl PubkyAppTag {
 impl ToJson for PubkyAppTag {}
 
 impl HasPath for PubkyAppTag {
+    const PATH_SEGMENT: &'static str = "tags/";
+
     fn create_path(&self) -> String {
-        format!("{}tags/{}", APP_PATH, self.create_id())
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT, &self.create_id()].concat()
     }
 }
 
@@ -217,7 +219,7 @@ mod tests {
         };
 
         let expected_id = tag.create_id();
-        let expected_path = format!("{}tags/{}", APP_PATH, expected_id);
+        let expected_path = format!("{}{}tags/{}", PUBLIC_PATH, APP_PATH, expected_id);
         let path = tag.create_path();
 
         assert_eq!(path, expected_path);

src/models/user.rs

@@ -1,6 +1,6 @@
 use crate::{
     traits::{HasPath, Validatable},
-    APP_PATH,
+    APP_PATH, PUBLIC_PATH,
 };
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -122,8 +122,10 @@ impl PubkyAppUser {
 }
 
 impl HasPath for PubkyAppUser {
+    const PATH_SEGMENT: &'static str = "profile.json";
+
     fn create_path(&self) -> String {
-        format!("{}profile.json", APP_PATH)
+        [PUBLIC_PATH, APP_PATH, Self::PATH_SEGMENT].concat()
     }
 }
 
@@ -287,7 +289,7 @@ impl Validatable for PubkyAppUserLink {
 mod tests {
     use super::*;
     use crate::traits::Validatable;
-    use crate::APP_PATH;
+    use crate::{APP_PATH, PUBLIC_PATH};
 
     #[test]
     fn test_new() {
@@ -323,7 +325,7 @@ mod tests {
     fn test_create_path() {
         let user = PubkyAppUser::default();
         let path = user.create_path();
-        assert_eq!(path, format!("{}profile.json", APP_PATH));
+        assert_eq!(path, format!("{}{}profile.json", PUBLIC_PATH, APP_PATH));
     }
 
     #[test]

src/traits.rs

@@ -121,10 +121,12 @@ pub trait Validatable: Sized + DeserializeOwned {
 }
 
 pub trait HasPath {
+    const PATH_SEGMENT: &'static str;
     fn create_path(&self) -> String;
 }
 
 pub trait HasPubkyIdPath {
+    const PATH_SEGMENT: &'static str;
     fn create_path(&self, pubky_id: &str) -> String;
 }
 

src/types.rs

@@ -10,7 +10,7 @@ use utoipa::ToSchema;
 
 /// Represents user data with name, bio, image, links, and status.
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen)]
-#[derive(Serialize, Deserialize, Default, Clone, Debug)]
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "openapi", derive(ToSchema))]
 pub struct PubkyId(String);