Finish tests

Author: yoshuawuyts

src/content/accept.rs

@@ -1,6 +1,6 @@
 //! Client header advertising available compression algorithms.
 
-use crate::content::MediaTypeProposal;
+use crate::content::{ContentType, MediaTypeProposal};
 use crate::headers::{HeaderName, HeaderValue, Headers, ToHeaderValues, ACCEPT};
 use crate::utils::sort_by_weight;
 use crate::{Error, Mime, StatusCode};
@@ -29,10 +29,10 @@ use std::slice;
 /// accept.push(MediaTypeProposal::new(mime::PLAIN, None)?);
 ///
 /// let mut res = Response::new(200);
-/// let media_type = accept.negotiate(&[mime::XML])?;
-/// media_type.apply(&mut res);
+/// let content_type = accept.negotiate(&[mime::XML])?;
+/// content_type.apply(&mut res);
 ///
-/// assert_eq!(res["Content-Encoding"], "text/html");
+/// assert_eq!(res["Content-Type"], "application/xml;charset=utf-8");
 /// #
 /// # Ok(()) }
 /// ```
@@ -111,14 +111,14 @@ impl Accept {
     /// # Errors
     ///
     /// If no suitable encoding is found, an error with the status of `406` will be returned.
-    pub fn negotiate(&mut self, available: &[Mime]) -> crate::Result<Mime> {
+    pub fn negotiate(&mut self, available: &[Mime]) -> crate::Result<ContentType> {
         // Start by ordering the encodings.
         self.sort();
 
         // Try and find the first encoding that matches.
         for accept in &self.entries {
             if available.contains(&accept) {
-                return Ok(accept.clone().into());
+                return Ok(accept.media_type.clone().into());
             }
         }
 

src/content/content_type.rs

@@ -21,13 +21,13 @@ use crate::Mime;
 /// use http_types::{Response, Mime};
 /// use std::str::FromStr;
 ///
-/// let ct = ContentType::new(Mime::from_str("text/*")?);
+/// let content_type = ContentType::new(Mime::from_str("text/*")?);
 ///
 /// let mut res = Response::new(200);
-/// ct.apply(&mut res);
+/// content_type.apply(&mut res);
 ///
-/// let ct = ContentType::from_headers(res)?.unwrap();
-/// assert_eq!(ct.value(), format!("{}", Mime::from_str("text/*")?).as_str());
+/// let content_type = ContentType::from_headers(res)?.unwrap();
+/// assert_eq!(content_type.value(), format!("{}", Mime::from_str("text/*")?).as_str());
 /// #
 /// # Ok(()) }
 /// ```
@@ -91,6 +91,24 @@ impl ContentType {
     }
 }
 
+impl PartialEq<Mime> for ContentType {
+    fn eq(&self, other: &Mime) -> bool {
+        &self.media_type == other
+    }
+}
+
+impl PartialEq<&Mime> for ContentType {
+    fn eq(&self, other: &&Mime) -> bool {
+        &&self.media_type == other
+    }
+}
+
+impl From<Mime> for ContentType {
+    fn from(media_type: Mime) -> Self {
+        Self { media_type }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;