Merge pull request #46 from Scattered-Systems/v0.1.40

V0.1.40

actors/Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["core", "primitives", "scsys"]
 license = "Apache-2.0"
 name = "scsys-actors"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.1.39" # TODO: Update the package version
+version = "0.1.40" # TODO: Update the package version
 
 [lib]
 crate-type = ["cdylib", "rlib"]

actors/src/networking/server.rs

@@ -45,8 +45,6 @@ impl std::fmt::Display for Server {
     }
 }
 
-const DEFAULT_IGNORE_CHARS: &[char] = &['[', ']', ',', '.', ' '];
-
 /// Implements the basic algorithm used by the extractor
 fn extractor<S: ToString, T: FromStr + ToString>(
     bp: char,
@@ -57,7 +55,7 @@ where
     <T as FromStr>::Err: std::fmt::Debug,
 {
     let data = data.to_string();
-    let skip = exclude.unwrap_or(DEFAULT_IGNORE_CHARS);
+    let skip = exclude.unwrap_or(&['[', ']', ',', '.', ' ']);
     let trimmed: &str = data.trim_matches(skip);
     trimmed
         .split(bp)

core/Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["core", "primitives", "scsys"]
 license = "Apache-2.0"
 name = "scsys-core"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.1.39" # TODO: Update the package version
+version = "0.1.40" # TODO: Update the package version
 
 [features]
 default = []
@@ -19,15 +19,15 @@ crate-type = ["cdylib", "rlib"]
 test = true
 
 [dependencies]
-anyhow = "1.0.68"
-bson = { features = ["chrono-0_4", "uuid-0_8"], version = "2.4.0" }
-chrono = "0.4.22"
-config = "0.13.2"
-glob = "0.3.0"
+anyhow = "1"
+bson = { features = ["chrono-0_4", "uuid-0_8"], version = "2.4" }
+chrono = "0.4"
+config = "0.13"
+glob = "0.3"
 serde = { features = ["derive"], version = "1" }
 serde_json = "1"
-strum = { features = ["derive"], version = "0.24.1" }
-url = "2.3.1"
+strum = { features = ["derive"], version = "0.24" }
+url = "2.3"
 
 # wasm-bindgen = { features = ["serde-serialize"], optional = true, version = "0.2.83" }
 

core/src/extract/extractor.rs

@@ -4,7 +4,7 @@
     Description:
         ... Summary ...
 */
-use crate::{extract::extractor, DEFAULT_IGNORE_CHARS};
+use crate::{extractor, DEFAULT_IGNORE_CHARS};
 use std::str::FromStr;
 
 /// Implements the formal interface for operating the extraction features

core/src/extract/mod.rs

@@ -3,7 +3,7 @@
     Contrib: FL03 <jo3mccain@icloud.com>
     Description: ... Summary ...
 */
-pub use self::{extractor::*, files::*, utils::*};
+pub use self::{extractor::*, files::*};
 
 mod extractor;
 mod files;
@@ -14,33 +14,13 @@ pub trait Extraction<S: ToString> {
     fn extract(bp: char, data: &S, exclude: Option<&[char]>) -> Vec<Self::Res>;
 }
 
-pub(crate) mod utils {
-    use crate::DEFAULT_IGNORE_CHARS;
-    use std::str::FromStr;
 
-    /// Implements the basic algorithm used by the extractor
-    pub fn extractor<S: ToString, T: FromStr + ToString>(
-        bp: char,
-        data: &S,
-        exclude: Option<&[char]>,
-    ) -> Vec<T>
-    where
-        <T as FromStr>::Err: std::fmt::Debug,
-    {
-        let data = data.to_string();
-        let skip = exclude.unwrap_or(DEFAULT_IGNORE_CHARS);
-        let trimmed: &str = data.trim_matches(skip);
-        trimmed
-            .split(bp)
-            .map(|i| i.trim_matches(skip).parse::<T>().unwrap())
-            .collect()
-    }
-}
 
 #[cfg(test)]
 mod tests {
     use super::*;
-
+    use crate::extractor;
+
     #[test]
     fn test_file_extractor() {
         let fp = "../README.md";

core/src/lib.rs

@@ -6,7 +6,6 @@
 #[doc(inline)]
 pub use self::{misc::*, primitives::*, specs::*, utils::*};
 
-pub mod accounts;
 pub mod errors;
 pub mod extract;
 

core/src/misc/mod.rs

@@ -3,9 +3,9 @@
     Contrib: FL03 <jo3mccain@icloud.com>
     Description: ... Summary ...
 */
-pub use self::{appellation::*, ids::*, links::*, timestamp::*,};
+pub use self::{appellation::*, ids::*, links::*, timestamp::*};
 
 pub(crate) mod appellation;
 pub(crate) mod ids;
 pub(crate) mod links;
-pub(crate) mod timestamp;
+pub(crate) mod timestamp;

core/src/misc/timestamp.rs

@@ -101,7 +101,6 @@ impl TryFrom<&str> for Timestamp {
     }
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::*;

core/src/specs.rs

@@ -26,8 +26,6 @@ pub trait Named {
     }
 }
 
-
-
 pub trait TemporalExt: Temporal {
     fn chrono_to_bson(&self, data: ChronoDateTime) -> bson::DateTime {
         chrono_into_bson::<Utc>(data)

core/src/utils.rs

@@ -3,7 +3,7 @@
     Contrib: FL03 <jo3mccain@icloud.com>
     Description: ... Summary ...
 */
-use crate::{BoxResult, ConfigFile, ConfigFileVec};
+use crate::{DEFAULT_IGNORE_CHARS, BoxResult, ConfigFile, ConfigFileVec};
 use chrono::{DateTime, TimeZone, Utc};
 use std::io::{self, BufRead, BufReader};
 use std::{fs::File, str::FromStr, string::ToString};
@@ -21,6 +21,23 @@ pub fn collect_config_files(pattern: &str, required: bool) -> ConfigFileVec {
     let f = |p: std::path::PathBuf| ConfigFile::from(p).required(required);
     collect_files_as(&f, pattern).expect("Failed to find any similar files...")
 }
+/// Implements the basic algorithm used by the extractor
+pub fn extractor<S: ToString, T: FromStr + ToString>(
+    bp: char,
+    data: &S,
+    exclude: Option<&[char]>,
+) -> Vec<T>
+where
+    <T as FromStr>::Err: std::fmt::Debug,
+{
+    let data = data.to_string();
+    let skip = exclude.unwrap_or(DEFAULT_IGNORE_CHARS);
+    let trimmed: &str = data.trim_matches(skip);
+    trimmed
+        .split(bp)
+        .map(|i| i.trim_matches(skip).parse::<T>().unwrap())
+        .collect()
+}
 /// Attempts to collect configuration files, following the given pattern, into a ConfigFileVec
 pub fn try_collect_config_files(pattern: &str, required: bool) -> BoxResult<ConfigFileVec> {
     let f = |p: std::path::PathBuf| ConfigFile::from(p).required(required);

crypto/Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["crypto", "scsys"]
 license = "Apache-2.0"
 name = "scsys-crypto"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.1.39" # TODO: Update the package version
+version = "0.1.40" # TODO: Update the package version
 
 [features]
 default = []

derive/Cargo.toml

@@ -8,16 +8,18 @@ keywords = ["derive", "macros", "scsys"]
 license = "Apache-2.0"
 name = "scsys-derive"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.1.39" # TODO: Update the package version
+version = "0.1.40" # TODO: Update the package version
 
 [lib]
 proc-macro = true
 test = false
 
 [dependencies]
-proc-macro2 = "1.0.48"
-quote = "1.0.22"
-syn = { features = ["full"], version = "1.0.106" }
+proc-macro2 = "1"
+quote = "1"
+syn = { features = ["full"], version = "1" }
+serde = { features = ["derive"], version = "1"}
+serde_json = "1"
 
 [package.metadata.docs.rs]
 all-features = true

derive/src/lib.rs

@@ -4,16 +4,14 @@
     Description:
         ... Summary ...
 */
-pub(crate) mod impls;
-
 extern crate proc_macro;
 extern crate quote;
 extern crate syn;
 
 use proc_macro::TokenStream;
 use syn::{parse_macro_input, DeriveInput};
 
-#[proc_macro_derive(Hashable)]
+#[proc_macro_derive(Hash)]
 pub fn hashable(input: TokenStream) -> TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
     let gen = impl_hashable(&ast);
@@ -25,8 +23,8 @@ fn impl_hashable(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
     let name = &ast.ident;
     let res = quote::quote! {
         impl Hashable for #name {
-            fn hash(&self) -> H256 {
-                scsys::crypto::hasher(&self).into()
+            fn hash(&self) -> scsys::prelude::H256 {
+                scsys::prelude::hasher(&self).into()
             }
         }
     };
@@ -55,3 +53,26 @@ pub(crate) fn impl_named(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
     };
     res
 }
+
+#[proc_macro_derive(SerdeDisplay)]
+pub fn serde_display(input: TokenStream) -> TokenStream {
+    // Parse the inputs into the proper struct
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    // Build the impl
+    let gen = impl_serde_display(&ast);
+
+    gen.into()
+}
+
+pub(crate) fn impl_serde_display(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
+    let name = &ast.ident;
+    let res = quote::quote! {
+        impl std::fmt::Display for #name {
+                fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+                    write!(f, "{}", scsys::prelude::fnl_remove(serde_json::to_string(&self).unwrap()))
+                }
+            }
+    };
+    res
+}

gen/Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["scsys"]
 license = "Apache-2.0"
 name = "scsys-gen"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.1.39" # TODO: Update the package version
+version = "0.1.40" # TODO: Update the package version
 
 [features]
 default = []

macros/Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["macros", "scsys"]
 license = "Apache-2.0"
 name = "scsys-macros"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.1.39" # TODO: Update the package version
+version = "0.1.40" # TODO: Update the package version
 
 [lib]
 crate-type = ["cdylib", "rlib"]

scsys/Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0"
 name = "scsys"
 readme = "README.md"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.1.39" # TODO: Update the package version
+version = "0.1.40" # TODO: Update the package version
 
 [features]
 default = [
@@ -50,6 +50,12 @@ config = ["config/default"]
 crate-type = ["cdylib", "rlib"]
 test = true
 
+[build-dependencies]
+
+[dev-dependencies]
+serde = { features = ["derive"], version = "1" }
+serde_json = "1"
+
 [dependencies]
 bson = { features = ["chrono-0_4", "serde_with", "uuid-0_8"], optional = true, version = "2.4.0" }
 chrono = { optional = true, version = "0.4.22" }

scsys/src/lib.rs

@@ -29,7 +29,7 @@ pub mod prelude {
     pub use super::gen::*;
     pub use super::*;
     #[cfg(feature = "core")]
-    pub use super::{accounts::*, errors::*, extract::*};
+    pub use super::{errors::*, extract::*};
     // Extras
     #[cfg(feature = "bson")]
     pub use bson;