Modify tests to use both ConfigBuilder and Config

Author: szarykott

src/builder.rs

@@ -1,9 +1,7 @@
 use std::str::FromStr;
 use std::{collections::HashMap, iter::IntoIterator};
 
-use crate::{
-    config::Config, error, error::ConfigError, path::Expression, source::Source, value::Value,
-};
+use crate::{config::Config, error, path::Expression, source::Source, value::Value};
 
 /// A configuration builder
 ///
@@ -142,7 +140,7 @@ impl ConfigBuilder {
     fn build_internal(
         defaults: HashMap<Expression, Value>,
         overrides: HashMap<Expression, Value>,
-        sources: &Vec<Box<dyn Source + Send + Sync>>,
+        sources: &[Box<dyn Source + Send + Sync>],
     ) -> error::Result<Config> {
         let mut cache: Value = HashMap::<String, Value>::new().into();
 

src/config.rs

@@ -56,6 +56,8 @@ impl Config {
         T: Source + Send + Sync,
     {
         self.sources.push(Box::new(source));
+
+        #[allow(deprecated)]
         self.refresh()
     }
 
@@ -67,6 +69,8 @@ impl Config {
         T: Source + Send + Sync,
     {
         self.sources.push(Box::new(source));
+
+        #[allow(deprecated)]
         self.refresh()?;
         Ok(self)
     }
@@ -107,6 +111,8 @@ impl Config {
         T: Into<Value>,
     {
         self.defaults.insert(key.parse()?, value.into());
+
+        #[allow(deprecated)]
         self.refresh()
     }
 
@@ -124,6 +130,8 @@ impl Config {
         T: Into<Value>,
     {
         self.overrides.insert(key.parse()?, value.into());
+
+        #[allow(deprecated)]
         self.refresh()
     }
 

src/ser.rs

@@ -27,6 +27,8 @@ impl ConfigSerializer {
                 )))
             }
         };
+
+        #[allow(deprecated)]
         self.output.set(&key, value.into())?;
         Ok(())
     }

src/source.rs

@@ -55,6 +55,26 @@ impl Source for Vec<Box<dyn Source + Send + Sync>> {
     }
 }
 
+impl Source for [Box<dyn Source + Send + Sync>] {
+    fn clone_into_box(&self) -> Box<dyn Source + Send + Sync> {
+        Box::new(self.to_owned())
+    }
+
+    fn collect(&self) -> Result<HashMap<String, Value>> {
+        let mut cache: Value = HashMap::<String, Value>::new().into();
+
+        for source in self {
+            source.collect_to(&mut cache)?;
+        }
+
+        if let ValueKind::Table(table) = cache.kind {
+            Ok(table)
+        } else {
+            unreachable!();
+        }
+    }
+}
+
 impl<T> Source for Vec<T>
 where
     T: Source + Sync + Send,

tests/datetime.rs

@@ -14,56 +14,53 @@ use chrono::{DateTime, TimeZone, Utc};
 use config::*;
 
 fn make() -> Config {
-    Config::default()
-        .merge(File::from_str(
+    let mut builder = Config::builder();
+
+    builder
+        .add_source(File::from_str(
             r#"
             {
                 "json_datetime": "2017-05-10T02:14:53Z"
             }
             "#,
             FileFormat::Json,
         ))
-        .unwrap()
-        .merge(File::from_str(
+        .add_source(File::from_str(
             r#"
             yaml_datetime: 2017-06-12T10:58:30Z
             "#,
             FileFormat::Yaml,
         ))
-        .unwrap()
-        .merge(File::from_str(
+        .add_source(File::from_str(
             r#"
             toml_datetime = 2017-05-11T14:55:15Z
             "#,
             FileFormat::Toml,
         ))
-        .unwrap()
-        .merge(File::from_str(
+        .add_source(File::from_str(
             r#"
             {
                 "hjson_datetime": "2017-05-10T02:14:53Z"
             }
             "#,
             FileFormat::Hjson,
         ))
-        .unwrap()
-        .merge(File::from_str(
+        .add_source(File::from_str(
             r#"
                 ini_datetime = 2017-05-10T02:14:53Z
             "#,
             FileFormat::Ini,
         ))
-        .unwrap()
-        .merge(File::from_str(
+        .add_source(File::from_str(
             r#"
             (
                 ron_datetime: "2021-04-19T11:33:02Z"
             )
             "#,
             FileFormat::Ron,
-        ))
-        .unwrap()
-        .clone()
+        ));
+
+    builder.build().unwrap()
 }
 
 #[test]

tests/errors.rs

@@ -10,17 +10,16 @@ use std::path::PathBuf;
 use config::*;
 
 fn make() -> Config {
-    let mut c = Config::default();
-    c.merge(File::new("tests/Settings", FileFormat::Toml))
-        .unwrap();
-
-    c
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings", FileFormat::Toml));
+    c.build().unwrap()
 }
 
 #[test]
 fn test_error_parse() {
-    let mut c = Config::default();
-    let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Toml));
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings-invalid", FileFormat::Toml));
+    let res = c.build();
 
     let path: PathBuf = ["tests", "Settings-invalid.toml"].iter().collect();
 
@@ -121,9 +120,9 @@ inner:
     test: ABC
 "#;
 
-    let mut cfg = Config::default();
-    cfg.merge(File::from_str(CFG, FileFormat::Yaml)).unwrap();
-    let e = cfg.try_into::<Outer>().unwrap_err();
+    let mut cfg = Config::builder();
+    cfg.add_source(File::from_str(CFG, FileFormat::Yaml));
+    let e = cfg.build().unwrap().try_into::<Outer>().unwrap_err();
     if let ConfigError::Type {
         key: Some(path), ..
     } = e

tests/file.rs

@@ -6,16 +6,18 @@ use config::*;
 
 #[test]
 fn test_file_not_required() {
-    let mut c = Config::default();
-    let res = c.merge(File::new("tests/NoSettings", FileFormat::Yaml).required(false));
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/NoSettings", FileFormat::Yaml).required(false));
+    let res = c.build();
 
     assert!(res.is_ok());
 }
 
 #[test]
 fn test_file_required_not_found() {
-    let mut c = Config::default();
-    let res = c.merge(File::new("tests/NoSettings", FileFormat::Yaml));
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/NoSettings", FileFormat::Yaml));
+    let res = c.build();
 
     assert!(res.is_err());
     assert_eq!(
@@ -26,18 +28,20 @@ fn test_file_required_not_found() {
 
 #[test]
 fn test_file_auto() {
-    let mut c = Config::default();
-    c.merge(File::with_name("tests/Settings-production"))
-        .unwrap();
+    let mut builder = Config::builder();
+    builder.add_source(File::with_name("tests/Settings-production"));
+
+    let c = builder.build().unwrap();
 
     assert_eq!(c.get("debug").ok(), Some(false));
     assert_eq!(c.get("production").ok(), Some(true));
 }
 
 #[test]
 fn test_file_auto_not_found() {
-    let mut c = Config::default();
-    let res = c.merge(File::with_name("tests/NoSettings"));
+    let mut c = Config::builder();
+    c.add_source(File::with_name("tests/NoSettings"));
+    let res = c.build();
 
     assert!(res.is_err());
     assert_eq!(
@@ -48,8 +52,10 @@ fn test_file_auto_not_found() {
 
 #[test]
 fn test_file_ext() {
-    let mut c = Config::default();
-    c.merge(File::with_name("tests/Settings.json")).unwrap();
+    let mut builder = Config::builder();
+    builder.add_source(File::with_name("tests/Settings.json"));
+
+    let c = builder.build().unwrap();
 
     assert_eq!(c.get("debug").ok(), Some(true));
     assert_eq!(c.get("production").ok(), Some(false));

tests/file_hjson.rs

@@ -35,11 +35,9 @@ struct Settings {
 }
 
 fn make() -> Config {
-    let mut c = Config::default();
-    c.merge(File::new("tests/Settings", FileFormat::Hjson))
-        .unwrap();
-
-    c
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings", FileFormat::Hjson));
+    c.build().unwrap()
 }
 
 #[test]
@@ -68,8 +66,9 @@ fn test_file() {
 
 #[test]
 fn test_error_parse() {
-    let mut c = Config::default();
-    let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Hjson));
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings-invalid", FileFormat::Hjson));
+    let res = c.build();
 
     let path: PathBuf = ["tests", "Settings-invalid.hjson"].iter().collect();
 

tests/file_ini.rs

@@ -28,10 +28,9 @@ struct Settings {
 }
 
 fn make() -> Config {
-    let mut c = Config::default();
-    c.merge(File::new("tests/Settings", FileFormat::Ini))
-        .unwrap();
-    c
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings", FileFormat::Ini));
+    c.build().unwrap()
 }
 
 #[test]
@@ -56,8 +55,9 @@ fn test_file() {
 
 #[test]
 fn test_error_parse() {
-    let mut c = Config::default();
-    let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Ini));
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings-invalid", FileFormat::Ini));
+    let res = c.build();
 
     let path: PathBuf = ["tests", "Settings-invalid.ini"].iter().collect();
 

tests/file_json.rs

@@ -35,11 +35,9 @@ struct Settings {
 }
 
 fn make() -> Config {
-    let mut c = Config::default();
-    c.merge(File::new("tests/Settings", FileFormat::Json))
-        .unwrap();
-
-    c
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings", FileFormat::Json));
+    c.build().unwrap()
 }
 
 #[test]
@@ -68,8 +66,9 @@ fn test_file() {
 
 #[test]
 fn test_error_parse() {
-    let mut c = Config::default();
-    let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Json));
+    let mut c = Config::builder();
+    c.add_source(File::new("tests/Settings-invalid", FileFormat::Json));
+    let res = c.build();
 
     let path_with_extension: PathBuf = ["tests", "Settings-invalid.json"].iter().collect();
 
@@ -85,17 +84,17 @@ fn test_error_parse() {
 
 #[test]
 fn test_json_vec() {
-    let c = Config::default()
-        .merge(File::from_str(
-            r#"
+    let mut builder = Config::builder();
+    builder.add_source(File::from_str(
+        r#"
             {
               "WASTE": ["example_dir1", "example_dir2"]
             }
             "#,
-            FileFormat::Json,
-        ))
-        .unwrap()
-        .clone();
+        FileFormat::Json,
+    ));
+
+    let c = builder.build().unwrap();
 
     let v = c.get_array("WASTE").unwrap();
     let mut vi = v.into_iter();