Update README

[rbdr/page] / src / file_handler / file_strategies / layout.rs

diff --git a/src/file_handler/file_strategies/layout.rs b/src/file_handler/file_strategies/layout.rs
index 44b5000052dea5941a9d75c6b2ca8c1ef1e371cc..9a60f12396a2dfb20ffd76d25ccbec2a71973a1e 100644 (file)
--- a/src/file_handler/file_strategies/layout.rs
+++ b/src/file_handler/file_strategies/layout.rs
@@ -1,12 +1,12 @@
 pub struct Strategy {}
 
 pub struct Strategy {}
 

-use std::path::PathBuf;
+use std::path::Path;

 
 

-use crate::file_handler::{File, FileType, FileHandlerStrategy};
+use crate::file_handler::{File, FileType, Strategy as FileHandlerStrategy};

 
 impl FileHandlerStrategy for Strategy {
 
 impl FileHandlerStrategy for Strategy {

-    fn is(&self, path: &PathBuf) -> bool {
-        return !path.is_dir() && path.ends_with("_layout.html");
+    fn is(&self, path: &Path) -> bool {
+        !path.is_dir() && path.ends_with("_layout.html")

     }
 
     fn identify(&self) -> FileType {
     }
 
     fn identify(&self) -> FileType {


@@ -14,129 +14,110 @@ impl FileHandlerStrategy for Strategy {
     }
 
     fn can_handle(&self, file_type: &FileType) -> bool {
     }
 
     fn can_handle(&self, file_type: &FileType) -> bool {

-        match file_type {
-            FileType::Layout => true,
-            _ => false,
-        }
+        matches!(file_type, FileType::Layout)

     }
 
     // We don't implement handling for layout, as we assume there's only one
     // and it got handled before.
     }
 
     // We don't implement handling for layout, as we assume there's only one
     // and it got handled before.

-    fn handle_html(&self, _s: &PathBuf, _d: &PathBuf,  _f: &File, _l: &str) {}
-    fn handle_gemini(&self, _s: &PathBuf, _d: &PathBuf, _f: &File) {}
+    fn handle_html(&self, _s: &Path, _d: &Path, _f: &File, _l: &str) {}
+    fn handle_gemini(&self, _s: &Path, _d: &Path, _f: &File) {}

 }
 
 #[cfg(test)]
 mod tests {
 }
 
 #[cfg(test)]
 mod tests {

-    use super::*;
+    use std::fs::create_dir_all;

     use std::path::PathBuf;
 
     use std::path::PathBuf;
 

-    fn setup() -> Strategy {
-        Strategy {}
+    use super::*;
+
+    use test_utilities::*;
+
+    #[test]
+    fn identifies_layout_file() {
+        let test_dir = setup_test_dir();
+        create_test_file(&test_dir.join("_layout.html"), "");
+        let strategy = Strategy {};
+        assert!(strategy.is(&test_dir.join("_layout.html")));
+    }
+
+    #[test]
+    fn rejects_non_layout_html() {
+        let test_dir = setup_test_dir();
+        create_test_file(&test_dir.join("regular.html"), "");
+        let strategy = Strategy {};
+        assert!(!strategy.is(&test_dir.join("regular.html")));
+    }
+
+    #[test]
+    fn rejects_layout_with_different_extension() {
+        let test_dir = setup_test_dir();
+        create_test_file(&test_dir.join("_layout.txt"), "");
+        let strategy = Strategy {};
+        assert!(!strategy.is(&test_dir.join("_layout.txt")));
+    }
+
+    #[test]
+    fn rejects_layout_with_prefix() {
+        let test_dir = setup_test_dir();
+        create_test_file(&test_dir.join("prefix_layout.txt"), "");
+        let strategy = Strategy {};
+        assert!(!strategy.is(&test_dir.join("prefix_layout.txt")));

     }
 
     }
 

-    mod is_tests {
-        use super::*;
-
-        #[test]
-        fn identifies_layout_file() {
-            let strategy = setup();
-            let path = PathBuf::from("_layout.html");
-            assert!(strategy.is(&path));
-        }
-
-        #[test]
-        fn rejects_non_layout_html() {
-            let strategy = setup();
-            let path = PathBuf::from("regular.html");
-            assert!(!strategy.is(&path));
-        }
-
-        #[test]
-        fn rejects_layout_with_different_extension() {
-            let strategy = setup();
-            let path = PathBuf::from("_layout.txt");
-            assert!(!strategy.is(&path));
-        }
-
-        #[test]
-        fn rejects_layout_with_prefix() {
-            let strategy = setup();
-            let path = PathBuf::from("prefix_layout.html");
-            assert!(!strategy.is(&path));
-        }
-
-        #[test]
-        fn rejects_directory_named_layout() {
-            let strategy = setup();
-            let path = PathBuf::from("tests/fixtures");
-
-            assert!(!strategy.is(&path));
-        }
+    #[test]
+    fn rejects_directory_named_layout() {
+        let test_dir = setup_test_dir();
+        let layout_dir = test_dir.join("_layout");
+        create_dir_all(&layout_dir).expect("Could not create _layout test directory");
+        let strategy = Strategy {};
+        assert!(!strategy.is(&layout_dir));

     }
 
     }
 

-    mod identify_tests {
-        use super::*;
+    #[test]
+    fn identifies_layout_type() {
+        let strategy = Strategy {};
+        assert!(matches!(strategy.identify(), FileType::Layout));
+    }

 
 

-        #[test]
-        fn returns_layout_type() {
-            let strategy = setup();
-            assert!(matches!(strategy.identify(), FileType::Layout));
-        }
+    #[test]
+    fn handles_layout_type() {
+        let strategy = Strategy {};
+        assert!(strategy.can_handle(&FileType::Layout));

     }
 
     }
 

-    mod can_handle_tests {
-        use super::*;
-
-        #[test]
-        fn handles_layout_type() {
-            let strategy = setup();
-            assert!(strategy.can_handle(&FileType::Layout));
-        }
-
-        #[test]
-        fn rejects_non_layout_types() {
-            let strategy = setup();
-            assert!(!strategy.can_handle(&FileType::File));
-            assert!(!strategy.can_handle(&FileType::Gemini));
-            assert!(!strategy.can_handle(&FileType::Unknown));
-        }
+    #[test]
+    fn rejects_non_layout_types() {
+        let strategy = Strategy {};
+        assert!(!strategy.can_handle(&FileType::File));
+        assert!(!strategy.can_handle(&FileType::Gemini));
+        assert!(!strategy.can_handle(&FileType::Unknown));

     }
 
     }
 

-    mod handle_methods {
-        use super::*;
-
-        #[test]
-        fn handle_html_does_nothing() {
-            let strategy = setup();
-            let file = File {
-                path: PathBuf::from("test.html"),
-                file_type: FileType::Layout,
-            };
-
-            // Should not panic
-            strategy.handle_html(
-                &PathBuf::from("source"),
-                &PathBuf::from("dest"),
-                &file,
-                "layout content"
-            );
-        }
-
-        #[test]
-        fn handle_gemini_does_nothing() {
-            let strategy = setup();
-            let file = File {
-                path: PathBuf::from("test.gmi"),
-                file_type: FileType::Layout,
-            };
-
-            // Should not panic
-            strategy.handle_gemini(
-                &PathBuf::from("source"),
-                &PathBuf::from("dest"),
-                &file
-            );
-        }
+    #[test]
+    fn handle_html_does_nothing() {
+        let strategy = Strategy {};
+        let file = File {
+            path: PathBuf::from("_layout.html"),
+            file_type: FileType::Layout,
+        };
+
+        strategy.handle_html(
+            &PathBuf::from("source"),
+            &PathBuf::from("dest"),
+            &file,
+            "layout content",
+        );
+    }
+
+    #[test]
+    fn handle_gemini_does_nothing() {
+        let strategy = Strategy {};
+        let file = File {
+            path: PathBuf::from("test.gmi"),
+            file_type: FileType::Layout,
+        };
+
+        // Should not panic
+        strategy.handle_gemini(&PathBuf::from("source"), &PathBuf::from("dest"), &file);

     }
 }
     }
 }