Merge pull request markfinger#87 from sassanh/master

markfinger · web-flow · commit 0e24aa3d36cf · 2018-07-17T10:12:57.000+10:00
API for returning extra items returned by render server
diff --git a/README.md b/README.md
@@ -69,6 +69,7 @@ The object returned has two properties:
 
  - `markup` - the rendered markup
  - `props` - the JSON-serialized props
+ - `data` - extra data returned by the render server
 
 If the object is coerced to a string, it will emit the value of the `markup` attribute.
 
@@ -82,6 +83,8 @@ for a simple server that will cover most cases. The key files for the render ser
  - [render_server.js](examples/basic_rendering/render_server.js) - the server's source code
  - [package.json](examples/basic_rendering/package.json) - the server's dependencies, installable with
    [npm](http://npmjs.com)
+   
+You can also return extra data from your render server and these data will be stored in `data` attribute of the response object.
 
 
 Using React on the front-end
diff --git a/react/render_server.py b/react/render_server.py
@@ -8,9 +8,10 @@
 
 
 class RenderedComponent(object):
-    def __init__(self, markup, props):
+    def __init__(self, markup, props, data):
         self.markup = markup
         self.props = props
+        self.data = data
 
     def __str__(self):
         return self.markup
@@ -67,8 +68,9 @@ def render(self, path, props=None, to_static_markup=False, request_headers=None,
 
         obj = res.json()
 
-        markup = obj.get('markup', None)
-        err = obj.get('error', None)
+        markup = obj.pop('markup', None)
+        err = obj.pop('error', None)
+        data = obj
 
         if err:
             if 'message' in err and 'stack' in err:
@@ -80,7 +82,7 @@ def render(self, path, props=None, to_static_markup=False, request_headers=None,
         if markup is None:
             raise ReactRenderingError('Render server failed to return markup. Returned: {}'.format(obj))
 
-        return RenderedComponent(markup, serialized_props)
+        return RenderedComponent(markup, serialized_props, data)
 
 
 render_server = RenderServer()
