plugged everythinh together

Makefile

@@ -29,13 +29,15 @@ test: build
 
 testjs: build
 	elasticsearch/bin/elasticsearch -p es.pid; sleep 5
-	$(BIN)/python tools/create_es.py 9998
 	-testacular start --single-run
-	kill $(cat es.pid)
+	kill `cat es.pid`
 
 elasticsearch:
 	curl -C - --progress-bar http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$(ES_VERSION).tar.gz | tar -zx
 	mv elasticsearch-$(ES_VERSION) elasticsearch
 	chmod a+x elasticsearch/bin/elasticsearch
 	mv elasticsearch/config/elasticsearch.yml elasticsearch/config/elasticsearch.in.yml
 	cp elasticsearch.yml elasticsearch/config/elasticsearch.yml
+	elasticsearch/bin/elasticsearch -p es.pid; sleep 5
+	$(BIN)/python tools/create_es.py 9998
+	kill `cat es.pid`

monolith/media/lib/monolith.js

@@ -32,6 +32,8 @@ Highcharts.setOptions({
 });
 
 
+jQuery.support.cors = true;
+
 function queryES(server, query) {
   var result;
   query = JSON.stringify(query);
@@ -42,6 +44,7 @@ function queryES(server, query) {
           dataType: "json",
           processData: false,
           dataType: "json",
+          //crossDomain: true,
           data: query,
           async: false,
           success: function(json) { result = json;},

monolith/tests/client.js

@@ -1,21 +1,16 @@
 
 
-describe("A suite", function() {
-  it("contains spec with an expectation", function() {
-      expect(true).toBe(true);
-    });
-});
-
+describe("Utils suite", function() {
+  it("'queryES'", function() {
 
+    var query = {"query": { "match_all": {}}};
 
+    result = queryES("http://0.0.0.0:9998/time_2012-01/_search", query);
+    var total = result.hits.total;
+    expect(total).toBe(3100);
+    });
+});
 
-describe("A suite is just a function", function() {
-  var a;
 
-    it("and so is a spec", function() {
-    a = true;
-    expect(a).toBe(true);
-  });
-});
 
 

tools/create_es.py

@@ -6,8 +6,8 @@
 from pyelasticsearch import ElasticSearch
 
 
-def feed(index='monolith', type='downloads'):
-    client = ElasticSearch('http://localhost:9200/')
+def feed(index='monolith', type='downloads', es_port=9200):
+    client = ElasticSearch('http://0.0.0.0:%d/' % es_port)
     platforms = ['Mac OS X', 'Windows 8', 'Ubuntu']
 
     # indexing a year of data (2012)
@@ -47,9 +47,15 @@ def feed(index='monolith', type='downloads'):
             sys.stdout.flush()
 
     client.optimize('time_*', max_num_segments=1, wait_for_merge=True)
+    client.flush()
     sys.stdout.write('\nDone!\n')
 
 
 if __name__ == '__main__':
-    feed()
+    if len(sys.argv) > 1:
+        port = int(sys.argv[1])
+    else:
+        port = 9200
+
+    feed(es_port=port)