concepts: require two Post approvals

diff --git a/concepts/src/lib.rs b/concepts/src/lib.rs
index 923b80b451cbe86402e4c649859da5705c11d878..b0839ad391739cb186adcf2bb81c97484c5a3dfe 100644 (file)
--- a/concepts/src/lib.rs
+++ b/concepts/src/lib.rs
@@ -145,7 +145,7 @@ impl Post {
 
 trait State {
     fn request_review(&self) -> Box<dyn State>;
 
 trait State {
     fn request_review(&self) -> Box<dyn State>;

-    fn approve(&self) -> Box<dyn State>;
+    fn approve(&mut self) -> Box<dyn State>;

     fn reject(&self) -> Box<dyn State>;
 
     #[allow(unused_variables)]
     fn reject(&self) -> Box<dyn State>;
 
     #[allow(unused_variables)]


@@ -157,10 +157,10 @@ trait State {
 struct Draft {}
 impl State for Draft {
     fn request_review(&self) -> Box<dyn State> {
 struct Draft {}
 impl State for Draft {
     fn request_review(&self) -> Box<dyn State> {

-        Box::new(PendingReview {})
+        Box::new(PendingReview {acks: 0})

     }
 
     }
 

-    fn approve(&self) -> Box<dyn State> {
+    fn approve(&mut self) -> Box<dyn State> {

         // don't change state
         Box::new(Self {})
     }
         // don't change state
         Box::new(Self {})
     }


@@ -170,14 +170,21 @@ impl State for Draft {
     }
 }
 
     }
 }
 

-struct PendingReview {}
+struct PendingReview {
+    acks: u32,
+}
+

 impl State for PendingReview {
     fn request_review(&self) -> Box<dyn State> {
 impl State for PendingReview {
     fn request_review(&self) -> Box<dyn State> {

-        Box::new(Self {})
+        Box::new(Self {acks: self.acks})

     }
 
     }
 

-    fn approve(&self) -> Box<dyn State> {
-        Box::new(Published {})
+    fn approve(&mut self) -> Box<dyn State> {
+        if self.acks >= 1 {
+            Box::new(Published {})
+        } else {
+            Box::new(Self {acks: self.acks + 1})
+        }

     }
 
     fn reject(&self) -> Box<dyn State> {
     }
 
     fn reject(&self) -> Box<dyn State> {


@@ -191,7 +198,7 @@ impl State for Published {
         Box::new(Self {})
     }
 
         Box::new(Self {})
     }
 

-    fn approve(&self) -> Box<dyn State> {
+    fn approve(&mut self) -> Box<dyn State> {

         Box::new(Published {})
     }
 
         Box::new(Published {})
     }
 

diff --git a/concepts/src/main.rs b/concepts/src/main.rs
index 3e9bbbd0cd042234615d20dd563baf6278258464..20826216bbd4c0ec5a0e8e3cec408f507b28140b 100644 (file)
--- a/concepts/src/main.rs
+++ b/concepts/src/main.rs
@@ -262,7 +262,13 @@ fn test_dyn_traits() {
     post.request_review();
     assert_eq!("", post.content());
 
     post.request_review();
     assert_eq!("", post.content());
 

-    post.approve();
+    post.approve();  // first
+    assert_eq!("", post.content());
+
+    post.approve();  // second
+    assert_eq!(text, post.content());
+
+    post.reject();  // no-op

     assert_eq!(text, post.content());
 }
 
     assert_eq!(text, post.content());
 }