Add missing mappings to adapter

This commit is contained in:
Piotr Sarnacki 2013-02-19 06:42:02 +01:00
parent 99b9c72e2e
commit a3f8e0ff7d
4 changed files with 18 additions and 10 deletions

View File

@ -12,4 +12,4 @@ require 'travis/model'
committerEmail: DS.attr('string')
pullRequestNumber: DS.attr('number')
build: DS.belongsTo('Travis.Build', key: 'buildId')
build: DS.belongsTo('Travis.Build')

View File

@ -1,7 +1,7 @@
require 'travis/model'
@Travis.Job = Travis.Model.extend Travis.DurationCalculations,
repoId: DS.attr('number', key: 'repository_id')
repoId: DS.attr('number')
buildId: DS.attr('number')
commitId: DS.attr('number')
logId: DS.attr('number')
@ -11,13 +11,13 @@ require 'travis/model'
number: DS.attr('string')
startedAt: DS.attr('string')
finishedAt: DS.attr('string')
allowFailure: DS.attr('boolean', key: 'allow_failure')
allowFailure: DS.attr('boolean')
repositorySlug: DS.attr('string')
repo: DS.belongsTo('Travis.Repo', key: 'repository_id')
build: DS.belongsTo('Travis.Build', key: 'build_id')
commit: DS.belongsTo('Travis.Commit', key: 'commit_id')
commits: DS.belongsTo('Travis.Commit', key: 'commit_id')
repo: DS.belongsTo('Travis.Repo')
build: DS.belongsTo('Travis.Build')
commit: DS.belongsTo('Travis.Commit')
commits: DS.belongsTo('Travis.Commit')
log: ( ->
Travis.Artifact.create(job: this)
).property()

View File

@ -9,6 +9,7 @@ require 'travis/model'
lastBuildState: DS.attr('string')
lastBuildStartedAt: DS.attr('string')
lastBuildFinishedAt: DS.attr('string')
_lastBuildDuration: DS.attr('number')
lastBuild: DS.belongsTo('Travis.Build')
@ -78,10 +79,10 @@ require 'travis/model'
).property('slug')
lastBuildDuration: (->
duration = @get('data.last_build_duration')
duration = @get('_lastBuildDuration')
duration = Travis.Helpers.durationFrom(@get('lastBuildStartedAt'), @get('lastBuildFinishedAt')) unless duration
duration
).property('data.last_build_duration', 'lastBuildStartedAt', 'lastBuildFinishedAt')
).property('_lastBuildDuration', 'lastBuildStartedAt', 'lastBuildFinishedAt')
sortOrder: (->
# cuz sortAscending seems buggy when set to false

View File

@ -49,4 +49,11 @@ Travis.RestAdapter.map 'Travis.Build', {
_config: { key: 'config' }
}
Travis.RestAdapter.map 'Travis.Repo', {}
Travis.RestAdapter.map 'Travis.Repo', {
_lastBuildDuration: { key: 'last_build_duration' }
}
Travis.RestAdapter.map 'Travis.Job', {
repoId: { key: 'repository_id' }
repo: { key: 'repository_id' }
}