Update readmes

This commit is contained in:
asonix 2020-03-11 21:45:53 -05:00
parent c8e1249974
commit 6f5fb994d3
6 changed files with 238 additions and 56 deletions

View file

@ -1,7 +1,7 @@
[package] [package]
name = "activitystreams" name = "activitystreams"
description = "Activity Streams in Rust" description = "Activity Streams in Rust"
version = "0.4.0-alpha.3" version = "0.4.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["asonix <asonix@asonix.dog>"] authors = ["asonix <asonix@asonix.dog>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams" repository = "https://git.asonix.dog/Aardwolf/activitystreams"
@ -17,7 +17,7 @@ primitives = ["chrono", "mime", "serde", "thiserror", "url"]
types = ["derive", "kinds", "primitives", "serde"] types = ["derive", "kinds", "primitives", "serde"]
[dependencies] [dependencies]
activitystreams-derive = { version = "0.4.0-alpha.2", path = "activitystreams-derive", optional = true} activitystreams-derive = { version = "0.4.0", path = "activitystreams-derive", optional = true}
typetag = "0.1.4" typetag = "0.1.4"
chrono = { version = "0.4", optional = true } chrono = { version = "0.4", optional = true }
mime = { version = "0.3", optional = true } mime = { version = "0.3", optional = true }

276
README.md
View file

@ -7,21 +7,198 @@ __A set of Traits and Types that make up the ActivityStreams and ActivityPub spe
## Usage ## Usage
### Basic usage First, add ActivityStreams to your dependencies
For basic use, add the following to your Cargo.toml
```toml ```toml
# Cargo.toml activitystreams = "0.4.0"
activitystreams = "0.4.0-alpha.3"
``` ```
And then use it in your project ### Types
The project is laid out by Kind => vocabulary => Type
So to use an ActivityStreams Video, you'd write
```rust ```rust
use activitystreams::object::streams::Video; use activitystreams::object::streams::Video;
```
fn main() -> Result<(), Box<dyn std::error::Error>> { And to use an ActivityPub profile, you'd write
let mut v = Video::default(); ```rust
use activitystreams::object::apub::Profile;
```
Link is a little different, since there's only one defined link type, called Mention.
```rust
use activitystreams::link::Mention;
```
### Properties
Each concrete type implements `AsRef<>` for each of their properties fields. A basic
ActivityStreams object will implement `AsRef<ObjectProperties>`, while an ActivityPub Actor
might implement `AsRef<ObjectProperties>`, `AsRef<ApObjectProperties>`, and
`AsRef<ApActorProperties>`.
The Properties types can be found near the kind they're associated with. `ObjectProperties` and
`ApObjectProperties` are located in `activitystreams::object::properties`.
The Properties types are generated by the `properties` macro, which attempts to create fields
that represent exactly the bounds of the ActivityStreams and ActivityPub specifications.
For example, the Object type in ActivityStreams has a `summary` field, which can either be
represented as an `xsd:string` or an `rdf:langString`. It also states that the `summary` field
is not `functional`, meaning that any number of `xsd:string` or `rdf:langString`, or a
combination thereof, can be present. To represent this, the `properties` macro generates a
couple `enum` types.
First, it generates `ObjectPropertiesSummaryTermEnum`, which is a "terminating" enum.
"terminating" in this context means it is the smallest unit of the type. This enum has two
variants, named after the types they contain, `XsdString(...)` and `RdfLangString(...)`.
Next, it generates `ObjectPropertiesSummaryEnum`, which contains two variants, `Term(...)` and
`Array(...)`. The `Term` variant contains an `ObjectPropertiesSummaryTermEnum`, and the `Array`
variant contains a `Vec<ObjectPropertiesSummaryTermEnum>`.
Finally, when declaring the field, it generates `summary: Option<ObjectPropertiesSummaryEnum>`,
since `summary` is not a required field.
This resulting type is exactly specific enough to match the following valid ActivityStreams
json, without matching any invalid json.
With no summary:
```json
{}
```
With a sring summary:
```json
{
"summary": "A string"
}
```
With an rdf langstring
```json
{
"summary": {
"@value": "A string",
"@language": "en"
}
}
```
With multiple values
```json
{
"summary": [
{
"@value": "A string",
"@language": "en"
},
"An xsd:string this time"
]
}
```
It may seem like interacting with these types might get unweildy, so the `properties` macro
also generates methods for interacting with each field.
```ignore
fn set_summary_xsd_string<T>(&mut self, T) -> Result<...>;
fn set_summary_rdf_lang_string<T>(&mut self, T) -> Result<...>;
fn set_many_summary_xsd_strings<T>(&mut self, Vec<T>) -> Result<...>;
fn set_many_summary_rdf_lang_strings<T>(&mut self, Vec<T>) -> Result<...>;
fn delete_summary(&mut self) -> &mut Self;
fn get_summary_xsd_string(&self) -> Option<XsdString>;
fn get_summary_rdf_lang_string(&self) -> Option<RdfLangString>;
fn get_many_summary_xsd_strings(&self) -> Option<Vec<&XsdString>>;
fn get_many_summary_rdf_lang_strings(&self) -> Option<Vec<&RdfLangString>>;
```
These methods provide access to setting and fetching uniformly typed data, as well as deleting
the data. In the setter methods, the type parameter T is bound by
`TryInto<XsdString>` or `TryInto<RdfLangString>`. This allows passing values to the method that
can be converted into the types, rather than requiring the caller to perform the conversion.
Types like `XsdString` and `RdfLangString` can be found in the `primitives` module. Unless
you're building your own custom types, you shouldn't need to import them yourself. They each
implement `FromStr` for parsing and `Display` to convert back to strings, as well as `From` and
`Into` or `TryFrom` and `TryInto` for types you might expect them to (e.g.
`XsdNonNegativeInteger` implements `From<u64>` and `Into<u64>`).
For some fields, like `id`, there is only one valid type. methods generated for fields like
these will leave out the type name from the function name.
```ignore
fn set_id<T>(&mut self, T) -> Result<...>;
fn delete_id(&mut self) -> &mut Self;
fn get_id(&self) -> Option<XsdAnyUri>;
```
### Traits
This library provides a number of traits, such as `Object`, `Link`, `Actor`, `Activity`,
`Collection`, and `CollectionPage`. The majority of these traits exist solely to "mark" types,
meaning they don't provide value, at runtime, but exist to add constraints to generics at
compiletime.
If you want to make a function that manipulates an Activity, but not a normal object, you could
bound the function like so:
```ignore
fn my_manipulator<T>(some_activity: T) -> Result<&mut ObjectProperties, SomeErrorType>
where
T: Activity + AsMut<ObjectProperties>,
{
some_activity.as_mut().set_whatever_tbh()
}
```
### Kinds
This library has a set of unit structs that serialize and deserialize to strings. This is to
enable different ActivityPub Object types to be deserialized into different Named structs.
These can be found in `activitystreams::objects::kind`, and similar paths.
To build your own Person struct, for example, you could write
```ignore
use activitystreams::actor::kind::PersonType;
#[derive(serde::Deserialize, serde::Serialize)]
pub struct MyPerson {
// Do a rename since `type` is not a valid rust field name
#[serde(rename = "type")]
kind: PersonType,
}
```
And this type would only deserialize for JSON where `"type":"Person"`
### Features
There are a number of features that can be disabled in this crate. By default, everything is
enabled.
```toml
activitystreams = { version = "0.4.0", default-features = "false", features = ["derive"] }
```
| feature | what you get |
| ---------- | --------------------------------------------------------- |
| none | Just the Marker Traits |
| derive | Marker Traits + derive macros from activitystreams-derive |
| kinds | Marker Traits + derive macros + Kind UnitStructs |
| primitives | Marker Traits + Primitive values |
| types | Everything, this is the default |
## Examples
### Basic
```rust
use activitystreams::object::{streams::Video, properties::ObjectProperties};
use anyhow::Error;
// We perform configuration in a dedicated function to specify which Properties type we want to
// perform the operations on.
fn configure_video(mut v: impl AsMut<ObjectProperties>) -> Result<(), Error> {
v.as_mut() v.as_mut()
.set_context_xsd_any_uri("https://www.w3.org/ns/activitystreams")? .set_context_xsd_any_uri("https://www.w3.org/ns/activitystreams")?
.set_id("https://example.com/@example/lions")? .set_id("https://example.com/@example/lions")?
@ -31,6 +208,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.set_media_type("video/webm")? .set_media_type("video/webm")?
.set_duration("PT4M20S")?; .set_duration("PT4M20S")?;
Ok(())
}
fn main() -> Result<(), Error> {
let mut v = Video::default();
configure_video(&mut v)?;
println!("Video, {:#?}", v); println!("Video, {:#?}", v);
let s = serde_json::to_string(&v)?; let s = serde_json::to_string(&v)?;
@ -45,7 +230,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
} }
``` ```
### Intermediate Usage ### Intermediate
```rust ```rust
use activitystreams::{ use activitystreams::{
@ -55,7 +240,7 @@ use activitystreams::{
ObjectProperties, ObjectProperties,
ProfileProperties ProfileProperties
}, },
Profile, apub::Profile,
}, },
primitives::XsdAnyUri, primitives::XsdAnyUri,
Actor, Actor,
@ -111,79 +296,76 @@ fn main() -> Result<(), anyhow::Error> {
} }
``` ```
### Advanced Usage ### Advanced
Add the required crates to your `Cargo.toml`
```toml
# Cargo.toml
activitystreams = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
```
And then in your project
```rust ```rust
use activitystreams::{ use activitystreams::{
context, properties,
link::properties::LinkProperties, link::{
properties::LinkProperties,
Mention,
},
Link, Link,
Object,
PropRefs, PropRefs,
UnitString UnitString,
}; };
use serde::{Deserialize, Serialize};
/// Using the UnitString derive macro /// Using the UnitString derive macro
/// ///
/// This macro implements Serialize and Deserialize for the given type, making this type /// This macro implements Serialize and Deserialize for the given type, making this type
/// represent the string "SomeKind" in JSON. /// represent the string "MyLink" in JSON.
#[derive(Clone, Debug, Default, UnitString)] #[derive(Clone, Debug, Default, UnitString)]
#[activitystreams(MyLink)] #[activitystreams(MyLink)]
pub struct MyKind; pub struct MyKind;
properties! { properties! {
MyLink { My {
docs [ "Document MyLinkProperties" ], docs [ "Defining our own properties struct called MyProperties" ],
required_key { required_key {
docs [ "Document the required key" ], docs [
"Our own required key field",
"",
"'types' defines the range of values that can be stored in required_key",
"",
"'functional' means there is at most one value for required_key",
"'required' means there is at least one value for required_key",
],
types [ String ], types [ String ],
functional, functional,
required, required,
} },
} }
} }
/// Using the Properties derive macro /// Using the Properties derive macro
/// ///
/// This macro generates getters and setters for the associated fields. /// This macro generates getters and setters for the associated fields.
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, PropRefs)] #[derive(Clone, Debug, Default, Deserialize, Serialize, PropRefs)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct MyLink { pub struct My {
/// Use the UnitString MyKind to enforce the type of the object by "SomeKind" /// Use the UnitString MyKind to enforce the type of the object by "MyLink"
pub kind: MyKind, pub kind: MyKind,
#[activitystreams(Link)] /// Derive AsRef/AsMut for My -> MyProperties
pub link_props: LinkProperties,
#[activitystreams(None)] #[activitystreams(None)]
pub my_link_props: MyLinkProperties, pub my_properties: MyProperties,
/// Derive AsRef/AsMut/Link for My -> LinkProperties
#[activitystreams(Link)]
pub link_properties: LinkProperties,
} }
fn run() -> Result<(), anyhow::Error> { fn main() -> Result<(), anyhow::Error> {
let mut my_link = MyLink::default(); let mut my_link = My::default();
let mprops: &mut MyLinkProperties = my_link.as_mut(); let lprops: &mut MyProperties = my_link.as_mut();
mprops.set_required_key("hey")?; lprops.set_required_key("Hey")?;
let lprops: &mut LinkProperties = my_link.as_mut();
lprops.set_context_xsd_any_uri(context)?;
let my_link_string = serde_json::to_string(&my_link)?; let my_link_string = serde_json::to_string(&my_link)?;
let my_link: MyLink = serde_json::from_str(&my_link_string)?; let my_link: My = serde_json::from_str(&my_link_string)?;
let mprops: &MyLinkProperties = my_link.as_ref();
println!("{}", mprops.get_required_key());
Ok(()) Ok(())
} }

View file

@ -1,7 +1,7 @@
[package] [package]
name = "activitystreams-derive" name = "activitystreams-derive"
description = "Derive macros for activitystreams" description = "Derive macros for activitystreams"
version = "0.4.0-alpha.2" version = "0.4.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["asonix <asonix.dev@gmail.com>"] authors = ["asonix <asonix.dev@gmail.com>"]
repository = "https://git.asonix.dog/Aardwolf/activitystreams" repository = "https://git.asonix.dog/Aardwolf/activitystreams"

View file

@ -10,7 +10,7 @@ Add the required crates to your `Cargo.toml`
```toml ```toml
# Cargo.toml # Cargo.toml
activitystreams = "0.4.0-alpha.3" activitystreams = "0.4.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
``` ```

View file

@ -23,8 +23,8 @@
//! //!
//! First, add `serde` and `activitystreams-derive` to your Cargo.toml //! First, add `serde` and `activitystreams-derive` to your Cargo.toml
//! ```toml //! ```toml
//! activitystreams-derive = "0.4.0-alpha.1" //! activitystreams-derive = "0.4.0"
//! # or activitystreams = "0.4.0-alpha.1" //! # or activitystreams = "0.4.0"
//! serde = { version = "1.0", features = ["derive"] } //! serde = { version = "1.0", features = ["derive"] }
//! ``` //! ```
//! //!

View file

@ -19,13 +19,13 @@
//! ActivityStreams //! ActivityStreams
//! //!
//! A set of Traits and Types that make up the Activity Streams specification //! A set of Traits and Types that make up the ActivityStreams and ActivityPub specifications
//! //!
//! ## Usage //! ## Usage
//! //!
//! First, add ActivityStreams to your dependencies //! First, add ActivityStreams to your dependencies
//! ```toml //! ```toml
//! activitystreams = "0.4.0-alpha.3" //! activitystreams = "0.4.0"
//! ``` //! ```
//! //!
//! ### Types //! ### Types
@ -110,7 +110,7 @@
//! "@value": "A string", //! "@value": "A string",
//! "@language": "en" //! "@language": "en"
//! }, //! },
//! "An xsd:string this time", //! "An xsd:string this time"
//! ] //! ]
//! } //! }
//! ``` //! ```