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

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

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')
+  repoId:       Ember.attr('number', key: 'repository_id')
-  commitId:     DS.attr('number')
+  commitId:     Ember.attr('number')
-  state:        DS.attr('string')
+  state:        Ember.attr('string')
-  number:       DS.attr('number')
+  number:       Ember.attr('number')
-  branch:       DS.attr('string')
+  branch:       Ember.attr('string')
-  message:      DS.attr('string')
+  message:      Ember.attr('string')
-  result:       DS.attr('number')
+  result:       Ember.attr('number')
-  duration:     DS.attr('number')
+  duration:     Ember.attr('number')
-  startedAt:    DS.attr('string')
+  startedAt:    Ember.attr('string')
-  finishedAt:   DS.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')

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') }

assets/scripts/app/models/build.coffee

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

assets/scripts/app/models/commit.coffee

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

assets/scripts/app/models/event.coffee

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

assets/scripts/app/models/hook.coffee

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

assets/scripts/app/models/job.coffee

@@ -1,29 +1,24 @@
 require 'travis/model'
 
 @Travis.Job = Travis.Model.extend Travis.DurationCalculations,
-  repoId:         DS.attr('number')
+  repoId:         Ember.attr('string', key: 'repository_id')
-  buildId:        DS.attr('number')
+  buildId:        Ember.attr('string')
-  commitId:       DS.attr('number')
+  commitId:       Ember.attr('string')
-  logId:          DS.attr('number')
+  logId:          Ember.attr('string')
 
-  queue:          DS.attr('string')
+  queue:          Ember.attr('string')
-  state:          DS.attr('string')
+  state:          Ember.attr('string')
-  number:         DS.attr('string')
+  number:         Ember.attr(Number)
-  startedAt:      DS.attr('string')
+  startedAt:      Ember.attr('string')
-  finishedAt:     DS.attr('string')
+  finishedAt:     Ember.attr('string')
-  allowFailure:   DS.attr('boolean')
+  allowFailure:   Ember.attr('boolean')
 
-  repositorySlug: DS.attr('string')
+  repositorySlug: Ember.attr('string')
-  repo:   DS.belongsTo('Travis.Repo')
+  repo:   Ember.belongsTo('Travis.Repo', key: 'repository_id')
-  build:  DS.belongsTo('Travis.Build')
+  build:  Ember.belongsTo('Travis.Build')
-  commit: DS.belongsTo('Travis.Commit')
+  commit: Ember.belongsTo('Travis.Commit')
 
-  # this is a fake relationship just to get rid
+  _config: Ember.attr('object', key: 'config')
-  # 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')
 
   repoSlugDidChange: (->
     if slug = @get('repoSlug')

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')
+  id:                  Ember.attr('string')
-  description:         DS.attr('string')
+  slug:                Ember.attr('string')
-  lastBuildId:         DS.attr('number')
+  description:         Ember.attr('string')
-  lastBuildNumber:     DS.attr('string')
+  lastBuildId:         Ember.attr('string')
-  lastBuildState:      DS.attr('string')
+  lastBuildNumber:     Ember.attr(Number)
-  lastBuildStartedAt:  DS.attr('string')
+  lastBuildState:      Ember.attr('string')
-  lastBuildFinishedAt: DS.attr('string')
+  lastBuildStartedAt:  Ember.attr('string')
-  _lastBuildDuration:  DS.attr('number')
+  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: (->
     {

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')
+  _name:       Ember.attr('string', key: 'name')
-  email:       DS.attr('string')
+  email:       Ember.attr('string')
-  login:       DS.attr('string')
+  login:       Ember.attr('string')
-  token:       DS.attr('string')
+  token:       Ember.attr('string')
-  locale:      DS.attr('string')
+  locale:      Ember.attr('string')
-  gravatarId:  DS.attr('string')
+  gravatarId:  Ember.attr('string')
-  isSyncing:   DS.attr('boolean')
+  isSyncing:   Ember.attr('boolean')
-  syncedAt:    DS.attr('string')
+  syncedAt:    Ember.attr('string')
-  repoCount:   DS.attr('number')
+  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')

assets/scripts/app/models/worker.coffee

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