Added status action. Split compilelibraries action into one that will be used by codebender website and one that will be used by others.

Author: fpapadopou

Symfony/src/Codebender/ApiBundle/Controller/DefaultController.php

@@ -12,44 +12,94 @@
 class DefaultController extends Controller
 {
     /**
-     * compilelibraries action
+     * status action
      *
      * @return Response Response intance.
      *
      */
-    public function compilelibrariesAction($auth_key, $version)
+    public function statusAction()
+    {
+        return new Response(json_encode(array("success" => true, "status" => "OK")));
+    }
+
+    /**
+     * compileWebsite action
+     *
+     * @return Response Response intance.
+     *
+     */
+    public function compileWebsiteAction($auth_key, $version)
     {
 
         if ($auth_key !== $this->container->getParameter('auth_key'))
         {
             return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid authorization key.")));
         }
 
-        if ($version == $this->container->getParameter('version')) {
-            $request = $this->getRequest()->getContent();
+        if ($version !== $this->container->getParameter('version'))
+        {
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid api version.")));
+        }
+
+        $request = $this->getRequest()->getContent();
+
+        $contents = json_decode($request, true);
+
+        $apihandler = $this->get('codebender_api.handler');
 
-            $contents = json_decode($request, true);
+        $personalMatchedLibs = $contents['libraries'];
 
-            $apihandler = $this->get('codebender_api.handler');
+        $files = $contents["files"];
 
-            $personalMatchedLib = $contents['libraries'];
-            $files = $contents["files"];
+        $headersArr = $this->checkHeaders($files, $personalMatchedLibs);
 
-            // get library manager url.
-            $libmanager_url = $this->container->getParameter('library');
+        $contents["libraries"] = $headersArr['libraries'];
+        $request_content = json_encode($contents);
 
-            $headersArr = $this->checkHeaders($files, $personalMatchedLib);
+        // perform the actual post to the compiler
+        $data = $apihandler->post_raw_data($this->container->getParameter('compiler'), $request_content);
 
-            $contents["libraries"] = $headersArr['libraries'];
-            $request_content = json_encode($contents);
+        $responsedata = array('success' => true, 'personal' => $personalMatchedLibs,  'library' => $headersArr['libraries'], 'foundFiles' => $headersArr['foundFiles'], 'notFoundHeaders' => $headersArr['notFoundHeaders'], 'compileResponse' => $data);
 
-            // compile into compiler with passing request_contents data.
-            $data = $apihandler->post_raw_data($this->container->getParameter('compiler'), $request_content);
+        return new Response(json_encode($responsedata));
+    }
+
+    /**
+     * compile action
+     *
+     * @return Response Response intance.
+     *
+     */
+    public function compileAction($auth_key, $version)
+    {
 
-            $responsedata = array('success' => true, 'library' => $headersArr['libraries'], 'foundFiles' => $headersArr['foundFiles'], 'notFoundHeaders' => $headersArr['notFoundHeaders'], 'compileResponse' => $data);
+        if ($auth_key !== $this->container->getParameter('auth_key'))
+        {
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid authorization key.")));
+        }
 
-            return new Response(json_encode($responsedata), 200);
+        if ($version !== $this->container->getParameter('version'))
+        {
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid api version.")));
         }
+
+        $request = $this->getRequest()->getContent();
+
+        $contents = json_decode($request, true);
+
+        $apihandler = $this->get('codebender_api.handler');
+
+        $files = $contents["files"];
+
+        $headersArr = $this->checkHeaders($files, array());
+
+        $contents["libraries"] = $headersArr['libraries'];
+        $request_content = json_encode($contents);
+
+        // perform the actual post to the compiler
+        $data = $apihandler->post_raw_data($this->container->getParameter('compiler'), $request_content);
+
+        return new Response($data);
     }
 
     /**

Symfony/src/Codebender/ApiBundle/Resources/config/routing.yml

@@ -1,5 +1,15 @@
-CodebenderApiBundle_compile:
-    pattern:    /compile/{auth_key}/{version}
-    defaults: { _controller: CodebenderApiBundle:Default:compilelibraries }
+CodebenderApiBundle_status_check:
+    pattern:  /status
+    defaults: { _controller: CodebenderApiBundle:Default:status }
+
+CodebenderApiBundle_cb_website_compile:
+    pattern:    /{auth_key}/{version}/website/compile
+    defaults: { _controller: CodebenderApiBundle:Default:compileWebsite }
     requirements:
        _method:  POST
+
+CodebenderApiBundle_compile:
+    pattern:    /{auth_key}/{version}/compile
+    defaults: { _controller: CodebenderApiBundle:Default:compile }
+    requirements:
+       _method:  POST