Add a builder method for includes in the populated assembly

Author: msuchane

src/main.rs

@@ -62,16 +62,17 @@ fn main() {
     if let Some(title) = cmdline_args.value_of("include-in") {
         // Gather all include statements for the other modules
         // TODO: Figure out if this can be done without calling .to_owned on all the Strings
-        let includes: Vec<String> = non_populated
+        let include_statements: Vec<String> = non_populated
             .iter()
             .map(|module| module.include_statement.to_owned())
             .collect();
 
-        // The includes should never be empty thanks to the required group in clap
-        assert!(!includes.is_empty());
+        // The include_statements should never be empty thanks to the required group in clap
+        assert!(!include_statements.is_empty());
 
         // Generate the populated assembly module
-        let populated = Module::new(ModuleType::Assembly, title, Some(&includes), &options);
+        let populated = Module::new(ModuleType::Assembly, title, &options)
+            .includes(include_statements);
 
         write_module(&populated, &options);
     }
@@ -94,7 +95,7 @@ fn process_module_type(titles: clap::Values, module_type_str: &str, options: &Op
             _ => unimplemented!(),
         };
 
-        let module = Module::new(module_type, title, None, &options);
+        let module = Module::new(module_type, title, &options);
 
         modules_from_type.push(module);
     }

src/module.rs

@@ -18,6 +18,7 @@ pub struct Module {
     pub file_name: String,
     pub include_statement: String,
     pub text: String,
+    included: Option<Vec<String>>,
 }
 
 // Load the AsciiDoc templates at build time
@@ -31,14 +32,13 @@ impl Module {
     pub fn new(
         mod_type: ModuleType,
         title: &str,
-        includes: Option<&[String]>,
         options: &Options,
     ) -> Module {
         let title = String::from(title);
         let id = Module::convert_title_to_id(&title);
         let file_name = Module::compose_file_name(&id, &mod_type, &options);
         let include_statement = Module::compose_include_statement(&file_name);
-        let text = Module::compose_text(&title, &id, &mod_type, includes, &options);
+        let text = Module::compose_text(&title, &id, &mod_type, None, &options);
 
         Module {
             mod_type,
@@ -47,9 +47,15 @@ impl Module {
             file_name,
             include_statement,
             text,
+            included: None,
         }
     }
 
+    pub fn includes(mut self, include_statements: Vec<String>) -> Self {
+        self.included = Some(include_statements);
+        self
+    }
+
     /// Create an ID string that is derived from the human-readable title. The ID is usable as:
     ///
     /// * An AsciiDoc section ID