Added possibility to directly access the response vpack

martin-schilling · martin-schilling · commit 07f321bd0b81 · 2017-12-17T20:40:26.000+01:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -155,13 +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::accessResponse>("accessResponse", {
-            Php::ByVal("accessor", Php::Type::String)
+        response.method<&arangodb::fuerte::php::Response::get>("get", {
+            Php::ByVal("accessor")
         });
-        response.method<&arangodb::fuerte::php::Response::accessResponseTop>("accessResponseTop", {
-            Php::ByVal("accessor", Php::Type::String)
-        });
-
         extension->add(std::move(response));
     }
 
diff --git a/src/response.cpp b/src/response.cpp
@@ -30,25 +30,37 @@ namespace arangodb { namespace fuerte { namespace php {
         return body;
     }
 
-    Php::Value Response::accessResponse(Php::Parameters& params)
+    Php::Value Response::get(Php::Parameters& params)
     {
-        std::vector<std::string> accessor;
-        std::istringstream accessorStr(params[0]);
-
-        for(std::string token; std::getline(accessorStr, token, '.'); ) {
-            accessor.push_back(std::move(token));
-        }
-
-        vp::Slice slice = this->response.slices().front().get(accessor);
-        return this->sliceToPhpValue(slice);
-    }
+        try {
 
-    Php::Value Response::accessResponseTop(Php::Parameters& params)
-    {
-        std::string accessor = params[0];
+            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;
+            }
 
-        vp::Slice slice = this->response.slices().front().get(accessor);
-        return this->sliceToPhpValue(slice);
+        } catch(vp::Exception e) {
+            ARANGODB_THROW(RuntimeException(), e.what());
+            return NULL;
+        }
     }
 
     Php::Value Response::sliceToPhpValue(const vp::Slice& slice)
@@ -73,11 +85,8 @@ namespace arangodb { namespace fuerte { namespace php {
                 break;
 
             case vp::ValueType::Array:
-                return -1;
-                break;
-
             case vp::ValueType::Object:
-                return -1;
+                return this->sliceToJson(slice);
                 break;
 
             default:
@@ -86,6 +95,25 @@ namespace arangodb { namespace fuerte { namespace php {
     }
 
 
+    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
@@ -24,14 +24,14 @@ namespace arangodb { namespace fuerte { namespace php {
         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 accessResponse(Php::Parameters& params);
-        Php::Value accessResponseTop(Php::Parameters& params);
+        Php::Value get(Php::Parameters& params);
 
         fu::Response* getFuerteResponse();
     };
