Enable Ubuntu 14.04 beta in travis

.travis.yml

@@ -1,6 +1,6 @@
-language: php
-php:
-  - 5.5.9
+sudo: required
+dist: trusty
+services: mysql
 
 # Add encrypted env variables, used for setting up the test environment
 env:

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/codebendercc/eratosthenes.svg?branch=library-manager-updates-no-html-encode)](https://travis-ci.org/codebendercc/eratosthenes)
+[![Coverage Status](https://coveralls.io/repos/codebendercc/eratosthenes/badge.svg?branch=library-manager-updates-no-html-encode&service=github)](https://coveralls.io/github/codebendercc/eratosthenes?branch=library-manager-updates-no-html-encode)
 Arduino Library Management System
 ====
 

Symfony/app/config/config.yml

@@ -20,6 +20,13 @@ framework:
     session:         ~
     fragments:       ~
 
+services:
+    kernel.listener.auth_listener:
+        class: Codebender\LibraryBundle\EventListener\AuthenticationListener
+        tags:
+            - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest }
+        arguments: [ %authorizationKey% ]
+
 # Twig Configuration
 twig:
     debug:            %kernel.debug%

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

@@ -6,6 +6,7 @@
 use Codebender\LibraryBundle\Entity\ExternalLibrary;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -18,38 +19,33 @@ class DefaultController extends Controller
      */
     public function statusAction()
     {
-        return new Response(json_encode(array("success" => true, "status" => "OK")));
+        return new JsonResponse(['success' => true, 'status' => 'OK']);
     }
 
     /**
      * The main library manager API handler action.
      * Checks the autorization credentials and the validity of the request.
      * Can handle several types of requests, like code fetching, examples fetching, etc.
      *
-     * @param $authorizationKey
      * @param $version
      * @return Response
      */
-    public function apiHandlerAction($authorizationKey, $version)
+    public function apiHandlerAction($version)
     {
-        if ($authorizationKey !== $this->container->getParameter('authorizationKey')) {
-            return new Response(json_encode(array("success" => false, "message" => "Invalid library manager authorization key.")));
-        }
-
-        if ($version != "v1") {
-            return new Response(json_encode(array("success" => false, "message" => "Invalid library manager API version.")));
+        if ($version != 'v1') {
+            return new JsonResponse(['success' => false, 'message' => 'Invalid library manager API version.']);
         }
 
         $request = $this->getRequest();
         $content = $request->getContent();
 
         $content = json_decode($content, true);
         if ($content === null) {
-            return new Response(json_encode(array("success" => false, "message" => "Wrong data")));
+            return new JsonResponse(['success' => false, 'message' => 'Wrong data']);
         }
 
         if ($this->isValid($content) === false) {
-            return new Response(json_encode(array("success" => false, "message" => "Incorrect request fields")));
+            return new JsonResponse(['success' => false, 'message' => 'Incorrect request fields']);
         }
 
         return $this->selectAction($content);
@@ -74,7 +70,7 @@ private function selectAction($content)
             case "getKeywords":
                 return $this->getKeywords($content["library"]);
             default:
-                return new Response(json_encode(array("success" => false, "message" => "No valid action requested")));
+                return new JsonResponse(['success' => false, 'message' => 'No valid action requested']);
         }
     }
 
@@ -112,25 +108,25 @@ private function listAll()
         ksort($includedLibraries);
         ksort($externalLibraries);
 
-        return new Response(json_encode(
-                array(
-                    "success" => true,
-                    "text" => "Successful Request!",
-                    "categories" => array(
-                        "Examples" => $builtinExamples,
-                        "Builtin Libraries" => $includedLibraries,
-                        "External Libraries" => $externalLibraries)
-                )
-            )
+        return new JsonResponse(
+            [
+                'success' => true,
+                'text' => 'Successful Request!',
+                'categories' => [
+                    'Examples' => $builtinExamples,
+                    'Builtin Libraries' => $includedLibraries,
+                    'External Libraries' => $externalLibraries
+                ]
+            ]
         );
     }
 
     private function getExampleCode($library, $example)
     {
 
         $type = json_decode($this->getLibraryType($library), true);
-        if (!$type['success']) {
-            return new Response(json_encode($type));
+        if ($type['success'] !== true) {
+            return new JsonResponse($type);
         }
 
         switch ($type['type']) {
@@ -150,50 +146,39 @@ private function getExampleCode($library, $example)
         return new Response($example, 200, array('content-type' => 'application/json'));
     }
 
-    public function getLibraryGitBranchesAction($authorizationKey)
+    public function getLibraryGitBranchesAction()
     {
-        if ($authorizationKey !== $this->container->getParameter('authorizationKey')) {
-            return new Response(json_encode(array('success' => false, 'step' => 0, 'message' => 'Invalid authorization key.')));
-        }
-
         $handler = $this->get('codebender_library.handler');
 
         $githubUrl = $this->getRequest()->request->get('githubUrl');
         $processedGitUrl = $handler->processGithubUrl($githubUrl);
 
         if ($processedGitUrl['success'] !== true) {
-            return new Response(json_encode(array('success' => false, 'message' => 'Could not process provided url')));
+            return new JsonResponse(['success' => false, 'message' => 'Could not process provided url']);
         }
 
         $repoBranches = $handler->fetchRepoRefsFromGit($processedGitUrl['owner'], $processedGitUrl['repo']);
 
-        if ($repoBranches['success'] != true) {
-            return new Response(json_encode(array(
-                        'success' => false,
-                        'message' => 'Something went wrong while fetching the library. Please double check the Url you provided.'
-                    )));
+        if ($repoBranches['success'] !== true) {
+            return new JsonResponse([
+                'success' => false,
+                'message' => 'Something went wrong while fetching the library. Please double check the Url you provided.'
+            ]);
         }
 
-        $response = new Response(json_encode(array('success' => true, 'branches' => $repoBranches['headRefs'])));
-
-        $response->headers->set('Content-Type', 'application/json');
-        return $response;
+        return new JsonResponse(['success' => true, 'branches' => $repoBranches['headRefs']]);
     }
 
-    public function getRepoGitTreeAndMetaAction($authorizationKey)
+    public function getRepoGitTreeAndMetaAction()
     {
-        if ($authorizationKey !== $this->container->getParameter('authorizationKey')) {
-            return new Response(json_encode(array('success' => false, 'step' => 0, 'message' => 'Invalid authorization key.')));
-        }
-
         $handler = $this->get('codebender_library.handler');
 
         $githubUrl = $this->getRequest()->request->get('githubUrl');
         $processedGitUrl = $handler->processGithubUrl($githubUrl);
         $gitBranch = $this->getRequest()->request->get('githubBranch');
 
         if ($processedGitUrl['success'] !== true) {
-            return new Response(json_encode(array('success' => false, 'message' => 'Could not process provided url')));
+            return new JsonResponse(['success' => false, 'message' => 'Could not process provided url']);
         }
 
         $githubLibrary = json_decode(
@@ -207,25 +192,19 @@ public function getRepoGitTreeAndMetaAction($authorizationKey)
         );
 
         if (!$githubLibrary['success']) {
-            $response = new Response(json_encode($githubLibrary));
-            $response->headers->set('Content-Type', 'application/json');
-            return $response;
+            return new JsonResponse($githubLibrary);
         }
 
         $description = $handler->getRepoDefaultDescription($processedGitUrl['owner'], $processedGitUrl['repo']);
 
-        $response = new Response(json_encode(
-            array(
-                'success' => true,
-                'files' => $githubLibrary['files'],
-                'owner' => $processedGitUrl['owner'],
-                'repo' => $processedGitUrl['repo'],
-                'branch' => $gitBranch,
-                'description' => $description
-                )
-        ));
-        $response->headers->set('Content-Type', 'application/json');
-        return $response;
+        return new JsonResponse([
+            'success' => true,
+            'files' => $githubLibrary['files'],
+            'owner' => $processedGitUrl['owner'],
+            'repo' => $processedGitUrl['repo'],
+            'branch' => $gitBranch,
+            'description' => $description
+        ]);
     }
 
     private function getLibraryExamples($library)
@@ -495,23 +474,20 @@ private function getExampleAndLibNameFromRelativePath($path, $filename)
     private function getKeywords($library)
     {
         if ($library === null) {
-
-            return new Response(json_encode(array("success" => false)));
-
+            return new JsonResponse(['success' => false]);
         }
 
         $exists = json_decode($this->getLibraryType($library), true);
 
         if ($exists['success'] === false) {
-            return new Response(json_encode($exists));
+            return new JsonResponse($exists);
         }
 
-        $path = "";
         if ($exists['type'] == 'external') {
             $path = $this->container->getParameter('external_libraries') . '/' . $library;
         } else if ($exists['type'] = 'builtin') {
             $path = $this->container->getParameter('builtin_libraries') . "/libraries/" . $library;
-        } else return new Response(json_encode(array("success" => false)));
+        } else return new JsonResponse(['success' => false]);
 
         $keywords = array();
 
@@ -548,7 +524,7 @@ private function getKeywords($library)
             break;
         }
 
-        return new Response(json_encode(array('success' => true, 'keywords' => $keywords)));
+        return new JsonResponse(['success' => true, 'keywords' => $keywords]);
 
     }