2e9c9411a3
This moves InnerJid into Jid and reformulates BareJid and FullJid in terms of Jid. Doing this has the key advantage that FullJid and BareJid can deref to and borrow as Jid. This, in turn, has the advantage that they can be used much more flexibly in HashMaps. However, this is (as we say in Germany) future music; this commit only does the internal reworking. Oh and also, it saves 20% memory on Jid objects. Fixes #122 more thoroughly, or rather the original intent behind it.
76 lines
2 KiB
Rust
76 lines
2 KiB
Rust
// Copyright (c) 2019 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
|
||
//
|
||
// This Source Code Form is subject to the terms of the Mozilla Public
|
||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
||
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||
|
||
use crate::iq::{IqGetPayload, IqResultPayload};
|
||
use crate::util::text_node_codecs::{Codec, JidCodec, Text};
|
||
|
||
generate_element!(
|
||
/// Request from a client to stringprep/PRECIS a string into a JID.
|
||
JidPrepQuery, "jid", JID_PREP,
|
||
text: (
|
||
/// The potential JID.
|
||
data: Text
|
||
)
|
||
);
|
||
|
||
impl IqGetPayload for JidPrepQuery {}
|
||
|
||
impl JidPrepQuery {
|
||
/// Create a new JID Prep query.
|
||
pub fn new<J: Into<String>>(jid: J) -> JidPrepQuery {
|
||
JidPrepQuery { data: jid.into() }
|
||
}
|
||
}
|
||
|
||
generate_element!(
|
||
/// Response from the server with the stringprep’d/PRECIS’d JID.
|
||
JidPrepResponse, "jid", JID_PREP,
|
||
text: (
|
||
/// The JID.
|
||
jid: JidCodec
|
||
)
|
||
);
|
||
|
||
impl IqResultPayload for JidPrepResponse {}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
use crate::Element;
|
||
use jid::FullJid;
|
||
|
||
#[cfg(target_pointer_width = "32")]
|
||
#[test]
|
||
fn test_size() {
|
||
assert_size!(JidPrepQuery, 12);
|
||
assert_size!(JidPrepResponse, 16);
|
||
}
|
||
|
||
#[cfg(target_pointer_width = "64")]
|
||
#[test]
|
||
fn test_size() {
|
||
assert_size!(JidPrepQuery, 24);
|
||
assert_size!(JidPrepResponse, 32);
|
||
}
|
||
|
||
#[test]
|
||
fn simple() {
|
||
let elem: Element = "<jid xmlns='urn:xmpp:jidprep:0'>ROMeo@montague.lit/orchard</jid>"
|
||
.parse()
|
||
.unwrap();
|
||
let query = JidPrepQuery::try_from(elem).unwrap();
|
||
assert_eq!(query.data, "ROMeo@montague.lit/orchard");
|
||
|
||
let elem: Element = "<jid xmlns='urn:xmpp:jidprep:0'>romeo@montague.lit/orchard</jid>"
|
||
.parse()
|
||
.unwrap();
|
||
let response = JidPrepResponse::try_from(elem).unwrap();
|
||
assert_eq!(
|
||
response.jid,
|
||
FullJid::new("romeo@montague.lit/orchard").unwrap()
|
||
);
|
||
}
|
||
}
|