refactor: extract AnsibleHost and SshPrivateKeyFile types into separate modules

- Extract AnsibleHost wrapper type into ansible_host.rs module
- Extract SshPrivateKeyFile wrapper type into ssh_private_key_file.rs module
- Refactor inventory/mod.rs to import and re-export the types
- Maintain all existing functionality and tests (13 tests still pass)
- Improve code organization and maintainability through separation of concerns

Author: josecelano

src/template/wrappers/ansible/inventory/ansible_host.rs

@@ -0,0 +1,64 @@
+//! Ansible host wrapper type for IP address validation and serialization
+
+use anyhow::{Context, Result};
+use serde::Serialize;
+use std::fmt;
+use std::net::IpAddr;
+use std::str::FromStr;
+
+/// Wrapper type for Ansible host address using the newtype pattern
+///
+/// Ansible's `ansible_host` can contain:
+/// - Hostnames (e.g., "server.example.com")
+/// - FQDN (e.g., "www.example.com")
+/// - IP addresses (IPv4/IPv6)
+/// - Custom connection aliases
+/// - SSH proxy configurations
+///
+/// For this implementation, we only support IP addresses (IPv4 and IPv6) for simplicity.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AnsibleHost(IpAddr);
+
+impl AnsibleHost {
+    /// Create a new `AnsibleHost` from an IP address
+    #[must_use]
+    pub fn new(ip: IpAddr) -> Self {
+        Self(ip)
+    }
+
+    /// Get the inner IP address
+    #[must_use]
+    pub fn as_ip_addr(&self) -> &IpAddr {
+        &self.0
+    }
+
+    /// Convert to string representation
+    #[must_use]
+    pub fn as_str(&self) -> String {
+        self.0.to_string()
+    }
+}
+
+impl FromStr for AnsibleHost {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let ip = IpAddr::from_str(s).with_context(|| format!("Invalid IP address format: {s}"))?;
+        Ok(Self(ip))
+    }
+}
+
+impl fmt::Display for AnsibleHost {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl Serialize for AnsibleHost {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&self.0.to_string())
+    }
+}

…c/template/wrappers/ansible/inventory.rs …mplate/wrappers/ansible/inventory/mod.rssrc/template/wrappers/ansible/inventory.rs renamed to src/template/wrappers/ansible/inventory/mod.rs src/template/wrappers/ansible/inventory.rs renamed to src/template/wrappers/ansible/inventory/mod.rs

@@ -2,122 +2,19 @@
 //!
 //! This template has mandatory variables that must be provided at construction time.
 
+pub mod ansible_host;
+pub mod ssh_private_key_file;
+
 use crate::template::file::File;
 use crate::template::{StaticContext, TemplateRenderer};
 use anyhow::{Context, Result};
 use serde::Serialize;
-use std::fmt;
 use std::fs;
-use std::net::IpAddr;
 use std::path::Path;
 use std::str::FromStr;
 
-/// Wrapper type for Ansible host address using the newtype pattern
-///
-/// Ansible's `ansible_host` can contain:
-/// - Hostnames (e.g., "server.example.com")
-/// - FQDN (e.g., "www.example.com")
-/// - IP addresses (IPv4/IPv6)
-/// - Custom connection aliases
-/// - SSH proxy configurations
-///
-/// For this implementation, we only support IP addresses (IPv4 and IPv6) for simplicity.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct AnsibleHost(IpAddr);
-
-impl AnsibleHost {
-    /// Create a new `AnsibleHost` from an IP address
-    #[must_use]
-    pub fn new(ip: IpAddr) -> Self {
-        Self(ip)
-    }
-
-    /// Get the inner IP address
-    #[must_use]
-    pub fn as_ip_addr(&self) -> &IpAddr {
-        &self.0
-    }
-
-    /// Convert to string representation
-    #[must_use]
-    pub fn as_str(&self) -> String {
-        self.0.to_string()
-    }
-}
-
-impl FromStr for AnsibleHost {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let ip = IpAddr::from_str(s).with_context(|| format!("Invalid IP address format: {s}"))?;
-        Ok(Self(ip))
-    }
-}
-
-impl fmt::Display for AnsibleHost {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Serialize for AnsibleHost {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.0.to_string())
-    }
-}
-
-/// Wrapper type for SSH private key file path using the newtype pattern
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SshPrivateKeyFile(String);
-
-impl SshPrivateKeyFile {
-    /// Create a new `SshPrivateKeyFile` from a string path
-    pub fn new<S: Into<String>>(path: S) -> Self {
-        Self(path.into())
-    }
-
-    /// Get the inner path as a string reference
-    #[must_use]
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-
-    /// Get the inner path as a string
-    #[must_use]
-    pub fn as_string(&self) -> String {
-        self.0.clone()
-    }
-}
-
-impl From<&str> for SshPrivateKeyFile {
-    fn from(path: &str) -> Self {
-        Self::new(path)
-    }
-}
-
-impl From<String> for SshPrivateKeyFile {
-    fn from(path: String) -> Self {
-        Self(path)
-    }
-}
-
-impl fmt::Display for SshPrivateKeyFile {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Serialize for SshPrivateKeyFile {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.0)
-    }
-}
+pub use ansible_host::AnsibleHost;
+pub use ssh_private_key_file::SshPrivateKeyFile;
 
 #[derive(Debug)]
 pub struct InventoryTemplate {

src/template/wrappers/ansible/inventory/ssh_private_key_file.rs

@@ -0,0 +1,54 @@
+//! SSH private key file wrapper type for path handling and serialization
+
+use serde::Serialize;
+use std::fmt;
+
+/// Wrapper type for SSH private key file path using the newtype pattern
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SshPrivateKeyFile(String);
+
+impl SshPrivateKeyFile {
+    /// Create a new `SshPrivateKeyFile` from a string path
+    pub fn new<S: Into<String>>(path: S) -> Self {
+        Self(path.into())
+    }
+
+    /// Get the inner path as a string reference
+    #[must_use]
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+
+    /// Get the inner path as a string
+    #[must_use]
+    pub fn as_string(&self) -> String {
+        self.0.clone()
+    }
+}
+
+impl From<&str> for SshPrivateKeyFile {
+    fn from(path: &str) -> Self {
+        Self::new(path)
+    }
+}
+
+impl From<String> for SshPrivateKeyFile {
+    fn from(path: String) -> Self {
+        Self(path)
+    }
+}
+
+impl fmt::Display for SshPrivateKeyFile {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl Serialize for SshPrivateKeyFile {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&self.0)
+    }
+}