Merge branch 'feat/query-http-method'

Author: Julien-cpsn

README.md

@@ -168,6 +168,7 @@ cargo run -- -h
 | Methods                                                                        | :white_check_mark:                                                                  | :white_check_mark:   | :white_check_mark:       |
 | - GET                                                                          | :white_check_mark:                                                                  | :white_check_mark:   | :white_check_mark:       |
 | - POST                                                                         | :white_check_mark:                                                                  | :white_check_mark:   | :white_check_mark:       |
+| - QUERY                                                                        | :white_check_mark:                                                                  | :x:                  | :x:                      |
 | - PUT                                                                          | :white_check_mark:                                                                  | :white_check_mark:   | :white_check_mark:       |
 | - PATCH                                                                        | :white_check_mark:                                                                  | :white_check_mark:   | :white_check_mark:       |
 | - DELETE                                                                       | :white_check_mark:                                                                  | :white_check_mark:   | :white_check_mark:       |

example_resources/collections/HTTP_methods.json

@@ -133,6 +133,67 @@
         }
       }
     },
+    {
+      "name": "Test Query",
+      "url": "https://httpbin.org",
+      "params": [],
+      "headers": [
+        {
+          "enabled": true,
+          "data": [
+            "cache-control",
+            "no-cache"
+          ]
+        },
+        {
+          "enabled": true,
+          "data": [
+            "user-agent",
+            "ATAC/v0.23.0"
+          ]
+        },
+        {
+          "enabled": true,
+          "data": [
+            "accept",
+            "*/*"
+          ]
+        },
+        {
+          "enabled": true,
+          "data": [
+            "accept-encoding",
+            "gzip, deflate, br"
+          ]
+        },
+        {
+          "enabled": true,
+          "data": [
+            "connection",
+            "keep-alive"
+          ]
+        }
+      ],
+      "auth": "no_auth",
+      "scripts": {
+        "pre_request_script": null,
+        "post_request_script": null
+      },
+      "settings": {
+        "use_config_proxy": true,
+        "allow_redirects": true,
+        "timeout": 30000,
+        "store_received_cookies": true,
+        "pretty_print_response_content": true,
+        "accept_invalid_certs": false,
+        "accept_invalid_hostnames": false
+      },
+      "protocol": {
+        "type": "http",
+        "method": "QUERY",
+        "body": "no_body"
+      }
+    },
     {
       "name": "Test Put",
       "url": "https://httpbin.org/put",

src/app/files/theme.rs

@@ -49,6 +49,8 @@ nest! {
                     pub get: Color,
                     #[serde(alias = "POST")]
                     pub post: Color,
+                    #[serde(alias = "QUERY")]
+                    pub query: Color,
                     #[serde(alias = "PUT")]
                     pub put: Color,
                     #[serde(alias = "PATCH")]
@@ -118,6 +120,7 @@ impl Default for Theme {
                 methods: ThemeMethods {
                     get: Color::Green,
                     post: Color::Yellow,
+                    query: Color::LightGreen,
                     put: Color::LightBlue,
                     patch: Color::LightCyan,
                     delete: Color::LightRed,

src/cli/commands/request_commands/method.rs

@@ -8,7 +8,7 @@ pub enum MethodCommand {
 
     /// Set the request method
     Set {
-        /// Method (GET, POST, PUT, PATCH, DELETE, HEAD, OPTION)
+        /// Method (GET, POST, QUERY, PUT, PATCH, DELETE, OPTIONS, HEAD, TRACE, CONNECT)
         new_method: Method
     }
 }

src/models/protocol/http/method.rs

@@ -10,6 +10,8 @@ pub enum Method {
     GET,
     #[strum(to_string = "POST")]
     POST,
+    #[strum(to_string = "QUERY")]
+    QUERY,
     #[strum(to_string = "PUT")]
     PUT,
     #[strum(to_string = "PATCH")]
@@ -33,6 +35,7 @@ impl Method {
         match self {
             Method::GET => theme.http.methods.get,
             Method::POST => theme.http.methods.post,
+            Method::QUERY => theme.http.methods.query,
             Method::PUT => theme.http.methods.put,
             Method::PATCH => theme.http.methods.patch,
             Method::DELETE => theme.http.methods.delete,
@@ -47,6 +50,8 @@ impl Method {
         match self {
             Method::GET => reqwest::Method::GET,
             Method::POST => reqwest::Method::POST,
+            // TODO: Remove when Reqwest supports the QUERY method
+            Method::QUERY => reqwest::Method::from_bytes(b"QUERY").expect("QUERY is a valid HTTP method token"),
             Method::PUT => reqwest::Method::PUT,
             Method::PATCH => reqwest::Method::PATCH,
             Method::DELETE => reqwest::Method::DELETE,
@@ -61,7 +66,8 @@ impl Method {
 pub fn next_method(method: &Method) -> Method {
     match method {
         &Method::GET => Method::POST,
-        &Method::POST => Method::PUT,
+        &Method::POST => Method::QUERY,
+        &Method::QUERY => Method::PUT,
         &Method::PUT => Method::PATCH,
         &Method::PATCH => Method::DELETE,
         &Method::DELETE => Method::OPTIONS,