suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change EmberData properties/relationships into EmberModel versions

Browse Source 
DS.attr -> Ember.attr
DS.belongsTo -> Ember.belongsTo
DS.hasMany -> Ember.hasMany
This commit is contained in:
Piotr Sarnacki 2013-07-31 13:24:05 +02:00
parent 4d74491401
commit 823c8441be
11 changed files with 92 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/scripts/app/models/account.coffee
View File

@ -2,10 +2,10 @@ require 'travis/model'
@Travis.Account = Travis.Model.extend
primaryKey: 'login'
login: DS.attr('string')
name: DS.attr('string')
type: DS.attr('string')
reposCount: DS.attr('number')
login: Ember.attr('string')
name: Ember.attr('string')
type: Ember.attr('string')
reposCount: Ember.attr(Number)
urlGithub: (->
"http://github.com/#{@get('login')}"

22
assets/scripts/app/models/branch.coffee
View File

@ -1,18 +1,18 @@
require 'travis/model'
@Travis.Branch = Travis.Model.extend
repoId: DS.attr('number', key: 'repository_id')
commitId: DS.attr('number')
state: DS.attr('string')
number: DS.attr('number')
branch: DS.attr('string')
message: DS.attr('string')
result: DS.attr('number')
duration: DS.attr('number')
startedAt: DS.attr('string')
finishedAt: DS.attr('string')
repoId: Ember.attr('number', key: 'repository_id')
commitId: Ember.attr('number')
state: Ember.attr('string')
number: Ember.attr('number')
branch: Ember.attr('string')
message: Ember.attr('string')
result: Ember.attr('number')
duration: Ember.attr('number')
startedAt: Ember.attr('string')
finishedAt: Ember.attr('string')
commit: DS.belongsTo('Travis.Commit')
commit: Ember.belongsTo('Travis.Commit')
repo: (->
Travis.Repo.find @get('repoId') if @get('repoId')

2
assets/scripts/app/models/broadcast.coffee
View File

@ -1,7 +1,7 @@
require 'travis/model'
@Travis.Broadcast = Travis.Model.extend
message: DS.attr('string')
message: Ember.attr('string')
toObject: ->
{ type: 'broadcast', id: @get('id'), message: @get('message') }

33
assets/scripts/app/models/build.coffee
View File

@ -1,25 +1,24 @@
require 'travis/model'
@Travis.Build = Travis.Model.extend Travis.DurationCalculations,
eventType: DS.attr('string')
repoId: DS.attr('number')
commitId: DS.attr('number')
repositoryId: Ember.attr('number')
commitId: Ember.attr('number')
state: DS.attr('string')
number: DS.attr('number')
branch: DS.attr('string')
message: DS.attr('string')
_duration: DS.attr('number')
_config: DS.attr('object')
startedAt: DS.attr('string')
finishedAt: DS.attr('string')
pullRequest: DS.attr('boolean')
pullRequestTitle: DS.attr('string')
pullRequestNumber: DS.attr('number')
state: Ember.attr('string')
number: Ember.attr(Number)
branch: Ember.attr('string')
message: Ember.attr('string')
_duration: Ember.attr(Number, key: 'duration')
_config: Ember.attr('object', key: 'config')
startedAt: Ember.attr('string')
finishedAt: Ember.attr('string')
pullRequest: Ember.attr('boolean')
pullRequestTitle: Ember.attr('string')
pullRequestNumber: Ember.attr(Number)
repo: DS.belongsTo('Travis.Repo')
commit: DS.belongsTo('Travis.Commit')
jobs: DS.hasMany('Travis.Job')
repo: Ember.belongsTo('Travis.Repo', key: 'repository_id')
commit: Ember.belongsTo('Travis.Commit')
jobs: Ember.hasMany('Travis.Job')
config: (->
Travis.Helpers.compact(@get('_config'))

22
assets/scripts/app/models/commit.coffee
View File

@ -1,15 +1,15 @@
require 'travis/model'
@Travis.Commit = Travis.Model.extend
buildId: DS.attr('number')
sha: DS.attr('string')
branch: DS.attr('string')
message: DS.attr('string')
compareUrl: DS.attr('string')
authorName: DS.attr('string')
authorEmail: DS.attr('string')
committerName: DS.attr('string')
committerEmail: DS.attr('string')
pullRequestNumber: DS.attr('number')
buildId: Ember.attr('number')
sha: Ember.attr('string')
branch: Ember.attr('string')
message: Ember.attr('string')
compareUrl: Ember.attr('string')
authorName: Ember.attr('string')
authorEmail: Ember.attr('string')
committerName: Ember.attr('string')
committerEmail: Ember.attr('string')
pullRequestNumber: Ember.attr('number')
build: DS.belongsTo('Travis.Build')
build: Ember.belongsTo('Travis.Build')

10
assets/scripts/app/models/event.coffee
View File

@ -1,11 +1,11 @@
require 'travis/model'
@Travis.Event = Travis.Model.extend
event: DS.attr('string')
repoId: DS.attr('number', key: 'repository_id')
sourceId: DS.attr('number', key: 'source_id')
sourceType: DS.attr('string', key: 'source_type')
createdAt: DS.attr('string', key: 'created_at')
event: Ember.attr('string')
repoId: Ember.attr('number', key: 'repository_id')
sourceId: Ember.attr('number', key: 'source_id')
sourceType: Ember.attr('string', key: 'source_type')
createdAt: Ember.attr('string', key: 'created_at')
event_: (->
@get('event')

10
assets/scripts/app/models/hook.coffee
View File

@ -1,11 +1,11 @@
require 'travis/model'
@Travis.Hook = Travis.Model.extend
name: DS.attr('string')
ownerName: DS.attr('string')
description: DS.attr('string')
active: DS.attr('boolean')
admin: DS.attr('boolean')
name: Ember.attr('string')
ownerName: Ember.attr('string')
description: Ember.attr('string')
active: Ember.attr('boolean')
admin: Ember.attr('boolean')
account: (->
@get('slug').split('/')[0]

35
assets/scripts/app/models/job.coffee
View File

@ -1,29 +1,24 @@
require 'travis/model'
@Travis.Job = Travis.Model.extend Travis.DurationCalculations,
repoId: DS.attr('number')
buildId: DS.attr('number')
commitId: DS.attr('number')
logId: DS.attr('number')
repoId: Ember.attr('string', key: 'repository_id')
buildId: Ember.attr('string')
commitId: Ember.attr('string')
logId: Ember.attr('string')
queue: DS.attr('string')
state: DS.attr('string')
number: DS.attr('string')
startedAt: DS.attr('string')
finishedAt: DS.attr('string')
allowFailure: DS.attr('boolean')
queue: Ember.attr('string')
state: Ember.attr('string')
number: Ember.attr(Number)
startedAt: Ember.attr('string')
finishedAt: Ember.attr('string')
allowFailure: Ember.attr('boolean')
repositorySlug: DS.attr('string')
repo: DS.belongsTo('Travis.Repo')
build: DS.belongsTo('Travis.Build')
commit: DS.belongsTo('Travis.Commit')
repositorySlug: Ember.attr('string')
repo: Ember.belongsTo('Travis.Repo', key: 'repository_id')
build: Ember.belongsTo('Travis.Build')
commit: Ember.belongsTo('Travis.Commit')
# this is a fake relationship just to get rid
# of ember data's bug: https://github.com/emberjs/data/issues/758
# TODO: remove when this issue is fixed
fakeBuild: DS.belongsTo('Travis.Build')
_config: DS.attr('object')
_config: Ember.attr('object', key: 'config')
repoSlugDidChange: (->
if slug = @get('repoSlug')

19
assets/scripts/app/models/repo.coffee
View File

@ -2,16 +2,17 @@ require 'travis/expandable_record_array'
require 'travis/model'
@Travis.Repo = Travis.Model.extend
slug: DS.attr('string')
description: DS.attr('string')
lastBuildId: DS.attr('number')
lastBuildNumber: DS.attr('string')
lastBuildState: DS.attr('string')
lastBuildStartedAt: DS.attr('string')
lastBuildFinishedAt: DS.attr('string')
_lastBuildDuration: DS.attr('number')
id: Ember.attr('string')
slug: Ember.attr('string')
description: Ember.attr('string')
lastBuildId: Ember.attr('string')
lastBuildNumber: Ember.attr(Number)
lastBuildState: Ember.attr('string')
lastBuildStartedAt: Ember.attr('string')
lastBuildFinishedAt: Ember.attr('string')
_lastBuildDuration: Ember.attr(Number, key: 'last_build_duration')
lastBuild: DS.belongsTo('Travis.Build')
lastBuild: Ember.belongsTo('Travis.Build', key: 'last_build_id')
lastBuildHash: (->
{

20
assets/scripts/app/models/user.coffee
View File

@ -2,17 +2,17 @@ require 'travis/ajax'
require 'travis/model'
@Travis.User = Travis.Model.extend
_name: DS.attr('string')
email: DS.attr('string')
login: DS.attr('string')
token: DS.attr('string')
locale: DS.attr('string')
gravatarId: DS.attr('string')
isSyncing: DS.attr('boolean')
syncedAt: DS.attr('string')
repoCount: DS.attr('number')
_name: Ember.attr('string', key: 'name')
email: Ember.attr('string')
login: Ember.attr('string')
token: Ember.attr('string')
locale: Ember.attr('string')
gravatarId: Ember.attr('string')
isSyncing: Ember.attr('boolean')
syncedAt: Ember.attr('string')
repoCount: Ember.attr('number')
# This is the only way I found to override the attribue created with DS.attr
# This is the only way I found to override the attribue created with Ember.attr
name: Ember.computed( (key, value) ->
if arguments.length == 1
@get('_name') || @get('login')

8
assets/scripts/app/models/worker.coffee
View File

@ -1,10 +1,10 @@
require 'travis/model'
@Travis.Worker = Travis.Model.extend
state: DS.attr('string')
name: DS.attr('string')
host: DS.attr('string')
payload: DS.attr('object')
state: Ember.attr('string')
name: Ember.attr('string')
host: Ember.attr('string')
payload: Ember.attr('object')
number: (->
@get('name').match(/\d+$/)[0]