Ported the codebase and tests over to js-host.

markfinger · markfinger · commit cf11cfcc3748 · 2015-04-26T11:57:01.000+10:00
diff --git a/react/bundle.py b/react/bundle.py
@@ -2,7 +2,7 @@
 import re
 import tempfile
 from webpack.compiler import webpack
-from service_host.conf import settings as service_host_settings
+from js_host.conf import settings as js_host_settings
 from .templates import BUNDLE_CONFIG, BUNDLE_TRANSLATE_CONFIG, DEVTOOL_CONFIG
 from .conf import settings
 
@@ -34,7 +34,7 @@ def get_webpack_config(path, translate=None, path_to_react=None, devtool=None):
     if devtool is None:
         devtool = settings.DEVTOOL
 
-    node_modules = os.path.join(service_host_settings.SOURCE_ROOT, 'node_modules')
+    node_modules = os.path.join(js_host_settings.SOURCE_ROOT, 'node_modules')
 
     if path_to_react is None:
         path_to_react = settings.PATH_TO_REACT or os.path.join(node_modules, 'react')
diff --git a/react/conf.py b/react/conf.py
@@ -14,6 +14,6 @@ class Conf(conf.Conf):
     # bundling components
     WATCH_SOURCE_FILES = False
 
-    SERVICE_NAME = 'react'
+    FUNCTION_NAME = 'react'
 
 settings = Conf()
diff --git a/react/render.py b/react/render.py
@@ -5,15 +5,15 @@
 from optional_django.serializers import JSONEncoder
 from optional_django.safestring import mark_safe
 from optional_django import six
-from service_host.service import Service
-from service_host.exceptions import ServiceError
+from js_host.function import Function
+from js_host.exceptions import JSFunctionError
 from .exceptions import ComponentSourceFileNotFound, ComponentWasNotBundled
 from .conf import settings
 from .bundle import bundle_component
 from .templates import MOUNT_JS
 from .exceptions import ReactRenderingError
 
-service = Service(settings.SERVICE_NAME)
+function = Function(settings.FUNCTION_NAME)
 
 
 class RenderedComponent(object):
@@ -118,16 +118,14 @@ def render_component(
         serialized_props = None
 
     try:
-        res = service.call(
+        markup = function.call(
             path=path_to_source,
             serializedProps=serialized_props,
             toStaticMarkup=to_static_markup
         )
-    except ServiceError as e:
+    except JSFunctionError as e:
         raise six.reraise(ReactRenderingError, ReactRenderingError(*e.args), sys.exc_info()[2])
 
-    markup = res.text
-
     return RenderedComponent(
         markup, path_to_source, props, serialized_props, watch_source, bundled_component, to_static_markup
     )
diff --git a/tests/host.config.js b/tests/host.config.js
@@ -2,7 +2,7 @@ var reactRender = require('react-render');
 var webpackService = require('webpack-service');
 
 module.exports = {
-	services: {
+	functions: {
 		react: reactRender,
 		webpack: webpackService
 	}
diff --git a/tests/package.json b/tests/package.json
@@ -3,9 +3,9 @@
   "dependencies": {
     "babel-core": "^5.1.11",
     "babel-loader": "^5.0.0",
+    "js-host": "^0.4.0",
     "react": "^0.13.2",
     "react-render": "^0.2.4",
-    "service-host": "git+https://git@github.com/markfinger/service-host#c26dd63074536dfdb3fbf0bfc7904b2cbe223613",
     "webpack": "^1.8.8",
     "webpack-service": "^0.1.1"
   }
diff --git a/tests/settings.py b/tests/settings.py
@@ -1,11 +1,11 @@
 import os
-from service_host.conf import settings as service_host_settings
+from js_host.conf import settings as js_host_settings
 from webpack.conf import settings as webpack_settings
 
 TEST_ROOT = os.path.dirname(__file__)
 COMPONENT_ROOT = os.path.join(TEST_ROOT, 'components')
 
-service_host_settings.configure(
+js_host_settings.configure(
     SOURCE_ROOT=TEST_ROOT,
     # Let the manager spin up an instance
     USE_MANAGER=True,
diff --git a/tests/utils.py b/tests/utils.py
@@ -1,7 +1,7 @@
 import os
 import shutil
 import unittest
-from service_host.host import host
+from js_host.host import host
 from webpack.conf import settings as webpack_settings
 
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ var reactRender = require('react-render');`
`2`	`2`	`var webpackService = require('webpack-service');`
`3`	`3`
`4`	`4`	`module.exports = {`
`5`		`- services: {`
	`5`	`+ functions: {`
`6`	`6`	`react: reactRender,`
`7`	`7`	`webpack: webpackService`
`8`	`8`	`}`