refactoring kernel_language variable; add some unit tests to the added argument of format_request

Author: B1nj0y

kernel_gateway/notebook_http/__init__.py

@@ -70,6 +70,7 @@ def __init__(self, *args, **kwargs):
         self.api_parser = func(parent=self, log=self.log,
                                comment_prefix=prefix,
                                notebook_cells=self.parent.seed_notebook.cells)
+        self.kernel_language = lang
 
     def init_configurables(self):
         """Create a managed kernel pool"""
@@ -123,7 +124,7 @@ def create_request_handlers(self):
                 'response_sources' : response_source_map,
                 'kernel_pool' : self.kernel_pool,
                 'kernel_name' : self.parent.kernel_manager.seed_kernelspec,
-                'kernel_language' : getattr(self.parent.kernel_spec_manager.get_kernel_spec(self.parent.kernel_manager.seed_kernelspec), 'language', 'no_spec')
+                'kernel_language' : self.kernel_language or 'no_spec'
             }
             handlers.append((parameterized_path, NotebookAPIHandler, handler_args))
 

kernel_gateway/notebook_http/handlers.py

@@ -33,8 +33,7 @@ class NotebookAPIHandler(TokenAuthorizationMixin,
     kernel_pool
         Instance of services.kernels.ManagedKernelPool
     kernel_name
-        Kernel spec name used to launch the kernel pool. Identifies the
-        language of the source code cells.
+        Kernel spec name used to launch the kernel pool
     kernel_language
         Kernel spec language used to make language specific operations
 

kernel_gateway/notebook_http/request_utils.py

@@ -19,7 +19,8 @@ def format_request(bundle, kernel_language='no_spec'):
     Returns
     -------
     str
-        `REQUEST = "<json-encoded expression>"`
+        `REQUEST = "<json-encoded expression>"` by default or
+        `<a kernel_language specific variable name> = "<json-encoded expression>"`
     """
     bundle = json.dumps(bundle)
     if kernel_language.lower() == 'perl':

kernel_gateway/tests/notebook_http/test_request_utils.py

@@ -142,3 +142,13 @@ def test_format_request_code_escaped(self):
         #Get the value of REQUEST = "{ to test for equality
         test_request_js_value = request_code[request_code.index("\"{"):]
         self.assertEqual(test_request, json.loads(test_request_js_value), "Escaped Request code was not formatted correctly")
+
+    def test_format_request_without_a_kernel_language_arg(self):
+        test_request = ('''{"body": "", "headers": {}, "args": {}, "path": {}}''')
+        request_code = format_request(test_request)
+        self.assertTrue(request_code.startswith("REQUEST"), "Call format_request without a kernel_language argument was not formatted correctly")
+
+    def test_format_request_with_a_kernel_language_arg(self):
+        test_request = ('''{"body": "", "headers": {}, "args": {}, "path": {}}''')
+        request_code = format_request(test_request, 'perl')
+        self.assertTrue(request_code.startswith("my $REQUEST"), "Call format_request with a kernel language argument was not formatted correctly")