From 5bdc9a65c89eb86d5b923b23bd2e0b6b8c5a451e Mon Sep 17 00:00:00 2001
From: Jerboa-app <dev@jerboa.app>
Date: Thu, 25 Jan 2024 08:15:21 +0000
Subject: [PATCH 1/3] adds multiple selection criteria, version output

---
 Cargo.toml              |   3 +-
 src/lib.rs              |  18 +++++++
 src/main.rs             |   9 ++++
 src/main_http.rs        |  11 ++++-
 src/web/event.rs        |  76 ++++++++++++++++++-----------
 tests/event_config.json |  32 +++++++++----
 tests/test_template.rs  | 104 +++++++++++++++++++++++++++++++++++++---
 7 files changed, 209 insertions(+), 44 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index db2635c..e80b73b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pulse"
-version = "0.0.3"
+version = "0.0.4"
 authors = ["Jerboa"]
 
 edition="2021"
@@ -33,6 +33,7 @@ serde = {version="1.0", features=["derive"]}
 serde_json = "1.0"
 reqwest = { version = "0.11", features = ["json"] }
 regex = "1.10.2"
+semver = "1.0.20"
 
 [profile.dev]
 opt-level = 0
diff --git a/src/lib.rs b/src/lib.rs
index 9fe5d2e..e6899d4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,14 @@
+use semver::{BuildMetadata, Prerelease, Version};
+
 pub mod web;
 pub mod server;
 pub mod stats;
 pub mod util;
 
+const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR");
+const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");
+const PATCH: &str = env!("CARGO_PKG_VERSION_PATCH");
+
 const DEBUG: bool = true;
 
 pub fn debug(msg: String, context: Option<String>)
@@ -15,4 +21,16 @@ pub fn debug(msg: String, context: Option<String>)
         None => println!("[DEBUG] {msg}")
     }
     
+}
+
+pub fn program_version() -> Version 
+{
+    Version
+    {
+        major: MAJOR.parse().unwrap(),
+        minor: MINOR.parse().unwrap(),
+        patch: PATCH.parse().unwrap(),
+        pre: Prerelease::EMPTY,
+        build: BuildMetadata::EMPTY
+    }
 }
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index fff7843..f38e4e7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,17 @@
 use pulse::server::https::Server;
+use pulse::program_version;
 
 #[tokio::main]
 async fn main() {
 
+    let args: Vec<String> = std::env::args().collect();
+    
+    if args.iter().any(|x| x == "-v")
+    {
+        println!("Version: {}", program_version());
+        std::process::exit(0);
+    }
+
     let server = Server::new(0,0,0,0);
 
     server.serve().await;
diff --git a/src/main_http.rs b/src/main_http.rs
index b4755d7..02c492c 100644
--- a/src/main_http.rs
+++ b/src/main_http.rs
@@ -1,11 +1,20 @@
 #[cfg(feature = "http")]
 
-use pulse::{server::http::ServerHttp, stats};
+use pulse::server::http::ServerHttp;
+use pulse::program_version;
 
 #[cfg(feature = "http")]
 #[tokio::main]
 async fn main() {
 
+    let args: Vec<String> = std::env::args().collect();
+    
+    if args.iter().any(|x| x == "-v")
+    {
+        println!("Version: {}", program_version());
+        std::process::exit(0);
+    }
+
     let server = ServerHttp::new(0,0,0,0);
 
     server.serve().await;
diff --git a/src/web/event.rs b/src/web/event.rs
index 476a887..5b1f78d 100644
--- a/src/web/event.rs
+++ b/src/web/event.rs
@@ -15,21 +15,32 @@ pub const CONFIG_PATH: &str = "event_config.json";
 const TEMPLATE_REPLACE_REGEX: &str = "<[^<>]+>";
 
 #[derive(Clone, Serialize, Deserialize)]
-pub struct Template
+pub struct Criterion
 {
     #[serde(default)]
     check_value_path: String,
     #[serde(default)]
-    check_value: String,
+    check_value_in: Vec<String>,
+    #[serde(default)]
+    check_value_not_in: Vec<String>
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+pub struct Template
+{
+    #[serde(default="default_criteria")]
+    criteria: Vec<Criterion>,
     #[serde(default)]
     body: String
 }
 
+fn default_criteria() -> Vec<Criterion> { Vec::<Criterion>::new() }
+
 impl Template 
 {
     pub fn new() -> Template
     {
-        Template {check_value_path: String::new(), check_value: String::new(), body: String::new()}
+        Template {criteria: Vec::<Criterion>::new(), body: String::new()}
     }
 }
 
@@ -171,40 +182,49 @@ pub fn expand_template(template: String, data: HashMap<String, serde_json::Value
     Some(formatted)
 }
 
+pub fn satisfied(criterion: Criterion, data: &HashMap<String, serde_json::Value>) -> bool
+{
+    let path: Vec<&str> = criterion.check_value_path.split("/").collect();
+        
+    let extracted_value= match path.len()
+    {
+        0 => None,
+        1 => Some(&data[path[0]]),
+        _ => 
+        {
+            let p = ["/", &path[1..path.len()].join("/")].join("");
+            data[path[0]].pointer(&p)
+        }
+    };
+
+    if extracted_value.is_none()
+    {
+        return false
+    }
+
+    let string_value = extracted_value.unwrap().to_string().replace("\"", "");
+
+    if (criterion.check_value_in.is_empty() || criterion.check_value_in.contains(&string_value)) &&
+        (criterion.check_value_not_in.is_empty() || !criterion.check_value_not_in.contains(&string_value))
+    {
+        return true
+    }
+    else
+    {
+        return false
+    }
+}
+
 pub fn select_template(templates: Vec<Template>, data: HashMap<String, serde_json::Value>) -> String
 {
     if templates.is_empty()
     {
         return "".to_string()
     }
-    else if templates.len() == 1 
-    {
-        return templates[0].body.clone()
-    }
 
     for template in templates
     {
-        let path: Vec<&str> = template.check_value_path.split("/").collect();
-        
-        let extracted_value= match path.len()
-        {
-            0 => None,
-            1 => Some(&data[path[0]]),
-            _ => 
-            {
-                let p = ["/", &path[1..path.len()].join("/")].join("");
-                data[path[0]].pointer(&p)
-            }
-        };
-
-        if extracted_value.is_none()
-        {
-            continue
-        }
-
-        let string_value = extracted_value.unwrap().to_string().replace("\"", "");
-
-        if string_value == template.check_value
+        if template.criteria.into_iter().all(|c| satisfied(c, &data))
         {
             return template.body
         }
diff --git a/tests/event_config.json b/tests/event_config.json
index 2b687d1..3ae8a0c 100644
--- a/tests/event_config.json
+++ b/tests/event_config.json
@@ -5,8 +5,14 @@
         "templates":
         [ 
             {
-                "check_value_path": "",
-                "check_value": "",
+                "criteria": 
+                [
+                    {
+                        "check_value_path": "",
+                        "check_value_in": [],
+                        "check_value_not_in": []
+                    }
+                ],
                 "body": "New release!"
             }
         ],
@@ -19,13 +25,25 @@
         "templates":
         [
             {
-                "check_value_path": "action",
-                "check_value": "created",
+                "criteria": 
+                [
+                    {
+                        "check_value_path": "action",
+                        "check_value_in": ["created"],
+                        "check_value_not_in": []
+                    }
+                ],
                 "body": "<repository/name> just got a new star! That makes <repository/stargazers_count>"
             },
             {
-                "check_value_path": "action",
-                "check_value": "deleted",
+                "criteria": 
+                [
+                    {
+                        "check_value_path": "action",
+                        "check_value_in": ["deleted"],
+                        "check_value_not_in": []
+                    }
+                ],
                 "body": "<repository/name> just lost a star :cry: That makes <repository/stargazers_count>"
             }
         ],
@@ -45,8 +63,6 @@
         "templates":
         [
             {
-                "check_value_path": "",
-                "check_value": "",
                 "body": "Ping!"
             }
         ],
diff --git a/tests/test_template.rs b/tests/test_template.rs
index a6a1c4c..5426dbc 100644
--- a/tests/test_template.rs
+++ b/tests/test_template.rs
@@ -15,8 +15,6 @@ mod test_template
     const SINGLE_JSON_TEMPLATE: &str = r#"
     [ 
             {
-                "check_value_path": "",
-                "check_value": "",
                 "body": "New release!"
             }
     ]
@@ -30,18 +28,88 @@ mod test_template
     const STAR_JSON_TEMPLATE: &str = r#"
     [
         {
-            "check_value_path": "action",
-            "check_value": "created",
+            "criteria": 
+            [
+                {
+                    "check_value_path": "action",
+                    "check_value_in": ["created"],
+                    "check_value_not_in": []
+                }
+            ],
             "body": "New star!"
         },
         {
-            "check_value_path": "action",
-            "check_value": "deleted",
+            "criteria": 
+            [
+                {
+                    "check_value_path": "action",
+                    "check_value_in": ["deleted"],
+                    "check_value_not_in": []
+                }
+            ],
             "body": "Lost a star!"
         }
     ]
     "#;
 
+    const STAR_CREATED_NOT_JERBOA_APP_JSON_TEMPLATE: &str = r#"
+    [
+        {
+            "criteria": 
+            [
+                {
+                    "check_value_path": "action",
+                    "check_value_in": ["created"],
+                    "check_value_not_in": []
+                },
+                {
+                    "check_value_path": "sender/login",
+                    "check_value_in": [],
+                    "check_value_not_in": ["Jerboa-app"]
+                }
+            ],
+            "body": "New star!"
+        }
+    ]
+    "#;
+
+    const STAR_CREATED_JERBOA_APP_JSON_TEMPLATE: &str = r#"
+    [
+        {
+            "criteria": 
+            [
+                {
+                    "check_value_path": "action",
+                    "check_value_in": ["created"],
+                    "check_value_not_in": []
+                },
+                {
+                    "check_value_path": "sender/login",
+                    "check_value_in": [],
+                    "check_value_not_in": ["Jerboa-app"]
+                }
+            ],
+            "body": "New star!"
+        },
+        {
+            "criteria": 
+            [
+                {
+                    "check_value_path": "action",
+                    "check_value_in": ["created"],
+                    "check_value_not_in": []
+                },
+                {
+                    "check_value_path": "sender/login",
+                    "check_value_in": ["Jerboa-app"],
+                    "check_value_not_in": []
+                }
+            ],
+            "body": "New star from Jerboa!"
+        }
+    ]
+    "#;
+
     #[test]
     fn issue_format_ok()
     {
@@ -112,6 +180,30 @@ mod test_template
         assert_eq!(selected, "Lost a star!".to_string())
     }
 
+    #[test]
+    fn select_star_create_not_user_json_templates()
+    {
+        let templates: Vec<Template> = serde_json::from_str(STAR_CREATED_NOT_JERBOA_APP_JSON_TEMPLATE).unwrap();
+
+        let parsed_data: HashMap<String, serde_json::Value> = serde_json::from_str(STAR_CREATED_PAYLOAD).unwrap();
+
+        let selected = select_template(templates, parsed_data);
+
+        assert_eq!(selected, "".to_string())
+    }
+
+    #[test]
+    fn select_star_create_is_user_json_templates()
+    {
+        let templates: Vec<Template> = serde_json::from_str(STAR_CREATED_JERBOA_APP_JSON_TEMPLATE).unwrap();
+
+        let parsed_data: HashMap<String, serde_json::Value> = serde_json::from_str(STAR_CREATED_PAYLOAD).unwrap();
+
+        let selected = select_template(templates, parsed_data);
+
+        assert_eq!(selected, "New star from Jerboa!".to_string())
+    }
+
     #[test]
     fn select_path_not_found()
     {

From eab56b53fec1ed96ea80cefb08665d6f915c80fb Mon Sep 17 00:00:00 2001
From: Jerboa-app <dev@jerboa.app>
Date: Thu, 25 Jan 2024 08:17:58 +0000
Subject: [PATCH 2/3] add pr workflow

---
 .github/workflows/build-and-test.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/build-and-test.yml

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..7c89858
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,23 @@
+name: Build and test
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build_test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-20.04, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: setup rust stable
+      run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+    - name: unit tests
+      run: |
+        cp tests/*.json .
+        cargo test --all --release
\ No newline at end of file

From 8d07fd28580537da8385f2c80b74e5b8d04c7db8 Mon Sep 17 00:00:00 2001
From: Jerboa-app <dev@jerboa.app>
Date: Thu, 25 Jan 2024 08:27:24 +0000
Subject: [PATCH 3/3] check for empty criteria

---
 src/web/event.rs | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/web/event.rs b/src/web/event.rs
index 5b1f78d..543a9b9 100644
--- a/src/web/event.rs
+++ b/src/web/event.rs
@@ -184,16 +184,40 @@ pub fn expand_template(template: String, data: HashMap<String, serde_json::Value
 
 pub fn satisfied(criterion: Criterion, data: &HashMap<String, serde_json::Value>) -> bool
 {
+
+    if criterion.check_value_path == ""
+    {
+        return true
+    }
+
     let path: Vec<&str> = criterion.check_value_path.split("/").collect();
         
     let extracted_value= match path.len()
     {
         0 => None,
-        1 => Some(&data[path[0]]),
+        1 => 
+        { 
+            if data.contains_key(path[0])
+            {
+                Some(&data[path[0]])
+            }
+            else
+            {
+                None
+            }
+        },
         _ => 
         {
             let p = ["/", &path[1..path.len()].join("/")].join("");
-            data[path[0]].pointer(&p)
+            if data.contains_key(path[0])
+            {
+                data[path[0]].pointer(&p)
+            }
+            else
+            {
+                None
+            }
+            
         }
     };