Skip to content

Commit f29ae12

Browse files
committed
Remove date-fns from dependencies
1 parent e3257b5 commit f29ae12

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"license": "MIT",
2525
"repository": "https://github.com/mxstbr/micro-analytics",
2626
"dependencies": {
27-
"date-fns": "^1.25.0",
2827
"flat-file-db": "^1.0.0",
2928
"micro": "6.1.0",
3029
"promise": "^7.1.1",

src/flat-file-adapter.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const flatfile = require('flat-file-db')
22
const promise = require('promise')
3-
const dateFns = require('date-fns')
43

54
const db = flatfile.sync(process.env.DB_NAME || 'views.db')
65

@@ -13,8 +12,8 @@ module.exports = {
1312

1413
return {
1514
views: value.views.filter(view => {
16-
if (options && options.before && dateFns.isAfter(view.time, options.before)) return false
17-
if (options && options.after && dateFns.isBefore(view.time, options.after)) return false
15+
if (options && options.before && view.time > options.before) return false
16+
if (options && options.after && view.time < options.after) return false
1817
return true
1918
})
2019
}

src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ module.exports = async function (req, res) {
1212
const data = {
1313
data: await db.getAll({
1414
pathname: pathname,
15-
before: query.before,
16-
after: query.after,
15+
before: parseInt(query.before, 10),
16+
after: parseInt(query.after, 10),
1717
}),
1818
time: Date.now()
1919
}

tests/items.test.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const request = require('request-promise')
2-
const dateFns = require('date-fns')
32
const { listen, mockDb } = require('./utils')
43

54
jest.mock('flat-file-db', () => mockDb)
@@ -93,27 +92,24 @@ describe('all', () => {
9392
})
9493

9594
it('should filter based on before after', async () => {
96-
const baseDate = new Date(2017, 1, 1, 10, 0)
97-
const after = dateFns.addMinutes(baseDate, 11).toISOString()
98-
const before = dateFns.addMinutes(baseDate, 41).toISOString()
99-
100-
const d = dateFns.addMinutes(baseDate, 20)
95+
const after = new Date('2017-01-01T09:11:00.000Z').getTime()
96+
const before = new Date('2017-01-01T09:41:00.000Z').getTime()
10197

10298
mockDb._put('/rover', { views: [
103-
{ time: baseDate.getTime() },
104-
{ time: dateFns.addMinutes(baseDate, 10).getTime() },
105-
{ time: dateFns.addMinutes(baseDate, 20).getTime() },
106-
{ time: dateFns.addMinutes(baseDate, 30).getTime() },
107-
{ time: dateFns.addMinutes(baseDate, 40).getTime() },
108-
{ time: dateFns.addMinutes(baseDate, 50).getTime() },
99+
{ time: new Date('2017-01-01T09:00:00.000Z').getTime() },
100+
{ time: new Date('2017-01-01T09:10:00.000Z').getTime() },
101+
{ time: new Date('2017-01-01T09:20:00.000Z').getTime() },
102+
{ time: new Date('2017-01-01T09:30:00.000Z').getTime() },
103+
{ time: new Date('2017-01-01T09:40:00.000Z').getTime() },
104+
{ time: new Date('2017-01-01T09:50:00.000Z').getTime() },
109105
]})
110106

111107
const mapToIsoString = view => new Date(view.time).toISOString()
112108
const body = JSON.parse(await request(`${url}/rover?all=true&before=${before}&after=${after}`))
113109
expect(body.data['/rover'].views.map(mapToIsoString)).toEqual([
114-
'2017-02-01T09:20:00.000Z',
115-
'2017-02-01T09:30:00.000Z',
116-
'2017-02-01T09:40:00.000Z'
110+
'2017-01-01T09:20:00.000Z',
111+
'2017-01-01T09:30:00.000Z',
112+
'2017-01-01T09:40:00.000Z'
117113
])
118114
})
119115
})

0 commit comments

Comments
 (0)