use correct sg files in unit tests

jslib -> lib it & test use same jasmine files
mighdoll · Apr 19, 2014 · fc71927 · fc71927
1 parent 57db6ac
commit fc71927
Show file tree

Hide file tree

Showing 199 changed files with 154 additions and 21,685 deletions.
diff --git a/Building.md b/Building.md
@@ -8,7 +8,7 @@ Directories
 
 - *dashboard* - Example sparkle-graph dashboards.
 
-- *jslib* - Javascript libraries used by sg.js  (primarily: require.js, when.js, d3.js) 
+- *lib* - Javascript libraries used by sg.js  (primarily: require.js, when.js, d3.js) 
 
 ##### sg.js tests
 - *test/web/spec* - unit tests (using jasmine 2)
@@ -60,5 +60,5 @@ integration tests (requires that cassandra is running locally)
 
 javascript tests in e.g. chrome, browse to: 
 
-    file:///Users/MyAccountNameHere/sparkle-graph/src/test/web/SpecRunner.html
+    file:///Users/MyAccountNameHere/sparkle-graph/src/test/web/index.html
 
diff --git a/dashboard/db-requests/dbDashboard.js b/dashboard/db-requests/dbDashboard.js
@@ -1,4 +1,4 @@
-require( ["jslib/d3", "sg/dashboard", "sg/sideAxis", "sg/palette", "sg/linePlot" ], 
+require( ["lib/d3", "sg/dashboard", "sg/sideAxis", "sg/palette", "sg/linePlot" ], 
     function(_d3, dashboard, sideAxis, palette, linePlot) {
 
   var greyish = d3.scale.ordinal().range(["#BFB9A2"]), 

diff --git a/dashboard/db-requests/index.html b/dashboard/db-requests/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
   <link rel="stylesheet" href="css/graph.css">
-  <script data-main="dbDashboard.js" src="jslib/require.js"></script>
+  <script data-main="dbDashboard.js" src="lib/require.js"></script>
 <body>
diff --git a/dashboard/simple/index.html b/dashboard/simple/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
   <link rel="stylesheet" href="css/graph.css">
-  <script data-main="simple.js" src="jslib/require.js"></script>
+  <script data-main="simple.js" src="lib/require.js"></script>
 <body>
diff --git a/dashboard/ssl-sessions/index.html b/dashboard/ssl-sessions/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
   <link rel="stylesheet" href="css/graph.css">
-  <script data-main="sessions.js" src="jslib/require.js"></script>
+  <script data-main="sessions.js" src="lib/require.js"></script>
 <body>
diff --git a/jslib/d3.js → lib/d3.js b/jslib/d3.js → lib/d3.js
diff --git a/jslib/d3.min.js → lib/d3.min.js b/jslib/d3.min.js → lib/d3.min.js
diff --git a/sparkle/src/it/static/lib/jquery-2.1.0.js → lib/jquery-2.1.0.js b/sparkle/src/it/static/lib/jquery-2.1.0.js → lib/jquery-2.1.0.js
diff --git a/...kle/src/it/static/lib/jquery-2.1.0.min.js → lib/jquery-2.1.0.min.js b/...kle/src/it/static/lib/jquery-2.1.0.min.js → lib/jquery-2.1.0.min.js
diff --git a/...le/src/it/static/lib/jquery-2.1.0.min.map → lib/jquery-2.1.0.min.map b/...le/src/it/static/lib/jquery-2.1.0.min.map → lib/jquery-2.1.0.min.map
diff --git a/jslib/jquery.js → lib/jquery.js b/jslib/jquery.js → lib/jquery.js
diff --git a/jslib/require.js → lib/require.js b/jslib/require.js → lib/require.js
diff --git a/jslib/require.min.js → lib/require.min.js b/jslib/require.min.js → lib/require.min.js
diff --git a/jslib/select2-spinner.gif → lib/select2-spinner.gif b/jslib/select2-spinner.gif → lib/select2-spinner.gif
diff --git a/jslib/select2.css → lib/select2.css b/jslib/select2.css → lib/select2.css
diff --git a/jslib/select2.js → lib/select2.js b/jslib/select2.js → lib/select2.js
diff --git a/jslib/select2.min.js → lib/select2.min.js b/jslib/select2.min.js → lib/select2.min.js
diff --git a/jslib/select2.png → lib/select2.png b/jslib/select2.png → lib/select2.png
diff --git a/jslib/select2x2.png → lib/select2x2.png b/jslib/select2x2.png → lib/select2x2.png
diff --git a/jslib/when/.editorconfig → lib/when/.editorconfig b/jslib/when/.editorconfig → lib/when/.editorconfig
diff --git a/jslib/when/.gitignore → lib/when/.gitignore b/jslib/when/.gitignore → lib/when/.gitignore
diff --git a/jslib/when/.jshintignore → lib/when/.jshintignore b/jslib/when/.jshintignore → lib/when/.jshintignore
diff --git a/jslib/when/.jshintrc → lib/when/.jshintrc b/jslib/when/.jshintrc → lib/when/.jshintrc
diff --git a/jslib/when/.npmignore → lib/when/.npmignore b/jslib/when/.npmignore → lib/when/.npmignore
diff --git a/jslib/when/.travis.yml → lib/when/.travis.yml b/jslib/when/.travis.yml → lib/when/.travis.yml
diff --git a/jslib/when/CHANGES.md → lib/when/CHANGES.md b/jslib/when/CHANGES.md → lib/when/CHANGES.md
diff --git a/jslib/when/LICENSE.txt → lib/when/LICENSE.txt b/jslib/when/LICENSE.txt → lib/when/LICENSE.txt
diff --git a/jslib/when/README.md → lib/when/README.md b/jslib/when/README.md → lib/when/README.md
diff --git a/jslib/when/apply.js → lib/when/apply.js b/jslib/when/apply.js → lib/when/apply.js
diff --git a/jslib/when/benchmark/index.html → lib/when/benchmark/index.html b/jslib/when/benchmark/index.html → lib/when/benchmark/index.html
diff --git a/jslib/when/benchmark/map.js → lib/when/benchmark/map.js b/jslib/when/benchmark/map.js → lib/when/benchmark/map.js
diff --git a/jslib/when/benchmark/promise.js → lib/when/benchmark/promise.js b/jslib/when/benchmark/promise.js → lib/when/benchmark/promise.js
diff --git a/jslib/when/benchmark/run.js → lib/when/benchmark/run.js b/jslib/when/benchmark/run.js → lib/when/benchmark/run.js
diff --git a/jslib/when/callbacks.js → lib/when/callbacks.js b/jslib/when/callbacks.js → lib/when/callbacks.js
diff --git a/jslib/when/cancelable.js → lib/when/cancelable.js b/jslib/when/cancelable.js → lib/when/cancelable.js
diff --git a/jslib/when/debug.js → lib/when/debug.js b/jslib/when/debug.js → lib/when/debug.js
diff --git a/jslib/when/delay.js → lib/when/delay.js b/jslib/when/delay.js → lib/when/delay.js
diff --git a/jslib/when/docs/api.md → lib/when/docs/api.md b/jslib/when/docs/api.md → lib/when/docs/api.md
diff --git a/jslib/when/function.js → lib/when/function.js b/jslib/when/function.js → lib/when/function.js
diff --git a/jslib/when/guard.js → lib/when/guard.js b/jslib/when/guard.js → lib/when/guard.js
diff --git a/jslib/when/keys.js → lib/when/keys.js b/jslib/when/keys.js → lib/when/keys.js
diff --git a/jslib/when/monitor/README.md → lib/when/monitor/README.md b/jslib/when/monitor/README.md → lib/when/monitor/README.md
diff --git a/jslib/when/monitor/aggregator.js → lib/when/monitor/aggregator.js b/jslib/when/monitor/aggregator.js → lib/when/monitor/aggregator.js
diff --git a/jslib/when/monitor/array.js → lib/when/monitor/array.js b/jslib/when/monitor/array.js → lib/when/monitor/array.js
diff --git a/jslib/when/monitor/both.js → lib/when/monitor/both.js b/jslib/when/monitor/both.js → lib/when/monitor/both.js
diff --git a/jslib/when/monitor/console.js → lib/when/monitor/console.js b/jslib/when/monitor/console.js → lib/when/monitor/console.js
diff --git a/jslib/when/monitor/logger/consoleGroup.js → lib/when/monitor/logger/consoleGroup.js b/jslib/when/monitor/logger/consoleGroup.js → lib/when/monitor/logger/consoleGroup.js
diff --git a/jslib/when/monitor/logger/rethrowToHost.js → lib/when/monitor/logger/rethrowToHost.js b/jslib/when/monitor/logger/rethrowToHost.js → lib/when/monitor/logger/rethrowToHost.js
diff --git a/jslib/when/monitor/simpleFormatter.js → lib/when/monitor/simpleFormatter.js b/jslib/when/monitor/simpleFormatter.js → lib/when/monitor/simpleFormatter.js
diff --git a/jslib/when/monitor/simpleReporter.js → lib/when/monitor/simpleReporter.js b/jslib/when/monitor/simpleReporter.js → lib/when/monitor/simpleReporter.js
diff --git a/jslib/when/monitor/stackFilter.js → lib/when/monitor/stackFilter.js b/jslib/when/monitor/stackFilter.js → lib/when/monitor/stackFilter.js
diff --git a/jslib/when/monitor/throttledReporter.js → lib/when/monitor/throttledReporter.js b/jslib/when/monitor/throttledReporter.js → lib/when/monitor/throttledReporter.js
diff --git a/jslib/when/node/function.js → lib/when/node/function.js b/jslib/when/node/function.js → lib/when/node/function.js
diff --git a/jslib/when/package.json → lib/when/package.json b/jslib/when/package.json → lib/when/package.json
diff --git a/jslib/when/parallel.js → lib/when/parallel.js b/jslib/when/parallel.js → lib/when/parallel.js
diff --git a/jslib/when/pipeline.js → lib/when/pipeline.js b/jslib/when/pipeline.js → lib/when/pipeline.js
diff --git a/jslib/when/poll.js → lib/when/poll.js b/jslib/when/poll.js → lib/when/poll.js
diff --git a/jslib/when/sequence.js → lib/when/sequence.js b/jslib/when/sequence.js → lib/when/sequence.js
diff --git a/jslib/when/test/all-test.js → lib/when/test/all-test.js b/jslib/when/test/all-test.js → lib/when/test/all-test.js
diff --git a/jslib/when/test/any-test.js → lib/when/test/any-test.js b/jslib/when/test/any-test.js → lib/when/test/any-test.js
diff --git a/jslib/when/test/apply-test.js → lib/when/test/apply-test.js b/jslib/when/test/apply-test.js → lib/when/test/apply-test.js
diff --git a/jslib/when/test/buster.js → lib/when/test/buster.js b/jslib/when/test/buster.js → lib/when/test/buster.js
diff --git a/jslib/when/test/callbacks-test.js → lib/when/test/callbacks-test.js b/jslib/when/test/callbacks-test.js → lib/when/test/callbacks-test.js
diff --git a/jslib/when/test/cancelable-test.js → lib/when/test/cancelable-test.js b/jslib/when/test/cancelable-test.js → lib/when/test/cancelable-test.js
diff --git a/jslib/when/test/curl-config.js → lib/when/test/curl-config.js b/jslib/when/test/curl-config.js → lib/when/test/curl-config.js
diff --git a/jslib/when/test/defer-test.js → lib/when/test/defer-test.js b/jslib/when/test/defer-test.js → lib/when/test/defer-test.js
diff --git a/jslib/when/test/delay-test.js → lib/when/test/delay-test.js b/jslib/when/test/delay-test.js → lib/when/test/delay-test.js
diff --git a/jslib/when/test/function-test.js → lib/when/test/function-test.js b/jslib/when/test/function-test.js → lib/when/test/function-test.js
diff --git a/jslib/when/test/guard-test.js → lib/when/test/guard-test.js b/jslib/when/test/guard-test.js → lib/when/test/guard-test.js
diff --git a/jslib/when/test/isPromise-test.js → lib/when/test/isPromise-test.js b/jslib/when/test/isPromise-test.js → lib/when/test/isPromise-test.js
diff --git a/jslib/when/test/join-test.js → lib/when/test/join-test.js b/jslib/when/test/join-test.js → lib/when/test/join-test.js
diff --git a/jslib/when/test/keys-test.js → lib/when/test/keys-test.js b/jslib/when/test/keys-test.js → lib/when/test/keys-test.js
diff --git a/jslib/when/test/map-test.js → lib/when/test/map-test.js b/jslib/when/test/map-test.js → lib/when/test/map-test.js
diff --git a/jslib/when/test/monitor/aggregator-test.js → lib/when/test/monitor/aggregator-test.js b/jslib/when/test/monitor/aggregator-test.js → lib/when/test/monitor/aggregator-test.js
diff --git a/jslib/when/test/monitor/deep-chain.js → lib/when/test/monitor/deep-chain.js b/jslib/when/test/monitor/deep-chain.js → lib/when/test/monitor/deep-chain.js
diff --git a/jslib/when/test/monitor/developer-error.js → lib/when/test/monitor/developer-error.js b/jslib/when/test/monitor/developer-error.js → lib/when/test/monitor/developer-error.js
diff --git a/...when/test/monitor/immediate-rejections.js → ...when/test/monitor/immediate-rejections.js b/...when/test/monitor/immediate-rejections.js → ...when/test/monitor/immediate-rejections.js
diff --git a/jslib/when/test/monitor/index.html → lib/when/test/monitor/index.html b/jslib/when/test/monitor/index.html → lib/when/test/monitor/index.html
diff --git a/jslib/when/test/monitor/map.js → lib/when/test/monitor/map.js b/jslib/when/test/monitor/map.js → lib/when/test/monitor/map.js
diff --git a/jslib/when/test/monitor/multiple-escapes.js → lib/when/test/monitor/multiple-escapes.js b/jslib/when/test/monitor/multiple-escapes.js → lib/when/test/monitor/multiple-escapes.js
diff --git a/...est/monitor/unhandled-begets-unhandled.js → ...est/monitor/unhandled-begets-unhandled.js b/...est/monitor/unhandled-begets-unhandled.js → ...est/monitor/unhandled-begets-unhandled.js
diff --git a/jslib/when/test/monitor/unhandled-forever.js → lib/when/test/monitor/unhandled-forever.js b/jslib/when/test/monitor/unhandled-forever.js → lib/when/test/monitor/unhandled-forever.js
diff --git a/...n/test/monitor/unhandled-handled-later.js → ...n/test/monitor/unhandled-handled-later.js b/...n/test/monitor/unhandled-handled-later.js → ...n/test/monitor/unhandled-handled-later.js
diff --git a/jslib/when/test/node/function-test.js → lib/when/test/node/function-test.js b/jslib/when/test/node/function-test.js → lib/when/test/node/function-test.js
diff --git a/jslib/when/test/parallel-test.js → lib/when/test/parallel-test.js b/jslib/when/test/parallel-test.js → lib/when/test/parallel-test.js
diff --git a/jslib/when/test/pipeline-test.js → lib/when/test/pipeline-test.js b/jslib/when/test/pipeline-test.js → lib/when/test/pipeline-test.js
diff --git a/jslib/when/test/poll-test.js → lib/when/test/poll-test.js b/jslib/when/test/poll-test.js → lib/when/test/poll-test.js
diff --git a/jslib/when/test/promise-test.js → lib/when/test/promise-test.js b/jslib/when/test/promise-test.js → lib/when/test/promise-test.js
diff --git a/jslib/when/test/promises-aplus-adapter.js → lib/when/test/promises-aplus-adapter.js b/jslib/when/test/promises-aplus-adapter.js → lib/when/test/promises-aplus-adapter.js
diff --git a/jslib/when/test/reduce-test.js → lib/when/test/reduce-test.js b/jslib/when/test/reduce-test.js → lib/when/test/reduce-test.js
diff --git a/jslib/when/test/reject-test.js → lib/when/test/reject-test.js b/jslib/when/test/reject-test.js → lib/when/test/reject-test.js
diff --git a/jslib/when/test/resolve-test.js → lib/when/test/resolve-test.js b/jslib/when/test/resolve-test.js → lib/when/test/resolve-test.js
diff --git a/jslib/when/test/run.js → lib/when/test/run.js b/jslib/when/test/run.js → lib/when/test/run.js
diff --git a/jslib/when/test/sequence-test.js → lib/when/test/sequence-test.js b/jslib/when/test/sequence-test.js → lib/when/test/sequence-test.js
diff --git a/jslib/when/test/settle-test.js → lib/when/test/settle-test.js b/jslib/when/test/settle-test.js → lib/when/test/settle-test.js
diff --git a/jslib/when/test/some-test.js → lib/when/test/some-test.js b/jslib/when/test/some-test.js → lib/when/test/some-test.js
diff --git a/jslib/when/test/timeout-test.js → lib/when/test/timeout-test.js b/jslib/when/test/timeout-test.js → lib/when/test/timeout-test.js
diff --git a/jslib/when/test/unfold-test.js → lib/when/test/unfold-test.js b/jslib/when/test/unfold-test.js → lib/when/test/unfold-test.js
diff --git a/jslib/when/test/unfold/list-test.js → lib/when/test/unfold/list-test.js b/jslib/when/test/unfold/list-test.js → lib/when/test/unfold/list-test.js
diff --git a/jslib/when/test/when-test.js → lib/when/test/when-test.js b/jslib/when/test/when-test.js → lib/when/test/when-test.js
diff --git a/jslib/when/timed.js → lib/when/timed.js b/jslib/when/timed.js → lib/when/timed.js
diff --git a/jslib/when/timeout.js → lib/when/timeout.js b/jslib/when/timeout.js → lib/when/timeout.js
diff --git a/jslib/when/unfold.js → lib/when/unfold.js b/jslib/when/unfold.js → lib/when/unfold.js
diff --git a/jslib/when/unfold/list.js → lib/when/unfold/list.js b/jslib/when/unfold/list.js → lib/when/unfold/list.js
diff --git a/jslib/when/when.js → lib/when/when.js b/jslib/when/when.js → lib/when/when.js
diff --git a/sg/bar.js b/sg/bar.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/domCache"], 
+define(["lib/d3", "sg/domCache"], 
   function(_, domCache) {
 
 return function() {

diff --git a/sg/categorized.js b/sg/categorized.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/scatterLine", "sg/palette", "sg/util"], 
+define(["lib/d3", "sg/scatterLine", "sg/palette", "sg/util"], 
        function(_d3, scatterLine, palette, _util) {
 
 /** Divide a Series into categories and then plot each category with 

diff --git a/sg/chart.js b/sg/chart.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "jslib/when/monitor/console", "jslib/when/when", 
+define(["lib/d3", "lib/when/monitor/console", "lib/when/when", 
         "sg/data", "sg/util", "sg/zoom", "sg/resizable", "sg/linePlot", "sg/richAxis", 
         "sg/legend", "sg/timeClip", "sg/domCache"], 
    function(_d3, _console, when, dataApi, _util, zoomBrush, resizable, linePlot, richAxis, 

diff --git a/sg/combiner.js b/sg/combiner.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/domCache", "sg/barGroup", "sg/streamWrapper"], 
+define(["lib/d3", "sg/domCache", "sg/barGroup", "sg/streamWrapper"], 
   function(_, domCache, barGroup, streamWrap) {
 
 var combiner = function() {

diff --git a/sg/controlPanel.js b/sg/controlPanel.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define (["jslib/d3", "sg/util", "sg/metadata", "sg/dropDown"], 
+define (["lib/d3", "sg/util", "sg/metadata", "sg/dropDown"], 
         function(_d3, _util, networkMetaDataApi, dropDown) {
 
 /** A dashboard control panel.  More functionality to come! */

diff --git a/sg/dashboard.js b/sg/dashboard.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define (["jslib/when/when", "jslib/d3", 
+define (["lib/when/when", "lib/d3", 
          "sg/util", "sg/richAxis", "sg/maxLock", "sg/data", 
          "sg/zoom", "sg/chart", "sg/domCache"], 
         function(when, _d3, util, _richAxis, _maxLock, networkDataApi, 

diff --git a/sg/data.js b/sg/data.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/when/monitor/console", "sg/request"], 
+define(["lib/when/monitor/console", "sg/request"], 
     function(_console, request) {
 
 /** Fetch data points from the server.  Return a When that completes with the raw data 
@@ -37,6 +37,7 @@ define(["jslib/when/monitor/console", "sg/request"],
     function streamsResponse(message) {
       var streamsMessage = JSON.parse(message);
       return streamsMessage.message.streams[0].data;
+      // TODO: Handle more than one stream
     }
 
     /** Construct a StreamRequest to request a transform from the server */

diff --git a/sg/default.js b/sg/default.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-require(["jslib/d3", "sg/serverDescribedGraph"], function (_, serverDescribedChart) {
+require(["lib/d3", "sg/serverDescribedGraph"], function (_, serverDescribedChart) {
 
 /** Create a simple xy chart.  The server specifies the chart title and which data series to plot.  
  * This is intended to be a basic default plot of time series data, e.g. when launching the sg tool

diff --git a/sg/domCache.js b/sg/domCache.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3"], 
+define(["lib/d3"], 
   function(_) {
 
   /** Cache some private data in a javascript object e.g. a DOM node.  

diff --git a/sg/dropDown.js b/sg/dropDown.js
@@ -15,15 +15,15 @@
 requirejs.config({
   paths:{
     'select2': 'http://ivaynberg.github.com/select2/select2-3.2/select2',
-    'jquery': 'jslib/jquery'
+    'jquery': 'lib/jquery'
   },
   shim: {
     'select2': ['jquery']
   }
 });
 
 //define(["jquery", "select2", "sg/util"],  // TODO we saw some problems loading select2, temporarily disabled
-define(["jslib/jquery", "sg/util"], 
+define(["lib/jquery", "sg/util"], 
        function (_jquery, _util, _select2) {
 
 /** create a select2 based dropdown menu */

diff --git a/sg/legend.js b/sg/legend.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3"], function(_) {
+define(["lib/d3"], function(_) {
 /** Display a visual 'key' - named color swatches.
  *
  * Bind to LegendData 

diff --git a/sg/linePlot.js b/sg/linePlot.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3"], 
+define(["lib/d3"], 
   function(_) {
 
 /** Plot a single line into a container.  

diff --git a/sg/localData.js b/sg/localData.js
@@ -12,21 +12,35 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/when/when"], function(when) {
+define(["lib/when/when"], function(when) {
 
   /** returns an object that supports the async data() api
    *
    * Call with a local array of data: [Date, Number] */
   return function(dataArray) {
+
+    returnFn.millisToDates = millisToDates;
+    returnFn.toObject = toObject;
+    return returnFn;
 
     /* return data points within the domain from a local RAM array.
      * (see data.js data api)
      */
-    return function(setName, column, params) {
+    function returnFn(setName, column, params) {
       var domain = params.domain,
           first,
           extra = params.edgeExtra;
 
+      // Simulate DomainRange transform if requested
+      if (params.transform == "DomainRange") {
+        var d = minMax(dataArray, 0);
+        var r = minMax(dataArray, 1);
+
+        return when.resolve(
+            [ [["domain",d],["range",r]] ]
+        );
+      } 
+
       dataArray.every( function(datum, index) {
         var dataTime = datum[0];
         if (dataTime < domain[0]) {
@@ -51,6 +65,43 @@ define(["jslib/when/when"], function(when) {
       var result = dataArray.slice(start, endDex + 1);
       return when.resolve(result);
     }
+
+    /** convert [Millis,Number] to [Date, Number] format */
+    function millisToDates(jsonArray) {
+      var data = jsonArray.map( function (row) { 
+        var time = new Date(row[0]);
+        return [time, row[1]]; 
+      });
+      return data;
+    }
+
+    /** convert [String,Value] to {name1: value1, name2: value2}.  */
+    function toObject(jsonArray) {
+      var result = {};
+      jsonArray[0].forEach( function(element) {
+        result[element[0]] = element[1];
+      });
+      return result;
+    }
+
+    /**
+     * Return a 2 value array of the min & max of a column from a 2D array.
+     * @param array An array of 2 arrays
+     * @param index The 'column' of the array to find the min & max for.
+     * @returns {*[]}
+     */
+    function minMax(array, index) {
+      return [
+        reduce(array, Math.min, index),
+        reduce(array, Math.max, index)
+      ];
+    }
+
+    function reduce(array, reducer, index) {
+      return array.reduce(function(prev, current) {
+        return reducer(prev, current[index]);
+      }, array[0][index]);
+    }
 
   };
 });
diff --git a/sg/maxLock.js b/sg/maxLock.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/maxLock"], function(_, maxLock) {
+define(["lib/d3", "sg/maxLock"], function(_, maxLock) {
 /** Display a lockable maximum value indicator for a Y axis.
  *
  * When the lock/unlock button is clicked, a custom event 'toggleMaxLock' is fired.

diff --git a/sg/metadata.js b/sg/metadata.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/when/monitor/console", "sg/request"], function(_console, request) {
+define(["lib/when/monitor/console", "sg/request"], function(_console, request) {
 
 /** Fetch list of all data sets from the server.  
   * Returns a When that contains an array of strings e.g. ["foo/b.csv", "bar/c.csv"] */

diff --git a/sg/palette.js b/sg/palette.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define (["jslib/d3"], function(_) {
+define (["lib/d3"], function(_) {
 
 var palette = {
   category10       : d3.scale.category10,

diff --git a/sg/request.js b/sg/request.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/when/monitor/console", "jslib/when/when", "jslib/d3"], 
+define(["lib/when/monitor/console", "lib/when/when", "lib/d3"], 
     function(_console, when, _d3) {
 
 

diff --git a/sg/resizable.js b/sg/resizable.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define (["jslib/d3", "sg/util"], function(_d3, _util) {
+define (["lib/d3", "sg/util"], function(_d3, _util) {
 
 /** Make an svg box resizable by dragging on a resize widget.  
   *

diff --git a/sg/richAxis.js b/sg/richAxis.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/util", "sg/maxLock"], function(_d3, _util, maxLock) {
+define(["lib/d3", "sg/util", "sg/maxLock"], function(_d3, _util, maxLock) {
 
 /** A display d3.axis with a few extensions:
   *  label - a code or css styled text label

diff --git a/sg/scatterLine.js b/sg/scatterLine.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/symbolMark", "sg/util"], function(_d3, symbolMark, _util) {
+define(["lib/d3", "sg/symbolMark", "sg/util"], function(_d3, symbolMark, _util) {
 
 /** Plot of scatter of marks on a horizontal line 
  * Bind to an array containing a single Categorized object */

diff --git a/sg/sideAxis.js b/sg/sideAxis.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/util", "sg/richAxis", "sg/palette"], 
+define(["lib/d3", "sg/util", "sg/richAxis", "sg/palette"], 
        function(_d3, _util, richAxis, palette) {
 
 /** Attach a lockable axis to one side of the chart.

diff --git a/sg/symbolMark.js b/sg/symbolMark.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3"], function(_) {
+define(["lib/d3"], function(_) {
 
 /** Return a function which plots a single d3Symbol.  */
 return function() {

diff --git a/sg/timeClip.js b/sg/timeClip.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define(["jslib/d3", "sg/domCache"], function(_d3, domCache) {
+define(["lib/d3", "sg/domCache"], function(_d3, domCache) {
 
 /** Add an svg clipping rectangle to a selection.   If called within a transition, animate the 
   * clip rectangle to the it's new size. */

diff --git a/sg/zoom.js b/sg/zoom.js
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.  */
 
-define (["jslib/d3", "sg/domCache"], function(_, domCache) {
+define (["lib/d3", "sg/domCache"], function(_, domCache) {
 /** Setup drag zooming.   
   *
   * Wraps a d3.brush with a few modifications:

diff --git a/sparkle/src/it/static/index.html b/sparkle/src/it/static/index.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8">
   <title>Sparkle IT Jasmine Spec Runner</title>
   <link rel="shortcut icon" type="image/png" href="jasmine-2.0.0/jasmine_favicon.png">
   <link rel="stylesheet" type="text/css" href="jasmine-2.0.0/jasmine.css">

diff --git a/sparkle/src/it/static/jasmine-2.0.0 b/sparkle/src/it/static/jasmine-2.0.0
@@ -0,0 +1 @@
+../../test/web/jasmine-2.0.0
diff --git a/sparkle/src/it/static/lib b/sparkle/src/it/static/lib
@@ -0,0 +1 @@
+../../../../lib