Merge pull request #11 from jmjoy/0.2.0-alpha.2-dev

Author: jmjoy

examples/hello/src/lib.rs

@@ -62,7 +62,7 @@ pub fn get_module() -> Module {
     );
 
     // register classes
-    let mut foo_class = DynamicClass::new();
+    let mut foo_class = DynamicClass::new("FooClass");
     foo_class.add_property("foo", "100".to_string());
     foo_class.add_method(
         "getFoo",
@@ -80,7 +80,7 @@ pub fn get_module() -> Module {
         },
         vec![Argument::by_val("foo")],
     );
-    module.add_class("FooClass", foo_class);
+    module.add_class(foo_class);
 
     module
 }

examples/hello/tests/php/test.php

@@ -26,6 +26,6 @@
 
 function assert_eq($left, $right) {
     if ($left !== $right) {
-        throw new Exception(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));
+        throw new AssertionError(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));
     }
 }

examples/http-client/Cargo.toml

@@ -12,8 +12,12 @@ license = "Unlicense"
 crate-type = ["cdylib"]
 
 [dependencies]
+anyhow = "1.0.40"
+bytes = "1.0.1"
+indexmap = "1.6.2"
 phper = { version = "0.2.0-alpha.2", path = "../../phper" }
 reqwest = { version = "0.11.3", features = ["blocking"] }
+thiserror = "1.0.24"
 
 [dev-dependencies]
 phper-test = { version = "0.2.0-alpha.2", path = "../../phper-test" }

examples/http-client/src/client.rs

@@ -0,0 +1,44 @@
+use crate::{
+    errors::HttpClientError,
+    response::{ReadiedResponse, RESPONSE_CLASS_NAME},
+};
+
+use phper::{classes::DynamicClass, functions::Argument, objects::Object};
+use reqwest::blocking::{Client, ClientBuilder};
+use std::time::Duration;
+
+const HTTP_CLIENT_CLASS_NAME: &'static str = "HttpClient\\HttpClient";
+
+pub fn make_client_class() -> DynamicClass<Client> {
+    let mut class = DynamicClass::new_with_constructor(HTTP_CLIENT_CLASS_NAME, || {
+        let client = ClientBuilder::new()
+            .timeout(Duration::from_secs(15))
+            .build()?;
+        Ok::<_, HttpClientError>(client)
+    });
+
+    class.add_method(
+        "get",
+        |this, arguments| {
+            let url = arguments[0].as_string()?;
+            let client = this.as_state();
+            let response = client.get(url).send()?;
+
+            let readied_response = ReadiedResponse {
+                status: response.status(),
+                remote_addr: response.remote_addr(),
+                headers: response.headers().clone(),
+                body: response.bytes()?,
+            };
+
+            let mut response_object =
+                Object::<Option<ReadiedResponse>>::new_by_class_name(RESPONSE_CLASS_NAME)?;
+            *response_object.as_mut_state() = Some(readied_response);
+
+            Ok::<_, HttpClientError>(response_object)
+        },
+        vec![Argument::by_val("url")],
+    );
+
+    class
+}

examples/http-client/src/errors.rs

@@ -0,0 +1,27 @@
+use phper::{
+    classes::{ClassEntry, DynamicClass, StatelessClassEntry},
+    errors::Throwable,
+};
+
+const EXCEPTION_CLASS_NAME: &'static str = "HttpClient\\HttpClientException";
+
+#[derive(thiserror::Error, Debug)]
+pub enum HttpClientError {
+    #[error(transparent)]
+    Phper(#[from] phper::Error),
+
+    #[error(transparent)]
+    Reqwest(#[from] reqwest::Error),
+}
+
+impl Throwable for HttpClientError {
+    fn class_entry(&self) -> &StatelessClassEntry {
+        ClassEntry::from_globals(EXCEPTION_CLASS_NAME).unwrap()
+    }
+}
+
+pub fn make_exception_class() -> DynamicClass<()> {
+    let mut exception_class = DynamicClass::new(EXCEPTION_CLASS_NAME);
+    exception_class.extends("Exception");
+    exception_class
+}

examples/http-client/src/http_client.rs

@@ -1,6 +1,11 @@
-use phper::{classes::DynamicClass, modules::Module, php_get_module};
+use crate::{
+    client::make_client_class, errors::make_exception_class, response::make_response_class,
+};
+use phper::{modules::Module, php_get_module};
 
-pub mod http_client;
+pub mod client;
+pub mod errors;
+pub mod response;
 
 #[php_get_module]
 pub fn get_module() -> Module {
@@ -10,9 +15,9 @@ pub fn get_module() -> Module {
         env!("CARGO_PKG_AUTHORS"),
     );
 
-    // let client = HttpClient::new();
-    let client_class: DynamicClass<()> = DynamicClass::new();
-    module.add_class("HttpClient", client_class);
+    module.add_class(make_client_class());
+    module.add_class(make_exception_class());
+    module.add_class(make_response_class());
 
     module
 }

examples/http-client/src/lib.rs

@@ -0,0 +1,60 @@
+use bytes::Bytes;
+use indexmap::map::IndexMap;
+use phper::classes::DynamicClass;
+use reqwest::{header::HeaderMap, StatusCode};
+use std::{convert::Infallible, net::SocketAddr};
+
+pub const RESPONSE_CLASS_NAME: &'static str = "HttpClient\\Response";
+
+pub struct ReadiedResponse {
+    pub status: StatusCode,
+    pub remote_addr: Option<SocketAddr>,
+    pub headers: HeaderMap,
+    pub body: Bytes,
+}
+
+pub fn make_response_class() -> DynamicClass<Option<ReadiedResponse>> {
+    let mut class = DynamicClass::new_with_constructor(RESPONSE_CLASS_NAME, || {
+        Ok::<Option<ReadiedResponse>, Infallible>(None)
+    });
+
+    class.add_method(
+        "body",
+        |this, _arguments| {
+            let readied_response = this.as_state().as_ref().unwrap();
+            let body: &[u8] = readied_response.body.as_ref();
+            body.to_vec()
+        },
+        vec![],
+    );
+
+    class.add_method(
+        "status",
+        |this, _arguments| {
+            let readied_response = this.as_state().as_ref().unwrap();
+            readied_response.status.as_u16() as i64
+        },
+        vec![],
+    );
+
+    class.add_method(
+        "headers",
+        |this, _arguments| {
+            let readied_response = this.as_state().as_ref().unwrap();
+            let headers_map =
+                readied_response
+                    .headers
+                    .iter()
+                    .fold(IndexMap::new(), |mut acc, (key, value)| {
+                        acc.entry(key.as_str().to_owned())
+                            .or_insert(vec![])
+                            .push(value.as_bytes().to_owned());
+                        acc
+                    });
+            headers_map
+        },
+        vec![],
+    );
+
+    class
+}

examples/http-client/src/response.rs

@@ -0,0 +1,13 @@
+use phper_test::test_php_scripts;
+use std::{env, path::Path};
+
+#[test]
+fn test_php() {
+    test_php_scripts(
+        env!("CARGO_BIN_EXE_http-client"),
+        &[&Path::new(env!("CARGO_MANIFEST_DIR"))
+            .join("tests")
+            .join("php")
+            .join("test.php")],
+    );
+}

examples/http-client/tests/integration.rs

@@ -1,7 +1,23 @@
 <?php
 
+use HttpClient\HttpClient;
+use HttpClient\HttpClientException;
+
 ini_set("display_errors", "On");
 ini_set("display_startup_errors", "On");
 error_reporting(E_ALL);
 
-phpinfo();
+$client = new HttpClient();
+
+$resp = $client->get("https://httpbin.org/ip");
+var_dump([
+    "status" => $resp->status(),
+    "headers" => $resp->headers(),
+    "body" => $resp->body(),
+]);
+
+try {
+    $client->get("file:///");
+    throw new AssertionError("no throw exception");
+} catch (HttpClientException $e) {
+}