senaduka/old-spike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor client models to use lokijs

Browse Source
This commit is contained in:
Eric Hulburd
2016-02-19 15:42:10 -06:00
parent c26b3b94c3
commit a84df34b55
6 changed files with 172 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/lib/databasable.js
View File

@@ -1,12 +1,18 @@
import Loki from 'lokijs';
import LokiIndexedAdapter from 'loki/loki-indexed-adapter';
const DEFAULTS = { const DEFAULTS = {
adapter: '' autosave: false
}; };
var databasable = { var databasable = {
accessDb: function(db_name, opts){ accessDb: function(db_name, opts){
var databasable = this; var databasable = this;
opts = Object.assign(Object.assign({}, DEFAULTS), opts || {}); opts = Object.assign(Object.assign({
persistenceMethod: 'adapter',
persistenceAdapter: new LokiIndexedAdapter(db_name)
}, DEFAULTS), opts || {});
return new Promise((fnResolve, fnReject){ return new Promise((fnResolve, fnReject){
if (!databasable.db) { if (!databasable.db) {
databasable.db = new Loki(db_name, opts); databasable.db = new Loki(db_name, opts);
@@ -26,9 +32,9 @@ var databasable = {
} }
}, },
collection(collection_name, options){ collection: function(collection_name, options){
var databasable = this; var databasable = this;
databasable.accessDb() return databasable.accessDb()
.then((db)=>{ .then((db)=>{
var collection = db.getCollection(collection_name) var collection = db.getCollection(collection_name)
if (!collection){ if (!collection){
@@ -38,6 +44,22 @@ var databasable = {
}); });
} }
rangeToLokiParams: function(attr, range){
var date_params = {};
if (range[0] !== undefined && range[0] !== undefined){
var start_condition = {},
end_condition = {};
date_params['$and'] = [start_condition, end_condition];
start_condition[attr] = {'$lt': range[1]};
end_condition[attr] = {'$lt': range[1]};
} else if (range[0] !== undefined) {
date_params[attr] = {'$gt': range[0]}
} else if (range[1] !== undefined) {
date_params[attr] = {'$lt': range[1]}
}
return date_params;
}
}; };
export default databaseable; export default databaseable;

20
client/models/energy_datum.js
View File

@@ -1,6 +1,11 @@
import extend from 'extend'; import extend from 'extend';
import moment from 'moment-timezone'; import moment from 'moment-timezone';
const NAME = 'EnergyDatum';
const COLLECTION_DEFAULTS = {
indices: ['day']
};
class EnergyDatum { class EnergyDatum {
constructor(data, house){ constructor(data, house){
var energy_datum = this; var energy_datum = this;
@@ -36,20 +41,9 @@ class EnergyDatum {
return Math.round(energy_datum.data.production); return Math.round(energy_datum.data.production);
} }
update(data){
var energy_datum = this,
house = energy_datum.house;
if (data.day) data.day = moment.tz(data.day, house.data.timezone);
extend(energy_datum.data, data);
}
static updateOrInitialize(data, house){
var energy_datum = EnergyDatum.store.get(data.id);
if (energy_datum) energy_datum.update(data);
return energy_datum || new EnergyDatum(data, house)
}
} }
EnergyDatum.store = new Map(); EnergyDatum.NAME = NAME;
EnergyDatum.COLLECTION_DEFAULTS = COLLECTION_DEFAULTS;
export default EnergyDatum; export default EnergyDatum;

152
client/models/house.js
View File

@@ -6,8 +6,10 @@ import EnergyDatum from './energy_datum';
import PowerDataApi from './../api/power_data'; import PowerDataApi from './../api/power_data';
import EnergyDataApi from './../api/energy_data'; import EnergyDataApi from './../api/energy_data';
import HousesApi from './../api/houses'; import HousesApi from './../api/houses';
import ArrayUtil from './../../shared/utils/array' import ArrayUtil from './../../shared/utils/array';
import MathUtil from './../../shared/utils/math' import MathUtil from './../../shared/utils/math';
import DateRange from './../../shared/utils/date_range';
import Databasable from './../lib/databasable';
class House { class House {
@@ -27,6 +29,18 @@ class House {
return House.collection() return House.collection()
.then((house_collection)=>{ .then((house_collection)=>{
return house_collection.update(house.data); return house_collection.update(house.data);
});
}
setPowerData(opts){
var house = this;
return house.ensurePowerData(opts)
.then(()=>{
return house.collection(PowerDatum.NAME, PowerDatum.COLLECTION_OPTIONS)
.then((power_collection)=>{
var params = house.rangeToLokiParams('time', [opts.start_date, opts.end_date]);
house.power_data = power_collection.find(params).map((data)=>{ return new PowerDatum(data); })
});
}) })
} }
@@ -36,29 +50,40 @@ class House {
end_date: undefined end_date: undefined
}, opts || {}); }, opts || {});
var house = this, var house = this,
query_ranges = DateUtil.dateOverlaps([opts.start_date, opts.end_date], house.data.query_dates]); query_ranges = DateRange.addRange([opts.start_date, opts.end_date], house.data.power_datum_ranges);
if (query_ranges.gaps_filled.length > 0){
house.getPowerData({dates: query_ranges.gaps_filled})
house.collection(PowerDatum.name, {}) .then(()=>{
.then((power_collection)=>{ house.data.power_datum_ranges = query_ranges.new_ranges;
return house.save();
}) });
} else { return Promise.resolve(); }
} }
getPowerData(params){ getPowerData(params){
var house = this; var house = this;
params.house_id = house.data.id; params.house_id = house.data.id;
return PowerDataApi.index(params).then((power_data)=>{ return PowerDataApi.index(params)
return power_data.map((power_datum_data)=>{ .then((power_data)=>{
// save new power data into db return house.collection(PowerDatum.NAME, PowerDatum.COLLECTION_OPTIONS);
// update mins and maxes. .then((power_collection)=>{
var power_datum = PowerDatum.updateOrInitialize(power_datum_data, house); power_collection.insert(power_data);
house.power_data_collection.set(power_datum.data.time, power_datum); return house.db.save();
house.power_data.push(power_datum); });
return power_datum; })
}); }
});
setEnergyData(opts){
var house = this;
return house.ensureEnergyData(opts)
.then(()=>{
return house.collection(EnergyDatum.NAME, EnergyDatum.COLLECTION_OPTIONS)
.then((energy_collection)=>{
var params = house.rangeToLokiParams('day', [opts.start_date, opts.end_date]);
house.energy_data = energy_collection.find(params).map((data)=>{ return new EnergyDatum(data); })
});
})
} }
ensureEnergyData(opts){ ensureEnergyData(opts){
@@ -67,84 +92,28 @@ class House {
end_date: undefined end_date: undefined
}, opts || {}); }, opts || {});
var house = this, var house = this,
date_range = Array.from(house.energy_data_store.keys()), query_ranges = DateRange.addRange([opts.start_date, opts.end_date], house.data.energy_datum_ranges);
min_date = Math.min(date_range),
max_date = Math.max(date_range),
query_ranges, cache;
if (date_range.length === 0) return house.getEnergyData({dates: [[opts.start_date, opts.end_date]]}) if (query_ranges.gaps_filled.length > 0){
house.getEnergyData({dates: query_ranges.gaps_filled})
query_ranges = MathUtil.minusRange([opts.start_date, opts.end_date], [min_date, max_date]); .then(()=>{
house.data.energy_datum_ranges = query_ranges.new_ranges;
if (!query_ranges) return Promise.resolve(house.power_data); return house.save();
});
cache = ArrayUtil.selectMap(date_range, (datum_day)=>{ } else { return Promise.resolve(); }
return ArrayUtil.all(query_ranges, (query_range)=>{
return !MathUtil.inRange(datum_day, query_range);
});
}, (datum_day)=>{
return house.energy_data_store.get(datum_day);
});
if (query_ranges.length > 0){
return house.getEnergyData({dates: query_ranges}).then((new_energy_data)=>{
return new_energy_data_store.concat(cache);
});
} else return Promise.resolve(cache);
} }
getEnergyData(params){ getEnergyData(params){
var house = this; var house = this;
params.house_id = house.data.id; params.house_id = house.data.id;
return EnergyDataApi.index(params).then((energy_data)=>{ return EnergyDataApi.index(params)
return energy_data.map((energy_datum_data)=>{ .then((energy_data)=>{
var energy_datum = EnergyDatum.updateOrInitialize(energy_datum_data, house); return house.collection(EnergyDatum.NAME, EnergyDatum.COLLECTION_OPTIONS);
house.energy_data_store.set(energy_datum.day, energy_datum); .then((energy_collection)=>{
house.energy_data.push(energy_datum); energy_collection.insert(energy_data);
return energy_datum; return house.db.save();
}); });
}); })
}
update(data){
var house = this;
extend(house.data, data);
}
static updateOrInitialize(id, data){
var house = PowerDatum.store.get(id);
if (house) house.update(data);
return house || new House(data, data)
}
static accessDb(){
return new Promise((fnResolve, fnReject){
if (!House.db) {
House.db = new Loki('houses', adapter: '');
House.db.loadDatabase({}, ()=>{
fnResolve(House.db);
});
} else { fnResolve(House.db); }
});
}
static closeDb(){
if (House.db){
House.db.save();
House.db.close();
House.db = undefined;
}
}
static collection(){
return House.accessDb()
.then((db)=>{
var house_collection = db.getCollection('houses')
if (!house_collection){
house_collection = db.addCollection('houses', {indices: ['id']});
}
return house_collection;
});
} }
static ensureHouses(ids){ static ensureHouses(ids){
@@ -178,4 +147,5 @@ class House {
} }
Object.assign(House, Databasable);
export default House; export default House;

21
client/models/power_datum.js
View File

@@ -1,6 +1,11 @@
import extend from 'extend'; import extend from 'extend';
import moment from 'moment-timezone'; import moment from 'moment-timezone';
const NAME = 'PowerDatum';
const COLLECTION_DEFAULTS = {
indices: ['time']
};
class PowerDatum { class PowerDatum {
constructor(data, house){ constructor(data, house){
var power_datum = this; var power_datum = this;
@@ -34,21 +39,9 @@ class PowerDatum {
return Math.round(power_datum.data.production); return Math.round(power_datum.data.production);
} }
update(data){
var power_datum = this,
house = power_datum.house;
if (data.time) data.time = moment.tz(data.time, house.data.timezone);
extend(power_datum.data, data);
}
static updateOrInitialize(data, house){
var power_datum = PowerDatum.store.get(data.id);
if (power_datum) power_datum.update(data);
return power_datum || new PowerDatum(data, house)
}
} }
PowerDatum.store = new Map(); PowerDatum.NAME = NAME;
PowerDatum.COLLECTION_DEFAULTS = COLLECTION_DEFAULTS;
export default PowerDatum; export default PowerDatum;

10
shared/utils/date.js → shared/utils/date_range.js
View File

@@ -1,4 +1,4 @@
class DateUtil { class DateRange {
static addRange(new_range, ranges){ static addRange(new_range, ranges){
var gaps_filled = [], new_ranges = [], var gaps_filled = [], new_ranges = [],
@@ -49,14 +49,6 @@ class DateUtil {
return { gaps_filled: gaps_filled, new_ranges: new_ranges } return { gaps_filled: gaps_filled, new_ranges: new_ranges }
} }
static min(date1, date2){
}
static max(date1, date2){
}
static gte(date1, date2){ static gte(date1, date2){
return (date1 === undefined || (date2 !== undefined && date1 >= date2)); return (date1 === undefined || (date2 !== undefined && date1 >= date2));
} }

166
spec/shared/util/date.test.js → spec/shared/utils/date_range.test.js
View File

@@ -1,89 +1,63 @@
"use strict"; "use strict";
import DateUtil from './../../../shared/utils/date.js'; import DateRange from './../../../shared/utils/date_range.js';
function rangeEquivalent(range1, range2){ describe('DateRange.gte', ()=>{
if (range1 && !range2 || !range1 && range2) return false
var equivalent = true
if (range1[0] && range2[0]) {
equivalent = range1[0].getTime() === range2[0].getTime();
} else {
equivalent = range1[0] === range2[0];
}
if (!equivalent) return false;
if (range1[1] && range2[1]) {
equivalent = range1[1].getTime() === range2[1].getTime();
} else {
equivalent = range1[1] === range2[1];
}
return equivalent
}
function rangesEquivalent(a1, a2){
var match = true;
if (a1.length !== a2.length) return false;
a1.forEach((range, i)=>{
if (!rangeEquivalent(range, a2[i])) match = false; return false;
});
return match;
}
describe('DateUtil.gte', ()=>{
it('considers undefined as a large date', ()=>{ it('considers undefined as a large date', ()=>{
var date1 = new Date(), var date1 = new Date(),
date2 = new Date(date1.getTime() + 1000); date2 = new Date(date1.getTime() + 1000);
expect(DateUtil.gte(undefined, date1)).toEqual(true); expect(DateRange.gte(undefined, date1)).toEqual(true);
expect(DateUtil.gte(undefined, undefined)).toEqual(true); expect(DateRange.gte(undefined, undefined)).toEqual(true);
expect(DateUtil.gte(date1, undefined)).toEqual(false); expect(DateRange.gte(date1, undefined)).toEqual(false);
expect(DateUtil.gte(date1, date2)).toEqual(false); expect(DateRange.gte(date1, date2)).toEqual(false);
expect(DateUtil.gte(date2, date1)).toEqual(true); expect(DateRange.gte(date2, date1)).toEqual(true);
}); });
}); });
describe('DateUtil.lte', ()=>{ describe('DateRange.lte', ()=>{
it('considers undefined as a small date', ()=>{ it('considers undefined as a small date', ()=>{
var date1 = new Date(), var date1 = new Date(),
date2 = new Date(date1.getTime() + 1000); date2 = new Date(date1.getTime() + 1000);
expect(DateUtil.lte(undefined, date1)).toEqual(true); expect(DateRange.lte(undefined, date1)).toEqual(true);
expect(DateUtil.lte(undefined, undefined)).toEqual(true); expect(DateRange.lte(undefined, undefined)).toEqual(true);
expect(DateUtil.lte(date1, undefined)).toEqual(false); expect(DateRange.lte(date1, undefined)).toEqual(false);
expect(DateUtil.lte(date1, date2)).toEqual(true); expect(DateRange.lte(date1, date2)).toEqual(true);
expect(DateUtil.lte(date2, date1)).toEqual(false); expect(DateRange.lte(date2, date1)).toEqual(false);
}); });
}); });
describe('DateUtil.addRange', ()=>{ describe('DateRange.addRange', ()=>{
var date1 = new Date(), var date1 = new Date(),
date01 = DateUtil.add(date1, -1000), date01 = DateRange.add(date1, -1000),
date11 = DateUtil.add(date1, 1000), date11 = DateRange.add(date1, 1000),
date2 = DateUtil.add(date1, 2000), date2 = DateRange.add(date1, 2000),
date21 = DateUtil.add(date2, 1000), date21 = DateRange.add(date2, 1000),
date3 = DateUtil.add(date2, 2000), date3 = DateRange.add(date2, 2000),
date31 = DateUtil.add(date3, 1000), date31 = DateRange.add(date3, 1000),
date4 = DateUtil.add(date3, 2000), date4 = DateRange.add(date3, 2000),
date41 = DateUtil.add(date4, 1000), date41 = DateRange.add(date4, 1000),
date5 = DateUtil.add(date4, 2000), date5 = DateRange.add(date4, 2000),
date51 = DateUtil.add(date5, 1000), date51 = DateRange.add(date5, 1000),
date6 = DateUtil.add(date5, 2000), date6 = DateRange.add(date5, 2000),
date61 = DateUtil.add(date6, 1000), date61 = DateRange.add(date6, 1000),
date7 = DateUtil.add(date6, 2000), date7 = DateRange.add(date6, 2000),
date71 = DateUtil.add(date7, 1000); date71 = DateRange.add(date7, 1000);
describe('no ranges exist', ()=>{ describe('no ranges exist', ()=>{
it('returns the new ranges', ()=>{ it('returns the new ranges', ()=>{
var result = DateUtil.addRange([date1, date2], []); var result = DateRange.addRange([date1, date2], []);
expect(rangesEquivalent(result.gaps_filled, [[date1, date2]])).toBeTruthy(); expect(result.gaps_filled).toEqual([[date1, date2]]);
expect(rangesEquivalent(result.new_ranges, [[date1, date2]])).toBeTruthy(); expect(result.new_ranges).toEqual([[date1, date2]]);
}); });
}); });
describe('infinite range exists', ()=>{ describe('infinite range exists', ()=>{
it('returns the infinite range, no gaps filled', ()=>{ it('returns the infinite range, no gaps filled', ()=>{
var result = DateUtil.addRange([date1, date2], [[undefined, undefined]]); var result = DateRange.addRange([date1, date2], [[undefined, undefined]]);
expect(rangesEquivalent(result.gaps_filled, [])).toBeTruthy(); expect(result.gaps_filled).toEqual([]);
expect(rangesEquivalent(result.new_ranges, [[undefined, undefined]])).toBeTruthy(); expect(result.new_ranges).toEqual([[undefined, undefined]]);
}); });
}); });
@@ -94,7 +68,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{ describe('new range low low', ()=>{
var new_range = [undefined, date01]; var new_range = [undefined, date01];
it('no gaps filled', ()=>{ it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]) expect(result.gaps_filled).toEqual([])
expect(result.new_ranges).toEqual(ranges); expect(result.new_ranges).toEqual(ranges);
}); });
@@ -103,7 +77,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{ describe('new range low mid', ()=>{
var new_range = [undefined, date31]; var new_range = [undefined, date31];
it('fills mid gaps', ()=>{ it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date2], [date3, date31]]); expect(result.gaps_filled).toEqual([[date1, date2], [date3, date31]]);
expect(result.new_ranges).toEqual([[undefined, date31], [date4, date5]]); expect(result.new_ranges).toEqual([[undefined, date31], [date4, date5]]);
}); });
@@ -112,7 +86,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{ describe('new range low high', ()=>{
var new_range = [undefined, date61]; var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{ it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date2], [date3, date4], [date5, date61]]); expect(result.gaps_filled).toEqual([[date1, date2], [date3, date4], [date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]); expect(result.new_ranges).toEqual([[undefined, date61]]);
}); });
@@ -122,7 +96,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{ describe('new range mid mid', ()=>{
var new_range = [date11, date41]; var new_range = [date11, date41];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date11, date2], [date3, date4]]) expect(result.gaps_filled).toEqual([[date11, date2], [date3, date4]])
expect(result.new_ranges).toEqual([[undefined, date1], [date11, date5]]); expect(result.new_ranges).toEqual([[undefined, date1], [date11, date5]]);
}); });
@@ -131,7 +105,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{ describe('new range mid high', ()=>{
var new_range = [date11, date61]; var new_range = [date11, date61];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date11, date2], [date3, date4], [date5, date61]]); expect(result.gaps_filled).toEqual([[date11, date2], [date3, date4], [date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date1], [date11, date61]]); expect(result.new_ranges).toEqual([[undefined, date1], [date11, date61]]);
}); });
@@ -140,7 +114,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{ describe('new range high high', ()=>{
var new_range = [date5, date61]; var new_range = [date5, date61];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date5, date61]]); expect(result.gaps_filled).toEqual([[date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date1], [date2, date3], [date4, date61]]); expect(result.new_ranges).toEqual([[undefined, date1], [date2, date3], [date4, date61]]);
}); });
@@ -154,7 +128,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{ describe('new range low low', ()=>{
var new_range = [undefined, date01]; var new_range = [undefined, date01];
it('no gaps filled', ()=>{ it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]) expect(result.gaps_filled).toEqual([])
expect(result.new_ranges).toEqual([[undefined, date1]]); expect(result.new_ranges).toEqual([[undefined, date1]]);
}); });
@@ -163,7 +137,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{ describe('new range low mid', ()=>{
var new_range = [undefined, date1]; var new_range = [undefined, date1];
it('fills mid gaps', ()=>{ it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]); expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[undefined, date1]]); expect(result.new_ranges).toEqual([[undefined, date1]]);
}); });
@@ -172,7 +146,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{ describe('new range low high', ()=>{
var new_range = [undefined, date61]; var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{ it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date61]]); expect(result.gaps_filled).toEqual([[date1, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]); expect(result.new_ranges).toEqual([[undefined, date61]]);
}); });
@@ -182,7 +156,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{ describe('new range mid mid', ()=>{
var new_range = [date01, date1]; var new_range = [date01, date1];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]) expect(result.gaps_filled).toEqual([])
expect(result.new_ranges).toEqual([[undefined, date1]]); expect(result.new_ranges).toEqual([[undefined, date1]]);
}); });
@@ -191,7 +165,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{ describe('new range mid high', ()=>{
var new_range = [date1, date61]; var new_range = [date1, date61];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date1, date61]]); expect(result.gaps_filled).toEqual([[date1, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]); expect(result.new_ranges).toEqual([[undefined, date61]]);
}); });
@@ -200,7 +174,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{ describe('new range high high', ()=>{
var new_range = [date5, date61]; var new_range = [date5, date61];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date5, date61]]); expect(result.gaps_filled).toEqual([[date5, date61]]);
expect(result.new_ranges).toEqual([[undefined, date1], [date5, date61]]); expect(result.new_ranges).toEqual([[undefined, date1], [date5, date61]]);
}); });
@@ -215,7 +189,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{ describe('new range low low', ()=>{
var new_range = [undefined, date01]; var new_range = [undefined, date01];
it('no gaps filled', ()=>{ it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]); expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2], [date3, date4], [date5, undefined]]); expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2], [date3, date4], [date5, undefined]]);
}); });
@@ -224,7 +198,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{ describe('new range low mid', ()=>{
var new_range = [undefined, date3]; var new_range = [undefined, date3];
it('fills mid gaps', ()=>{ it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3]]); expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3]]);
expect(result.new_ranges).toEqual([[undefined, date4], [date5, undefined]]); expect(result.new_ranges).toEqual([[undefined, date4], [date5, undefined]]);
}); });
@@ -233,7 +207,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{ describe('new range low high', ()=>{
var new_range = [undefined, date61]; var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{ it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date5]]); expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date5]]);
expect(result.new_ranges).toEqual([[undefined, undefined]]); expect(result.new_ranges).toEqual([[undefined, undefined]]);
}); });
@@ -242,7 +216,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{ describe('new range mid mid', ()=>{
var new_range = [date1, date41]; var new_range = [date1, date41];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date2, date3], [date4, date41]]); expect(result.gaps_filled).toEqual([[date2, date3], [date4, date41]]);
expect(result.new_ranges).toEqual([[date1, date41], [date5, undefined]]); expect(result.new_ranges).toEqual([[date1, date41], [date5, undefined]]);
}); });
@@ -251,7 +225,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{ describe('new range mid high', ()=>{
var new_range = [date31, date61]; var new_range = [date31, date61];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date4, date5]]); expect(result.gaps_filled).toEqual([[date4, date5]]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, undefined]]); expect(result.new_ranges).toEqual([[date1, date2], [date3, undefined]]);
}); });
@@ -260,7 +234,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{ describe('new range high high', ()=>{
var new_range = [date5, date61]; var new_range = [date5, date61];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]); expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, date4], [date5, undefined]]); expect(result.new_ranges).toEqual([[date1, date2], [date3, date4], [date5, undefined]]);
}); });
@@ -273,7 +247,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{ describe('new range low low', ()=>{
var new_range = [undefined, date01]; var new_range = [undefined, date01];
it('no gaps filled', ()=>{ it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]); expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, undefined]]); expect(result.new_ranges).toEqual([[undefined, date01], [date1, undefined]]);
}); });
@@ -282,7 +256,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{ describe('new range low mid', ()=>{
var new_range = [undefined, date1]; var new_range = [undefined, date1];
it('fills mid gaps', ()=>{ it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1]]); expect(result.gaps_filled).toEqual([[undefined, date1]]);
expect(result.new_ranges).toEqual([[undefined, undefined]]); expect(result.new_ranges).toEqual([[undefined, undefined]]);
}); });
@@ -291,7 +265,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{ describe('new range low high', ()=>{
var new_range = [undefined, date61]; var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{ it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1]]); expect(result.gaps_filled).toEqual([[undefined, date1]]);
expect(result.new_ranges).toEqual([[undefined, undefined]]); expect(result.new_ranges).toEqual([[undefined, undefined]]);
}); });
@@ -300,7 +274,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{ describe('new range mid mid', ()=>{
var new_range = [date1, date1]; var new_range = [date1, date1];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]); expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, undefined]]); expect(result.new_ranges).toEqual([[date1, undefined]]);
}); });
@@ -309,7 +283,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{ describe('new range mid high', ()=>{
var new_range = [date1, undefined]; var new_range = [date1, undefined];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]); expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, undefined]]); expect(result.new_ranges).toEqual([[date1, undefined]]);
}); });
@@ -318,7 +292,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{ describe('new range high high', ()=>{
var new_range = [date5, undefined]; var new_range = [date5, undefined];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]); expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, undefined]]); expect(result.new_ranges).toEqual([[date1, undefined]]);
}); });
@@ -334,7 +308,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{ describe('new range low low', ()=>{
var new_range = [undefined, date01]; var new_range = [undefined, date01];
it('no gaps filled', ()=>{ it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]); expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2], [date3, date4], [date5, date6]]); expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2], [date3, date4], [date5, date6]]);
}); });
@@ -343,7 +317,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{ describe('new range low mid', ()=>{
var new_range = [undefined, date41]; var new_range = [undefined, date41];
it('fills mid gaps', ()=>{ it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date41]]); expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date41]]);
expect(result.new_ranges).toEqual([[undefined, date41], [date5, date6]]); expect(result.new_ranges).toEqual([[undefined, date41], [date5, date6]]);
}); });
@@ -352,7 +326,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{ describe('new range low high', ()=>{
var new_range = [undefined, date61]; var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{ it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date5], [date6, date61]]); expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date3], [date4, date5], [date6, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]); expect(result.new_ranges).toEqual([[undefined, date61]]);
}); });
@@ -361,7 +335,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{ describe('new range mid mid', ()=>{
var new_range = [date11, date41]; var new_range = [date11, date41];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date2, date3], [date4, date41]]); expect(result.gaps_filled).toEqual([[date2, date3], [date4, date41]]);
expect(result.new_ranges).toEqual([[date1, date41], [date5, date6]]); expect(result.new_ranges).toEqual([[date1, date41], [date5, date6]]);
}); });
@@ -370,7 +344,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{ describe('new range mid high', ()=>{
var new_range = [date31, undefined]; var new_range = [date31, undefined];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date4, date5], [date6, undefined]]); expect(result.gaps_filled).toEqual([[date4, date5], [date6, undefined]]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, undefined]]); expect(result.new_ranges).toEqual([[date1, date2], [date3, undefined]]);
}); });
@@ -379,7 +353,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{ describe('new range high high', ()=>{
var new_range = [date61, undefined]; var new_range = [date61, undefined];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date61, undefined]]); expect(result.gaps_filled).toEqual([[date61, undefined]]);
expect(result.new_ranges).toEqual([[date1, date2], [date3, date4], [date5, date6], [date61, undefined]]); expect(result.new_ranges).toEqual([[date1, date2], [date3, date4], [date5, date6], [date61, undefined]]);
}); });
@@ -393,7 +367,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low low', ()=>{ describe('new range low low', ()=>{
var new_range = [undefined, date01]; var new_range = [undefined, date01];
it('no gaps filled', ()=>{ it('no gaps filled', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date01]]); expect(result.gaps_filled).toEqual([[undefined, date01]]);
expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2]]); expect(result.new_ranges).toEqual([[undefined, date01], [date1, date2]]);
}); });
@@ -402,7 +376,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low mid', ()=>{ describe('new range low mid', ()=>{
var new_range = [undefined, date11]; var new_range = [undefined, date11];
it('fills mid gaps', ()=>{ it('fills mid gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1]]); expect(result.gaps_filled).toEqual([[undefined, date1]]);
expect(result.new_ranges).toEqual([[undefined, date2]]); expect(result.new_ranges).toEqual([[undefined, date2]]);
}); });
@@ -411,7 +385,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range low high', ()=>{ describe('new range low high', ()=>{
var new_range = [undefined, date61]; var new_range = [undefined, date61];
it('fills mid and high gaps', ()=>{ it('fills mid and high gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date61]]); expect(result.gaps_filled).toEqual([[undefined, date1], [date2, date61]]);
expect(result.new_ranges).toEqual([[undefined, date61]]); expect(result.new_ranges).toEqual([[undefined, date61]]);
}); });
@@ -420,7 +394,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid mid', ()=>{ describe('new range mid mid', ()=>{
var new_range = [date11, date2]; var new_range = [date11, date2];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([]); expect(result.gaps_filled).toEqual([]);
expect(result.new_ranges).toEqual([[date1, date2]]); expect(result.new_ranges).toEqual([[date1, date2]]);
}); });
@@ -429,7 +403,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range mid high', ()=>{ describe('new range mid high', ()=>{
var new_range = [date11, undefined]; var new_range = [date11, undefined];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date2, undefined]]); expect(result.gaps_filled).toEqual([[date2, undefined]]);
expect(result.new_ranges).toEqual([[date1, undefined]]); expect(result.new_ranges).toEqual([[date1, undefined]]);
}); });
@@ -438,7 +412,7 @@ describe('DateUtil.addRange', ()=>{
describe('new range high high', ()=>{ describe('new range high high', ()=>{
var new_range = [date61, undefined]; var new_range = [date61, undefined];
it('includes gaps', ()=>{ it('includes gaps', ()=>{
var result = DateUtil.addRange(new_range, ranges); var result = DateRange.addRange(new_range, ranges);
expect(result.gaps_filled).toEqual([[date61, undefined]]); expect(result.gaps_filled).toEqual([[date61, undefined]]);
expect(result.new_ranges).toEqual([[date1, date2], [date61, undefined]]); expect(result.new_ranges).toEqual([[date1, date2], [date61, undefined]]);
}); });