Merge pull request #1 from conduit-rust/more-headers

Add some more headers for conditional-get

Author: wycats

src/conduit-static.rs

@@ -1,5 +1,6 @@
-extern crate mime = "mime-types";
 extern crate conduit;
+extern crate mime = "mime-types";
+extern crate time;
 
 use std::fmt::Show;
 use std::collections::HashMap;
@@ -36,10 +37,28 @@ impl Handler for Static {
         }
 
         let mime = self.types.mime_for_path(&path);
-        let file = try!(File::open(&path).map_err(|e| box e as Box<Show>));
+        let mut file = match File::open(&path) {
+            Ok(f) => f,
+            Err(..) => {
+                return Ok(Response {
+                    status: (404, "Not Found"),
+                    headers: HashMap::new(),
+                    body: box NullReader,
+                })
+            }
+        };
+        let stat = try!(file.stat().map_err(|e| box e as Box<Show>));
+        let ts = time::Timespec {
+            sec: (stat.modified as i64) / 1000,
+            nsec: ((stat.modified as i32) % 1000) * 1000
+        };
+        let tm = time::at(ts).to_utc();
 
         let mut headers = HashMap::new();
-        headers.insert("Content-Type".to_str(), vec!(mime.to_str()));
+        headers.insert("Content-Type".to_str(), vec![mime.to_str()]);
+        headers.insert("Content-Length".to_str(), vec![stat.size.to_str()]);
+        headers.insert("Last-Modified".to_str(),
+                       vec![tm.strftime("%a, %d %b %Y %T GMT")]);
 
         Ok(Response {
             status: (200, "OK"),
@@ -52,27 +71,65 @@ impl Handler for Static {
 #[cfg(test)]
 mod tests {
     extern crate test = "conduit-test";
+
+    use std::io::{fs, File, TempDir, UserRWX};
+
     use conduit;
     use conduit::Handler;
     use Static;
 
     #[test]
     fn test_static() {
-        let root = Path::new(file!()).dir_path().dir_path();
-        let handler = Static::new(root);
+        let td = TempDir::new("conduit-static").unwrap();
+        let root = td.path();
+        let handler = Static::new(root.clone());
+        File::create(&root.join("Cargo.toml")).write(b"[package]").unwrap();
         let mut req = test::MockRequest::new(conduit::Get, "/Cargo.toml");
         let mut res = handler.call(&mut req).ok().expect("No response");
         let body = res.body.read_to_str().ok().expect("No body");
-        assert!(body.as_slice().contains("[package]"), "The Cargo.toml was provided");
-        assert_eq!(res.headers.find_equiv(&"Content-Type").expect("No content-type"), &vec!("text/plain".to_str()));
+        assert_eq!(body.as_slice(), "[package]");
+        assert_eq!(res.headers.find_equiv(&"Content-Type"),
+                   Some(&vec!("text/plain".to_str())));
+        assert_eq!(res.headers.find_equiv(&"Content-Length"),
+                   Some(&vec!["9".to_str()]));
     }
 
     #[test]
     fn test_mime_types() {
-        let root = Path::new(file!()).dir_path().dir_path();
-        let handler = Static::new(root);
+        let td = TempDir::new("conduit-static").unwrap();
+        let root = td.path();
+        fs::mkdir(&root.join("src"), UserRWX).unwrap();
+        File::create(&root.join("src/fixture.css")).unwrap();
+
+        let handler = Static::new(root.clone());
         let mut req = test::MockRequest::new(conduit::Get, "/src/fixture.css");
         let res = handler.call(&mut req).ok().expect("No response");
-        assert_eq!(res.headers.find_equiv(&"Content-Type").expect("No content-type"), &vec!("text/css".to_str()));
+        assert_eq!(res.headers.find_equiv(&"Content-Type"),
+                   Some(&vec!("text/css".to_str())));
+        assert_eq!(res.headers.find_equiv(&"Content-Length"),
+                   Some(&vec!["0".to_str()]));
+    }
+
+    #[test]
+    fn test_missing() {
+        let td = TempDir::new("conduit-static").unwrap();
+        let root = td.path();
+
+        let handler = Static::new(root.clone());
+        let mut req = test::MockRequest::new(conduit::Get, "/nope");
+        let res = handler.call(&mut req).ok().expect("No response");
+        assert_eq!(res.status.val0(), 404);
+    }
+
+    #[test]
+    fn last_modified() {
+        let td = TempDir::new("conduit-static").unwrap();
+        let root = td.path();
+        File::create(&root.join("test")).unwrap();
+        let handler = Static::new(root.clone());
+        let mut req = test::MockRequest::new(conduit::Get, "/test");
+        let res = handler.call(&mut req).ok().expect("No response");
+        assert_eq!(res.status.val0(), 200);
+        assert!(res.headers.find_equiv(&"Last-Modified").is_some());
     }
 }