Merge pull request #332 from pyfisch/improvquality

refactor(headers): Use u16 based newtype for quality value
hyperium · Mar 1, 2015 · 7235d3f · 7235d3f
2 parents b1b8bf1 + 8f6ce45
commit 7235d3f
Show file tree

Hide file tree

Showing 6 changed files with 199 additions and 111 deletions.
diff --git a/src/header/common/accept.rs b/src/header/common/accept.rs
@@ -33,7 +33,8 @@ impl_list_header!(Accept,
 mod tests {
     use mime::*;
 
-    use header::{Header, QualityItem, qitem};
+    use header::{Header, Quality, QualityItem, qitem};
+
     use super::Accept;
 
     #[test]
@@ -49,7 +50,7 @@ mod tests {
     fn test_parse_header_with_quality() {
         let a: Accept = Header::parse_header([b"text/plain; charset=utf-8; q=0.5".to_vec()].as_slice()).unwrap();
         let b = Accept(vec![
-            QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)]), 0.5f32),
+            QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)]), Quality(500)),
         ]);
         assert_eq!(a, b);
     }

diff --git a/src/header/common/accept_encoding.rs b/src/header/common/accept_encoding.rs
@@ -13,16 +13,16 @@ impl_list_header!(AcceptEncoding,
 
 #[cfg(test)]
 mod tests {
-    use header::{Encoding, Header, QualityItem};
+    use header::{Encoding, Header, qitem, Quality, QualityItem};
 
     use super::*;
 
     #[test]
     fn test_parse_header() {
         let a: AcceptEncoding = Header::parse_header([b"gzip;q=1.0, identity; q=0.5".to_vec()].as_slice()).unwrap();
         let b = AcceptEncoding(vec![
-            QualityItem{item: Encoding::Gzip, quality: 1f32},
-            QualityItem{item: Encoding::Identity, quality: 0.5f32},
+            qitem(Encoding::Gzip),
+            QualityItem::new(Encoding::Identity, Quality(500)),
         ]);
         assert_eq!(a, b);
     }

diff --git a/src/header/common/accept_language.rs b/src/header/common/accept_language.rs
@@ -46,41 +46,45 @@ impl_list_header!(AcceptLanguage,
                   "Accept-Language",
                   Vec<QualityItem<Language>>);
 
-bench_header!(bench, AcceptLanguage,
-              { vec![b"en-us;q=1.0, en;q=0.5, fr".to_vec()] });
+#[cfg(test)]
+mod tests {
+    use header::{Header, qitem, Quality, QualityItem};
 
-#[test]
-fn test_parse_header() {
-    let a: AcceptLanguage = header::Header::parse_header(
-        [b"en-us;q=1.0, en;q=0.5, fr".to_vec()].as_slice()).unwrap();
-    let b = AcceptLanguage(vec![
-        QualityItem { item: Language{primary: "en".to_string(),
-                                   sub: Some("us".to_string())},
-                      quality: 1f32 },
-        QualityItem { item: Language{primary: "en".to_string(), sub: None},
-                      quality: 0.5f32 },
-        QualityItem { item: Language{primary: "fr".to_string(), sub: None},
-                      quality: 1f32 },
-    ]);
-    assert_eq!(format!("{}", a), format!("{}", b));
-    assert_eq!(a, b);
-}
+    use super::*;
 
-#[test]
-fn test_display() {
-    assert_eq!("en".to_string(),
-               format!("{}", Language{primary: "en".to_string(),
-                                      sub: None}));
-    assert_eq!("en-us".to_string(),
-               format!("{}", Language{primary: "en".to_string(),
-                                      sub: Some("us".to_string())}));
-}
+    #[test]
+    fn test_parse_header() {
+        let a: AcceptLanguage = Header::parse_header(
+            [b"en-us;q=1.0, en;q=0.5, fr".to_vec()].as_slice()).unwrap();
+        let b = AcceptLanguage(vec![
+            qitem(Language{primary: "en".to_string(), sub: Some("us".to_string())}),
+            QualityItem::new(Language{primary: "en".to_string(), sub: None},
+                             Quality(500)),
+            qitem(Language{primary: "fr".to_string(), sub: None}),
+        ]);
+        assert_eq!(format!("{}", a), format!("{}", b));
+        assert_eq!(a, b);
+    }
 
-#[test]
-fn test_from_str() {
-    assert_eq!(Language { primary: "en".to_string(), sub: None },
-               "en".parse().unwrap());
-    assert_eq!(Language { primary: "en".to_string(),
-                          sub: Some("us".to_string()) },
-               "en-us".parse().unwrap());
+    #[test]
+    fn test_display() {
+        assert_eq!("en".to_string(),
+                   format!("{}", Language{primary: "en".to_string(),
+                                          sub: None}));
+        assert_eq!("en-us".to_string(),
+                   format!("{}", Language{primary: "en".to_string(),
+                                          sub: Some("us".to_string())}));
+    }
+
+    #[test]
+    fn test_from_str() {
+        assert_eq!(Language { primary: "en".to_string(), sub: None },
+                   "en".parse().unwrap());
+        assert_eq!(Language { primary: "en".to_string(),
+                              sub: Some("us".to_string()) },
+                   "en-us".parse().unwrap());
+    }
 }
+
+bench_header!(bench, AcceptLanguage,
+              { vec![b"en-us;q=1.0, en;q=0.5, fr".to_vec()] });
diff --git a/src/header/mod.rs b/src/header/mod.rs
@@ -21,7 +21,7 @@ use unicase::UniCase;
 use self::cell::OptCell;
 use {http, HttpResult, HttpError};
 
-pub use self::shared::{Encoding, EntityTag, QualityItem, qitem};
+pub use self::shared::{Encoding, EntityTag, Quality, QualityItem, qitem};
 pub use self::common::*;
 
 mod cell;
@@ -540,7 +540,7 @@ mod tests {
     use mime::TopLevel::Text;
     use mime::SubLevel::Plain;
     use super::{Headers, Header, HeaderFormat, ContentLength, ContentType,
-                Accept, Host, QualityItem};
+                Accept, Host, qitem};
 
     use test::Bencher;
 
@@ -562,7 +562,7 @@ mod tests {
 
     #[test]
     fn test_accept() {
-        let text_plain = QualityItem{item: Mime(Text, Plain, vec![]), quality: 1f32};
+        let text_plain = qitem(Mime(Text, Plain, vec![]));
         let application_vendor = "application/vnd.github.v3.full+json; q=0.5".parse().unwrap();
 
         let accept = Header::parse_header([b"text/plain".to_vec()].as_slice());

diff --git a/src/header/shared/mod.rs b/src/header/shared/mod.rs
@@ -1,6 +1,6 @@
 pub use self::encoding::Encoding;
 pub use self::entity::EntityTag;
-pub use self::quality_item::{QualityItem, qitem};
+pub use self::quality_item::{Quality, QualityItem, qitem};
 
 mod encoding;
 mod entity;