Release 0.1.49

[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] Generated by cargo-workspaces
rudof-project · Oct 30, 2024 · c59c1b1 · c59c1b1
1 parent 4c45590
commit c59c1b1
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Current changes without release yet
 
+## [v0.1.49] - 2025-10-30
+
+- Implemented Display for ShapeMap, ShEx-schema and SHACL-schema
+- Added `__repr__` to ShapeMap, ShExSchema and SHACLSchema
+- Added `update_config` to rudof and pyrudof
+
 ## [v0.1.48] - 2025-10-29
 
 - Minor release to force re-publication

diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pyrudof"
-version = "0.1.48"
+version = "0.1.49"
 documentation = "https://rudof-project.github.io/rudof/"
 readme = "README.md"
 license.workspace = true

diff --git a/python/src/pyrudof_lib.rs b/python/src/pyrudof_lib.rs
@@ -51,6 +51,10 @@ impl PyRudof {
         })
     }
 
+    pub fn update_config(&mut self, config: &PyRudofConfig) {
+        self.inner.update_config(&config.inner)
+    }
+
     /// Obtain the version of the Rudof library
     #[pyo3(signature = ())]
     pub fn version(&self) -> PyResult<String> {
@@ -92,14 +96,14 @@ impl PyRudof {
     #[pyo3(signature = ())]
     pub fn get_dctap(&self) -> Option<PyDCTAP> {
         let dctap = self.inner.get_dctap();
-        dctap.map(|s| PyDCTAP { _inner: s.clone() })
+        dctap.map(|s| PyDCTAP { inner: s.clone() })
     }
 
     /// Obtains the current ShEx Schema
     #[pyo3(signature = ())]
     pub fn get_shex(&self) -> Option<PyShExSchema> {
         let shex_schema = self.inner.get_shex();
-        shex_schema.map(|s| PyShExSchema { _inner: s.clone() })
+        shex_schema.map(|s| PyShExSchema { inner: s.clone() })
     }
 
     /// Obtains the current Shapemap
@@ -487,6 +491,7 @@ impl PyShExFormatter {
     }
 }
 
+/// Defines how to format a ShapeMap
 #[pyclass(frozen, name = "ShapeMapFormatter")]
 pub struct PyShapeMapFormatter {
     inner: ShapeMapFormatter,
@@ -541,17 +546,25 @@ impl PyUmlGenerationMode {
 
 #[pyclass(name = "ShExSchema")]
 pub struct PyShExSchema {
-    _inner: ShExSchema,
+    inner: ShExSchema,
 }
 
-impl PyShExSchema {}
+impl PyShExSchema {
+    pub fn __repr__(&self) -> String {
+        format!("{}", self.inner)
+    }
+}
 
 #[pyclass(name = "DCTAP")]
 pub struct PyDCTAP {
-    _inner: DCTAP,
+    inner: DCTAP,
 }
 
-impl PyDCTAP {}
+impl PyDCTAP {
+    pub fn __repr__(&self) -> String {
+        format!("{}", self.inner)
+    }
+}
 
 #[pyclass(name = "QueryShapeMap")]
 pub struct PyQueryShapeMap {
@@ -563,6 +576,10 @@ impl PyQueryShapeMap {
         let result = &self.inner;
         format!("{result:?}")
     }
+
+    fn __repr__(&self) -> String {
+        format!("{}", self.inner)
+    }
 }
 
 #[pyclass(name = "ShaclSchema")]
@@ -571,9 +588,8 @@ pub struct PyShaclSchema {
 }
 
 impl PyShaclSchema {
-    pub fn serialize(&self, _format: &ShaclFormat) -> String {
-        let result = &self.inner;
-        format!("{result:?}")
+    pub fn __repr__(&self) -> String {
+        format!("{}", self.inner)
     }
 }
 

diff --git a/rudof_lib/Cargo.toml b/rudof_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rudof_lib"
-version = "0.1.48"
+version = "0.1.49"
 authors.workspace = true
 description.workspace = true
 documentation = "https://docs.rs/rudof_lib"

diff --git a/rudof_lib/src/rudof.rs b/rudof_lib/src/rudof.rs
@@ -59,6 +59,10 @@ impl Rudof {
         }
     }
 
+    pub fn update_config(&mut self, config: &RudofConfig) {
+        self.config = config.clone();
+    }
+
     /// Resets the current RDF Data
     pub fn reset_data(&mut self) {
         self.rdf_data = RdfData::new()

diff --git a/shacl_ast/Cargo.toml b/shacl_ast/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shacl_ast"
-version = "0.1.35"
+version = "0.1.49"
 authors.workspace = true
 description.workspace = true
 documentation = "https://docs.rs/shacl_ast"

diff --git a/shacl_ast/src/ast/schema.rs b/shacl_ast/src/ast/schema.rs
@@ -46,6 +46,16 @@ impl Schema {
     }
 }
 
+/*impl Display for Schema {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            serde_json::to_string_pretty(&self).map_err(|_| std::fmt::Error)?
+        )
+    }
+}*/
+
 impl Display for Schema {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         for (id, shape) in self.shapes.iter() {

diff --git a/shacl_validation/Cargo.toml b/shacl_validation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shacl_validation"
-version = "0.1.38"
+version = "0.1.49"
 readme = "README.md"
 license.workspace = true
 authors.workspace = true

diff --git a/shapemap/Cargo.toml b/shapemap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shapemap"
-version = "0.1.39"
+version = "0.1.49"
 authors.workspace = true
 description.workspace = true
 documentation = "https://docs.rs/shapemap"

diff --git a/shapemap/src/query_shape_map.rs b/shapemap/src/query_shape_map.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use crate::{Association, NodeSelector, ShapeSelector};
 use prefixmap::PrefixMap;
 use serde_derive::Serialize;
@@ -53,3 +55,13 @@ impl QueryShapeMap {
         self.iter().flat_map(|assoc| assoc.iter_node_shape(rdf))
     }
 }
+
+impl Display for QueryShapeMap {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            serde_json::to_string_pretty(&self).map_err(|_| std::fmt::Error)?
+        )
+    }
+}
diff --git a/shex_ast/Cargo.toml b/shex_ast/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shex_ast"
-version = "0.1.39"
+version = "0.1.49"
 authors.workspace = true
 description.workspace = true
 documentation = "https://docs.rs/shex_ast"

diff --git a/shex_ast/src/ast/schema.rs b/shex_ast/src/ast/schema.rs
@@ -3,6 +3,7 @@ use crate::ShapeExprLabel;
 use iri_s::IriS;
 use prefixmap::{IriRef, PrefixMap, PrefixMapError};
 use serde_derive::{Deserialize, Serialize};
+use std::fmt::Display;
 use std::path::{Path, PathBuf};
 use std::{fs, io};
 use tracing::debug;
@@ -277,6 +278,17 @@ impl Default for Schema {
     }
 }
 
+impl Display for Schema {
+    // TODO: Improve
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            serde_json::to_string_pretty(&self).map_err(|_| std::fmt::Error)?
+        )
+    }
+}
+
 #[cfg(test)]
 mod tests {
 

diff --git a/sparql_service/Cargo.toml b/sparql_service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sparql_service"
-version = "0.1.38"
+version = "0.1.49"
 authors.workspace = true
 description.workspace = true
 edition.workspace = true

diff --git a/srdf/Cargo.toml b/srdf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "srdf"
-version = "0.1.45"
+version = "0.1.49"
 authors.workspace = true
 description.workspace = true
 documentation = "https://docs.rs/srdf"