Merge branch 'master' of github.com:travis-ci/travis-web

Conflicts:
	assets/scripts/lib/travis/model.coffee
	public/scripts/app.js
	public/scripts/min/app.js
	public/version

assets/scripts/app/store.coffee

@@ -8,6 +8,22 @@ Travis.Store = DS.Store.extend
   revision: 4
   adapter: Travis.RestAdapter.create()
 
+  load: (type, id, hash) ->
+    result = @_super.apply this, arguments
+
+    if result && result.clientId
+      # I assume that everything that goes through load is complete record
+      # representation, incomplete hashes from pusher go through merge()
+      record = @findByClientId type, result.clientId
+      record.set 'incomplete', false
+      record.set 'complete', true
+      # setting both incomplete and complete may be weird, but it's easier to
+      # work with both values. I need to check if record has already been completed
+      # and in order to do that, without having 'complete', I would need to check
+      # for incomplete == false, which looks worse
+
+    result
+
   merge: (type, id, hash) ->
     if hash == undefined
       hash = id
@@ -29,11 +45,7 @@ Travis.Store = DS.Store.extend
       if record = recordCache[clientId]
         record.send('didChangeData')
     else
-      # that's nasty, but will do for now
+      clientId = @pushHash(hash, id, type)
-      # if event is triggered for a record
-      # that's not yet available, just use find
-      # to make a request to fetch it
-      clientId = @find(type, id).get('clientId')
 
     if clientId
       DATA_PROXY.savedData = hash
@@ -59,9 +71,23 @@ Travis.Store = DS.Store.extend
 
   _loadOne: (store, type, json) ->
     root = type.singularName()
-    @adapter.sideload(store, type, json, root)
+    # we get other types of records only on build, it comes with repository
-    @merge(type, json[root])
+    # attached. I don't want to use store.sideload here as it will not use merge,
-    @_updateAssociations(type, root, json[root])
+    # if we need sideload becasue we have side records with other events it needs to
+    # be revised
+    if type == Travis.Build && json.repository
+      result = @_loadIncomplete(Travis.Repo, 'repository', json.repository)
+    @_loadIncomplete(type, root, json[root])
+
+  _loadIncomplete: (type, root, hash) ->
+    result = @merge(type, hash)
+
+    if result && result.clientId
+      record = @findByClientId(type, result.clientId)
+      unless record.get('complete')
+        record.set 'incomplete', true
+
+      @_updateAssociations(type, root, hash)
 
   _loadMany: (store, type, json) ->
     root = type.pluralName()

assets/scripts/app/templates/jobs/show.hbs

@@ -1,5 +1,5 @@
 {{#with view}}
-  {{#if job.isLoaded}}
+  {{#if job.isComplete}}
     <div {{bindAttr class="view.color"}}>
       <dl id="summary">
         <div class="left">

assets/scripts/app/templates/repos/show.hbs

@@ -2,7 +2,7 @@
   {{#if view.isEmpty}}
     {{view Travis.ReposEmptyView}}
   {{else}}
-    {{#if view.repo.isLoaded}}
+    {{#if view.repo.isComplete}}
       {{#with view.repo}}
         <h3>
           <a {{bindAttr href="view.urlGithub"}}>{{slug}}</a>

assets/scripts/app/views/build.coffee

@@ -55,8 +55,8 @@
     currentItemBinding: 'build'
 
     loading: (->
-      !@get('build.isLoaded')
+      !@get('build.isComplete')
-    ).property('build.isLoaded')
+    ).property('build.isComplete')
 
     color: (->
       Travis.Helpers.colorForResult(@get('build.result'))

assets/scripts/app/views/repo/show.coffee

@@ -6,8 +6,8 @@
     repoBinding: 'controller.repo'
 
     class: (->
-      'loading' if !@get('repo.isLoaded') && !@get('isEmpty')
+      'loading' if !@get('repo.isComplete') && !@get('isEmpty')
-    ).property('repo.isLoaded')
+    ).property('repo.isComplete')
 
     isEmpty: (->
       @get('repos.length') == 0

assets/scripts/lib/travis/model.coffee

@@ -3,14 +3,30 @@
   id: DS.attr('number')
 
   refresh: ->
-    id = @get('id')
+    if id = @get('id')
-    Travis.app.store.adapter.find(Travis.app.store, @constructor, id) if id
+      store = @get('store')
+      store.adapter.find store, @constructor, id
 
   update: (attrs) ->
     $.each attrs, (key, value) =>
       @set(key, value) unless key is 'id'
     this
 
+  isComplete: (->
+    if @get 'incomplete'
+      @loadTheRest()
+      false
+    else
+      @set 'isCompleting', false
+      @get 'isLoaded'
+  ).property('incomplete', 'isLoaded')
+
+  loadTheRest: ->
+    return if @get('isCompleting')
+    @set 'isCompleting', true
+
+    @refresh()
+
   select: ->
     @constructor.select(@get('id'))
 

public/version

@@ -1 +1 @@
-6e2bd916
+e60df424