refactor: simplify atom ref format

crates/atom/src/lib.rs

@@ -15,16 +15,16 @@
 //! ```console
 //! ❯ git ls-remote
 //! From https://github.com/ekala-project/eka
-//! ceebaca6d44c4cda555db3fbf687c0604c4818eb        refs/atoms/ひらがな/0.1.0
-//! a87bff5ae43894a158dadf40938c775cb5b62d4b        refs/atoms/ひらがな/_specs/0.1.0
-//! 9f17c8c816bd1de6f8aa9c037d1b529212ab2a02        refs/atoms/ひらがな/_srcs/0.1.0
+//! ceebaca6d44c4cda555db3fbf687c0604c4818eb        refs/atoms/ひらがな/0.1.0/atom
+//! a87bff5ae43894a158dadf40938c775cb5b62d4b        refs/atoms/ひらがな/0.1.0/spec
+//! 9f17c8c816bd1de6f8aa9c037d1b529212ab2a02        refs/atoms/ひらがな/0.1.0/src
 //! ```
 //!
-//! Here the 0.1.0 ref points to the Atom's contents in full. The `_spec` refs points
+//! Here the `atom` ref points to the Atom's contents in full. The `spec` ref points
 //! to a git tree object containing only the manifest and its lock file, which will be
-//! important for efficient resolution (not yet implemented). The refs under `_srcs`
-//! point to the original commit from which the Atom's content references, ensuring
-//! it remains live. Ensuring we can trivially verify an Atom's content at any time.
+//! important for efficient resolution (not yet implemented). The refs under `src`
+//! points to the original commit from which the Atom's content references, ensuring
+//! it remains live, allowing trivially verification.
 #![deny(missing_docs)]
 #![cfg_attr(not(feature = "git"), allow(dead_code))]
 

crates/atom/src/publish/git/inner.rs

@@ -10,11 +10,10 @@ use gix::objs::tree::Entry as AtomEntry;
 use gix::worktree::object::Tree as AtomTree;
 use gix::{ObjectId, Reference};
 
-use super::super::{ATOM_FORMAT_VERSION, ATOM_MANIFEST, EMPTY_SIG};
 use super::{AtomContext, AtomRef, GitContext, GitResult, RefKind};
 use crate::core::AtomPaths;
-use crate::publish::ATOM_ORIGIN;
 use crate::publish::error::git::Error;
+use crate::publish::{ATOM, ATOM_FORMAT_VERSION, ATOM_MANIFEST, ATOM_ORIGIN, EMPTY_SIG};
 use crate::store::git;
 use crate::{Atom, AtomId, Manifest};
 impl<'a> GitContext<'a> {
@@ -118,9 +117,9 @@ use std::fmt;
 impl<'a> fmt::Display for AtomRef<'a> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.kind {
-            RefKind::Content => write!(f, "{}/{}", self.prefix, self.version),
-            RefKind::Spec => write!(f, "{}/_{}s/{}", self.prefix, ATOM_MANIFEST, self.version),
-            RefKind::Origin => write!(f, "{}/_{}s/{}", self.prefix, ATOM_ORIGIN, self.version),
+            RefKind::Content => write!(f, "{}/{}/{}", self.prefix, self.version, ATOM),
+            RefKind::Origin => write!(f, "{}/{}/{}", self.prefix, self.version, ATOM_ORIGIN),
+            RefKind::Spec => write!(f, "{}/{}/{}", self.prefix, self.version, ATOM_MANIFEST),
         }
     }
 }

crates/atom/src/publish/mod.rs

@@ -135,6 +135,7 @@ impl<R> Record<R> {
 }
 
 const EMPTY_SIG: &str = "";
+const ATOM: &str = "atom";
 const ATOM_FORMAT_VERSION: &str = "1";
 const ATOM_REF_TOP_LEVEL: &str = "atoms";
 const ATOM_MANIFEST: &str = "spec";