From c3b6f377e3494227238d46bfba7e996eaf846c7a Mon Sep 17 00:00:00 2001
From: Vit Brunner <vit.brunner@gmail.com>
Date: Mon, 22 Dec 2014 11:15:01 +0100
Subject: [PATCH] Get route properties in specified order

---
 source/scripts/services/route.js.coffee |  8 +++++---
 source/tests/services/route.js.coffee   | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/source/scripts/services/route.js.coffee b/source/scripts/services/route.js.coffee
index b85b0f0..1e534fb 100644
--- a/source/scripts/services/route.js.coffee
+++ b/source/scripts/services/route.js.coffee
@@ -29,9 +29,11 @@ angular.module("sideBySide").service "route", ['$location', ($location) ->
 		value
 
 	@get = () ->
-		(property + ':' + getValue(value) \
-			for property, value of @params when value)
-		.join('/')
+		['base', 'display', 'section']
+			.filter (key) => @params[key]
+			.map (key) =>
+				key + ':' + getValue @params[key]
+			.join('/')
 
 	@update = (key, value) ->
 		@params[key] = value
diff --git a/source/tests/services/route.js.coffee b/source/tests/services/route.js.coffee
index b46021a..50457de 100644
--- a/source/tests/services/route.js.coffee
+++ b/source/tests/services/route.js.coffee
@@ -4,7 +4,7 @@ module "route", {}
 
 setup = (
 	base = 'http://example.com'
-	path = '/asdf:zxcv/qwerty:asdf'
+	path = '/base:asdf/section:7'
 	hash = '#test'
 ) ->
 	angular.module("sideBySide").service("$location", () ->
@@ -21,17 +21,17 @@ test "has app url", () ->
 
 test "gets parameters", () ->
 	setup()
-	equal route.get(), 'asdf:zxcv/qwerty:asdf'
+	equal route.get(), 'base:asdf/section:7'
 
 test "updates parameters", () ->
 	setup()
-	route.update('asdf', 'hjkl')
-	equal route.get(), 'asdf:hjkl/qwerty:asdf'
+	route.update('base', 'zxcv')
+	equal route.get(), 'base:zxcv/section:7'
 
 test "adds parameter", () ->
-	setup()
-	route.update('new', 'one')
-	equal route.get(), 'asdf:zxcv/qwerty:asdf/new:one'
+	setup('http://example.com', '/base:asdf')
+	route.update('section', '1')
+	equal route.get(), 'base:asdf/section:1'
 
 test "processes arrays from url", () ->
 	setup('http://example.com', '/display:Language:Czech,English', '')
@@ -42,3 +42,8 @@ test "processes arrays from url", () ->
 			'Language': [ 'Czech', 'English' ]
 		}
 	}
+
+test "adds base before section", () ->
+	setup('http://example.com', '/section:7', '')
+	route.update('base', 'the_raven')
+	equal route.get(), 'base:the_raven/section:7'