From 823c8441bed7705498b53a11c5a5ce4a9fd3b917 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 31 Jul 2013 13:24:05 +0200 Subject: [PATCH] Change EmberData properties/relationships into EmberModel versions DS.attr -> Ember.attr DS.belongsTo -> Ember.belongsTo DS.hasMany -> Ember.hasMany --- assets/scripts/app/models/account.coffee | 8 ++--- assets/scripts/app/models/branch.coffee | 22 +++++++------- assets/scripts/app/models/broadcast.coffee | 2 +- assets/scripts/app/models/build.coffee | 33 ++++++++++---------- assets/scripts/app/models/commit.coffee | 22 +++++++------- assets/scripts/app/models/event.coffee | 10 +++---- assets/scripts/app/models/hook.coffee | 10 +++---- assets/scripts/app/models/job.coffee | 35 ++++++++++------------ assets/scripts/app/models/repo.coffee | 19 ++++++------ assets/scripts/app/models/user.coffee | 20 ++++++------- assets/scripts/app/models/worker.coffee | 8 ++--- 11 files changed, 92 insertions(+), 97 deletions(-) diff --git a/assets/scripts/app/models/account.coffee b/assets/scripts/app/models/account.coffee index 4169903e..09aeec51 100644 --- a/assets/scripts/app/models/account.coffee +++ b/assets/scripts/app/models/account.coffee @@ -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')}" diff --git a/assets/scripts/app/models/branch.coffee b/assets/scripts/app/models/branch.coffee index 3d45d52d..9f6e66f7 100644 --- a/assets/scripts/app/models/branch.coffee +++ b/assets/scripts/app/models/branch.coffee @@ -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') diff --git a/assets/scripts/app/models/broadcast.coffee b/assets/scripts/app/models/broadcast.coffee index dab4fe4d..9f712631 100644 --- a/assets/scripts/app/models/broadcast.coffee +++ b/assets/scripts/app/models/broadcast.coffee @@ -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') } diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 9906e770..de4b46f6 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -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')) diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee index 18602b5c..f756c4e1 100644 --- a/assets/scripts/app/models/commit.coffee +++ b/assets/scripts/app/models/commit.coffee @@ -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') diff --git a/assets/scripts/app/models/event.coffee b/assets/scripts/app/models/event.coffee index 605fe7b3..357d9abd 100644 --- a/assets/scripts/app/models/event.coffee +++ b/assets/scripts/app/models/event.coffee @@ -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') diff --git a/assets/scripts/app/models/hook.coffee b/assets/scripts/app/models/hook.coffee index 13cc04d1..3bd932ac 100644 --- a/assets/scripts/app/models/hook.coffee +++ b/assets/scripts/app/models/hook.coffee @@ -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] diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index b8c02d26..f4d85f2d 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -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') diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee index e1503b2a..fd29cd0a 100644 --- a/assets/scripts/app/models/repo.coffee +++ b/assets/scripts/app/models/repo.coffee @@ -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: (-> { diff --git a/assets/scripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee index 242ffb93..e1b0edaa 100644 --- a/assets/scripts/app/models/user.coffee +++ b/assets/scripts/app/models/user.coffee @@ -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') diff --git a/assets/scripts/app/models/worker.coffee b/assets/scripts/app/models/worker.coffee index c60a898f..c5bc8539 100644 --- a/assets/scripts/app/models/worker.coffee +++ b/assets/scripts/app/models/worker.coffee @@ -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]