From 4871409032b9564544cec3cf5d45b5b77e616fe4 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 28 Jan 2015 17:21:27 +0100
Subject: [PATCH] Ember CLI compat
---
assets/scripts/app/models/account.coffee | 6 +++++-
assets/scripts/app/models/annotation.coffee | 6 +++++-
assets/scripts/app/models/branch.coffee | 8 ++++----
assets/scripts/app/models/broadcast.coffee | 4 +++-
assets/scripts/app/models/build.coffee | 9 ++++++---
assets/scripts/app/models/commit.coffee | 6 +++++-
assets/scripts/app/models/env-var.coffee | 6 +++++-
assets/scripts/app/models/event.coffee | 8 ++++----
assets/scripts/app/models/hook.coffee | 5 ++++-
assets/scripts/app/models/job.coffee | 5 ++++-
assets/scripts/app/models/log.coffee | 6 ++++--
assets/scripts/app/models/repo.coffee | 7 +++++--
assets/scripts/app/models/request.coffee | 6 +++++-
assets/scripts/app/models/ssh-key.coffee | 6 +++++-
assets/scripts/app/models/user.coffee | 5 ++++-
15 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/assets/scripts/app/models/account.coffee b/assets/scripts/app/models/account.coffee
index ac9ec1bb..3af78de9 100644
--- a/assets/scripts/app/models/account.coffee
+++ b/assets/scripts/app/models/account.coffee
@@ -1,9 +1,13 @@
require 'travis/model'
-Travis.Account = Travis.Model.extend
+Model = Travis.Model
+
+Account = Model.extend
name: DS.attr()
type: DS.attr()
reposCount: DS.attr('number')
subscribed: DS.attr('boolean')
education: DS.attr('boolean')
loginBinding: 'id'
+
+Travis.Account = Account
diff --git a/assets/scripts/app/models/annotation.coffee b/assets/scripts/app/models/annotation.coffee
index 1ffed232..7a26e231 100644
--- a/assets/scripts/app/models/annotation.coffee
+++ b/assets/scripts/app/models/annotation.coffee
@@ -1,6 +1,8 @@
require 'travis/model'
-Travis.Annotation = Travis.Model.extend
+Model = Travis.Model
+
+Annotation = Model.extend
jobId: DS.attr('number')
description: DS.attr()
url: DS.attr()
@@ -8,3 +10,5 @@ Travis.Annotation = Travis.Model.extend
providerName: DS.attr()
job: DS.belongsTo('job')
+
+Travis.Annotation = Annotation
diff --git a/assets/scripts/app/models/branch.coffee b/assets/scripts/app/models/branch.coffee
index 66de4c5a..1daabd36 100644
--- a/assets/scripts/app/models/branch.coffee
+++ b/assets/scripts/app/models/branch.coffee
@@ -1,6 +1,8 @@
require 'travis/model'
-Travis.Branch = Travis.Model.extend
+Model = Travis.Model
+
+Branch = Model.extend
repositoryId: DS.attr('number')
commitId: DS.attr('number')
state: DS.attr()
@@ -22,6 +24,4 @@ Travis.Branch = Travis.Model.extend
@notifyPropertyChange 'started_at'
@notifyPropertyChange 'finished_at'
-Travis.Branch.reopenClass
- byRepoId: (id) ->
- @find repository_id: id
+Travis.Branch = Branch
diff --git a/assets/scripts/app/models/broadcast.coffee b/assets/scripts/app/models/broadcast.coffee
index e8201299..4f7e36bd 100644
--- a/assets/scripts/app/models/broadcast.coffee
+++ b/assets/scripts/app/models/broadcast.coffee
@@ -1,6 +1,8 @@
require 'travis/model'
-Broadcast = Travis.Model.extend
+Model = Travis.Model
+
+Broadcast = Model.extend
message: DS.attr()
toObject: ->
diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee
index e3a03ef8..a4a9e915 100644
--- a/assets/scripts/app/models/build.coffee
+++ b/assets/scripts/app/models/build.coffee
@@ -6,10 +6,11 @@ require 'travis/ajax'
compact = Travis.Helpers.compact
configKeys = Travis.Helpers.configKeys
Ajax = Travis.ajax
-config_keys_map = Travis.CONFIG_KEYS_MAP
+configKeysMap = Travis.CONFIG_KEYS_MAP
DurationCalculations = Travis.DurationCalculations
+Model = Travis.Model
-Travis.Build = Travis.Model.extend DurationCalculations,
+Build = Model.extend DurationCalculations,
state: DS.attr()
number: DS.attr('number')
branch: DS.attr('string')
@@ -89,7 +90,7 @@ Travis.Build = Travis.Model.extend DurationCalculations,
configKeys: (->
keys = @get('rawConfigKeys')
headers = ['Job', 'Duration', 'Finished']
- $.map(headers.concat(keys), (key) -> if config_keys_map.hasOwnProperty(key) then config_keys_map[key] else key)
+ $.map(headers.concat(keys), (key) -> if configKeysMap.hasOwnProperty(key) then configKeysMap[key] else key)
).property('rawConfigKeys.length')
canCancel: (->
@@ -107,3 +108,5 @@ Travis.Build = Travis.Model.extend DurationCalculations,
if finishedAt = @get('finishedAt')
moment(finishedAt).format('lll')
).property('finishedAt')
+
+Travis.Build = Build
diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee
index f716b9d1..2f456486 100644
--- a/assets/scripts/app/models/commit.coffee
+++ b/assets/scripts/app/models/commit.coffee
@@ -1,6 +1,8 @@
require 'travis/model'
-@Travis.Commit = Travis.Model.extend
+Model = Travis.Model
+
+Commit = Model.extend
sha: DS.attr()
branch: DS.attr()
message: DS.attr()
@@ -31,3 +33,5 @@ require 'travis/model'
@get('authorName') == @get('committerName') and
@get('authorEmail') == @get('committerEmail')
).property('authorName', 'authorEmail', 'committerName', 'committerEmail')
+
+Travis.Commit = Commit
diff --git a/assets/scripts/app/models/env-var.coffee b/assets/scripts/app/models/env-var.coffee
index 9de243de..10eeb270 100644
--- a/assets/scripts/app/models/env-var.coffee
+++ b/assets/scripts/app/models/env-var.coffee
@@ -1,8 +1,12 @@
require 'travis/model'
-Travis.EnvVar = Travis.Model.extend
+Model = Travis.Model
+
+EnvVar = Model.extend
name: DS.attr()
value: DS.attr()
public: DS.attr('boolean')
repo: DS.belongsTo('repo', async: true)
+
+Travis.EnvVar = EnvVar
diff --git a/assets/scripts/app/models/event.coffee b/assets/scripts/app/models/event.coffee
index c3e6eea5..5c86ae10 100644
--- a/assets/scripts/app/models/event.coffee
+++ b/assets/scripts/app/models/event.coffee
@@ -1,6 +1,8 @@
require 'travis/model'
-@Travis.Event = Travis.Model.extend
+Model = Travis.Model
+
+Event = Model.extend
event: DS.attr()
repositoryId: DS.attr('number')
sourceId: DS.attr('number')
@@ -23,6 +25,4 @@ require 'travis/model'
Travis[type].find(@get('sourceId')) if type = @get('sourceType')
).property('sourceType', 'sourceId')
-@Travis.Event.reopenClass
- byRepoId: (id) ->
- @find repository_id: id
+Travis.Event = Event
diff --git a/assets/scripts/app/models/hook.coffee b/assets/scripts/app/models/hook.coffee
index 81b1ad41..fd6c03b1 100644
--- a/assets/scripts/app/models/hook.coffee
+++ b/assets/scripts/app/models/hook.coffee
@@ -1,8 +1,9 @@
require 'travis/model'
+Model = Travis.Model
Repo = Travis.Repo
-@Travis.Hook = Travis.Model.extend
+Hook = Model.extend
name: DS.attr()
ownerName: DS.attr()
description: DS.attr()
@@ -30,3 +31,5 @@ Repo = Travis.Repo
return if @get('isSaving')
@set 'active', !@get('active')
@save()
+
+Travis.Hook = Hook
diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee
index f6cac3a3..d248fdc9 100644
--- a/assets/scripts/app/models/job.coffee
+++ b/assets/scripts/app/models/job.coffee
@@ -3,12 +3,13 @@ require 'models/extensions'
require 'models/log'
require 'travis/ajax'
+Model = Travis.Model
DurationCalculations = Travis.DurationCalculations
Log = Travis.Log
compact = Travis.Helpers.compact
Ajax = Travis.ajax
-@Travis.Job = Travis.Model.extend DurationCalculations,
+Job = Model.extend DurationCalculations,
logId: DS.attr()
queue: DS.attr()
@@ -143,3 +144,5 @@ Ajax = Travis.ajax
slug: (->
"#{@get('repo.slug')} ##{@get('number')}"
).property()
+
+Travis.Job = Job
diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee
index bee94b29..e270bdce 100644
--- a/assets/scripts/app/models/log.coffee
+++ b/assets/scripts/app/models/log.coffee
@@ -2,7 +2,7 @@ require 'travis/log_chunks'
Ajax = Travis.ajax
-Request = Em.Object.extend
+Request = Ember.Object.extend
HEADERS:
accept: 'application/json; chunked=true; version=2, text/plain; version=2'
@@ -34,7 +34,7 @@ Request = Em.Object.extend
type = xhr.getResponseHeader('Content-Type') || ''
type.indexOf('json') > -1
-@Travis.Log = Em.Object.extend
+Log = Ember.Object.extend
version: 0 # used to refresh log on requeue
isLoaded: false
length: 0
@@ -96,3 +96,5 @@ Request = Em.Object.extend
console.log 'log model: load text' if Log.DEBUG
@append(number: 1, content: text, final: true)
@set('isLoaded', true)
+
+Travis.Log = Log
diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee
index abba50a0..9751743b 100644
--- a/assets/scripts/app/models/repo.coffee
+++ b/assets/scripts/app/models/repo.coffee
@@ -2,6 +2,7 @@ require 'travis/expandable_record_array'
require 'travis/model'
require 'helpers/helpers'
+Model = Travis.Model
ExpandableRecordArray = Travis.ExpandableRecordArray
EnvVar = Travis.EnvVar
Build = Travis.Build
@@ -10,7 +11,7 @@ Event = Travis.Event
durationFrom = Travis.Helpers.durationFrom
Ajax = Travis.ajax
-Travis.Repo = Travis.Model.extend
+Repo = Model.extend
slug: DS.attr()
description: DS.attr()
private: DS.attr('boolean')
@@ -138,7 +139,7 @@ Travis.Repo = Travis.Model.extend
saveSettings: (settings) ->
Ajax.ajax('/repos/' + @get('id') + '/settings', 'patch', data: { settings: settings })
-Travis.Repo.reopenClass
+Repo.reopenClass
recent: ->
@find()
@@ -183,3 +184,5 @@ Travis.Repo.reopenClass
# buildURL: (slug) ->
# if slug then slug else 'repos'
+
+Travis.Repo = Repo
diff --git a/assets/scripts/app/models/request.coffee b/assets/scripts/app/models/request.coffee
index f0ca91e6..4ad37ecb 100644
--- a/assets/scripts/app/models/request.coffee
+++ b/assets/scripts/app/models/request.coffee
@@ -1,6 +1,8 @@
require 'travis/model'
-@Travis.Request = Travis.Model.extend
+Model = Travis.Model
+
+Request = Model.extend
created_at: DS.attr()
event_type: DS.attr()
result: DS.attr()
@@ -27,3 +29,5 @@ require 'travis/model'
isPullRequest: (->
@get('event_type') == 'pull_request'
).property('event_type')
+
+Travis.Request = Request
diff --git a/assets/scripts/app/models/ssh-key.coffee b/assets/scripts/app/models/ssh-key.coffee
index 7bb3d7cd..a0e5795e 100644
--- a/assets/scripts/app/models/ssh-key.coffee
+++ b/assets/scripts/app/models/ssh-key.coffee
@@ -1,4 +1,8 @@
-Travis.SshKey = Travis.Model.extend
+Travis.Model = Model
+
+SshKey = Model.extend
value: DS.attr()
description: DS.attr()
fingerprint: DS.attr()
+
+Travis.SshKey = SshKey
diff --git a/assets/scripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee
index ceb1f80f..76667356 100644
--- a/assets/scripts/app/models/user.coffee
+++ b/assets/scripts/app/models/user.coffee
@@ -1,11 +1,12 @@
require 'travis/ajax'
require 'travis/model'
+Model = Travis.Model
Ajax = Travis.ajax
trigger = Travis.trigger
Account = Travis.Account
-@Travis.User = Travis.Model.extend
+User = Model.extend
name: DS.attr()
email: DS.attr()
login: DS.attr()
@@ -86,3 +87,5 @@ Account = Travis.Account
user = JSON.parse(Travis.sessionStorage.getItem('travis.user'))
user[$.underscore(name)] = @get(name)
Travis.sessionStorage.setItem('travis.user', JSON.stringify(user))
+
+Travis.User = User