knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#129,refactor][l]: ([s] in effort) rename Document to Record - fixes #129.

Browse Source
This commit is contained in:
Rufus Pollock
2012-05-31 21:04:31 +01:00
parent e7aa60c7d2
commit c1c1881660
19 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/backend.elasticsearch.test.js
View File

@@ -155,11 +155,11 @@ test("write", function() {
stop();
var id = parseInt(Math.random()*100000000).toString();
var doc = {
var rec = {
id: id,
title: 'my title'
};
var jqxhr = backend.upsert(doc);
var jqxhr = backend.upsert(rec);
jqxhr.done(function(data) {
ok(data.ok);
equal(data._id, id);
@@ -167,16 +167,16 @@ test("write", function() {
equal(data._version, 1);
// update
doc.title = 'new title';
var jqxhr = backend.upsert(doc);
rec.title = 'new title';
var jqxhr = backend.upsert(rec);
jqxhr.done(function(data) {
equal(data._version, 2);
// delete
var jqxhr = backend.delete(doc.id);
var jqxhr = backend.delete(rec.id);
jqxhr.done(function(data) {
ok(data.ok);
doc = null;
rec = null;
// try to get ...
var jqxhr = backend.get(id);
@@ -233,10 +233,10 @@ test("query", function() {
dataset.fetch().done(function(dataset) {
deepEqual(['_created', '_last_modified', 'end', 'owner', 'start', 'title'], _.pluck(dataset.fields.toJSON(), 'id'));
dataset.query().then(function(docList) {
dataset.query().then(function(recList) {
equal(3, dataset.docCount);
equal(3, docList.length);
equal('Note 1', docList.models[0].get('title'));
equal(3, recList.length);
equal('Note 1', recList.models[0].get('title'));
start();
});
});
@@ -254,14 +254,14 @@ test("write", function() {
stop();
var id = parseInt(Math.random()*100000000).toString();
var doc = new recline.Model.Document({
var rec = new recline.Model.Record({
id: id,
title: 'my title'
});
doc.backend = backend;
doc.dataset = dataset;
dataset.currentDocuments.add(doc);
var jqxhr = doc.save();
rec.backend = backend;
rec.dataset = dataset;
dataset.currentRecords.add(rec);
var jqxhr = rec.save();
jqxhr.done(function(data) {
ok(data.ok);
equal(data._id, id);
@@ -269,29 +269,29 @@ test("write", function() {
equal(data._version, 1);
// update
doc.set({title: 'new title'});
var jqxhr = doc.save();
rec.set({title: 'new title'});
var jqxhr = rec.save();
jqxhr.done(function(data) {
equal(data._version, 2);
// delete
var jqxhr = doc.destroy();
var jqxhr = rec.destroy();
jqxhr.done(function(data) {
ok(data.ok);
doc = null;
rec = null;
// try to get ...
var olddoc = new recline.Model.Document({id: id});
equal(olddoc.get('title'), null);
olddoc.dataset = dataset;
olddoc.backend = backend;
var jqxhr = olddoc.fetch();
var oldrec = new recline.Model.Record({id: id});
equal(oldrec.get('title'), null);
oldrec.dataset = dataset;
oldrec.backend = backend;
var jqxhr = oldrec.fetch();
jqxhr.done(function(data) {
// should not be here
ok(false, 'Should have got 404');
}).error(function(error) {
equal(error.status, 404);
equal(typeof olddoc.get('title'), 'undefined');
equal(typeof oldrec.get('title'), 'undefined');
start();
});
});

2
test/backend/csv.test.js
View File

@@ -26,7 +26,7 @@ test("parseCSV", function() {
'"Other, AN", 12:35\n';
var dataset = recline.Backend.CSV.csvToDataset(csv);
dataset.query();
equal(dataset.currentDocuments.length, 3);
equal(dataset.currentRecords.length, 3);
});
test("parseCSVsemicolon", function() {

40
test/backend/memory.test.js
View File

@@ -30,8 +30,8 @@ test('query', function () {
, from: 2
};
var out = data.query(queryObj);
deepEqual(out.documents[0], memoryData[2]);
equal(out.documents.length, 4);
deepEqual(out.records[0], memoryData[2]);
equal(out.records.length, 4);
equal(out.total, 6);
});
@@ -43,18 +43,18 @@ test('query sort', function () {
]
};
var out = data.query(queryObj);
equal(out.documents[0].x, 6);
equal(out.records[0].x, 6);
});
test('query string', function () {
var data = _wrapData();
var out = data.query({q: 'UK'});
equal(out.total, 3);
deepEqual(_.pluck(out.documents, 'country'), ['UK', 'UK', 'UK']);
deepEqual(_.pluck(out.records, 'country'), ['UK', 'UK', 'UK']);
var out = data.query({q: 'UK 6'})
equal(out.total, 1);
deepEqual(out.documents[0].id, 1);
deepEqual(out.records[0].id, 1);
});
test('filters', function () {
@@ -63,7 +63,7 @@ test('filters', function () {
query.addTermFilter('country', 'UK');
var out = data.query(query.toJSON());
equal(out.total, 3);
deepEqual(_.pluck(out.documents, 'country'), ['UK', 'UK', 'UK']);
deepEqual(_.pluck(out.records, 'country'), ['UK', 'UK', 'UK']);
});
test('facet', function () {
@@ -118,7 +118,7 @@ var memoryData = {
, id: 'test-dataset'
},
fields: [{id: 'x'}, {id: 'y'}, {id: 'z'}, {id: 'country'}, {id: 'label'}],
documents: [
records: [
{id: 0, x: 1, y: 2, z: 3, country: 'DE', label: 'first'}
, {id: 1, x: 2, y: 4, z: 6, country: 'UK', label: 'second'}
, {id: 2, x: 3, y: 6, z: 9, country: 'US', label: 'third'}
@@ -129,16 +129,16 @@ var memoryData = {
};
function makeBackendDataset() {
var dataset = new recline.Backend.Memory.createDataset(memoryData.documents, null, memoryData.metadata);
var dataset = new recline.Backend.Memory.createDataset(memoryData.records, null, memoryData.metadata);
return dataset;
}
test('createDataset', function () {
var dataset = recline.Backend.Memory.createDataset(memoryData.documents);
var dataset = recline.Backend.Memory.createDataset(memoryData.records);
equal(dataset.fields.length, 6);
deepEqual(['id', 'x', 'y', 'z', 'country', 'label'], dataset.fields.pluck('id'));
dataset.query();
equal(memoryData.documents.length, dataset.currentDocuments.length);
equal(memoryData.records.length, dataset.currentRecords.length);
});
test('basics', function () {
@@ -162,8 +162,8 @@ test('query', function () {
size: 4
, from: 2
};
dataset.query(queryObj).then(function(documentList) {
deepEqual(data[2], documentList.models[0].toJSON());
dataset.query(queryObj).then(function(recordList) {
deepEqual(data[2], recordList.models[0].toJSON());
});
});
@@ -177,7 +177,7 @@ test('query sort', function () {
]
};
dataset.query(queryObj).then(function() {
var doc0 = dataset.currentDocuments.models[0].toJSON();
var doc0 = dataset.currentRecords.models[0].toJSON();
equal(doc0.x, 6);
});
});
@@ -186,13 +186,13 @@ test('query string', function () {
var dataset = makeBackendDataset();
dataset.fetch();
dataset.query({q: 'UK'}).then(function() {
equal(dataset.currentDocuments.length, 3);
deepEqual(dataset.currentDocuments.pluck('country'), ['UK', 'UK', 'UK']);
equal(dataset.currentRecords.length, 3);
deepEqual(dataset.currentRecords.pluck('country'), ['UK', 'UK', 'UK']);
});
dataset.query({q: 'UK 6'}).then(function() {
equal(dataset.currentDocuments.length, 1);
deepEqual(dataset.currentDocuments.models[0].id, 1);
equal(dataset.currentRecords.length, 1);
deepEqual(dataset.currentRecords.models[0].id, 1);
});
});
@@ -200,8 +200,8 @@ test('filters', function () {
var dataset = makeBackendDataset();
dataset.queryState.addTermFilter('country', 'UK');
dataset.query().then(function() {
equal(dataset.currentDocuments.length, 3);
deepEqual(dataset.currentDocuments.pluck('country'), ['UK', 'UK', 'UK']);
equal(dataset.currentRecords.length, 3);
deepEqual(dataset.currentRecords.pluck('country'), ['UK', 'UK', 'UK']);
});
});
@@ -247,7 +247,7 @@ test('update and delete', function () {
// Test Delete
doc1.destroy().then(function() {
equal(data.data.length, 5);
equal(data.data[0].x, memoryData.documents[1].x);
equal(data.data[0].x, memoryData.records[1].x);
});
});
});

4
test/model.test.js
View File

@@ -39,7 +39,7 @@ test('Field: basics', function () {
});
test('Field: default renderers', function () {
var doc = new recline.Model.Document({
var doc = new recline.Model.Record({
x: 12.3,
myobject: {a: 1, b: 2},
link: 'http://abc.com/',
@@ -74,7 +74,7 @@ test('Field: default renderers', function () {
});
test('Field: custom deriver and renderer', function () {
var doc = new recline.Model.Document({x: 123});
var doc = new recline.Model.Record({x: 123});
var cellRenderer = function(value, field) {
return '<span class="field-' + field.id + '">' + value + '</span>';
}

2
test/view-grid.test.js
View File

@@ -38,7 +38,7 @@ test('state', function () {
test('new GridRow View', function () {
var $el = $('<tr />');
$('.fixtures .test-datatable').append($el);
var doc = new recline.Model.Document({
var doc = new recline.Model.Record({
'id': 1,
'b': '2',
'a': '1'

16
test/view-map.test.js
View File

@@ -11,12 +11,12 @@ var GeoJSONFixture = {
{id: 'z'},
{id: 'geom'}
];
var documents = [
var records = [
{id: 0, x: 1, y: 2, z: 3, geom: '{"type":"Point","coordinates":[13.40,52.35]}'},
{id: 1, x: 2, y: 4, z: 6, geom: {type:"Point",coordinates:[13.40,52.35]}},
{id: 2, x: 3, y: 6, z: 9, geom: {type:"LineString",coordinates:[[100.0, 0.0],[101.0, 1.0]]}}
];
var dataset = recline.Backend.Memory.createDataset(documents, fields);
var dataset = recline.Backend.Memory.createDataset(records, fields);
return dataset;
}
};
@@ -55,12 +55,12 @@ test('Lat/Lon geom fields', function () {
// Check that all markers were created
equal(_getFeaturesCount(view.features),6);
// Delete a document
view.model.currentDocuments.remove(view.model.currentDocuments.get('1'));
// Delete a record
view.model.currentRecords.remove(view.model.currentRecords.get('1'));
equal(_getFeaturesCount(view.features),5);
// Add a new one
view.model.currentDocuments.add({id: 7, x: 7, y: 14, z: 21, country: 'KX', label: 'seventh', lat:13.23, lon:23.56}),
view.model.currentRecords.add({id: 7, x: 7, y: 14, z: 21, country: 'KX', label: 'seventh', lat:13.23, lon:23.56}),
equal(_getFeaturesCount(view.features),6);
view.remove();
@@ -79,12 +79,12 @@ test('GeoJSON geom field', function () {
// Check that all features were created
equal(_getFeaturesCount(view.features),3);
// Delete a document
view.model.currentDocuments.remove(view.model.currentDocuments.get('2'));
// Delete a record
view.model.currentRecords.remove(view.model.currentRecords.get('2'));
equal(_getFeaturesCount(view.features),2);
// Add it back
view.model.currentDocuments.add({id: 2, x: 3, y: 6, z: 9, geom: {type:"LineString",coordinates:[[100.0, 0.0],[101.0, 1.0]]}}),
view.model.currentRecords.add({id: 2, x: 3, y: 6, z: 9, geom: {type:"LineString",coordinates:[[100.0, 0.0],[101.0, 1.0]]}}),
equal(_getFeaturesCount(view.features),3);
view.remove();

2
test/view-slickgrid.test.js
View File

@@ -16,7 +16,7 @@ test('basic', function () {
assertPresent('.slick-header-column[title="x"]');
equal($('.slick-header-column').length,dataset.fields.length);
equal(dataset.currentDocuments.length,view.grid.getDataLength());
equal(dataset.currentRecords.length,view.grid.getDataLength());
view.remove();
});

12
test/view-timeline.test.js
View File

@@ -17,16 +17,16 @@ test('extract dates and timelineJSON', function () {
'headline': '',
'date': [
{
'startDate': '2012-03-20',
'startDate': new Date('2012-03-20'),
'endDate': null,
'headline': '2012-03-20',
'text': ''
'headline': '1',
'text': '<div><strong>Date</strong>: 2012-03-20</div><div><strong>title</strong>: 1</div>'
},
{
'startDate': '2012-03-25',
'startDate': new Date('2012-03-25'),
'endDate': null,
'headline': '2012-03-25',
'text': ''
'headline': '2',
'text': '<div><strong>Date</strong>: 2012-03-25</div><div><strong>title</strong>: 2</div>'
}
]
}