Move calcRect into util/ and add tests.

src/HotspotContainer.js

@@ -17,7 +17,7 @@
 
 var eventEmitter = require('minimal-event-emitter');
 var Hotspot = require('./Hotspot');
-var calcRect = require('./calcRect');
+var calcRect = require('./util/calcRect');
 var cssPointerEventsSupported = require('./support/cssPointerEvents');
 var positionAbsolutely = require('./util/positionAbsolutely');
 var setAbsolute = require('./util/dom').setAbsolute;

src/stages/Stage.js

@@ -17,7 +17,7 @@
 
 var eventEmitter = require('minimal-event-emitter');
 var WorkQueue = require('../collections/WorkQueue');
-var calcRect = require('../calcRect');
+var calcRect = require('../util/calcRect');
 var async = require('../util/async');
 var cancelize = require('../util/cancelize');
 var clearOwnProperties = require('../util/clearOwnProperties');

test/suite/util/calcRect.js

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+'use strict';
+
+var assert = require('proclaim');
+var sinon = require('sinon');
+
+var calcRect = require('../../../src/util/calcRect');
+
+suite('calcRect', function() {
+
+  test('null', function() {
+    var rect = calcRect(1, 1, null);
+    assert(rect.x === 0);
+    assert(rect.y === 0);
+    assert(rect.width === 1);
+    assert(rect.height === 1);
+  });
+
+  test('relative offset', function() {
+    var rect = calcRect(100, 200, { relativeX: 0.1, relativeY: 0.2 });
+    assert(rect.x === 0.1);
+    assert(rect.y === 0.2);
+    assert(rect.width === 1);
+    assert(rect.height === 1);
+  });
+
+  test('relative size', function() {
+    var rect = calcRect(100, 200, { relativeWidth: 0.25, relativeHeight: 0.75 });
+    assert(rect.x === 0);
+    assert(rect.y === 0);
+    assert(rect.width === 0.25);
+    assert(rect.height === 0.75);
+  });
+
+  test('relative offset and size', function() {
+    var rect = calcRect(100, 200,
+      { relativeX: 0.1, relativeY: 0.2,
+        relativeWidth: 0.25, relativeHeight: 0.75 });
+    assert(rect.x === 0.1);
+    assert(rect.y === 0.2);
+    assert(rect.width === 0.25);
+    assert(rect.height === 0.75);
+  });
+
+  test('absolute offset', function() {
+    var rect = calcRect(100, 200, { absoluteX: 10, absoluteY: 40 });
+    assert(rect.x === 0.1);
+    assert(rect.y === 0.2);
+    assert(rect.width === 1);
+    assert(rect.height === 1);
+  });
+
+  test('absolute size', function() {
+    var rect = calcRect(100, 200, { absoluteWidth: 20, absoluteHeight: 50 });
+    assert(rect.x === 0);
+    assert(rect.y === 0);
+    assert(rect.width === 0.2);
+    assert(rect.height === 0.25);
+  });
+
+  test('absolute offset and size', function() {
+    var rect = calcRect(100, 200,
+      { absoluteX: 10, absoluteY: 40,
+        absoluteWidth: 20, absoluteHeight: 50 });
+    assert(rect.x === 0.1);
+    assert(rect.y === 0.2);
+    assert(rect.width === 0.2);
+    assert(rect.height === 0.25);
+  });
+
+  test('relative offset absolute size', function() {
+    var rect = calcRect(100, 200,
+      { relativeX: 0.1, relativeY: 0.2,
+        absoluteWidth: 20, absoluteHeight: 50 });
+    assert(rect.x === 0.1);
+    assert(rect.y === 0.2);
+    assert(rect.width === 0.2);
+    assert(rect.height === 0.25);
+  });
+
+  test('absolute offset relative size', function() {
+    var rect = calcRect(100, 200,
+      { absoluteX: 10, absoluteY: 40,
+        relativeWidth: 0.25, relativeHeight: 0.75 });
+    assert(rect.x === 0.1);
+    assert(rect.y === 0.2);
+    assert(rect.width === 0.25);
+    assert(rect.height === 0.75);
+  });
+
+  test('absolute overrides relative', function() {
+    var rect = calcRect(100, 200,
+      { absoluteX: 10, absoluteY: 40,
+        absoluteWidth: 20, absoluteHeight: 50,
+        relativeX: 0.12, relativeY: 0.34,
+        relativeWidth: 0.56, relativeHeight: 0.78 });
+    assert(rect.x === 0.1);
+    assert(rect.y === 0.2);
+    assert(rect.width === 0.2);
+    assert(rect.height === 0.25);
+  });
+
+});