Generalize, fix tests.

cutting-room-floor · Apr 7, 2011 · 775349b · 775349b
1 parent 04a8c41
commit 775349b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 30 deletions.
diff --git a/mvc/models.js b/mvc/models.js
@@ -13,26 +13,36 @@ if (typeof require !== 'undefined') {
 var Bones = Bones || {};
 Bones.models = Bones.models || {};
 
+// Set options on initialize.
+Backbone.Collection.prototype.initialize =
+Backbone.Model.prototype.initialize = function(attributes, options) {
+    options = options || {};
+    if (this.collection && this.collection.options) {
+        this.options = this.collection.options;
+    } else {
+        this.options = options;
+    }
+    if (this.models) {
+        _(this.models).each(function(model) {
+            model.options = this.options;
+        });
+    }
+};
+
 // Tileset
 // ---
 // A single tileset, corresponding to an `.mbtiles` file. `model.id` is the
 // file basename, e.g. `foo.mbtiles` has an `id` of `foo`.
 Bones.models.Tileset = Backbone.Model.extend({
-    initialize: function(attributes, options) {
-        options = options || {};
-        if (this.collection) {
-            this.uiHost = this.collection.uiHost;
-            this.tileHost = this.collection.tileHost;
-        } else {
-            this.uiHost = options.uiHost;
-            this.tileHost = options.tileHost;
-        }
-    },
     url: function() {
         return '/api/Tileset/' + this.id;
     },
     layerURL: function() {
-        return this.tileHost;
+        if (this.options.tileHost) {
+            return this.options.tileHost;
+        } else {
+            return ['http://localhost:8888/'];
+        }
     },
     // Get ZXY of tile of tileset's center and minzoom. From [OSM wiki][1].
     // [1]: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#lon.2Flat_to_tile_numbers_2
@@ -65,11 +75,6 @@ Bones.models.Tileset = Backbone.Model.extend({
 // --------
 // Collection of all tileset models.
 Bones.models.Tilesets = Backbone.Collection.extend({
-    initialize: function(models, options) {
-        options = options || {};
-        this.uiHost = options.uiHost;
-        this.tileHost = options.tileHost;
-    },
     model: Bones.models.Tileset,
     url: '/api/Tileset',
     comparator: function(model) {

diff --git a/test/fixtures/wax/wax.center.json b/test/fixtures/wax/wax.center.json
@@ -10,7 +10,7 @@
                         "@new OpenLayers.Layer.TMS",
                         "control_room",
                         [
-                            "http://localhost:8888"
+                            "http://localhost:8888/"
                         ],
                         {
                             "projection": [
@@ -64,7 +64,7 @@
                 ],
                 "units": "m",
                 "maxResolution": 1.40625,
-                "theme": "http://locahost:8888maps/ol/dark.css",
+                "theme": "http://localhost:8888/maps/ol/dark.css",
                 "maxExtent": [
                     "@new OpenLayers.Bounds",
                     -20037508.34,

diff --git a/test/fixtures/wax/wax.el.json b/test/fixtures/wax/wax.el.json
@@ -10,7 +10,7 @@
                         "@new OpenLayers.Layer.TMS",
                         "control_room",
                         [
-                            "http://localhost:8888"
+                            "http://localhost:8888/"
                         ],
                         {
                             "projection": [
@@ -64,7 +64,7 @@
                 ],
                 "units": "m",
                 "maxResolution": 1.40625,
-                "theme": "http://locahost:8888maps/ol/dark.css",
+                "theme": "http://localhost:8888/maps/ol/dark.css",
                 "maxExtent": [
                     "@new OpenLayers.Bounds",
                     -20037508.34,

diff --git a/test/fixtures/wax/wax.layers.json b/test/fixtures/wax/wax.layers.json
@@ -10,7 +10,7 @@
                         "@new OpenLayers.Layer.TMS",
                         "control_room",
                         [
-                            "http://localhost:8888"
+                            "http://localhost:8888/"
                         ],
                         {
                             "projection": [
@@ -64,7 +64,7 @@
                 ],
                 "units": "m",
                 "maxResolution": 1.40625,
-                "theme": "http://locahost:8888maps/ol/dark.css",
+                "theme": "http://localhost:8888/maps/ol/dark.css",
                 "maxExtent": [
                     "@new OpenLayers.Bounds",
                     -20037508.34,

diff --git a/test/fixtures/wax/wax.options.json b/test/fixtures/wax/wax.options.json
@@ -10,7 +10,7 @@
                         "@new OpenLayers.Layer.TMS",
                         "control_room",
                         [
-                            "http://localhost:8888"
+                            "http://localhost:8888/"
                         ],
                         {
                             "projection": [
@@ -64,7 +64,7 @@
                 ],
                 "units": "m",
                 "maxResolution": 1.40625,
-                "theme": "http://locahost:8888maps/ol/dark.css",
+                "theme": "http://localhost:8888/maps/ol/dark.css",
                 "maxExtent": [
                     "@new OpenLayers.Bounds",
                     -20037508.34,

diff --git a/test/tilestream.test.js b/test/tilestream.test.js
@@ -1,9 +1,11 @@
-var assert = require('assert'),
+var _ = require('underscore')._,
+    assert = require('assert'),
     tilestream = require('tilestream')({
         tiles: __dirname + '/fixtures/tiles',
         uiPort: 8888,
         tilePort: 8888
-    });
+    }),
+    request = { headers: { 'host': 'localhost:8888' } };
 
 module.exports = {
     'tile': function() {
@@ -142,7 +144,7 @@ module.exports = {
         );
         assert.response(
             tilestream.uiServer,
-            { url: '/wax.json?layers[]=control_room' },
+            _.extend({ url: '/wax.json?layers[]=control_room' }, request),
             { status: 200 },
             function(res) {
                 assert.deepEqual(fixtures.layers, JSON.parse(res.body));
@@ -156,7 +158,7 @@ module.exports = {
         );
         assert.response(
             tilestream.uiServer,
-            { url: '/wax.json?layers[]=control_room&el=foo' },
+            _.extend({ url: '/wax.json?layers[]=control_room&el=foo' }, request),
             { status: 200 },
             function(res) {
                 assert.deepEqual(fixtures.el, JSON.parse(res.body));
@@ -180,7 +182,7 @@ module.exports = {
         );
         assert.response(
             tilestream.uiServer,
-            { url: '/wax.json?layers[]=control_room&center[]=40&center[]=40&center[]=2' },
+            _.extend({ url: '/wax.json?layers[]=control_room&center[]=40&center[]=40&center[]=2' }, request),
             { status: 200 },
             function(res) {
                 assert.deepEqual(fixtures.center, JSON.parse(res.body));
@@ -199,7 +201,7 @@ module.exports = {
         );
         assert.response(
             tilestream.uiServer,
-            { url: '/wax.json?layers[]=control_room&options[]=tooltips' },
+            _.extend({ url: '/wax.json?layers[]=control_room&options[]=tooltips' }, request),
             { status: 200 },
             function(res) {
                 assert.deepEqual(fixtures.options, JSON.parse(res.body));