add support for HTTPie's --raw flag

README.md

@@ -49,6 +49,7 @@ OPTIONS:
     -j, --json                           (default) Serialize data items from the command line as a JSON object
     -f, --form                           Serialize data items from the command line as form fields
     -m, --multipart                      Like --form, but force a multipart/form-data request even without files
+        --raw <RAW>                      Pass raw request data without extra processing
         --pretty <STYLE>                 Controls output processing [possible values: all, colors, format, none]
     -s, --style <THEME>                  Output coloring style [possible values: auto, solarized, monokai]
         --response-charset <ENCODING>    Override the response encoding for terminal display purposes

src/cli.rs

@@ -61,6 +61,10 @@ pub struct Cli {
     #[structopt(short = "m", long, overrides_with_all = &["json", "form"])]
     pub multipart: bool,
 
+    /// Pass raw request data without extra processing.
+    #[structopt(long, value_name = "RAW")]
+    pub raw: Option<String>,
+
     /// Controls output processing.
     #[structopt(long, possible_values = &Pretty::variants(), case_insensitive = true, value_name = "STYLE")]
     pub pretty: Option<Pretty>,
@@ -365,6 +369,7 @@ const NEGATION_FLAGS: &[&str] = &[
     "--no-print",
     "--no-proxy",
     "--no-quiet",
+    "--no-raw",
     "--no-response-charset",
     "--no-response-mime",
     "--no-session",

src/main.rs

@@ -102,10 +102,25 @@ fn run(args: Cli) -> Result<i32> {
 
     let ignore_stdin = args.ignore_stdin || atty::is(Stream::Stdin) || test_pretend_term();
     let body_type = args.request_items.body_type;
-    let mut body = args.request_items.body()?;
-    if !ignore_stdin {
-        if !body.is_empty() {
-            if body.is_multipart() {
+    let body_from_request_items = args.request_items.body()?;
+
+    let body = match (!ignore_stdin, args.raw, !body_from_request_items.is_empty()) {
+        (true, None, false) => {
+            let mut buffer = Vec::new();
+            stdin().read_to_end(&mut buffer)?;
+            Body::Raw(buffer)
+        }
+        (false, Some(raw), false) => Body::Raw(raw.as_bytes().to_vec()),
+        (false, None, _) => body_from_request_items,
+
+        (true, Some(_), _) => {
+            return Err(anyhow!(
+                "Request body from stdin and --raw cannot be mixed. \
+                Pass --ignore-stdin to ignore standard input."
+            ))
+        }
+        (true, _, true) => {
+            if args.multipart {
                 return Err(anyhow!("Cannot build a multipart request body from stdin"));
             } else {
                 return Err(anyhow!(
@@ -114,10 +129,16 @@ fn run(args: Cli) -> Result<i32> {
                 ));
             }
         }
-        let mut buffer = Vec::new();
-        stdin().read_to_end(&mut buffer)?;
-        body = Body::Raw(buffer);
-    }
+        (_, Some(_), true) => {
+            if args.multipart {
+                return Err(anyhow!("Cannot build a multipart request body from --raw"));
+            } else {
+                return Err(anyhow!(
+                    "Request body (from --raw) and request data (key=value) cannot be mixed."
+                ));
+            }
+        }
+    };
 
     let method = args.method.unwrap_or_else(|| body.pick_method());
     let timeout = args.timeout.and_then(|t| t.as_duration());

src/request_items.rs

@@ -247,10 +247,6 @@ impl Body {
             Method::POST
         }
     }
-
-    pub fn is_multipart(&self) -> bool {
-        matches!(self, Body::Multipart(..))
-    }
 }
 
 impl RequestItems {

tests/cli.rs

@@ -1350,6 +1350,30 @@ fn mixed_stdin_request_items() {
         ));
 }
 
+#[test]
+fn mixed_stdin_raw() {
+    let input_file = tempfile().unwrap();
+    redirecting_command()
+        .args(&["--offline", "--raw=hello", ":"])
+        .stdin(input_file)
+        .assert()
+        .failure()
+        .stderr(contains(
+            "Request body from stdin and --raw cannot be mixed",
+        ));
+}
+
+#[test]
+fn mixed_raw_request_items() {
+    get_command()
+        .args(&["--offline", "--raw=hello", ":", "x=3"])
+        .assert()
+        .failure()
+        .stderr(contains(
+            "Request body (from --raw) and request data (key=value) cannot be mixed",
+        ));
+}
+
 #[test]
 fn multipart_stdin() {
     let input_file = tempfile().unwrap();
@@ -1361,6 +1385,15 @@ fn multipart_stdin() {
         .stderr(contains("Cannot build a multipart request body from stdin"));
 }
 
+#[test]
+fn multipart_raw() {
+    get_command()
+        .args(&["--offline", "--raw=hello", "--multipart", ":"])
+        .assert()
+        .failure()
+        .stderr(contains("Cannot build a multipart request body from --raw"));
+}
+
 #[test]
 fn default_json_for_raw_body() {
     let server = server::http(|req| async move {