Merge pull request #49 from sandrokeil/feature/response-vpack-access

sandrokeil · web-flow · commit b03d9a52e676 · 2018-01-03T16:10:23.000+01:00
Added possibility to directly access the response vpack
diff --git a/src/main.cpp b/src/main.cpp
@@ -155,7 +155,9 @@ extern "C" {
 
         response.method<&arangodb::fuerte::php::Response::getHttpCode>("getHttpCode");
         response.method<&arangodb::fuerte::php::Response::getBody>("getBody");
-
+        response.method<&arangodb::fuerte::php::Response::get>("get", {
+            Php::ByVal("accessor")
+        });
         extension->add(std::move(response));
     }
 
diff --git a/src/response.cpp b/src/response.cpp
@@ -30,6 +30,90 @@ namespace arangodb { namespace fuerte { namespace php {
         return body;
     }
 
+    Php::Value Response::get(Php::Parameters& params)
+    {
+        try {
+
+            if(params[0].isString()) {
+                return this->sliceToPhpValue(this->response.slices().front().get(params[0].rawValue()));
+
+            } else if(params[0].isArray()) {
+                vp::Slice tmpSlice(this->response.slices().front());
+
+                for(auto const &value : params[0]) {
+                    if(value.second.isNumeric()) {
+                        tmpSlice = vp::Slice(tmpSlice.at(value.second.numericValue()));
+                    } else if(value.second.isString()) {
+                        tmpSlice = vp::Slice(tmpSlice.get(value.second.rawValue()));
+                    } else {
+                        ARANGODB_THROW(InvalidArgumentException(), "The accessor may only contain strings and integers in %s on line %d");
+                        return NULL;
+                    }
+                }
+
+                return this->sliceToPhpValue(tmpSlice);
+            } else {
+                ARANGODB_THROW(InvalidArgumentException(), "The accessor must be either of type array or of type string in %s on line %d");
+                return NULL;
+            }
+
+        } catch(vp::Exception e) {
+            ARANGODB_THROW(RuntimeException(), e.what());
+            return NULL;
+        }
+    }
+
+    Php::Value Response::sliceToPhpValue(const vp::Slice& slice)
+    {
+        switch(slice.type()) {
+            case vp::ValueType::String:
+                return slice.copyString();
+                break;
+
+            case vp::ValueType::Int:
+            case vp::ValueType::UInt:
+            case vp::ValueType::SmallInt:
+                return slice.getInt();
+                break;
+
+            case vp::ValueType::Double:
+                return slice.getDouble();
+                break;
+
+            case vp::ValueType::Null:
+                return NULL;
+                break;
+
+            case vp::ValueType::Array:
+            case vp::ValueType::Object:
+                return this->sliceToJson(slice);
+                break;
+
+            default:
+                return -1;
+        }
+    }
+
+
+    Php::Value Response::sliceToJson(const vp::Slice& slice)
+    {
+        std::string json;
+
+        try {
+            vp::Options dumperOptions;
+
+            vp::StringSink sink(&json);
+            vp::Dumper dumper(&sink, &dumperOptions);
+            dumper.dump(slice);
+        } catch(vp::Exception const& e) {
+            ARANGODB_THROW(InvalidArgumentException(), e.what());
+            return NULL;
+        }
+
+        return json;
+    }
+
+
     fu::Response* Response::getFuerteResponse()
     {
         return &this->response;
diff --git a/src/response.h b/src/response.h
@@ -2,11 +2,14 @@
 
 #include <phpcpp.h>
 
+#include <sstream>
+
 #include <fuerte/fuerte.h>
 #include <fuerte/types.h>
 
 #include "velocypack/vpack.h"
 #include "velocypack/velocypack-exception-macros.h"
+#include "velocypack/ValueType.h"
 
 #include "exception.h"
 
@@ -20,12 +23,15 @@ namespace arangodb { namespace fuerte { namespace php {
     private:
         fu::Response response;
 
+        Php::Value sliceToPhpValue(const vp::Slice& slice);
+        Php::Value sliceToJson(const vp::Slice& slice);
+
     public:
         Response(const fu::Response &response);
 
         Php::Value getHttpCode();
-
         Php::Value getBody();
+        Php::Value get(Php::Parameters& params);
 
         fu::Response* getFuerteResponse();
     };

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,9 @@ extern "C" {`
`155`	`155`
`156`	`156`	`response.method<&arangodb::fuerte::php::Response::getHttpCode>("getHttpCode");`
`157`	`157`	`response.method<&arangodb::fuerte::php::Response::getBody>("getBody");`
`158`		`-`
	`158`	`+ response.method<&arangodb::fuerte::php::Response::get>("get", {`
	`159`	`+ Php::ByVal("accessor")`
	`160`	`+ });`
`159`	`161`	`extension->add(std::move(response));`
`160`	`162`	`}`
`161`	`163`