Merge pull request #78 from elnur/host-support

Add support for hosts

Author: willdurand

Extractor/ExposedRoutesExtractor.php

@@ -11,6 +11,7 @@
 
 namespace FOS\JsRoutingBundle\Extractor;
 
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouterInterface;
 use JMS\I18nRoutingBundle\Router\I18nLoader;
 
@@ -58,6 +59,7 @@ public function __construct(RouterInterface $router, array $routesToExpose = arr
     public function getRoutes()
     {
         $exposedRoutes = array();
+        /** @var $route Route */
         foreach ($this->getExposedRoutes() as $name => $route) {
             // Maybe there is a better way to do that...
             $compiledRoute = $route->compile();
@@ -66,10 +68,12 @@ public function getRoutes()
                 array_fill_keys($compiledRoute->getVariables(), null)
             );
             $requirements = $route->getRequirements();
+            $host = method_exists($route, 'getHost') ? $route->getHost() : '';
             $exposedRoutes[$name] = new ExtractedRoute(
                 $compiledRoute->getTokens(),
                 $defaults,
-                $requirements
+                $requirements,
+                $host
             );
         }
 

Extractor/ExtractedRoute.php

@@ -16,12 +16,14 @@ class ExtractedRoute
     private $tokens;
     private $defaults;
     private $requirements;
+    private $host;
 
-    public function __construct(array $tokens, array $defaults, array $requirements)
+    public function __construct(array $tokens, array $defaults, array $requirements, $host = '')
     {
         $this->tokens = $tokens;
         $this->defaults = $defaults;
         $this->requirements = $requirements;
+        $this->host = $host;
     }
 
     public function getTokens()
@@ -38,4 +40,9 @@ public function getRequirements()
     {
         return $this->requirements;
     }
+
+    public function getHost()
+    {
+        return $this->host;
+    }
 }

Resources/js/router.js

@@ -206,7 +206,9 @@ fos.Router.prototype.generate = function(name, opt_params, absolute) {
 
     url = this.context_.base_url + url;
     if (goog.object.containsKey(route.requirements, "_scheme") && this.getScheme() != route.requirements["_scheme"]) {
-        url = route.requirements["_scheme"] + "://" + this.getHost() + url;
+        url = route.requirements["_scheme"] + "://" + (route.host || this.getHost()) + url;
+    } else if (route.host && this.getHost() !== route.host) {
+        url = this.getScheme() + "://" + route.host + url;
     } else if (absolute === true) {
         url = this.getScheme() + "://" + this.getHost() + url;
     }

Resources/js/router.test.js

@@ -48,6 +48,45 @@ function testGenerateUsesSchemeRequirements() {
     assertEquals('https://localhost/foo/bar', router.generate('homepage'));
 }
 
+function testGenerateUsesHost() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {},
+            host: 'otherhost'
+        }
+    });
+
+    assertEquals('http://otherhost/foo/bar', router.generate('homepage'));
+}
+
+function testGenerateUsesHostWhenTheSameSchemeRequirementGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {"_scheme": "http"},
+            host: 'otherhost'
+        }
+    });
+
+    assertEquals('http://otherhost/foo/bar', router.generate('homepage'));
+}
+
+function testGenerateUsesHostWhenAnotherSchemeRequirementGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {"_scheme": "https"},
+            host: 'otherhost'
+        }
+    });
+
+    assertEquals('https://otherhost/foo/bar', router.generate('homepage'));
+}
+
 function testGenerateUsesAbsoluteUrl() {
     var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
         homepage: {

Resources/public/js/router.js

@@ -31,12 +31,12 @@ public function testIndexAction()
             $this->getSerializer(),
             $this->getExtractor(array(
                 'literal' => new ExtractedRoute(array(array('text', '/homepage')), array(), array()),
-                'blog'    => new ExtractedRoute(array(array('variable', '/', '[^/]+?', 'slug'), array('text', '/blog-post')), array(), array()),
+                'blog'    => new ExtractedRoute(array(array('variable', '/', '[^/]+?', 'slug'), array('text', '/blog-post')), array(), array(), 'localhost'),
             ))
         );
         $response = $controller->indexAction($this->getRequest('/'), 'json');
 
-        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[]},"blog":{"tokens":[["variable","\/","[^\/]+?","slug"],["text","\/blog-post"]],"defaults":[],"requirements":[]}},"prefix":"","host":"","scheme":""}', $response->getContent());
+        $this->assertEquals('{"base_url":"","routes":{"literal":{"tokens":[["text","\/homepage"]],"defaults":[],"requirements":[],"host":""},"blog":{"tokens":[["variable","\/","[^\/]+?","slug"],["text","\/blog-post"]],"defaults":[],"requirements":[],"host":"localhost"}},"prefix":"","host":"","scheme":""}', $response->getContent());
     }
 
     public function testGenerateWithCallback()