Merge pull request softprops#134 from Veetaha/feat/impl-attr-for-into-from-attrs

Implement Attribute for FromAttributes + IntoAttributes

Author: softprops

dynomite-derive/src/lib.rs

@@ -289,30 +289,10 @@ fn make_dynomite_attributes(
     // impl ::dynomite::IntoAttributes for Name
     // impl From<Name> for ::dynomite::Attributes
     let to_attribute_map = get_to_attribute_map_trait(name, &item_fields);
-    // impl Attribute for Name (these are essentially just a map)
-    let attribute = quote!(::dynomite::Attribute);
-    let impl_attribute = quote! {
-        impl #attribute for #name {
-            fn into_attr(self: Self) -> ::dynomite::AttributeValue {
-                ::dynomite::AttributeValue {
-                    m: Some(self.into()),
-                    ..::dynomite::AttributeValue::default()
-                }
-            }
-            fn from_attr(value: ::dynomite::AttributeValue) -> std::result::Result<Self, ::dynomite::AttributeError> {
-                use ::dynomite::FromAttributes;
-                value
-                    .m
-                    .ok_or(::dynomite::AttributeError::InvalidType)
-                    .and_then(Self::from_attrs)
-            }
-        }
-    };
 
     Ok(quote! {
         #from_attribute_map
         #to_attribute_map
-        #impl_attribute
     })
 }
 

dynomite/src/lib.rs

@@ -390,7 +390,7 @@ pub type Attributes = HashMap<String, AttributeValue>;
 ///   #[dynomite(default)]
 ///   summary: Option<String>
 /// }
-pub trait Item: Into<Attributes> + FromAttributes {
+pub trait Item: IntoAttributes + FromAttributes {
     /// Returns the set of attributes which make up this item's primary key
     ///
     /// This is often used in item look ups
@@ -514,11 +514,11 @@ impl<A: Attribute> IntoAttributes for BTreeMap<String, A> {
     }
 }
 
-/// A Map type for Items, represented as the `M` AttributeValue type
-impl<T: Item> Attribute for T {
+/// A Map type for all hash-map-like values, represented as the `M` AttributeValue type
+impl<T: IntoAttributes + FromAttributes> Attribute for T {
     fn into_attr(self: Self) -> AttributeValue {
         AttributeValue {
-            m: Some(self.into()),
+            m: Some(self.into_attrs()),
             ..AttributeValue::default()
         }
     }
@@ -530,39 +530,6 @@ impl<T: Item> Attribute for T {
     }
 }
 
-/// A Map type for Items for HashMaps, represented as the `M` AttributeValue type
-#[allow(clippy::implicit_hasher)]
-impl<A: Attribute> Attribute for HashMap<String, A> {
-    fn into_attr(self: Self) -> AttributeValue {
-        AttributeValue {
-            m: Some(self.into_iter().map(|(k, v)| (k, v.into_attr())).collect()),
-            ..AttributeValue::default()
-        }
-    }
-    fn from_attr(value: AttributeValue) -> Result<Self, AttributeError> {
-        value
-            .m
-            .ok_or(AttributeError::InvalidType)
-            .and_then(Self::from_attrs) // because FromAttributes is impl by all HashMap<String, A>
-    }
-}
-
-/// A Map type for `Items` for `BTreeMaps`, represented as the `M` AttributeValue type
-impl<A: Attribute> Attribute for BTreeMap<String, A> {
-    fn into_attr(self: Self) -> AttributeValue {
-        AttributeValue {
-            m: Some(self.into_iter().map(|(k, v)| (k, v.into_attr())).collect()),
-            ..AttributeValue::default()
-        }
-    }
-    fn from_attr(value: AttributeValue) -> Result<Self, AttributeError> {
-        value
-            .m
-            .ok_or(AttributeError::InvalidType)
-            .and_then(Self::from_attrs) // because FromAttributes is impl by all BTreeMap<String, A>
-    }
-}
-
 /// A `String` type for `Uuids`, represented by the `S` AttributeValue type
 #[cfg(feature = "uuid")]
 impl Attribute for Uuid {