fix(all): Fix doc tests in website

Cargo.toml

@@ -38,6 +38,7 @@ webpki = { version = "^0.21", optional = true }
 criterion = "^0.3"
 env_logger = "^0.7"
 glob = "^0.3"
+walkdir = "^2"
 
 [[bench]]
 harness = false

README.md

@@ -44,7 +44,7 @@ lettre = "0.9"
 ```rust,no_run
 extern crate lettre;
 
-use lettre::{SmtpClient, Transport, Email, mime::TEXT_PLAIN};
+use lettre::{SmtpClient, Transport, Email, builder::mime::TEXT_PLAIN};
 use std::path::Path;
 
 fn main() {

src/builder/mod.rs

@@ -1,6 +1,7 @@
 use crate::{error::Error as LettreError, EmailAddress, Envelope, SendableEmail};
 pub use email::{Address, Header, Mailbox, MimeMessage, MimeMultipartType};
 use error::Error;
+pub use mime;
 use mime::Mime;
 use std::ffi::OsStr;
 use std::fs;

src/lib.rs

@@ -24,6 +24,8 @@ pub mod sendmail;
 pub mod smtp;
 pub mod stub;
 
+#[cfg(feature = "builder")]
+pub use crate::builder::Email;
 use crate::error::EmailResult;
 use crate::error::Error;
 #[cfg(feature = "file-transport")]

src/smtp/mod.rs

@@ -27,6 +27,8 @@ use crate::{SendableEmail, Transport};
 use log::{debug, info};
 #[cfg(feature = "native-tls")]
 use native_tls::TlsConnector;
+#[cfg(feature = "rustls")]
+use rustls::ClientConfig;
 use std::net::{SocketAddr, ToSocketAddrs};
 use std::time::Duration;
 
@@ -150,6 +152,16 @@ impl SmtpClient {
         )
     }
 
+    #[cfg(feature = "rustls")]
+    pub fn new_simple(domain: &str) -> Result<SmtpClient, Error> {
+        let tls_parameters = ClientTlsParameters::new(domain.to_string(), ClientConfig::new());
+
+        SmtpClient::new(
+            (domain, SUBMISSIONS_PORT),
+            ClientSecurity::Wrapper(tls_parameters),
+        )
+    }
+
     /// Creates a new local SMTP client to port 25
     pub fn new_unencrypted_localhost() -> Result<SmtpClient, Error> {
         SmtpClient::new(("localhost", SMTP_PORT), ClientSecurity::None)

tests/skeptic.rs

@@ -1,23 +1,21 @@
-use glob::glob;
-use std::env;
-use std::env::consts::EXE_EXTENSION;
+use std::env::{self, consts::EXE_EXTENSION};
 use std::path::Path;
 use std::process::Command;
+use walkdir::WalkDir;
 
 #[test]
 fn book_test() {
-    let mut book_path = env::current_dir().unwrap();
-    book_path.push(
-        Path::new(file!())
-            .parent()
-            .unwrap()
-            .parent()
-            .unwrap()
-            .join("../website/content/sending-messages"),
-    ); // For some reasons, calling .parent() once more gives us None...
+    skeptic_test(Path::new("README.md"));
 
-    for md in glob(&format!("{}/*.md", book_path.to_str().unwrap())).unwrap() {
-        skeptic_test(&md.unwrap());
+    for entry in WalkDir::new("website").into_iter().filter(|e| {
+        e.as_ref()
+            .unwrap()
+            .path()
+            .extension()
+            .map(|ex| ex == "md")
+            .unwrap_or(false)
+    }) {
+        skeptic_test(entry.unwrap().path());
     }
 }
 

website/src/creating-messages/email.md

@@ -8,9 +8,9 @@ The `email` part builds email messages. For now, it does not support attachments
 An email is built using an `EmailBuilder`. The simplest email could be:
 
 ```rust
-extern crate lettre_email;
+extern crate lettre;
 
-use lettre_email::Email;
+use lettre::Email;
 
 fn main() {
     // Create an email
@@ -22,7 +22,7 @@ fn main() {
         .subject("Hi, Hello world")
         .alternative("<h2>Hi, Hello world.</h2>", "Hi, Hello world.")
         .build();
-    
+
     assert!(email.is_ok());
 }
 ```

website/src/sending-messages/smtp.md

@@ -31,13 +31,13 @@ fn main() {
         "id".to_string(),
         "Hello world".to_string().into_bytes(),
     );
-    
+
     // Open a local connection on port 25
     let mut mailer =
     SmtpClient::new_unencrypted_localhost().unwrap().transport();
     // Send the email
     let result = mailer.send(email);
-    
+
     assert!(result.is_ok());
 }
 ```
@@ -61,7 +61,7 @@ fn main() {
         "id1".to_string(),
         "Hello world".to_string().into_bytes(),
     );
-    
+
     let email_2 = SendableEmail::new(
         Envelope::new(
             Some(EmailAddress::new("user@localhost".to_string()).unwrap()),
@@ -70,7 +70,7 @@ fn main() {
         "id2".to_string(),
         "Hello world a second time".to_string().into_bytes(),
     );
-    
+
     // Connect to a remote server on a custom port
     let mut mailer = SmtpClient::new_simple("server.tld").unwrap()
         // Set the name sent during EHLO/HELO, default is `localhost`
@@ -83,14 +83,14 @@ fn main() {
         .authentication_mechanism(Mechanism::Plain)
         // Enable connection reuse
         .connection_reuse(ConnectionReuseParameters::ReuseUnlimited).transport();
-    
+
     let result_1 = mailer.send(email_1);
     assert!(result_1.is_ok());
-    
+
     // The second email will use the same connection
     let result_2 = mailer.send(email_2);
     assert!(result_2.is_ok());
-    
+
     // Explicitly close the SMTP transaction as we enabled connection reuse
     mailer.close();
 }
@@ -99,6 +99,8 @@ fn main() {
 You can specify custom TLS settings:
 
 ```rust,no_run
+# #[cfg(feature = "native-tls")]
+# {
 extern crate native_tls;
 extern crate lettre;
 
@@ -144,6 +146,7 @@ fn main() {
 
     mailer.close();
 }
+# }
 ```
 
 #### Lower level