Attributes Iterator finalise cloudevents#3

Signed-off-by: Pranav Bhatt <adpranavb2000@gmail.com>

Author: pranav-bhatt

src/event/attributes.rs

@@ -71,7 +71,7 @@ pub(crate) trait DataAttributesWriter {
 }
 
 #[derive(PartialEq, Debug, Clone, Copy)]
-pub enum AttributesIter<'a> {
+pub(crate) enum AttributesIter<'a> {
     IterV03(AttributesIntoIteratorV03<'a>),
     IterV10(AttributesIntoIteratorV10<'a>),
 }

src/event/event.rs

@@ -79,7 +79,7 @@ impl Default for Event {
 
 impl Event {
     /// Returns an `Iterator` for `Attributes`
-    pub fn attributes_iter(&self) -> impl Iterator<Item = (&str, AttributeValue<'_>)> {
+    pub fn attributes_iter<'a>(&'a self) -> impl Iterator<Item = (&'a str, AttributeValue<'a>)> {
         match &self.attributes {
             Attributes::V03(a) => AttributesIter::IterV03(a.into_iter()),
             Attributes::V10(a) => AttributesIter::IterV10(a.into_iter()),

src/event/mod.rs

@@ -10,7 +10,8 @@ mod spec_version;
 mod types;
 
 pub use attributes::Attributes;
-pub use attributes::{AttributeValue, AttributesIter, AttributesReader, AttributesWriter};
+pub(crate) use attributes::AttributesIter;
+pub use attributes::{AttributeValue, AttributesReader, AttributesWriter};
 pub use builder::Error as EventBuilderError;
 pub use builder::EventBuilder;
 pub use data::Data;

src/event/v03/attributes.rs

@@ -52,25 +52,26 @@ impl<'a> Iterator for AttributesIntoIterator<'a> {
     type Item = (&'a str, AttributeValue<'a>);
     fn next(&mut self) -> Option<Self::Item> {
         let result = match self.index {
-            0 => Some(("id", AttributeValue::String(&self.attributes.id))),
-            1 => Some(("type", AttributeValue::String(&self.attributes.ty))),
-            2 => Some(("source", AttributeValue::URIRef(&self.attributes.source))),
-            3 => self
+            0 => Some(("specversion", AttributeValue::SpecVersion(SpecVersion::V03))),
+            1 => Some(("id", AttributeValue::String(&self.attributes.id))),
+            2 => Some(("type", AttributeValue::String(&self.attributes.ty))),
+            3 => Some(("source", AttributeValue::URIRef(&self.attributes.source))),
+            4 => self
                 .attributes
                 .datacontenttype
                 .as_ref()
                 .map(|v| ("datacontenttype", AttributeValue::String(v))),
-            4 => self
+            5 => self
                 .attributes
                 .schemaurl
                 .as_ref()
                 .map(|v| ("schemaurl", AttributeValue::URIRef(v))),
-            5 => self
+            6 => self
                 .attributes
                 .subject
                 .as_ref()
                 .map(|v| ("subject", AttributeValue::String(v))),
-            6 => self
+            7 => self
                 .attributes
                 .time
                 .as_ref()

src/event/v03/mod.rs

@@ -4,7 +4,7 @@ mod format;
 mod message;
 
 pub use attributes::Attributes;
-pub use attributes::AttributesIntoIterator;
+pub(crate) use attributes::AttributesIntoIterator;
 pub(crate) use attributes::ATTRIBUTE_NAMES;
 pub use builder::EventBuilder;
 pub(crate) use format::EventFormatDeserializer;

src/event/v10/attributes.rs

@@ -52,25 +52,26 @@ impl<'a> Iterator for AttributesIntoIterator<'a> {
     type Item = (&'a str, AttributeValue<'a>);
     fn next(&mut self) -> Option<Self::Item> {
         let result = match self.index {
-            0 => Some(("id", AttributeValue::String(&self.attributes.id))),
-            1 => Some(("type", AttributeValue::String(&self.attributes.ty))),
-            2 => Some(("source", AttributeValue::URIRef(&self.attributes.source))),
-            3 => self
+            0 => Some(("specversion", AttributeValue::SpecVersion(SpecVersion::V10))),
+            1 => Some(("id", AttributeValue::String(&self.attributes.id))),
+            2 => Some(("type", AttributeValue::String(&self.attributes.ty))),
+            3 => Some(("source", AttributeValue::URIRef(&self.attributes.source))),
+            4 => self
                 .attributes
                 .datacontenttype
                 .as_ref()
                 .map(|v| ("datacontenttype", AttributeValue::String(v))),
-            4 => self
+            5 => self
                 .attributes
                 .dataschema
                 .as_ref()
                 .map(|v| ("dataschema", AttributeValue::URI(v))),
-            5 => self
+            6 => self
                 .attributes
                 .subject
                 .as_ref()
                 .map(|v| ("subject", AttributeValue::String(v))),
-            6 => self
+            7 => self
                 .attributes
                 .time
                 .as_ref()

src/event/v10/mod.rs

@@ -4,7 +4,7 @@ mod format;
 mod message;
 
 pub use attributes::Attributes;
-pub use attributes::AttributesIntoIterator;
+pub(crate) use attributes::AttributesIntoIterator;
 pub(crate) use attributes::ATTRIBUTE_NAMES;
 pub use builder::EventBuilder;
 pub(crate) use format::EventFormatDeserializer;

tests/attributes_iter.rs

@@ -1,5 +1,6 @@
 mod test_data;
 use cloudevents::event::AttributeValue;
+use cloudevents::event::SpecVersion;
 use test_data::*;
 
 #[test]
@@ -8,7 +9,7 @@ fn iter_v10_test() {
     let mut iter_v10 = in_event.attributes_iter();
 
     assert_eq!(
-        ("id", AttributeValue::String("0001")),
+        ("specversion", AttributeValue::SpecVersion(SpecVersion::V10)),
         iter_v10.next().unwrap()
     );
 }
@@ -19,7 +20,7 @@ fn iter_v03_test() {
     let mut iter_v03 = in_event.attributes_iter();
 
     assert_eq!(
-        ("id", AttributeValue::String("0001")),
+        ("specversion", AttributeValue::SpecVersion(SpecVersion::V03)),
         iter_v03.next().unwrap()
     );
 }