build(deps): bump sophia from 0.7.2 to 0.8.0 (#118)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christian Kleinbölting <[email protected]> Co-authored-by: Balduin Landolt <[email protected]>
dasch-swiss · Aug 13, 2024 · 63a3d1b · 63a3d1b
1 parent e272c98
commit 63a3d1b
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 133 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dsp-meta/Cargo.toml b/dsp-meta/Cargo.toml
@@ -31,7 +31,7 @@ serde_yaml.workspace = true
 nonempty.workspace = true
 valico.workspace = true
 regex.workspace = true
-sophia = "0.7.2"
+sophia = "0.8.0"
 tokio.workspace = true
 tower.workspace = true
 tower-http.workspace = true

diff --git a/dsp-meta/src/api/convert/rdf/error.rs b/dsp-meta/src/api/convert/rdf/error.rs
@@ -1,13 +1,7 @@
 use crate::error::DspMetaError;
 
-impl From<sophia::iri::error::InvalidIri> for DspMetaError {
-    fn from(error: sophia::iri::error::InvalidIri) -> Self {
+impl From<sophia::iri::InvalidIri> for DspMetaError {
+    fn from(error: sophia::iri::InvalidIri) -> Self {
         DspMetaError::SerializeToRdf(error.0)
     }
 }
-
-impl From<sophia::term::TermError> for DspMetaError {
-    fn from(error: sophia::term::TermError) -> Self {
-        DspMetaError::SerializeToRdf(error.to_string())
-    }
-}
diff --git a/dsp-meta/src/api/convert/rdf/project.rs b/dsp-meta/src/api/convert/rdf/project.rs
@@ -1,10 +1,10 @@
 // placeholder for project
 
 use dsp_domain::metadata::entity::project::Project;
-use sophia::graph::inmem::LightGraph;
-use sophia::graph::{Graph, MutableGraph};
-use sophia::ns::{rdf, Namespace};
-use sophia::term::SimpleIri;
+use sophia::api::graph::{Graph, MutableGraph};
+use sophia::api::ns::{rdf, Namespace};
+use sophia::inmem::graph::LightGraph;
+use sophia::iri::Iri;
 
 use crate::api::convert::rdf::constance::DSP_NAMESPACE_STRING;
 use crate::api::convert::rdf::value::shortcode::ShortcodeGraphDto;
@@ -15,17 +15,21 @@ impl ProjectGraphDto {
         let mut graph = LightGraph::new();
 
         // http://ns.dasch.swiss/repository#dsp-081C-project a http://ns.dasch.swiss/repository#Project
-        let dsp = Namespace::new_unchecked(DSP_NAMESPACE_STRING);
-        let project_iri_suffix = format!("dsp-{}-project", self.0.shortcode.0);
-        let project_iri = SimpleIri::new_unchecked(dsp.as_ref(), Some(project_iri_suffix.as_str()));
-        let project_class = SimpleIri::new_unchecked(dsp.as_ref(), Some("Project"));
+        let ns = Namespace::new_unchecked(DSP_NAMESPACE_STRING);
 
-        let shortcode_graph = ShortcodeGraphDto(&self.0.shortcode).to_graph(&project_iri);
+        let project_iri = ns
+            .get(format!("{}dsp-{}-project", ns.as_str(), self.0.shortcode.0).as_str())
+            .expect("project_iri creation failed.")
+            .to_string();
+        let project_iri = Iri::new(project_iri).expect("project_iri creation failed.");
+
+        let project_class = ns.get("Project").expect("project_class creation failed.");
 
         graph
-            .insert(&project_iri, &rdf::type_, &project_class)
+            .insert(&project_iri, rdf::type_, project_class)
             .expect("insert of project triples into graph failed.");
 
+        let shortcode_graph = ShortcodeGraphDto(&self.0.shortcode).to_graph(&project_iri);
         graph
             .insert_all(shortcode_graph.triples())
             .expect("insert of project triples into graph failed.");