Commit 815d4009 authored by Wohlgemuth, Jason's avatar Wohlgemuth, Jason
Browse files

feat: Move schema consts in util to schema

parent d00fb92c

acorn-lib/src/schema/constants.rs

+4 −0
Original line number Diff line number Diff line
@@ -4,5 +4,9 @@ 
pub const CODEMETA_CONTEXT: &str = "https://codemeta.github.io/terms";

/// Base URL for DCAT v3

pub const DCAT_CONTEXT: &str = "http://www.w3.org/ns/dcat#";

/// Default schema URI for ORCiD values

pub const DEFAULT_ORCID_SCHEMA_URI: &str = "https://orcid.org";

/// Default schema URI for ROR values

pub const DEFAULT_ROR_SCHEMA_URI: &str = "https://ror.org/";

/// Base URL for schema.org

pub const SCHEMA_ORG_CONTEXT: &str = "https://schema.org";

acorn-lib/src/schema/pid/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
//! - Access the sub parts of a persistent identifier

//!

//! [RAiDs]: https://www.raid.org/

use crate::schema::constants::{DEFAULT_ORCID_SCHEMA_URI, DEFAULT_ROR_SCHEMA_URI};

use crate::util::constants::{

    DEFAULT_ORCID_SCHEMA_URI, DEFAULT_ROR_SCHEMA_URI, RE_ARK, RE_ARK_TEXT, RE_DOI, RE_DOI_TEXT, RE_ISBN, RE_ISBN_TEXT, RE_ORCID, RE_ORCID_TEXT,

    RE_RAID_TEXT, RE_ROR, RE_ROR_TEXT,

    RE_ARK, RE_ARK_TEXT, RE_DOI, RE_DOI_TEXT, RE_ISBN, RE_ISBN_TEXT, RE_ORCID, RE_ORCID_TEXT, RE_RAID_TEXT, RE_ROR, RE_ROR_TEXT,

};

use crate::util::{base32_crockford_decode, regex_capture_lookup, ToStringChunks};

use bon::Builder;

acorn-lib/src/schema/pid/raid.rs

+1 −1
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
use crate::io::read_file;

#[cfg(feature = "std")]

use crate::prelude::{Error, PathBuf};

use crate::schema::constants::{DEFAULT_ORCID_SCHEMA_URI, DEFAULT_ROR_SCHEMA_URI};

use crate::schema::research_activity::ResearchActivity;

use crate::schema::validate::{is_iso8601_date, is_iso8601_year, is_orcid, is_raid, is_ror, is_unix_epoch};

use crate::util::constants::{DEFAULT_ORCID_SCHEMA_URI, DEFAULT_ROR_SCHEMA_URI};

#[cfg(feature = "std")]

use crate::util::Label;

use crate::util::{current_date, License};

acorn-lib/src/util/constants.rs

+0 −4
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ pub const DEFAULT_AFFILIATION: &str = "Oak Ridge National Laboratory"; 
pub const DEFAULT_GRAPHIC_HREF: &str = "00.png";

/// Default graphic caption

pub const DEFAULT_GRAPHIC_CAPTION: &str = "";

/// Default schema URI for ORCiD values

pub const DEFAULT_ORCID_SCHEMA_URI: &str = "https://orcid.org";

/// Default schema URI for ROR values

pub const DEFAULT_ROR_SCHEMA_URI: &str = "https://ror.org/";

/// Maxumum number of [`ResearchActivity`] [`approaches`]

///

/// [`ResearchActivity`]: ../schema/struct.ResearchActivity.html