Skip to content

Commit

Permalink
feat(headers): export missing header types
Browse files Browse the repository at this point in the history
  • Loading branch information
brendanzab committed Jul 14, 2017
1 parent 2a49cee commit c9f4ff3
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 37 deletions.
30 changes: 0 additions & 30 deletions src/header/common/last-event-id.rs

This file was deleted.

63 changes: 63 additions & 0 deletions src/header/common/last_event_id.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
use std::fmt::{self, Display};
use header::{self, Header, Raw};

/// `Last-Event-ID` header, defined in
/// [RFC3864](https://html.spec.whatwg.org/multipage/references.html#refsRFC3864)
///
/// The `Last-Event-ID` header contains information about
/// the last event in an http interaction so that it's easier to
/// track of event state. This is helpful when working
/// with [Server-Sent-Events](http://www.html5rocks.com/en/tutorials/eventsource/basics/). If the connection were to be dropped, for example, it'd
/// be useful to let the server know what the last event you
/// received was.
///
/// The spec is a String with the id of the last event, it can be
/// an empty string which acts a sort of "reset".
///
/// # Example
/// ```
/// use hyper::header::{Headers, LastEventId};
///
/// let mut headers = Headers::new();
/// headers.set(LastEventId("1".to_owned()));
/// ```
#[derive(Clone, Debug, PartialEq)]
pub struct LastEventId(pub String);

impl Header for LastEventId {
#[inline]
fn header_name() -> &'static str {
static NAME: &'static str = "Last-Event-ID";
NAME
}

#[inline]
fn parse_header(raw: &Raw) -> ::Result<Self> {
match raw.one() {
Some(line) if line.is_empty() => Ok(LastEventId("".to_owned())),
Some(line) => header::parsing::from_raw_str(line).map(LastEventId),
None => Err(::Error::Header),
}
}

#[inline]
fn fmt_header(&self, f: &mut header::Formatter) -> fmt::Result {
f.fmt_line(self)
}
}

impl Display for LastEventId {
#[inline]
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Display::fmt(&self.0, f)
}
}

__hyper__deref!(LastEventId => String);

__hyper__tm!(LastEventId, tests {
// Initial state
test_header!(test1, vec![b""]);
// Own testcase
test_header!(test2, vec![b"1"], Some(LastEventId("1".to_owned())));
});
4 changes: 4 additions & 0 deletions src/header/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ pub use self::if_modified_since::IfModifiedSince;
pub use self::if_none_match::IfNoneMatch;
pub use self::if_range::IfRange;
pub use self::if_unmodified_since::IfUnmodifiedSince;
pub use self::last_event_id::LastEventId;
pub use self::last_modified::LastModified;
pub use self::link::{Link, LinkValue, RelationType, MediaDesc};
pub use self::location::Location;
Expand All @@ -56,6 +57,7 @@ pub use self::retry_after::RetryAfter;
pub use self::server::Server;
pub use self::set_cookie::SetCookie;
pub use self::strict_transport_security::StrictTransportSecurity;
pub use self::te::Te;
pub use self::transfer_encoding::TransferEncoding;
pub use self::upgrade::{Upgrade, Protocol, ProtocolName};
pub use self::user_agent::UserAgent;
Expand Down Expand Up @@ -474,6 +476,7 @@ mod if_modified_since;
mod if_none_match;
mod if_range;
mod if_unmodified_since;
mod last_event_id;
mod last_modified;
mod link;
mod location;
Expand All @@ -488,6 +491,7 @@ mod retry_after;
mod server;
mod set_cookie;
mod strict_transport_security;
mod te;
mod transfer_encoding;
mod upgrade;
mod user_agent;
Expand Down
14 changes: 7 additions & 7 deletions src/header/common/te.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,38 @@ header! {
///
/// # Examples
/// ```
/// use hyper::header::{Headers, TE, Encoding, qitem};
/// use hyper::header::{Headers, Te, Encoding, qitem};
///
/// let mut headers = Headers::new();
/// headers.set(
/// TE(vec![qitem(Encoding::Trailers)])
/// Te(vec![qitem(Encoding::Trailers)])
/// );
/// ```
/// ```
/// use hyper::header::{Headers, TE, Encoding, qitem};
/// use hyper::header::{Headers, Te, Encoding, qitem};
///
/// let mut headers = Headers::new();
/// headers.set(
/// TE(vec![
/// Te(vec![
/// qitem(Encoding::Trailers),
/// qitem(Encoding::Gzip),
/// qitem(Encoding::Deflate),
/// ])
/// );
/// ```
/// ```
/// use hyper::header::{Headers, TE, Encoding, QualityItem, q, qitem};
/// use hyper::header::{Headers, Te, Encoding, QualityItem, q, qitem};
///
/// let mut headers = Headers::new();
/// headers.set(
/// TE(vec![
/// Te(vec![
/// qitem(Encoding::Trailers),
/// QualityItem::new(Encoding::Gzip, q(600)),
/// QualityItem::new(Encoding::EncodingExt("*".to_owned()), q(0)),
/// ])
/// );
/// ```
(TE, "TE") => (QualityItem<Encoding>)*
(Te, "TE") => (QualityItem<Encoding>)*

test_te {
// From the RFC
Expand Down

0 comments on commit c9f4ff3

Please sign in to comment.