move out default profile, bugfixes 🐛

This commit is contained in:
Jannis R 2017-11-12 14:52:04 +01:00
parent 3c9f3393ba
commit eb98123e5b
No known key found for this signature in database
GPG key ID: 0FE83946296A88A5
4 changed files with 57 additions and 53 deletions

View file

@ -2,8 +2,8 @@
const moment = require('moment-timezone') const moment = require('moment-timezone')
const formatDate = (tz, when) => { const formatDate = (profile, when) => {
moment(when).tz(tz).format('YYYYMMDD') return moment(when).tz(profile.timezone).format('YYYYMMDD')
} }
module.exports = formatDate module.exports = formatDate

View file

@ -2,8 +2,8 @@
const moment = require('moment-timezone') const moment = require('moment-timezone')
const formatTime = (tz, when) => { const formatTime = (profile, when) => {
return moment(when).tz(tz).format('HHmmss') return moment(when).tz(profile.timezone).format('HHmmss')
} }
module.exports = formatTime module.exports = formatTime

View file

@ -1,55 +1,8 @@
'use strict' 'use strict'
const parseDateTime = require('./parse/date-time') const defaultProfile = require('./lib/default-profile')
const parseDeparture = require('./parse/departure')
const parseJourney = require('./parse/journey')
const parseLine = require('./parse/line')
const parseLocation = require('./parse/location')
const parseMovement = require('./parse/movement')
const parseNearby = require('./parse/nearby')
const parseOperator = require('./parse/operator')
const parseRemark = require('./parse/remark')
const parseStopover = require('./parse/stopover')
const formatAddress = require('./format/address')
const formatCoord = require('./format/coord')
const formatDate = require('./format/date')
const filters = require('./format/filters')
const formatLocationFilter = require('./format/location-filter')
const formatPoi = require('./format/poi')
const formatStation = require('./format/station')
const formatTime = require('./format/time')
const request = require('./lib/request') const request = require('./lib/request')
const id = x => x
// todo: find out which are actually necessary
const defaultProfile = {
transformReqBody: id,
transformReq: id,
parseDateTime,
parseDeparture,
parseJourney,
parseLine,
parseLocation,
parseMovement,
parseNearby,
parseOperator,
parseRemark,
parseStopover,
formatAddress,
formatCoord,
formatDate,
filters,
formatLocationFilter,
formatPoi,
formatStation,
formatTime
}
const createClient = (profile) => { const createClient = (profile) => {
profile = Object.assign({}, defaultProfile, profile) profile = Object.assign({}, defaultProfile, profile)
if ('string' !== typeof profile.timezone) { if ('string' !== typeof profile.timezone) {
@ -60,4 +13,4 @@ const createClient = (profile) => {
return client return client
} }
module.exports = createRequest module.exports = createClient

51
lib/default-profile.js Normal file
View file

@ -0,0 +1,51 @@
'use strict'
const parseDateTime = require('../parse/date-time')
const parseDeparture = require('../parse/departure')
const parseJourney = require('../parse/journey')
const parseLine = require('../parse/line')
const parseLocation = require('../parse/location')
const parseMovement = require('../parse/movement')
const parseNearby = require('../parse/nearby')
const parseOperator = require('../parse/operator')
const parseRemark = require('../parse/remark')
const parseStopover = require('../parse/stopover')
const formatAddress = require('../format/address')
const formatCoord = require('../format/coord')
const formatDate = require('../format/date')
const filters = require('../format/filters')
const formatLocationFilter = require('../format/location-filter')
const formatPoi = require('../format/poi')
const formatStation = require('../format/station')
const formatTime = require('../format/time')
const id = x => x
// todo: find out which are actually necessary
const defaultProfile = {
transformReqBody: id,
transformReq: id,
parseDateTime,
parseDeparture,
parseJourney,
parseLine,
parseLocation,
parseMovement,
parseNearby,
parseOperator,
parseRemark,
parseStopover,
formatAddress,
formatCoord,
formatDate,
filters,
formatLocationFilter,
formatPoi,
formatStation,
formatTime
}
module.exports = defaultProfile