Experimental implementation of travis-cmd

In a repo route we need to find record by slug there is no easy way to
do it with a public finders API, so we need to use adapter and
serializers directly. The problem is that the old way of doing this
didn't use the normalizePayload function and also it didn't add included
records properly. New code properly normalizes response and adds all of
the embedded records that were extracted from the response.

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp", "dist"]
+}

app/adapters/application.coffee

@@ -2,6 +2,8 @@
 `import config from 'travis/config/environment'`
 
 Adapter = DS.ActiveModelAdapter.extend
+  auth: Ember.inject.service()
+
   host: config.apiEndpoint
   coalesceFindRequests: true
 
@@ -12,12 +14,12 @@ Adapter = DS.ActiveModelAdapter.extend
 
     hash.headers['accept'] = 'application/json; version=2'
 
-    if token = Travis.sessionStorage.getItem('travis.token')
+    if token = @get('auth').token()
       hash.headers['Authorization'] ||= "token #{token}"
 
     hash
 
   findMany: (store, type, ids) ->
-    @ajax(@buildURL(type.typeKey), 'GET', data: { ids: ids })
+    @ajax(@buildURL(type.modelName), 'GET', data: { ids: ids })
 
 `export default Adapter`

app/adapters/repo.js

@@ -0,0 +1,24 @@
+import V3Adapter from 'travis/adapters/v3';
+
+export default V3Adapter.extend({
+  buildUrl(modelName, id, snapshot, requestType, query) {
+    var url = this._super(...arguments);
+
+    return url;
+  },
+
+  ajaxOptions(url, type, options) {
+    var hash = options || {};
+    if(!hash.data) {
+      hash.data = {};
+    }
+
+    if(hash.data.include) {
+      hash.data.include += ',repository.default_branch,branch.last_build,build.commit';
+    } else {
+      hash.data.include = 'repository.default_branch,branch.last_build,build.commit';
+    }
+
+    return this._super(url, type, hash);
+  }
+});

app/adapters/v3.js

@@ -0,0 +1,60 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+import config from 'travis/config/environment';
+
+export default DS.RESTAdapter.extend({
+  auth: Ember.inject.service(),
+  host: config.apiEndpoint,
+
+  defaultSerializer: '-repo',
+
+  sortQueryParams: false,
+  coalesceFindRequests: false,
+  headers: {
+    'Travis-API-Version': '3',
+    'Accept': 'application/json',
+    'Content-Type': 'application/json'
+  },
+
+  ajaxOptions: function(url, type, options) {
+    var hash = this._super(...arguments);
+
+    hash.headers = hash.headers || {};
+
+    var token;
+    if(token = this.get('auth').token()) {
+      hash.headers['Authorization'] = "token " + token;
+    }
+
+    return hash;
+  },
+
+  // TODO: I shouldn't override this method as it's private, a better way would
+  // be to create my own URL generator
+  _buildURL: function(modelName, id) {
+    var url = [];
+    var host = Ember.get(this, 'host');
+    var prefix = this.urlPrefix();
+    var path;
+
+    if (modelName) {
+      path = this.pathForType(modelName, id);
+      if (path) { url.push(path); }
+    }
+
+    if (id) { url.push(encodeURIComponent(id)); }
+    if (prefix) { url.unshift(prefix); }
+
+    url = url.join('/');
+    if (!host && url && url.charAt(0) !== '/') {
+      url = '/' + url;
+    }
+
+    return url;
+  },
+
+  pathForType: function(modelName, id) {
+    var underscored = Ember.String.underscore(modelName);
+    return id ? underscored :  Ember.String.pluralize(underscored);
+  }
+});

app/components/caches-item.coffee

@@ -1,7 +1,7 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 
 CachesItemComponent = Ember.Component.extend
+  ajax: Ember.inject.service()
 
   tagName: 'li'
   classNames: ['tile', 'tile--xs', 'row']
@@ -20,7 +20,7 @@ CachesItemComponent = Ember.Component.extend
         deletingDone = => @set('isDeleting', false)
 
         repo = @get('repo')
-        Ajax.ajax("/repos/#{repo.get('id')}/caches", "DELETE", data: data).then(deletingDone, deletingDone).then =>
+        @get('ajax').ajax("/repos/#{repo.get('id')}/caches", "DELETE", data: data).then(deletingDone, deletingDone).then =>
           @get('caches').removeObject(@get('cache'))
 
 

app/components/no-builds.coffee

@@ -1,10 +1,8 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 `import config from 'travis/config/environment'`
 
 NoBuildsComponent = Ember.Component.extend
-
+  actions:
-  actions: 
     triggerBuild: () ->
       @set('isLoading', true)
       apiEndpoint = config.apiEndpoint

app/components/repos-list-item.coffee

@@ -16,8 +16,8 @@ ReposListItemComponent = Ember.Component.extend Polling,
   ).property('selectedRepo')
 
   color: (->
-    colorForState(@get('repo.lastBuildState'))
+    colorForState(@get('repo.defaultBranch.lastBuild.state'))
-  ).property('repo.lastBuildState')
+  ).property('repo.defaultBranch.lastBuild.state')
 
   scrollTop: (->
     if (window.scrollY > 0)

app/components/repos-list.coffee

@@ -1,6 +0,0 @@
-`import Ember from 'ember'`
-
-ReposListComponent = Ember.Component.extend
-  tagName: 'ul'
-
-`export default ReposListComponent`

app/components/repos-list.js

@@ -0,0 +1,66 @@
+import Ember from 'ember';
+
+var sortCallback = function(repo1, repo2) {
+  // this function could be made simpler, but I think it's clearer this way
+  // what're we really trying to achieve
+
+  var lastBuild1 = repo1.get('defaultBranch.lastBuild');
+  var lastBuild2 = repo2.get('defaultBranch.lastBuild');
+
+  if(!lastBuild1 && !lastBuild2) {
+    // if both repos lack builds, put newer repo first
+    return repo1.get('id') > repo2.get('id') ? -1 : 1;
+  } else if(lastBuild1 && !lastBuild2) {
+    // if only repo1 has a build, it goes first
+    return -1;
+  } else if(lastBuild2 && !lastBuild1) {
+    // if only repo2 has a build, it goes first
+    return 1;
+  }
+
+  var finishedAt1 = lastBuild1.get('finishedAt');
+  var finishedAt2 = lastBuild2.get('finishedAt');
+
+  if(finishedAt1) {
+    finishedAt1 = new Date(finishedAt1);
+  }
+  if(finishedAt2) {
+    finishedAt2 = new Date(finishedAt2);
+  }
+
+  if(finishedAt1 && finishedAt2) {
+    // if both builds finished, put newer first
+    return finishedAt1.getTime() > finishedAt2.getTime() ? -1 : 1;
+  } else if(finishedAt1 && !finishedAt2) {
+    // if repo1 finished, but repo2 didn't, put repo2 first
+    return 1;
+  } else if(finishedAt2 && !finishedAt1) {
+    // if repo2 finisher, but repo1 didn't, put repo1 first
+    return -1;
+  } else {
+    // none of the builds finished, put newer build first
+    return lastBuild1.get('id') > lastBuild2.get('id') ? -1 : 1;
+  }
+
+  throw "should not happen";
+};
+
+var ReposListComponent = Ember.Component.extend({
+  tagName: 'ul',
+
+  sortedRepos: function() {
+    var repos = this.get('repos');
+
+    if(repos && repos.toArray) {
+      repos = repos.toArray();
+    }
+
+    if(repos && repos.sort) {
+      return repos.sort(sortCallback);
+    } else {
+      return [];
+    }
+  }.property('repos.[]', 'repos')
+});
+
+export default ReposListComponent;

app/components/travis-cmd.js

@@ -0,0 +1,84 @@
+import Ember from 'ember';
+import config from 'travis/config/environment';
+
+let Component = Ember.Component.extend({
+  keyboard: Ember.inject.service(),
+  auth: Ember.inject.service(),
+
+  classNameBindings: ['visible'],
+  classNames: ['travis-cmd'],
+
+  didInsertElement() {
+    this.get('keyboard').bind('t', this.show.bind(this));
+    this.get('keyboard').bind('esc', 'cmd', this.hide.bind(this));
+  },
+
+  show() {
+    this.loadSlugs();
+    this.set('visible', true);
+    this.get('keyboard').setScope('cmd');
+  },
+
+  hide() {
+    this.set('visible', false);
+    this.get('keyboard').setScope(null);
+    this.set('matches', null);
+    this.set('filterString', null);
+    this.set('results', null);
+  },
+
+  loadSlugs() {
+    this.set('loading', true);
+
+    $.ajax(config.apiEndpoint + '/repos/slugs', {
+      headers: {
+        Authorization: 'token ' + this.get('auth').token(),
+        Accept: 'application/json; version=2'
+      }
+    }).then((data) => {
+      this.set('loading', false);
+      this.set('repos', data.repositories);
+      this.onLoad();
+    });
+  },
+
+  onLoad() {
+    setTimeout( () => {
+      this.$('.input').focus();
+    }, 10);
+  },
+
+  actions: {
+    filterChanged(value) {
+      let list = this.get('repos');
+
+      let options = {
+          pre: '<strong>'
+        , post: '</strong>'
+        , extract: function(el) { return el.slug; }
+      };
+
+      let results = fuzzy.filter(value, list, options);
+      let matches = results.map(function(el) { return el.string; });
+      this.set('matches', matches.slice(0, 10).join('<br/>'));
+      this.set('results', results);
+      this.set('filterString', value);
+    },
+
+    keypress(event) {
+      if(event.keyCode === 27) {
+        this.hide();
+      } else if(event.keyCode === 13) {
+        let results;
+        if(results = this.get('results')) {
+          if(results[0]) {
+            let slug = results[0].original.slug;
+            console.log(slug);
+          }
+        }
+      }
+    }
+  }
+});
+
+export default Component;

app/components/travis-status.coffee

@@ -1,5 +1,4 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 `import config from 'travis/config/environment'`
 
 TravisStatusComponent = Ember.Component.extend

app/controllers/account.coffee

@@ -2,8 +2,7 @@
 
 Controller = Ember.Controller.extend
   allHooks: []
-  needs: ['currentUser']
+  userBinding: 'auth.currentUser'
-  userBinding: 'controllers.currentUser.model'
 
   init: ->
     @_super.apply this, arguments
@@ -22,7 +21,7 @@ Controller = Ember.Controller.extend
 
   reloadHooks: ->
     if login = @get('model.login')
-      hooks = @store.find('hook', all: true, owner_name: login)
+      hooks = @store.query('hook', all: true, owner_name: login)
 
       hooks.then () ->
         hooks.set('isLoaded', true)

app/controllers/accounts/info.coffee

@@ -1,7 +1,7 @@
 `import Ember from 'ember'`
 
 Controller = Ember.Controller.extend
-  needs: ['currentUser', 'repos']
+  repos: Ember.inject.controller()
-  userBinding: 'controllers.currentUser'
+  userBinding: 'auth.currentUser'
 
 `export default Controller`

app/controllers/build.coffee

@@ -3,11 +3,11 @@
 `import GithubUrlPropertievs from 'travis/mixins/github-url-properties'`
 
 Controller = Ember.Controller.extend GithubUrlPropertievs,
-  needs: ['repo', 'currentUser']
+  repoController: Ember.inject.controller('repo')
-  repoBinding: 'controllers.repo.repo'
+  repoBinding: 'repoController.repo'
   commitBinding: 'build.commit'
-  currentUserBinding: 'controllers.currentUser.model'
+  currentUserBinding: 'auth.currentUser'
-  tabBinding: 'controllers.repo.tab'
+  tabBinding: 'repoController.tab'
   sendFaviconStateChanges: true
 
   currentItemBinding: 'build'

app/controllers/builds.coffee

@@ -4,10 +4,10 @@ Controller = Ember.ArrayController.extend
   sortAscending: false
   sortProperties: ['number']
 
-  needs: ['repo']
+  repoController: Ember.inject.controller('repo')
 
-  repoBinding: 'controllers.repo.repo'
+  repoBinding: 'repoController.repo'
-  tabBinding: 'controllers.repo.tab'
+  tabBinding: 'repoController.tab'
   isLoadedBinding: 'content.isLoaded'
   isLoadingBinding: 'content.isLoading'
 
@@ -53,7 +53,7 @@ Controller = Ember.ArrayController.extend
     if type?
       options.event_type = type.replace(/s$/, '') # poor man's singularize
 
-    @store.find('build', options)
+    @store.query('build', options)
 
   actions:
     showMoreBuilds: ->

app/controllers/caches.coffee

@@ -1,9 +1,10 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 
 Controller = Ember.Controller.extend
-  needs: ['repo']
+  ajax: Ember.inject.service()
-  repo: Ember.computed.alias('controllers.repo.repo')
+
+  repoController: Ember.inject.controller('repo')
+  repo: Ember.computed.alias('repoController.repo')
 
   isDeleting: false
 
@@ -21,7 +22,7 @@ Controller = Ember.Controller.extend
         deletingDone = => @set('isDeleting', false)
 
         repo = @get('repo')
-        Ajax.ajax("/repos/#{@get('repo.id')}/caches", "DELETE").then(deletingDone, deletingDone).then =>
+        @get('ajax').ajax("/repos/#{@get('repo.id')}/caches", "DELETE").then(deletingDone, deletingDone).then =>
           @set('model', {})
 
 `export default Controller`

app/controllers/env-var.coffee

@@ -1,48 +0,0 @@
-`import Ember from 'ember'`
-`import Validations from 'travis/utils/validations'`
-
-Controller = Ember.ObjectController.extend Validations,
-  isEditing: false
-  isDeleting: false
-
-  validates:
-    name: ['presence']
-
-  actionType: 'Save'
-  showValueField: Ember.computed.alias('public')
-
-  value: ( (key, value) ->
-    if arguments.length == 2
-      @get('model').set('value', value)
-      value
-    else if @get('public')
-      @get('model.value')
-    else
-      '••••••••••••••••'
-  ).property('model.value', 'public')
-
-  actions:
-    delete: ->
-      return if @get('isDeleting')
-      @set('isDeleting', true)
-
-      @get('model').destroyRecord()
-
-    edit: ->
-      @set('isEditing', true)
-
-    cancel: ->
-      @set('isEditing', false)
-      @get('model').revert()
-
-    save: ->
-      return if @get('isSaving')
-
-      if @isValid()
-        env_var = @get('model')
-
-        # TODO: handle errors
-        env_var.save().then =>
-          @set('isEditing', false)
-
-`export default Controller`

app/controllers/env-vars.coffee

@@ -1,6 +0,0 @@
-`import Ember from 'ember'`
-
-Controller = Ember.ArrayController.extend
-  vars: Ember.computed.alias('model')
-
-`export default Controller`

app/controllers/env-vars/new.coffee

@@ -1,45 +0,0 @@
-`import Validations from 'travis/utils/validations'`
-
-Controller = Ember.Controller.extend Validations,
-  needs: ['repo']
-  repo: Ember.computed.alias('controllers.repo.repo')
-
-  isSaving: false
-
-  validates:
-    name: ['presence']
-
-  actionType: 'Add'
-  showValueField: true
-
-  reset: ->
-    @setProperties(name: null, value: null, public: null)
-
-  actions:
-    cancel: ->
-      @reset()
-      @transitionToRoute('env_vars')
-
-    save: ->
-      return if @get('isSaving')
-      @set('isSaving', true)
-
-      if @isValid()
-        env_var = @store.createRecord('env_var',
-          name: @get('name')
-          value: @get('value')
-          public: @get('public')
-          repo: @get('repo')
-        )
-
-        self = this
-        env_var.save().then =>
-          @set('isSaving', false)
-          @reset()
-          self.transitionToRoute('env_vars')
-        , =>
-          @set('isSaving', false)
-      else
-        @set('isSaving', false)
-
-`export default Controller`

app/controllers/first-sync.coffee

@@ -1,8 +1,7 @@
 `import Ember from 'ember'`
 
 Controller = Ember.Controller.extend
-  needs: ['currentUser']
+  user: Ember.computed.alias('auth.currentUser')
-  user: Ember.computed.alias('controllers.currentUser.model')
 
   isSyncing: Ember.computed.alias('user.isSyncing')
 

app/controllers/job.coffee

@@ -2,13 +2,13 @@
 `import { githubCommit } from 'travis/utils/urls'`
 
 Controller = Ember.Controller.extend
-  needs: ['repo', 'currentUser']
+  repoController: Ember.inject.controller('repo')
 
-  repoBinding: 'controllers.repo.repo'
+  repoBinding: 'repoController.repo'
   commitBinding: 'job.commit'
   annotationsBinding: 'job.annotations'
-  currentUserBinding: 'controllers.currentUser.model'
+  currentUserBinding: 'auth.currentUser'
-  tabBinding: 'controllers.repo.tab'
+  tabBinding: 'repoController.tab'
 
   currentItemBinding: 'job'
 

app/controllers/owner.coffee

@@ -1,5 +1,4 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 
 Controller = Ember.Controller.extend
   isLoading: false

app/controllers/owner/repositories.coffee

@@ -1,5 +1,4 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 
 Controller = Ember.Controller.extend
   isLoading: false
@@ -13,14 +12,13 @@ Controller = Ember.Controller.extend
           item
       ).sortBy('default_branch.last_build.finished_at').reverse()
     repos
-
   ).property('model')
 
   # running: (->
   #   data = @get('model')
 
-  #   repos = data.repositories.filter (item, index) -> 
+  #   repos = data.repositories.filter (item, index) ->
-  #     if item.default_branch.last_build != null 
+  #     if item.default_branch.last_build != null
   #       if item.default_branch.last_build.state == 'started'
   #         item
   #   repos

app/controllers/owner/running.coffee

@@ -1,5 +1,4 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 
 Controller = Ember.Controller.extend
   isLoading: false

app/controllers/profile.coffee

@@ -3,16 +3,17 @@
 Controller = Ember.Controller.extend
   name: 'profile'
 
-  needs: ['currentUser', 'accounts', 'account']
+  accountController: Ember.inject.controller('account')
-  userBinding: 'controllers.currentUser.model'
+  accountsController: Ember.inject.controller('accounts')
-  accountBinding: 'controllers.account.model'
+  userBinding: 'auth.currentUser'
+  accountBinding: 'accountController.model'
 
   activate: (action, params) ->
     this["view_#{action}".camelize()]()
 
   viewHooks: ->
     @connectTab('hooks')
-    @get('controllers.account').reloadHooks()
+    @get('accountController').reloadHooks()
 
   viewUser: ->
     @connectTab('user')

app/controllers/repo.coffee

@@ -2,11 +2,13 @@
 `import { githubRepo } from 'travis/utils/urls'`
 
 Controller = Ember.Controller.extend
-  needs: ['repos', 'currentUser', 'build', 'job']
+  jobController: Ember.inject.controller('job')
-  currentUserBinding: 'controllers.currentUser.model'
+  buildController: Ember.inject.controller('build')
+  reposController: Ember.inject.controller('repos')
+  currentUserBinding: 'auth.currentUser'
 
-  build: Ember.computed.alias('controllers.build.build')
+  build: Ember.computed.alias('buildController.build')
-  job: Ember.computed.alias('controllers.job.job')
+  job: Ember.computed.alias('jobController.job')
 
   slug: (-> @get('repo.slug') ).property('repo.slug')
   isLoading: (-> @get('repo.isLoading') ).property('repo.isLoading')
@@ -73,15 +75,15 @@ Controller = Ember.Controller.extend
     Ember.run.scheduleOnce('actions', this, @_lastBuildDidChange);
 
   _lastBuildDidChange: ->
-    build = @get('repo.lastBuild')
+    build = @get('repo.defaultBranch.lastBuild')
     @set('build', build)
 
   stopObservingLastBuild: ->
-    @removeObserver('repo.lastBuild', this, 'lastBuildDidChange')
+    @removeObserver('repo.defaultBranch.lastBuild', this, 'lastBuildDidChange')
 
   observeLastBuild: ->
     @lastBuildDidChange()
-    @addObserver('repo.lastBuild', this, 'lastBuildDidChange')
+    @addObserver('repo.defaultBranch.lastBuild', this, 'lastBuildDidChange')
 
   connectTab: (tab) ->
     # TODO: such implementation seems weird now, because we render

app/controllers/repos.coffee

@@ -3,7 +3,6 @@
 `import Repo from 'travis/models/repo'`
 
 Controller = Ember.Controller.extend
-  contentBinding: 'repos'
   actions:
     activate: (name) ->
       @activate(name)
@@ -30,15 +29,15 @@ Controller = Ember.Controller.extend
       if @get('tab') == 'owned' && @get('isLoaded') && @get('repos.length') == 0
         @container.lookup('router:main').send('redirectToGettingStarted')
 
-  isLoadedBinding: 'repos.isLoaded'
+  isLoaded: false
-  needs: ['currentUser', 'repo']
+  repoController: Ember.inject.controller('repo')
-  currentUserBinding: 'controllers.currentUser.model'
+  currentUserBinding: 'auth.currentUser'
   selectedRepo: (->
     # we need to observe also repo.content here, because we use
     # ObjectProxy in repo controller
     # TODO: get rid of ObjectProxy there
-    @get('controllers.repo.repo.content') || @get('controllers.repo.repo')
+    @get('repoController.repo.content') || @get('repoController.repo')
-  ).property('controllers.repo.repo', 'controllers.repo.repo.content')
+  ).property('repoController.repo', 'repoController.repo.content')
 
   startedJobsCount: Ember.computed.alias('runningJobs.length')
   allJobsCount: (->
@@ -87,20 +86,23 @@ Controller = Ember.Controller.extend
     this["view_#{tab}".camelize()](params)
 
   viewOwned: ->
-    @set('repos', @get('userRepos'))
+    @set('isLoaded', false);
+    @get('currentUser._rawPermissions').then (data) =>
+      repos = Repo.accessibleBy(@store, data.pull).then( (reposRecordArray) =>
+        @set('isLoaded', true)
+        @set('repos', reposRecordArray)
+      )
+      # TODO: handle error
 
   viewRunning: ->
 
-  userRepos: (->
-    if login = @get('currentUser.login')
-      Repo.accessibleBy(@store, login)
-    else
-      []
-  ).property('currentUser.login')
-
   viewSearch: (phrase) ->
     @set('search', phrase)
-    @set('repos', Repo.search(@store, phrase))
+    @set('isLoaded', false)
+    Repo.search(@store, phrase).then( (reposRecordArray) =>
+      @set('isLoaded', true)
+      @set('repos', reposRecordArray)
+    )
 
   searchObserver: (->
     search = @get('search')

app/controllers/requests.coffee

@@ -1,12 +1,11 @@
 `import Ember from 'ember'`
 
 Controller = Ember.ArrayController.extend
-  needs: ['repo']
+  repoController: Ember.inject.controller('repo')
-  repo: Ember.computed.alias('controllers.repo.repo')
 
   lintUrl: (->
-    slug = @get('repo.slug')
+    slug = @get('repoController.repo.slug')
     "https://lint.travis-ci.org/#{slug}"
-  ).property('repo.slug')
+  ).property('repoController.repo.slug')
 
 `export default Controller`

app/controllers/settings/index.coffee

@@ -1,22 +0,0 @@
-`import Ember from 'ember'`
-
-Controller = Ember.Controller.extend
-  settings: Ember.computed.alias('model.settings')
-
-  settingsChanged: (->
-    value = @get('settings.maximum_number_of_builds')
-    console.log value
-    if parseInt(value) > 0 || value == '0' || value == 0
-      @set('settings.maximum_number_of_builds_valid', '')
-      @get('model').saveSettings(@get('settings')).then null, ->
-        Travis.flash(error: 'There was an error while saving settings. Please try again.')
-    else
-      @set('settings.maximum_number_of_builds_valid', 'invalid')
-  ).observes('settings.maximum_number_of_builds')
-
-  actions:
-    save: ->
-      @get('model').saveSettings(@get('settings')).then null, ->
-        Travis.flash(error: 'There was an error while saving settings. Please try again.')
-
-`export default Controller`

app/controllers/top.coffee

@@ -3,10 +3,10 @@
 `import config from 'travis/config/environment'`
 
 Controller = Ember.Controller.extend
-  needs: ['currentUser']
+  userBinding: 'auth.currentUser'
-  userBinding: 'controllers.currentUser.model'
 
   store: Ember.inject.service()
+  storage: Ember.inject.service()
   currentUserBinding: 'auth.currentUser'
 
   userName: (->
@@ -18,6 +18,8 @@ Controller = Ember.Controller.extend
   ).property('user.gravatarId')
 
   defineTowerColor: (broadcastArray) ->
+    return '' unless broadcastArray
+
     if broadcastArray.length
       if broadcastArray.findBy('category', 'warning')
         return 'warning'
@@ -39,7 +41,7 @@ Controller = Ember.Controller.extend
       options.type = 'GET'
       options.headers = { Authorization: "token #{@auth.token()}" }
 
-      seenBroadcasts = Travis.storage.getItem('travis.seen_broadcasts')
+      seenBroadcasts = @get('storage').getItem('travis.seen_broadcasts')
       if seenBroadcasts
         seenBroadcasts = JSON.parse(seenBroadcasts)
       else
@@ -73,13 +75,13 @@ Controller = Ember.Controller.extend
 
     markBroadcastAsSeen: (broadcast) ->
       id = broadcast.get('id').toString()
-      seenBroadcasts = Travis.storage.getItem('travis.seen_broadcasts')
+      seenBroadcasts = @get('storage').getItem('travis.seen_broadcasts')
       if seenBroadcasts
-        seenBroadcasts = JSON.parse(seenBroadcasts) 
+        seenBroadcasts = JSON.parse(seenBroadcasts)
       else
         seenBroadcasts = []
       seenBroadcasts.push(id)
-      Travis.storage.setItem('travis.seen_broadcasts', JSON.stringify(seenBroadcasts))
+      @get('storage').setItem('travis.seen_broadcasts', JSON.stringify(seenBroadcasts))
       @get('broadcasts.content').removeObject(broadcast)
       @set('broadcasts.lastBroadcastStatus', @defineTowerColor(@get('broadcasts.content')))
       return false

app/helpers/format-commit.coffee

@@ -1,6 +1,6 @@
 `import { safe, formatCommit as formatCommitHelper } from 'travis/utils/helpers'`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   commit = params[0]
   safe formatCommitHelper(commit.get('sha'), commit.get('branch')) if commit
 

app/helpers/format-duration.coffee

@@ -1,7 +1,7 @@
 `import { timeInWords, safe } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   safe timeInWords(params[0])
 
 `export default helper`

app/helpers/format-message.coffee

@@ -1,7 +1,7 @@
 `import { formatMessage as _formatMessage, safe } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params, hash) ->
+helper = Ember.Helper.helper (params, hash) ->
   safe _formatMessage(params[0], hash)
 
 `export default helper`

app/helpers/format-sha.coffee

@@ -1,7 +1,7 @@
 `import { formatSha as _formatSha, safe } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   safe _formatSha(params[0])
 
 `export default helper`

app/helpers/format-time.coffee

@@ -1,7 +1,7 @@
 `import { timeAgoInWords, safe } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   safe timeAgoInWords(params[0]) || '-'
 
 `export default helper`

app/helpers/github-commit-link.coffee

@@ -1,7 +1,7 @@
 `import { formatCommit, safe } from 'travis/utils/helpers'`
 `import { githubCommit as githubCommitUrl } from 'travis/utils/urls'`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   slug = params[0]
   commitSha = params[1]
   return '' unless commitSha

app/helpers/humanize-state.coffee

@@ -1,7 +1,7 @@
 `import { safe } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   state = params[0]
   if state == 'received'
     'booting'

app/helpers/landing-page-last-build-time.coffee

@@ -1,7 +1,7 @@
 `import { timeAgoInWords, safe } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   safe timeAgoInWords(params[0]) || 'currently running'
 
 `export default helper`

app/helpers/pretty-date.coffee

@@ -1,7 +1,7 @@
 `import { timeAgoInWords, safe } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   safe moment(params[0]).format('MMMM D, YYYY H:mm:ss') || '-'
 
 `export default helper`

app/helpers/short-compare-shas.coffee

@@ -1,7 +1,7 @@
 `import { pathFrom } from 'travis/utils/helpers'`
 `import Ember from "ember"`
 
-helper = Ember.HTMLBars.makeBoundHelper (params) ->
+helper = Ember.Helper.helper (params) ->
   url = params[0]
   path = pathFrom(url)
   if path.indexOf('...') >= 0

app/helpers/travis-mb.coffee

@@ -4,4 +4,4 @@ fn = (size) ->
   if size
     (size / 1024 / 1024).toFixed(2)
 
-`export default Ember.HTMLBars.makeBoundHelper(fn)`
+`export default Ember.Helper.helper(fn)`

app/initializers/auth.coffee

@@ -1,16 +1,11 @@
-`import Auth from 'travis/utils/auth'`
 `import TestAuth from 'travis/utils/test-auth'`
 
 initialize = (container, app) ->
-  app.register 'auth:main', if Ember.testing then TestAuth else Auth
+  app.inject('route', 'auth', 'service:auth')
-
+  app.inject('controller', 'auth', 'service:auth')
-  app.inject('route', 'auth', 'auth:main')
+  app.inject('application', 'auth', 'service:auth')
-  app.inject('controller', 'auth', 'auth:main')
+  app.inject('component', 'auth', 'service:auth')
-  app.inject('application', 'auth', 'auth:main')
+  app.inject('service:flashes', 'auth', 'service:auth')
-  app.inject('component', 'auth', 'auth:main')
-  app.inject('service:flashes', 'auth', 'auth:main')
-
-  app.inject('auth', 'store', 'service:store')
 
 AuthInitializer =
   name: 'auth'

app/initializers/pusher.coffee

@@ -2,12 +2,7 @@
 `import TravisPusher from 'travis/utils/pusher'`
 
 initialize = (registry, application) ->
-  if config.pusher.key
+  null
-    application.pusher = new TravisPusher(config.pusher)
-
-    application.register 'pusher:main', application.pusher, { instantiate: false }
-
-    application.inject('route', 'pusher', 'pusher:main')
 
 PusherInitializer =
   name: 'pusher'

app/initializers/services.coffee

@@ -1,16 +1,11 @@
-`import Slider from 'travis/utils/slider'`
 `import Tailing from 'travis/utils/tailing'`
 `import ToTop from 'travis/utils/to-top'`
 `import config from 'travis/config/environment'`
 
 initialize = (container, application) ->
-  application.slider = new Slider(application.storage)
   application.tailing = new Tailing($(window), '#tail', '#log')
   application.toTop   = new ToTop($(window), '.to-top', '#log-container')
 
-  application.register 'slider:main', application.slider, { instantiate: false }
-  application.inject('controller', 'slider', 'slider:main')
-
 Initializer =
   name: 'services'
   initialize: initialize

app/initializers/storage.coffee

@@ -1,58 +0,0 @@
-`import Ember from 'ember'`
-
-Storage = Em.Object.extend
-  init: ->
-    @set('storage', {})
-  key: (key) ->
-    "__#{key.replace('.', '__')}"
-  getItem: (k) ->
-    return @get("storage.#{@key(k)}")
-  setItem: (k,v) ->
-    @set("storage.#{@key(k)}", v)
-  removeItem: (k) ->
-    @setItem(k, null)
-  clear: ->
-    @set('storage', {})
-
-sessionStorage = (->
-  storage = null
-  try
-    # firefox will not throw error on access for sessionStorage var,
-    # you need to actually get something from session
-    window.sessionStorage.getItem('foo')
-    storage = window.sessionStorage
-  catch err
-    storage = Storage.create()
-
-  storage
-)()
-
-storage = (->
-  storage = null
-  try
-    storage = window.localStorage || throw('no storage')
-  catch err
-    storage = Storage.create()
-
-  storage
-)()
-
-initialize = (container, application) ->
-  application.register 'storage:main', storage, { instantiate: false }
-  application.register 'sessionStorage:main', sessionStorage, { instantiate: false }
-
-  application.inject('auth', 'storage', 'storage:main')
-  application.inject('auth', 'sessionStorage', 'sessionStorage:main')
-
-  # I still use Travis.storage in some places which are not that easy to
-  # refactor
-  application.storage = storage
-  application.sessionStorage = sessionStorage
-
-StorageInitializer =
-  name: 'storage'
-  before: 'services'
-  initialize: initialize
-
-`export {initialize}`
-`export default StorageInitializer`

app/instance-initializers/pusher.coffee

@@ -1,5 +1,17 @@
+`import config from 'travis/config/environment'`
+`import TravisPusher from 'travis/utils/pusher'`
+
 initialize = (data) ->
-  data.application.pusher.store = data.container.lookup('service:store')
+  application = data.application
+
+  if config.pusher.key
+    application.pusher = new TravisPusher(config.pusher)
+
+    application.register 'pusher:main', application.pusher, { instantiate: false }
+
+    application.inject('route', 'pusher', 'pusher:main')
+
+    application.pusher.store = data.container.lookup('service:store')
 
 PusherInitializer =
   name: 'pusher'

app/models/branch.coffee

@@ -2,25 +2,11 @@
 `import Model from 'travis/models/model'`
 
 Branch = Model.extend
-  repositoryId: DS.attr('number')
+  name: DS.attr('string')
-  commitId:     DS.attr('number')
+  defaultBranch: DS.attr('boolean')
-  state:        DS.attr()
-  number:       DS.attr('number')
-  branch:       DS.attr()
-  message:      DS.attr()
-  result:       DS.attr('number')
-  duration:     DS.attr('number')
-  startedAt:    DS.attr()
-  finishedAt:   DS.attr()
 
-  commit: DS.belongsTo('commit')
+  lastBuild: DS.belongsTo('build')
-
+  builds: DS.hasMany('builds', inverse: 'branch')
-  repo: (->
+  repo:   DS.belongsTo('repo', inverse: 'defaultBranch')
-    @store.find('repo', @get('repositoryId')) if @get('repositoryId')
-  ).property('repositoryId')
-
-  updateTimes: ->
-    @notifyPropertyChange 'started_at'
-    @notifyPropertyChange 'finished_at'
 
 `export default Branch`

app/models/broadcast.coffee

@@ -18,7 +18,7 @@ Broadcast = Model.extend
 
 Broadcast.reopenClass
   seen: (->
-    seenBroadcasts = Travis.storage.getItem('travis.seen_broadcasts')
+    seenBroadcasts = Travis.lookup('service:storage').getItem('travis.seen_broadcasts')
     seenBroadcasts = JSON.parse(seenBroadcasts) if seenBroadcasts?
     Ember.A(seenBroadcasts || [])
   ).property()

app/models/build.coffee

@@ -1,26 +1,28 @@
 `import { durationFrom, configKeys, compact } from 'travis/utils/helpers'`
-`import Ajax from 'travis/utils/ajax'`
 `import configKeysMap from 'travis/utils/keys-map'`
 `import Ember from 'ember'`
 `import Model from 'travis/models/model'`
 `import DurationCalculations from 'travis/utils/duration-calculations'`
 
 Build = Model.extend DurationCalculations,
+  ajax: Ember.inject.service()
+
   state:             DS.attr()
   number:            DS.attr('number')
-  branch:            DS.attr('string')
   message:           DS.attr('string')
   _duration:         DS.attr('number')
   _config:           DS.attr('object')
   _startedAt:        DS.attr()
-  _finishedAt:       DS.attr()
+  _finishedAt:       DS.attr('string')
   pullRequest:       DS.attr('boolean')
   pullRequestTitle:  DS.attr()
   pullRequestNumber: DS.attr('number')
   eventType:         DS.attr('string')
+  repositoryId:      DS.attr('number')
 
+  branch: DS.belongsTo('branch', async: false, inverse: 'builds')
   repo:   DS.belongsTo('repo', async: true)
-  commit: DS.belongsTo('commit', async: true)
+  commit: DS.belongsTo('commit', async: false)
   jobs:   DS.hasMany('job', async: true)
 
   config: (->
@@ -91,11 +93,11 @@ Build = Model.extend DurationCalculations,
   canRestart: Ember.computed.alias('isFinished')
 
   cancel: (->
-    Ajax.post "/builds/#{@get('id')}/cancel"
+    @get('ajax').post "/builds/#{@get('id')}/cancel"
   )
 
   restart: ->
-    Ajax.post "/builds/#{@get('id')}/restart"
+    @get('ajax').post "/builds/#{@get('id')}/restart"
 
   formattedFinishedAt: (->
     if finishedAt = @get('finishedAt')

app/models/job.coffee

@@ -1,5 +1,4 @@
 `import { durationFrom, configKeys, compact } from 'travis/utils/helpers'`
-`import Ajax from 'travis/utils/ajax'`
 `import configKeysMap from 'travis/utils/keys-map'`
 `import Ember from 'ember'`
 `import Model from 'travis/models/model'`
@@ -7,6 +6,7 @@
 `import DurationCalculations from 'travis/utils/duration-calculations'`
 
 Job = Model.extend DurationCalculations,
+  ajax: Ember.inject.service()
   logId:          DS.attr()
 
   queue:          DS.attr()
@@ -30,7 +30,7 @@ Job = Model.extend DurationCalculations,
 
   log: ( ->
     @set('isLogAccessed', true)
-    Log.create(job: this)
+    Log.create(job: this, ajax: @get('ajax'))
   ).property()
 
   startedAt: (->
@@ -94,11 +94,11 @@ Job = Model.extend DurationCalculations,
   canRestart: Ember.computed.alias('isFinished')
 
   cancel: (->
-    Ajax.post "/jobs/#{@get('id')}/cancel"
+    @get('ajax').post "/jobs/#{@get('id')}/cancel"
   )
 
   removeLog: ->
-    Ajax.patch("/jobs/#{@get('id')}/log").then =>
+    @get('ajax').patch("/jobs/#{@get('id')}/log").then =>
       @reloadLog()
 
   reloadLog: ->
@@ -106,7 +106,7 @@ Job = Model.extend DurationCalculations,
     @get('log').fetch()
 
   restart: ->
-    Ajax.post "/jobs/#{@get('id')}/restart"
+    @get('ajax').post "/jobs/#{@get('id')}/restart"
 
   appendLog: (part) ->
     @get('log').append part

app/models/log.coffee

@@ -9,7 +9,7 @@ Request = Ember.Object.extend
     accept: 'application/json; chunked=true; version=2, text/plain; version=2'
 
   run: ->
-    Ajax.ajax "/jobs/#{@id}/log?cors_hax=true", 'GET',
+    @get('ajax').ajax "/jobs/#{@id}/log?cors_hax=true", 'GET',
       dataType: 'text'
       headers: @HEADERS
       success: (body, status, xhr) => Ember.run(this, -> @handle(body, status, xhr))
@@ -50,7 +50,7 @@ Log = Ember.Object.extend
     data['part_numbers'] = partNumbers if partNumbers
     data['after'] = after if after
 
-    Ajax.ajax "/jobs/#{@get('job.id')}/log", 'GET',
+    @get('ajax').ajax "/jobs/#{@get('job.id')}/log", 'GET',
       dataType: 'json'
       headers:
         accept: 'application/json; chunked=true; version=2'
@@ -81,7 +81,8 @@ Log = Ember.Object.extend
           @set('removed', true)
         @loadParts(json['log']['parts'])
       text: (text) => @loadText(text)
-    Request.create(id: id, handlers: handlers, log: this).run() if id = @get('job.id')
+    if id = @get('job.id')
+      Request.create(id: id, handlers: handlers, log: this, ajax: @get('ajax')).run()
 
   clear: ->
     @clearParts()

app/models/repo.coffee

@@ -1,40 +1,24 @@
 `import ExpandableRecordArray from 'travis/utils/expandable-record-array'`
 `import Model from 'travis/models/model'`
-`import Ajax from 'travis/utils/ajax'`
 # TODO: Investigate for some weird reason if I use durationFrom here not durationFromHelper,
 #       the function stops being visible inside computed properties.
 `import { durationFrom as durationFromHelper } from 'travis/utils/helpers'`
 `import Build from 'travis/models/build'`
 
 Repo = Model.extend
+  ajax: Ember.inject.service()
+
   slug:                DS.attr()
   description:         DS.attr()
   private:             DS.attr('boolean')
-  lastBuildNumber:     DS.attr('number')
-  lastBuildState:      DS.attr()
-  lastBuildStartedAt:  DS.attr()
-  lastBuildFinishedAt: DS.attr()
   githubLanguage:      DS.attr()
-  _lastBuildDuration:  DS.attr('number')
-  lastBuildLanguage:   DS.attr()
   active:              DS.attr()
-  lastBuildId:         DS.attr('number')
-  lastBuildHash: (->
-    {
-      id: @get('lastBuildId')
-      number: @get('lastBuildNumber')
-      repo: this
-    }
-  ).property('lastBuildId', 'lastBuildNumber')
 
-  lastBuild: (->
+  #lastBuild:     DS.belongsTo('build')
-    if id = @get('lastBuildId')
+  defaultBranch: DS.belongsTo('branch', async: false)
-      @store.find('build', id)
-      @store.recordForId('build', id)
-  ).property('lastBuildId')
 
   withLastBuild: ->
-    @filter( (repo) -> repo.get('lastBuildId') )
+    @filter( (repo) -> repo.get('defaultBranch.lastBuild') )
 
   sshKey: (->
     @store.find('ssh_key', @get('id'))
@@ -51,7 +35,7 @@ Repo = Model.extend
   builds: (->
     id = @get('id')
     builds = @store.filter('build', event_type: ['push', 'api'], repository_id: id, (b) ->
-      b.get('repo.id') == id && (b.get('eventType') == 'push' || b.get('eventType') == 'api')
+      b.get('repositoryId')+'' == id+'' && (b.get('eventType') == 'push' || b.get('eventType') == 'api')
     )
 
     # TODO: move to controller
@@ -68,7 +52,7 @@ Repo = Model.extend
   pullRequests: (->
     id = @get('id')
     builds = @store.filter('build', event_type: 'pull_request', repository_id: id, (b) ->
-      b.get('repo.id') == id && b.get('eventType') == 'pull_request'
+      b.get('repositoryId')+'' == id+'' && b.get('eventType') == 'pull_request'
     )
 
     # TODO: move to controller
@@ -85,7 +69,7 @@ Repo = Model.extend
   ).property()
 
   branches: (->
-    builds = @store.find 'build', repository_id: @get('id'), branches: true
+    builds = @store.query 'build', repository_id: @get('id'), branches: true
 
     builds.then ->
       builds.set 'isLoaded', true
@@ -101,27 +85,13 @@ Repo = Model.extend
     (@get('slug') || '').split('/')[1]
   ).property('slug')
 
-  lastBuildDuration: (->
-    duration = @get('_lastBuildDuration')
-    duration = durationFromHelper(@get('lastBuildStartedAt'), @get('lastBuildFinishedAt')) unless duration
-    duration
-  ).property('_lastBuildDuration', 'lastBuildStartedAt', 'lastBuildFinishedAt')
-
   sortOrderForLandingPage: (->
-    state = @get('lastBuildState')
+    state = @get('defaultBranch.lastBuild.state')
     if state != 'passed' && state != 'failed'
       0
     else
-      parseInt(@get('lastBuildId'))
+      parseInt(@get('defaultBranch.lastBuild.id'))
-  ).property('lastBuildId', 'lastBuildState')
+  ).property('defaultBranch.lastBuild.id', 'defaultBranch.lastBuild.state')
-
-  sortOrder: (->
-    # cuz sortAscending seems buggy when set to false
-    if lastBuildFinishedAt = @get('lastBuildFinishedAt')
-      - new Date(lastBuildFinishedAt).getTime()
-    else
-      - new Date('9999').getTime() - parseInt(@get('lastBuildId'))
-  ).property('lastBuildFinishedAt', 'lastBuildId')
 
   stats: (->
     if @get('slug')
@@ -132,32 +102,41 @@ Repo = Model.extend
   ).property('slug')
 
   updateTimes: ->
-    @notifyPropertyChange 'lastBuildDuration'
+    @notifyPropertyChange 'defaultBranch.lastBuild.duration'
 
   regenerateKey: (options) ->
-    Ajax.ajax '/repos/' + @get('id') + '/key', 'post', options
+    @get('ajax').ajax '/repos/' + @get('id') + '/key', 'post', options
 
   fetchSettings: ->
-    Ajax.ajax('/repos/' + @get('id') + '/settings', 'get', forceAuth: true).then (data) ->
+    @get('ajax').ajax('/repos/' + @get('id') + '/settings', 'get', forceAuth: true).then (data) ->
       data['settings']
 
   saveSettings: (settings) ->
-    Ajax.ajax('/repos/' + @get('id') + '/settings', 'patch', data: { settings: settings })
+    @get('ajax').ajax('/repos/' + @get('id') + '/settings', 'patch', data: { settings: settings })
 
 Repo.reopenClass
   recent: ->
     @find()
 
-  accessibleBy: (store, login) ->
+  accessibleBy: (store, reposIds) ->
-    repos = store.find('repo', { member: login, orderBy: 'name' })
+    # this fires only for authenticated users and with API v3 that means getting
+    # only repos of currently logged in owner, but in the future it would be
+    # nice to not use that as it may change in the future
+    repos = store.filter('repo', (repo) ->
+      reposIds.indexOf(parseInt(repo.get('id'))) != -1
+    )
 
-    repos.then () ->
+    promise = new Ember.RSVP.Promise (resolve, reject) ->
-      repos.set('isLoaded', true)
+      store.query('repo', { 'repository.active': 'true' }).then( ->
+        resolve(repos)
+      , ->
+        reject()
+      )
 
-    repos
+    promise
 
   search: (store, query) ->
-    promise = store.find('repo', search: query, orderBy: 'name')
+    promise = store.query('repo', search: query, orderBy: 'name')
     result = Ember.ArrayProxy.create(content: [])
 
     promise.then ->
@@ -168,7 +147,7 @@ Repo.reopenClass
 
   withLastBuild: (store) ->
     repos = store.filter('repo', {}, (build) ->
-      build.get('lastBuildId')
+      build.get('defaultBranch.lastBuild')
     )
 
     repos.then () ->
@@ -176,20 +155,24 @@ Repo.reopenClass
 
     repos
 
-  bySlug: (store, slug) ->
-    # first check if there is a repo with a given slug already ordered
-    repos = store.all('repo').filterBy('slug', slug)
-    if repos.get('length') > 0
-      repos
-    else
-      store.find('repo', { slug: slug })
-
   fetchBySlug: (store, slug) ->
-    repos = @bySlug(store, slug)
+    repos = store.peekAll('repo').filterBy('slug', slug)
     if repos.get('length') > 0
       repos.get('firstObject')
     else
-      repos.then (repos) ->
+      adapter = store.adapterFor('repo')
+      modelClass = store.modelFor('repo')
+      adapter.findRecord(store, modelClass, slug).then (payload) ->
+        serializer = store.serializerFor('repo')
+        modelClass = store.modelFor('repo')
+        result = serializer.normalizeResponse(store, modelClass, payload, null, 'findRecord')
+
+        repo = store.push(data: result.data)
+        for record in result.included
+          r = store.push(data: record)
+
+        repo
+      , ->
         error = new Error('repo not found')
         error.slug = slug
         Ember.get(repos, 'firstObject') || throw(error)

app/models/user.coffee

@@ -1,9 +1,13 @@
 `import Ember from 'ember'`
 `import Model from 'travis/models/model'`
-`import Ajax from 'travis/utils/ajax'`
 `import config from 'travis/config/environment'`
 
 User = Model.extend
+  ajax: Ember.inject.service()
+
+  # TODO: this totally not should be needed here
+  sessionStorage: Ember.inject.service()
+
   name:        DS.attr()
   email:       DS.attr()
   login:       DS.attr()
@@ -27,7 +31,7 @@ User = Model.extend
   ).property()
 
   _rawPermissions: (->
-    Ajax.get('/users/permissions')
+    @get('ajax').get('/users/permissions')
   ).property()
 
   permissions: (->
@@ -72,12 +76,12 @@ User = Model.extend
 
   sync: ->
     self = this
-    Ajax.post('/users/sync', {}, ->
+    @get('ajax').post('/users/sync', {}, ->
       self.setWithSession('isSyncing', true)
     )
 
   poll: ->
-    Ajax.get '/users', (data) =>
+    @get('ajax').get '/users', (data) =>
       if data.user.is_syncing
         self = this
         setTimeout ->
@@ -88,12 +92,12 @@ User = Model.extend
         @setWithSession('syncedAt', data.user.synced_at)
         Travis.trigger('user:synced', data.user)
 
-        @store.findQuery('account', {})
+        @store.query('account', {})
 
   setWithSession: (name, value) ->
     @set(name, value)
-    user = JSON.parse(Travis.sessionStorage.getItem('travis.user'))
+    user = JSON.parse(@get('sessionStorage').getItem('travis.user'))
     user[name.underscore()] = @get(name)
-    Travis.sessionStorage.setItem('travis.user', JSON.stringify(user))
+    @get('sessionStorage').setItem('travis.user', JSON.stringify(user))
 
 `export default User`

app/router.coffee

@@ -13,7 +13,7 @@ Router = Ember.Router.extend
       #
       # we should probably think about a more general way to
       # do this, location should not know about auth status
-      Location.create(auth: @container.lookup('auth:main'))
+      Location.create(auth: @container.lookup('service:auth'))
   ).property()
 
   # TODO: this is needed, because in the original version

app/routes/accounts.coffee

@@ -2,7 +2,7 @@
 
 Route = TravisRoute.extend
   model: ->
-    @store.find('account', { all: true })
+    @store.query('account', { all: true })
 
   setupController: (controller, model) ->
     user = model.filterBy('type', 'user')[0]

app/routes/application.coffee

@@ -21,7 +21,7 @@ Route = TravisRoute.extend BuildFaviconMixin,
     @get('stylesheetsManager').disable('dashboard')
 
     if !config.pro
-      repos = @get('store').all('repo')
+      repos = @get('store').peekAll('repo')
       repos.forEach (repo) =>
         @subscribeToRepo(repo)
 

app/routes/caches.coffee

@@ -1,8 +1,9 @@
 `import Ember from 'ember'`
 `import TravisRoute from 'travis/routes/basic'`
-`import Ajax from 'travis/utils/ajax'`
 
 Route = TravisRoute.extend
+  ajax: Ember.inject.service()
+
   needsAuth: true
   setupController: (controller) ->
     @_super.apply this, arguments
@@ -10,7 +11,7 @@ Route = TravisRoute.extend
 
   model: ->
     repo = @modelFor('repo')
-    Ajax.get("/repos/#{repo.get('id')}/caches").then( (data) ->
+    @get('ajax').get("/repos/#{repo.get('id')}/caches").then( (data) ->
       caches = {}
 
       data["caches"].forEach (cacheData) ->

app/routes/first-sync.coffee

@@ -15,7 +15,7 @@ Route = SimpleLayoutRoute.extend
     if !controller.get('isSyncing')
       self = this
       Ember.run.later this, ->
-        @store.find('repo', member: @get('controller.user.login')).then( (repos) ->
+        @store.query('repo', member: @get('controller.user.login')).then( (repos) ->
           if repos.get('length')
             self.transitionTo('main')
           else

app/routes/home.coffee

@@ -21,10 +21,10 @@ Route = BasicRoute.extend
     @_super.apply this, arguments
 
   loadMoreRepos: ->
-    @store.find('build').then (builds) =>
+    @store.findAll('build').then (builds) =>
       repoIds = builds.mapBy('data.repo').uniq()
       repos = @get('repos.repos')
-      @store.find('repo', ids: repoIds).then (reposFromRequest) =>
+      @store.query('repo', ids: repoIds).then (reposFromRequest) =>
         reposFromRequest.toArray().forEach (repo) ->
           repos.pushObject(repo) unless repos.contains(repo)
 

app/routes/job.coffee

@@ -18,16 +18,18 @@ Route = TravisRoute.extend
     @controllerFor('job').set('job', model)
     repo.activate('job')
 
-    if build = model.get('build')
+    buildController = @controllerFor('build')
-      build = @store.recordForId('build', build.get('id'))
-      buildController = @controllerFor('build')
 
-      # this is a hack to not set favicon changes from build
+    model.get('repo')
-      # controller while we're viewing job, this should go away
+    if buildPromise = model.get('build')
-      # after refactoring of controllers
+      buildPromise.then (build) =>
-      buildController.set('sendFaviconStateChanges', false)
+        build = @store.recordForId('build', build.get('id'))
+        buildController.set('build', build)
 
-      buildController.set('build', build)
+    # this is a hack to not set favicon changes from build
+    # controller while we're viewing job, this should go away
+    # after refactoring of controllers
+    buildController.set('sendFaviconStateChanges', false)
 
   model: (params) ->
     @store.find('job', params.job_id)

app/routes/main-tab.coffee

@@ -12,12 +12,12 @@ Route = TravisRoute.extend
     @controllerFor('repos').activate(@get('reposTabName'))
 
     @currentRepoDidChange()
-    if repos = @controllerFor('repos').get('repos')
+    if repos = @controllerFor('repos')
-      repos.addObserver('firstObject', this, 'currentRepoDidChange')
+      repos.addObserver('repos.firstObject', this, 'currentRepoDidChange')
 
   deactivate: ->
-    if repos = @controllerFor('repos').get('repos')
+    if repos = @controllerFor('repos')
-      repos.removeObserver('firstObject', this, 'currentRepoDidChange')
+      repos.removeObserver('repos.firstObject', this, 'currentRepoDidChange')
 
     @_super.apply(this, arguments)
 

app/routes/owner.coffee

@@ -1,6 +1,5 @@
 `import Ember from 'ember'`
 `import TravisRoute from 'travis/routes/basic'`
-`import Ajax from 'travis/utils/ajax'`
 `import config from 'travis/config/environment'`
 
 Route = TravisRoute.extend

app/routes/owner/repositories.coffee

@@ -1,6 +1,5 @@
 `import Ember from 'ember'`
 `import TravisRoute from 'travis/routes/basic'`
-`import Ajax from 'travis/utils/ajax'`
 `import config from 'travis/config/environment'`
 
 Route = TravisRoute.extend

app/routes/owner/running.coffee

@@ -1,6 +1,5 @@
 `import Ember from 'ember'`
 `import TravisRoute from 'travis/routes/basic'`
-`import Ajax from 'travis/utils/ajax'`
 `import config from 'travis/config/environment'`
 
 Route = TravisRoute.extend

app/routes/repo.coffee

@@ -1,7 +1,9 @@
 `import TravisRoute from 'travis/routes/basic'`
 `import Repo from 'travis/models/repo'`
+`import Ember from 'ember'`
 
 Route = TravisRoute.extend
+  store: Ember.inject.service()
   titleToken: (model) ->
     model.get('slug')
 
@@ -11,7 +13,7 @@ Route = TravisRoute.extend
   setupController: (controller, model) ->
     # TODO: if repo is just a data hash with id and slug load it
     #       as incomplete record
-    model = @store.find('repo', model.id) if model && !model.get
+    model = @get('store').find('repo', model.id) if model && !model.get
     controller.set('repo', model)
 
   serialize: (repo) ->
@@ -21,7 +23,7 @@ Route = TravisRoute.extend
 
   model: (params) ->
     slug = "#{params.owner}/#{params.name}"
-    Repo.fetchBySlug(@store, slug)
+    Repo.fetchBySlug(@get('store'), slug)
 
   resetController: ->
     @controllerFor('repo').deactivate()

app/routes/repo/index.coffee

@@ -6,7 +6,7 @@ Route = TravisRoute.extend
     @controllerFor('repo').activate('current')
 
   renderTemplate: ->
-    if @modelFor('repo').get('lastBuildId')
+    if @modelFor('repo').get('defaultBranch.lastBuild')
       @render 'build'
     else
       @render 'builds/not_found'

app/routes/requests.coffee

@@ -7,6 +7,6 @@ Route = TravisRoute.extend
     @controllerFor('repo').activate('requests')
 
   model: ->
-    @store.find 'request', repository_id: @modelFor('repo').get('id')
+    @store.query 'request', repository_id: @modelFor('repo').get('id')
 
 `export default Route`

app/routes/settings.coffee

@@ -1,8 +1,9 @@
 `import TravisRoute from 'travis/routes/basic'`
-`import Ajax from 'travis/utils/ajax'`
 `import config from 'travis/config/environment'`
 
 Route = TravisRoute.extend
+  ajax: Ember.inject.service()
+
   needsAuth: true
   setupController: (controller, model) ->
     @_super.apply(this, arguments)
@@ -27,7 +28,7 @@ Route = TravisRoute.extend
 
   fetchSshKey: () ->
     repo = @modelFor('repo')
-    Ajax.get "/repos/#{repo.get('id')}/key", (data) =>
+    @get('ajax').get "/repos/#{repo.get('id')}/key", (data) =>
       Ember.Object.create(fingerprint: data.fingerprint)
 
   fetchRepositoryActiveFlag: ->

app/routes/ssh-key.coffee

@@ -1,8 +1,9 @@
 `import Ember from 'ember'`
-`import Ajax from 'travis/utils/ajax'`
 `import TravisRoute from 'travis/routes/basic'`
 
 Route = TravisRoute.extend
+  ajax: Ember.inject.service()
+
   titleToken: 'Ssh Keys'
 
   model: (params) ->
@@ -17,7 +18,7 @@ Route = TravisRoute.extend
 
   afterModel: (model, transition) ->
     repo = @modelFor('repo')
-    Ajax.get "/repos/#{repo.get('id')}/key", (data) =>
+    @get('ajax').get "/repos/#{repo.get('id')}/key", (data) =>
       @defaultKey = Ember.Object.create(fingerprint: data.fingerprint)
 
   setupController: (controller, model) ->

app/serializers/application.coffee

@@ -1,7 +1,7 @@
 `import DS from 'ember-data'`
+`import V2FallbackSerializer from 'travis/serializers/v2_fallback'`
 
-Serializer = DS.ActiveModelSerializer.extend
+Serializer = V2FallbackSerializer.extend
-  defaultSerializer: 'application'
+  isNewSerializerAPI: true
-  serializer: 'application'
 
 `export default Serializer`

app/serializers/branch.js

@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import V3Serializer from 'travis/serializers/v3';
+
+export default V3Serializer.extend({
+  extractAttributes(klass, payload) {
+    payload.id = payload['@href'];
+    return this._super(...arguments);
+  },
+  extractId(modelClass, resourceHash) {
+    return resourceHash.id || resourceHash['@href'];
+  }
+});

app/serializers/build.coffee

@@ -1,19 +0,0 @@
-`import Ember from 'ember'`
-`import ApplicationSerializer from 'travis/serializers/application'`
-
-Serializer = ApplicationSerializer.extend
-  attrs: {
-    repo:        { key: 'repository_id' }
-    _config:     { key: 'config' }
-    _finishedAt: { key: 'finished_at' }
-    _startedAt:  { key: 'started_at' }
-    _duration:   { key: 'duration' }
-  }
-
-  extractSingle: (store, primaryType, rawPayload, recordId) ->
-    if commit = rawPayload.commit
-      rawPayload.commits = [commit]
-
-    @_super(store, primaryType, rawPayload, recordId)
-
-`export default Serializer`

app/serializers/build.js

@@ -0,0 +1,93 @@
+import Ember from 'ember';
+import V2FallbackSerializer from 'travis/serializers/v2_fallback';
+
+var Serializer = V2FallbackSerializer.extend({
+  isNewSerializerAPI: true,
+  attrs: {
+    _config: {
+      key: 'config'
+    },
+    _finished_at: {
+      key: 'finished_at'
+    },
+    _started_at: {
+      key: 'started_at'
+    },
+    _duration: {
+      key: 'duration'
+    }
+  },
+
+  extractRelationships: function(modelClass, resourceHash) {
+    var result;
+    result = this._super(modelClass, resourceHash);
+    return result;
+  },
+
+  normalizeArrayResponse: function(store, primaryModelClass, payload, id, requestType) {
+    var result;
+    if (payload.commits) {
+      payload.builds.forEach(function(build) {
+        var commit, commit_id;
+        commit_id = build.commit_id;
+        if (commit = payload.commits.findBy('id', commit_id)) {
+          build.commit = commit;
+          return delete build.commit_id;
+        }
+      });
+    }
+    return this._super.apply(this, arguments);
+  },
+
+  keyForV2Relationship: function(key, typeClass, method) {
+    if(key === 'jobs') {
+      return 'job_ids';
+    } else if (key === 'repo') {
+      return 'repository_id';
+    } else if (key === 'commit') {
+      return key;
+    } else {
+      return this._super.apply(this, arguments);
+    }
+  },
+
+  keyForRelationship(key, typeClass, method) {
+    if (key === 'repo') {
+      return 'repository';
+    } else {
+      return this._super.apply(this, arguments);
+    }
+  },
+
+  normalize: function(modelClass, resourceHash) {
+    var data, href, id, repoId, result;
+
+    // TODO: remove this after switching to V3 entirely
+    if(!resourceHash['@type']) {
+      let build = resourceHash.build,
+          commit = resourceHash.commit;
+      let branch = {
+        name: commit.branch,
+        default_branch: build.is_on_default_branch,
+        "@href": `/repo/${build.repository_id}/branch/${commit.branch}`
+      };
+      resourceHash.build.branch = branch;
+    }
+
+    result = this._super(modelClass, resourceHash);
+
+    data = result.data;
+
+    if (repoId = resourceHash.repository_id) {
+      data.attributes.repositoryId = repoId;
+    } else if (resourceHash.repository) {
+      if (href = resourceHash.repository['@href']) {
+        id = href.match(/\d+/)[0];
+        data.attributes.repositoryId = id;
+      }
+    }
+    return result;
+  }
+});
+
+export default Serializer;

app/serializers/job.coffee

@@ -1,18 +1,30 @@
 `import Ember from 'ember'`
-`import ApplicationSerializer from 'travis/serializers/application'`
+`import V2FallbackSerializer from 'travis/serializers/v2_fallback'`
 
-Serializer = ApplicationSerializer.extend
+Serializer = V2FallbackSerializer.extend
+  isNewSerializerAPI: true
   attrs: {
-    repo:   { key: 'repository_id' }
     _config: { key: 'config' }
-    _finishedAt: { key: 'finished_at' }
+    _finished_at: { key: 'finished_at' }
-    _startedAt:  { key: 'started_at' }
+    _started_at:  { key: 'started_at' }
   }
 
-  extractSingle: (store, primaryType, rawPayload, recordId) ->
+  keyForV2Relationship: (key, typeClass, method) ->
-    if commit = rawPayload.commit
+    if key == 'repo'
-      rawPayload.commits = [commit]
+      'repository'
+    else
+      @_super.apply(this, arguments)
 
-    @_super(store, primaryType, rawPayload, recordId)
+  keyForV2Relationship: (key, typeClass, method) ->
+    if key == 'repo'
+      'repository_id'
+    else
+      @_super.apply(this, arguments)
+
+  normalize: (modelClass, resourceHash) ->
+    if resourceHash.commit
+      resourceHash.commit['type'] = 'commit'
+
+    @_super(modelClass, resourceHash)
 
 `export default Serializer`

app/serializers/repo.coffee

@@ -1,9 +0,0 @@
-`import Ember from 'ember'`
-`import ApplicationSerializer from 'travis/serializers/application'`
-
-Serializer = ApplicationSerializer.extend
-  attrs: {
-    _lastBuildDuration: { key: 'last_build_duration' }
-  }
-
-`export default Serializer`

app/serializers/repo.js

@@ -0,0 +1,16 @@
+import Ember from 'ember';
+import V2FallbackSerializer from 'travis/serializers/v2_fallback';
+
+var Serializer = V2FallbackSerializer.extend({
+  isNewSerializerAPI: true,
+
+  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+    if(!id && requestType == 'findRecord') {
+      id = payload.id;
+    }
+
+    return this._super(store, primaryModelClass, payload, id, requestType);
+  }
+});
+
+export default Serializer;

app/serializers/request.coffee

@@ -3,8 +3,8 @@
 
 Serializer = ApplicationSerializer.extend
   attrs: {
-    branchName: { key: 'branch' }
+    branch_name: { key: 'branch' }
-    tagName:    { key: 'tag' }
+    tag_name:    { key: 'tag' }
     repo:       { key: 'repository_id' }
   }
 

app/serializers/v2_fallback.js

@@ -0,0 +1,93 @@
+import Ember from 'ember';
+import V3Serializer from 'travis/serializers/v3';
+
+export default V3Serializer.extend({
+  isNewSerializerAPI: true,
+
+  extractRelationships(modelClass, resourceHash) {
+    if(resourceHash['@type']) {
+      return this._super(...arguments);
+    } else {
+      let relationships = {};
+
+      modelClass.eachRelationship((key, relationshipMeta) => {
+        // V2 API payload
+        let relationship = null;
+        let relationshipKey = this.keyForV2Relationship(key, relationshipMeta.kind, 'deserialize');
+
+        if (resourceHash.hasOwnProperty(key) || resourceHash.hasOwnProperty(relationshipKey)) {
+          let data = null;
+          let relationshipHash = resourceHash[key] || resourceHash[relationshipKey];
+          if (relationshipMeta.kind === 'belongsTo') {
+            data = this.extractRelationship(relationshipMeta.type, relationshipHash);
+          } else if (relationshipMeta.kind === 'hasMany') {
+            data = relationshipHash.map((item) => this.extractRelationship(relationshipMeta.type, item));
+          }
+          relationship = { data };
+        }
+
+        if (relationship) {
+          relationships[key] = relationship;
+        }
+      });
+
+      return relationships;
+    }
+  },
+
+  normalize(modelClass, resourceHash) {
+    if(resourceHash['@type']) {
+      return this._super(...arguments);
+    } else {
+      var modelKey = modelClass.modelName;
+      var attributes = resourceHash[modelKey];
+      if(attributes) {
+        for(var key in attributes) {
+          resourceHash[key] = attributes[key];
+        }
+
+        resourceHash['type'] = modelKey;
+        delete resourceHash[modelKey];
+      }
+
+      let { data, included } = this._super(...arguments);
+      if(!included) {
+        included = [];
+      }
+      let store = this.store;
+
+      if(data.relationships) {
+        Object.keys(data.relationships).forEach(function (key) {
+          let relationship = data.relationships[key];
+          let process = function(data) {
+            if(Object.keys(data).sort()+'' !== 'id,type' || (data['@href'] && data.type == 'branch')) {
+              // no need to add records if they have only id and type
+              let type = key.singularize();
+              let serializer = store.serializerFor(type);
+              let modelClass = store.modelFor(type);
+              let normalized = serializer.normalize(modelClass, data);
+              included.push(normalized.data);
+              if(normalized.included) {
+                normalized.included.forEach(function(item) {
+                  included.push(item);
+                });
+              }
+            }
+          };
+
+          if(Array.isArray(relationship.data)) {
+            relationship.data.forEach(process);
+          } else if(relationship && relationship.data) {
+            process(relationship.data);
+          }
+        });
+      }
+
+      return { data, included };
+    }
+  },
+
+  keyForV2Relationship(key, typeClass, method) {
+    return key.underscore() + '_id';
+  }
+});

app/serializers/v3.js

@@ -0,0 +1,186 @@
+import Ember from 'ember';
+import DS from 'ember-data';
+
+var traverse = function(object, callback) {
+  if(!object) {
+    return;
+  }
+
+  if(typeof(object) === 'object' && !Ember.isArray(object)) {
+    callback(object);
+  }
+
+  if(Ember.isArray(object)) {
+    for(let item of object) {
+      traverse(item, callback);
+    }
+  } else if(typeof object === 'object') {
+    for(let key in object) {
+      if(object.hasOwnProperty(key)) {
+        let item = object[key];
+        traverse(item, callback);
+      }
+    }
+  }
+};
+
+export default DS.JSONSerializer.extend({
+  isNewSerializerAPI: true,
+
+  extractRelationship(type, hash) {
+    if(!hash.id && hash['@href']) {
+      hash.id = hash['@href'];
+    }
+
+    let relationshipHash = this._super(...arguments);
+    if(relationshipHash && relationshipHash['@type']) {
+      relationshipHash.type = relationshipHash['@type'];
+    } else if(relationshipHash && !relationshipHash.type) {
+      relationshipHash.type = type;
+    }
+    return relationshipHash;
+  },
+
+  extractRelationships() {
+    let relationships = this._super(...arguments);
+    return relationships;
+  },
+
+  keyForRelationship(key, typeClass, method) {
+    if(key && key.underscore) {
+      return key.underscore();
+    } else {
+      return key;
+    }
+  },
+
+  extractAttributes(modelClass, resourceHash) {
+    let attributes = this._super(...arguments);
+    for(let key in attributes) {
+      if(key.startsWith('@')) {
+        delete attributes.key;
+      }
+    }
+
+    return attributes;
+  },
+
+  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+    this._fixReferences(payload);
+    return this._super(...arguments);
+  },
+
+  normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+    let documentHash = {
+      data: null,
+      included: []
+    };
+
+    let meta = this.extractMeta(store, primaryModelClass, payload);
+    if (meta) {
+      Ember.assert('The `meta` returned from `extractMeta` has to be an object, not "' + Ember.typeOf(meta) + '".', Ember.typeOf(meta) === 'object');
+      documentHash.meta = meta;
+    }
+
+    let items, type;
+    if(type = payload['@type']) {
+      items = payload[type];
+    } else {
+      items = payload[primaryModelClass.modelName.underscore() + 's'];
+    }
+
+    documentHash.data = items.map((item) => {
+      let { data, included } = this.normalize(primaryModelClass, item);
+      if (included) {
+        documentHash.included.push(...included);
+      }
+      return data;
+    });
+
+    return documentHash;
+  },
+
+  normalize(modelClass, resourceHash) {
+    let { data, included } = this._super(...arguments);
+    if(!included) {
+      included = [];
+    }
+    let store = this.store;
+
+    if(data.relationships) {
+      Object.keys(data.relationships).forEach(function (key) {
+        let relationship = data.relationships[key];
+        let process = function(data) {
+          if(data['@representation'] !== 'standard') {
+            return;
+          }
+          let type = data['@type'];
+          let serializer = store.serializerFor(type);
+          let modelClass = store.modelFor(type);
+          let normalized = serializer.normalize(modelClass, data);
+          included.push(normalized.data);
+          if(normalized.included) {
+            normalized.included.forEach(function(item) {
+              included.push(item);
+            });
+          }
+        };
+
+        if(Array.isArray(relationship.data)) {
+          relationship.data.forEach(process);
+        } else if(relationship && relationship.data) {
+          process(relationship.data);
+        }
+      });
+    }
+
+    return { data, included };
+  },
+
+  keyForAttribute(key, method) {
+    if(method === 'deserialize') {
+      return Ember.String.underscore(key);
+    } else {
+      return Ember.String.camelize(key);
+    }
+  },
+
+  _fixReferences(payload) {
+    let byHref = {}, href, records;
+    if(payload['@type']) {
+      // API V3 doesn't return all of the objects in a full representation
+      // If an object is present in one place in the response, all of the
+      // other occurences will be just references of a kind - they will just
+      // include @href property.
+      //
+      // I don't want to identify records by href in ember-data, so here I'll
+      // set an id and a @type field on all of the references.
+      //
+      // First we need to group all of the items in the response by href:
+      traverse(payload, (item) => {
+        if(href = item['@href']) {
+          if(records = byHref[href]) {
+            records.push(item);
+          } else {
+            byHref[href] = [item];
+          }
+        }
+      });
+
+      // Then we can choose a record with an id for each href and put the id
+      // in all of the other occurences.
+      for(let href in byHref) {
+        records = byHref[href];
+        let recordWithAnId = records.find( (record) => record.id );
+        if(recordWithAnId) {
+          for(let record of records) {
+            record.id = recordWithAnId.id;
+            //record['@type'] = recordWithAnId['@type'];
+          }
+        }
+      }
+    }
+
+    return payload;
+  }
+});

app/services/ajax.coffee

@@ -0,0 +1,157 @@
+`import Ember from 'ember';`
+`import config from 'travis/config/environment'`
+
+jQuery.support.cors = true
+
+default_options =
+  accepts:
+    json: 'application/json; version=2'
+
+Ajax = Ember.Service.extend
+  auth: Ember.inject.service()
+
+  publicEndpoints: [/\/repos\/?.*/, /\/builds\/?.*/, /\/jobs\/?.*/]
+  privateEndpoints: [/\/repos\/\d+\/caches/]
+
+  get: (url, callback, errorCallback) ->
+    @ajax(url, 'get', success: callback, error: errorCallback)
+
+  post: (url, data, callback) ->
+    @ajax(url, 'post', data: data, success: callback)
+
+  patch: (url, data, callback) ->
+    @ajax(url, 'patch', data: data, success: callback)
+
+  needsAuth: (method, url) ->
+    return true if config.pro
+    return true if method != 'GET'
+
+    publicEndpoint = @publicEndpoints.find (pattern) ->
+      url.match(pattern)
+
+    privateEndpoint = @privateEndpoints.find (pattern) ->
+      url.match(pattern)
+
+    !publicEndpoint || privateEndpoint
+
+  ajax: (url, method, options) ->
+    # TODO: we have our own ajax implementation, because jQuery didn't
+    #       properly worked with headers on firefox, it would be nice to check
+    #       if this is still a problem and if we can remove this
+    method = method || "GET"
+    method = method.toUpperCase()
+
+    endpoint = config.apiEndpoint || ''
+    options = options || {}
+
+    token = Ember.get(this, 'auth').token()
+    if token && (@needsAuth(method, url) || options.forceAuth)
+      options.headers ||= {}
+      options.headers['Authorization'] ||= "token #{token}"
+
+    options.url = url = "#{endpoint}#{url}"
+    options.type = method
+    options.dataType = options.dataType || 'json'
+    options.context = this
+
+    if options.data && method != 'GET'
+      options.data = JSON.stringify(options.data)
+
+    if method != 'GET' && method != 'HEAD'
+      options.contentType = options.contentType || 'application/json; charset=utf-8'
+
+    success = options.success || (->)
+    options.success = (data, status, xhr) =>
+      Travis.lookup('controller:flash').loadFlashes(data.flash) if data?.flash
+      delete data.flash if data?
+      success.apply(this, arguments)
+
+    error = options.error || (->)
+    options.error = (data, status, xhr) =>
+      Travis.lookup('controller:flash').pushObject(data.flash) if data?.flash
+      delete data.flash if data?
+      error.apply(this, arguments)
+
+    options = $.extend(options, default_options)
+
+    if testMode?
+      console.log('Running ajax with', options.url)
+
+      # we use jquery.mockjax for test, I don't want to hack it or rewrite it,
+      # so let's just pretend we still use ajax if testing mode is on
+      return new Ember.RSVP.Promise( (resolve, reject) ->
+        oldSuccess = options.success
+        options.success = (json, status, xhr) ->
+          Ember.run this, ->
+            oldSuccess.call(this, json, status, xhr)
+          Ember.run(null, resolve, json)
+
+        oldError = options.error
+        options.error = (jqXHR) ->
+          if jqXHR
+            # for a context, please see https://github.com/emberjs/ember.js/issues/3051
+            jqXHR.then = null
+
+          Ember.run this, ->
+            oldError.call this, jqXHR
+            reject(jqXHR)
+
+        $.ajax(options)
+      )
+
+    if options.data && (method == "GET" || method == "HEAD")
+      params = jQuery.param(options.data)
+      delimeter = if url.indexOf('?') == -1 then '?' else '&'
+      url = url + delimeter + params
+
+    xhr = new XMLHttpRequest()
+
+    xhr.open(method, url)
+
+    if options.accepts && !options.headers?.accept?
+      accepts = []
+      for key, value of options.accepts
+        accepts.pushObject(value)
+      xhr.setRequestHeader('Accept', accepts.join(', '))
+
+    if options.headers
+      for name, value of options.headers
+        xhr.setRequestHeader(name, value)
+
+    if options.contentType
+      xhr.setRequestHeader('Content-Type', options.contentType)
+
+    resolve = null
+    reject = null
+    promise = new Ember.RSVP.Promise( (_resolve, _reject) ->
+      resolve = _resolve
+      reject = _reject
+    )
+
+    xhr.onreadystatechange = ->
+      if xhr.readyState == 4
+        contentType = xhr.getResponseHeader('Content-Type')
+        data = if contentType && contentType.match /application\/json/
+          try
+            jQuery.parseJSON(xhr.responseText)
+          catch e
+            console.log('error while parsing a response', method, options.url, xhr.responseText)
+        else
+          xhr.responseText
+
+        if xhr.status >= 200 && xhr.status < 300
+          resolve(data)
+          options.success.call(options.context, data, xhr.status, xhr)
+        else
+          reject(xhr)
+          options.error.call(data, xhr.status, xhr)
+
+    data = options.data
+    if typeof(options.data) == "object" && (Ember.isNone(options.contentType) || options.contentType.match /application\/json/)
+      data = JSON.stringify(data)
+
+    xhr.send(data)
+
+    return promise
+
+`export default Ajax`

app/services/auth.coffee

@@ -1,7 +1,11 @@
 `import config from 'travis/config/environment'`
-`import Ajax from 'travis/utils/ajax'`
 
-Auth = Ember.Object.extend
+Auth = Ember.Service.extend
+  store: Ember.inject.service(),
+  storage: Ember.inject.service(),
+  sessionStorage: Ember.inject.service(),
+  ajax: Ember.inject.service()
+
   state:        "signed-out"
   receivingEnd: "#{location.protocol}//#{location.host}"
 
@@ -9,20 +13,20 @@ Auth = Ember.Object.extend
     window.addEventListener('message', (e) => @receiveMessage(e))
 
   token: ->
-    Travis.sessionStorage.getItem('travis.token')
+    @get('sessionStorage').getItem('travis.token')
 
   endpoint: (->
     config.apiEndpoint
   ).property(),
 
   signOut: ->
-    @storage.removeItem('travis.user')
+    @get('storage').removeItem('travis.user')
-    @storage.removeItem('travis.token')
+    @get('storage').removeItem('travis.token')
-    @sessionStorage.clear()
+    @get('sessionStorage').clear()
     @set('state', 'signed-out')
     @set('user', undefined)
     if user = @get('currentUser')
-      @store.unloadAll('user')
+      @get('store').unloadAll('user')
     @set('currentUser', null)
     @sendToApp('afterSignOut')
     Travis.trigger('user:signed_out')
@@ -36,7 +40,7 @@ Auth = Ember.Object.extend
       $('<iframe id="auth-frame" />').hide().appendTo('body').attr('src', url)
 
   autoSignIn: (data) ->
-    data ||= @userDataFrom(@sessionStorage) || @userDataFrom(@storage)
+    data ||= @userDataFrom(@get('sessionStorage')) || @userDataFrom(@get('storage'))
     @setData(data) if data
 
   userDataFrom: (storage) ->
@@ -54,7 +58,7 @@ Auth = Ember.Object.extend
 
   validateUser: (user) ->
     fieldsToValidate = ['id', 'login', 'token']
-    isTravisBecome = sessionStorage.getItem('travis.become')
+    isTravisBecome = @get('sessionStorage').getItem('travis.become')
 
     unless isTravisBecome
       fieldsToValidate.push 'correct_scopes'
@@ -72,8 +76,8 @@ Auth = Ember.Object.extend
       false
 
   setData: (data) ->
-    @storeData(data, @sessionStorage)
+    @storeData(data, @get('sessionStorage'))
-    @storeData(data, @storage) unless @userDataFrom(@storage)
+    @storeData(data, @get('storage')) unless @userDataFrom(@get('storage'))
     user = @loadUser(data.user)
     @set('currentUser', user)
 
@@ -83,19 +87,19 @@ Auth = Ember.Object.extend
 
   refreshUserData: (user) ->
     unless user
-      if data = @userDataFrom(@sessionStorage) || @userDataFrom(@storage)
+      if data = @userDataFrom(@get('sessionStorage')) || @userDataFrom(@get('storage'))
         user = data.user
 
     if user
-      Ajax.get("/users/#{user.id}").then (data) =>
+      @get('ajax').get("/users/#{user.id}").then (data) =>
         if data.user.correct_scopes
           userRecord = @loadUser(data.user)
           userRecord.get('permissions')
           # if user is still signed in, update saved data
           if @get('signedIn')
             data.user.token = user.token
-            @storeData(data, @sessionStorage)
+            @storeData(data, @get('sessionStorage'))
-            @storeData(data, @storage)
+            @storeData(data, @get('storage'))
             Travis.trigger('user:refreshed', data.user)
         else
           return Ember.RSVP.Promise.reject()
@@ -119,8 +123,13 @@ Auth = Ember.Object.extend
     storage.setItem('travis.user', JSON.stringify(data.user))
 
   loadUser: (user) ->
-    @store.pushPayload(users: [user])
+    @get('store').push(
-    @store.recordForId('user', user.id)
+      data:
+        type: 'user',
+        id: user.id
+        attributes: user
+    )
+    @get('store').recordForId('user', user.id)
 
   receiveMessage: (event) ->
     if event.origin == @expectedOrigin()

app/services/keyboard.js

@@ -0,0 +1,13 @@
+import Ember from 'ember';
+
+let KeyboardService = Ember.Service.extend({
+  bind(keyName, scope, callback) {
+    key(...arguments);
+  },
+
+  setScope(scope) {
+    key.setScope(scope);
+  }
+});
+
+export default KeyboardService;

app/services/session-storage.coffee

@@ -0,0 +1,18 @@
+`import Ember from 'ember'`
+`import StorageService from 'travis/services/storage'`
+`import Storage from 'travis/utils/hash-storage'`
+
+SessionStorageService = StorageService.extend
+  init: ->
+    storage = null
+    try
+      # firefox will not throw error on access for sessionStorage var,
+      # you need to actually get something from session
+      window.sessionStorage.getItem('foo')
+      storage = window.sessionStorage
+    catch err
+      storage = Storage.create()
+
+    @set('storage', storage)
+
+`export default SessionStorageService`

app/services/storage.coffee

@@ -0,0 +1,22 @@
+`import Ember from 'ember'`
+`import Storage from 'travis/utils/hash-storage'`
+
+StorageService = Ember.Service.extend
+  init: ->
+    storage = null
+    try
+      storage = window.localStorage || throw('no storage')
+    catch err
+      storage = Storage.create()
+
+    @set('storage', storage)
+  getItem: (key) ->
+    return @get("storage").getItem(key)
+  setItem: (key, value) ->
+    return @get("storage").setItem(key, value)
+  removeItem: (key) ->
+    return @get("storage").removeItem(key)
+  clear: ->
+    return @get("storage").clear()
+
+`export default StorageService`

app/services/store.coffee

@@ -2,6 +2,8 @@
 `import config from 'travis/config/environment'`
 
 Store = DS.Store.extend
+  auth: Ember.inject.service()
+
   defaultAdapter: 'application'
   adapter: 'application'
 
@@ -17,7 +19,8 @@ Store = DS.Store.extend
 
   canHandleEvent: (event, data) ->
     [name, type] = event.split(':')
-    auth = @container.lookup('auth:main')
+    auth = @get('auth')
+
     if event != 'job:log' && auth.get('signedIn') &&
         !config.pro && !config.enterprise
       # if recent repos hasn't been opened yet, we can safely
@@ -45,7 +48,7 @@ Store = DS.Store.extend
     return unless @canHandleEvent(event, data)
 
     if name == 'job' && data.job?.commit
-      @pushPayload(commits: [data.job.commit])
+      @push(this.normalize('commit', data.job.commit))
 
     if name == 'build' && data.build?.commit
       # TODO: commit should be a sideload record on build, not mixed with it
@@ -64,27 +67,25 @@ Store = DS.Store.extend
       }
       delete(data.build.commit)
 
-      @pushPayload(commits: [commit])
+      @push(this.normalize('commit', commit))
 
     if event == 'job:log'
       data = data.job
       job = @recordForId('job', data.id)
       job.appendLog(number: parseInt(data.number), content: data._log, final: data.final)
     else if data[name]
-      @_loadOne(name, data)
+      @loadOne(name, data)
     else
       throw "can't load data for #{name}" unless type
 
-  _loadOne: (type, json) ->
+  loadOne: (type, json) ->
-    payload = {}
+    record = @push(this.normalize(type, json))
-    payload[type.pluralize()] = [json[type]]
-    @pushPayload(payload)
 
     # we get other types of records only in a few situations and
     # it's not always needed to update data, so I'm specyfing which
     # things I want to update here:
     if type == 'build' && (json.repository || json.repo)
       data = json.repository || json.repo
-      @pushPayload(repos: [data])
+      @push(this.normalize('repo', data))
 
 `export default Store`

app/styles/app.scss

@@ -66,3 +66,4 @@
 @import "app/layouts/missing-notice";
 @import "app/layouts/settings";
 
+@import "fuzzy";

app/styles/fuzzy.scss

@@ -0,0 +1,35 @@
+.travis-cmd {
+  opacity:    0.3;
+  background: #000;
+  width:      100%;
+  height:     100%;
+  z-index:    10;
+  top:        0;
+  left:       0;
+  position:   fixed;
+  display: none;
+
+  .content {
+    opacity: 1;
+  }
+
+  &.visible {
+    display: block;
+  }
+
+  .content {
+    width: 400px;
+    min-height: 60px;
+    background-color: white;
+    border-radius: 10px;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .content, .input {
+    color: black;
+    font-size: 20px;
+  }
+}

app/templates/application.hbs

@@ -1 +1,3 @@
 {{outlet}}
+
+{{travis-cmd}}

app/templates/build.hbs

@@ -13,7 +13,7 @@
         <small class="repo-main-branch" title={{build.pullRequestTitle}}>Pull Request #{{build.pullRequestNumber}}</small>
         {{build.pullRequestTitle}}
       {{else}}
-        <small class="repo-main-branch" title={{build.commit.branch}}>{{build.commit.branch}}</small>
+        <small class="repo-main-branch" title={{build.branch.name}}>{{build.branch.name}}</small>
         {{format-message build.commit.subject repo=build.repo}}
       {{/if}}
       </h2>

app/templates/components/repos-list-item.hbs

@@ -1,13 +1,12 @@
-<div class="tile tile--sidebar {{repo.lastBuildState}}">
+<div class="tile tile--sidebar {{repo.defaultBranch.lastBuild.state}}">
   <h2 class="tile-title">
     {{#if repo.slug}}
-      {{status-icon status=repo.lastBuildState}}
+      {{status-icon status=repo.defaultBranch.lastBuild.state}}
       {{#link-to "repo" repo class="slug"}}{{repo.slug}}{{/link-to}}
     {{/if}}
   </h2>
-  {{#with repo.lastBuildHash as lastBuild}}
+  {{#if repo.slug}}
-    {{#if repo.slug}}
+    {{#if repo.defaultBranch.lastBuild.id}}
-      {{#if lastBuild.id}}
       <p class="tile-title float-right">
         <span class="icon">
           <svg version="1.1" id="Layer_1" x="0px" y="0px"
@@ -21,12 +20,11 @@
             L-277.2,202.4z"/>
           </svg>
         </span>
-        {{#link-to "build" repo lastBuild.id
+        {{#link-to "build" repo repo.defaultBranch.lastBuild.id
-           class="last_build"}}{{lastBuild.number}}{{/link-to}}
+           class="last_build"}}{{repo.defaultBranch.lastBuild.number}}{{/link-to}}
       </p>
-      {{/if}}
     {{/if}}
-  {{/with}}
+  {{/if}}
 
   <p>
     <span class="icon">
@@ -41,8 +39,8 @@
       </svg>
     </span>
     Duration: 
-    <abbr class="duration" title={{lastBuildStartedAt}}>
+    <abbr class="duration" title={{repo.defaultBranch.lastBuild.startedAt}}>
-      {{format-duration repo.lastBuildDuration}}
+      {{format-duration repo.defaultBranch.lastBuild.duration}}
     </abbr>
   </p>
 
@@ -64,8 +62,8 @@
       </svg>
     </span>
     Finished: 
-    <abbr class="finished_at timeago" title={{lastBuildFinishedAt}}>
+    <abbr class="finished_at timeago" title={{repo.defaultBranch.lastBuild.finishedAt}}>
-      {{format-time repo.lastBuildFinishedAt}}
+      {{format-time repo.defaultBranch.lastBuild.finishedAt}}
     </abbr>
   </p>
 </div>

app/templates/components/repos-list.hbs

@@ -1,7 +1,5 @@
-{{#each repos as |repo|}}
+{{#each sortedRepos as |repo|}}
   {{repos-list-item repo=repo selectedRepo=selectedRepo}}
 {{else}}
   <p class="empty">{{noReposMessage}}</p>
 {{/each}}
-
-

app/templates/components/travis-cmd.hbs

@@ -0,0 +1,15 @@
+<div class="content">
+  {{#if loading}}
+    {{loading-indicator}}
+  {{else}}
+
+    <input type="text" class="input" value={{filterString}}
+           oninput={{action "filterChanged" value="target.value"}}
+           onkeydown={{action "keypress"}}>
+
+    <div class="matches">
+      {{{matches}}}
+    </div>
+
+  {{/if}}
+</div>

app/templates/job.hbs

@@ -8,7 +8,7 @@
 
   <div class="tile-main medium-8 columns">
     <h2 class="repo-main-commit">
-      <small class="repo-main-branch" title={{job.commit.branch}}>{{job.commit.branch}}</small>
+      <small class="repo-main-branch" title={{job.build.branch.name}}>{{job.build.branch.name}}</small>
       {{format-message job.commit.subject repoBinding=job.repo}}
     </h2>
     <div class="repo-main-description">

app/templates/repo.hbs

@@ -26,7 +26,7 @@
             {{#if repo.active}}
               {{outlet}}
             {{else}}
-              {{#if repo.lastBuildId}}
+              {{#if repo.defaultBranch.lastBuild.id}}
                 {{outlet}}
               {{else}}
                 {{not-active user=currentUser repo=repo}}

app/utils/ajax.coffee

@@ -1,155 +1 @@
-`import Ember from 'ember';`
-`import config from 'travis/config/environment'`
 
-jQuery.support.cors = true
-
-default_options =
-  accepts:
-    json: 'application/json; version=2'
-
-ajax = Em.Object.create
-  publicEndpoints: [/\/repos\/?.*/, /\/builds\/?.*/, /\/jobs\/?.*/]
-  privateEndpoints: [/\/repos\/\d+\/caches/]
-
-  get: (url, callback, errorCallback) ->
-    @ajax(url, 'get', success: callback, error: errorCallback)
-
-  post: (url, data, callback) ->
-    @ajax(url, 'post', data: data, success: callback)
-
-  patch: (url, data, callback) ->
-    @ajax(url, 'patch', data: data, success: callback)
-
-  needsAuth: (method, url) ->
-    return true if config.pro
-    return true if method != 'GET'
-
-    publicEndpoint = @publicEndpoints.find (pattern) ->
-      url.match(pattern)
-
-    privateEndpoint = @privateEndpoints.find (pattern) ->
-      url.match(pattern)
-
-    !publicEndpoint || privateEndpoint
-
-  ajax: (url, method, options) ->
-    # TODO: we have our own ajax implementation, because jQuery didn't
-    #       properly worked with headers on firefox, it would be nice to check
-    #       if this is still a problem and if we can remove this
-    method = method || "GET"
-    method = method.toUpperCase()
-
-    endpoint = config.apiEndpoint || ''
-    options = options || {}
-
-    token = Travis.sessionStorage.getItem('travis.token')
-    if token && (ajax.needsAuth(method, url) || options.forceAuth)
-      options.headers ||= {}
-      options.headers['Authorization'] ||= "token #{token}"
-
-    options.url = url = "#{endpoint}#{url}"
-    options.type = method
-    options.dataType = options.dataType || 'json'
-    options.context = this
-
-    if options.data && method != 'GET'
-      options.data = JSON.stringify(options.data)
-
-    if method != 'GET' && method != 'HEAD'
-      options.contentType = options.contentType || 'application/json; charset=utf-8'
-
-    success = options.success || (->)
-    options.success = (data, status, xhr) =>
-      Travis.lookup('controller:flash').loadFlashes(data.flash) if data?.flash
-      delete data.flash if data?
-      success.apply(this, arguments)
-
-    error = options.error || (->)
-    options.error = (data, status, xhr) =>
-      Travis.lookup('controller:flash').pushObject(data.flash) if data?.flash
-      delete data.flash if data?
-      error.apply(this, arguments)
-
-    options = $.extend(options, default_options)
-
-    if testMode?
-      console.log('Running ajax with', options.url)
-
-      # we use jquery.mockjax for test, I don't want to hack it or rewrite it,
-      # so let's just pretend we still use ajax if testing mode is on
-      return new Ember.RSVP.Promise( (resolve, reject) ->
-        oldSuccess = options.success
-        options.success = (json, status, xhr) ->
-          Ember.run this, ->
-            oldSuccess.call(this, json, status, xhr)
-          Ember.run(null, resolve, json)
-
-        oldError = options.error
-        options.error = (jqXHR) ->
-          if jqXHR
-            # for a context, please see https://github.com/emberjs/ember.js/issues/3051
-            jqXHR.then = null
-
-          Ember.run this, ->
-            oldError.call this, jqXHR
-            reject(jqXHR)
-
-        $.ajax(options)
-      )
-
-    if options.data && (method == "GET" || method == "HEAD")
-      params = jQuery.param(options.data)
-      delimeter = if url.indexOf('?') == -1 then '?' else '&'
-      url = url + delimeter + params
-
-    xhr = new XMLHttpRequest()
-
-    xhr.open(method, url)
-
-    if options.accepts && !options.headers?.accept?
-      accepts = []
-      for key, value of options.accepts
-        accepts.pushObject(value)
-      xhr.setRequestHeader('Accept', accepts.join(', '))
-
-    if options.headers
-      for name, value of options.headers
-        xhr.setRequestHeader(name, value)
-
-    if options.contentType
-      xhr.setRequestHeader('Content-Type', options.contentType)
-
-    resolve = null
-    reject = null
-    promise = new Ember.RSVP.Promise( (_resolve, _reject) ->
-      resolve = _resolve
-      reject = _reject
-    )
-
-    xhr.onreadystatechange = ->
-      if xhr.readyState == 4
-        contentType = xhr.getResponseHeader('Content-Type')
-        data = if contentType && contentType.match /application\/json/
-          try
-            jQuery.parseJSON(xhr.responseText)
-          catch e
-            console.log('error while parsing a response', method, options.url, xhr.responseText)
-        else
-          xhr.responseText
-
-        if xhr.status >= 200 && xhr.status < 300
-          resolve(data)
-          options.success.call(options.context, data, xhr.status, xhr)
-        else
-          reject(xhr)
-          options.error.call(data, xhr.status, xhr)
-
-    data = options.data
-    if typeof(options.data) == "object" && (Ember.isNone(options.contentType) || options.contentType.match /application\/json/)
-      data = JSON.stringify(data)
-
-    xhr.send(data)
-
-    return promise
-
-`export default ajax`

app/utils/hash-storage.coffee

@@ -0,0 +1,17 @@
+`import Ember from 'ember'`
+
+Storage = Ember.Object.extend
+  init: ->
+    @set('storage', {})
+  key: (key) ->
+    "__#{key.replace('.', '__')}"
+  getItem: (k) ->
+    return @get("storage.#{@key(k)}")
+  setItem: (k,v) ->
+    @set("storage.#{@key(k)}", v)
+  removeItem: (k) ->
+    @setItem(k, null)
+  clear: ->
+    @set('storage', {})
+
+`export default Storage`

app/utils/keys-map.coffee

@@ -26,6 +26,7 @@ languageConfigKeys = {
   lein:        'Lein'
   compiler:    'Compiler'
   crystal:     'Crystal'
+  osx_image:   'Xcode'
 }
 
 configKeys = {

app/utils/pusher.coffee

@@ -1,13 +1,13 @@
 `import ENV from 'travis/config/environment'`
-`import Ajax from 'travis/utils/ajax'`
 
-TravisPusher = (config) ->
+TravisPusher = (config, ajaxService) ->
-  @init(config)
+  @init(config, ajaxService)
   this
 
 TravisPusher.prototype.active_channels = []
 
-TravisPusher.prototype.init = (config) ->
+TravisPusher.prototype.init = (config, ajaxService) ->
+  this.ajaxService = ajaxService
   Pusher.warn = @warn.bind(this)
   Pusher.host = config.host if config.host
   @pusher = new Pusher(config.key, encrypted: config.encrypted, disableStats: true)
@@ -93,7 +93,7 @@ if ENV.pro
 
     unless channels.fetching
       channels.fetching = true
-      Ajax.post Pusher.channel_auth_endpoint, { socket_id: socketId, channels: names }, (data) ->
+      TravisPusher.ajaxService.post Pusher.channel_auth_endpoint, { socket_id: socketId, channels: names }, (data) ->
         channels.fetching = false
         callback(data.channels) for callback in channels.callbacks
 

app/utils/slider.coffee

@@ -1,24 +0,0 @@
-`import Ember from 'ember'`
-
-Slider = (storage) ->
-  @minimize() if storage.getItem('travis.maximized') == 'true'
-  this
-
-Slider.prototype.persist = ->
-  Travis.storage.setItem('travis.maximized', @isMinimized())
-
-Slider.prototype.isMinimized = ->
-  return $('body').hasClass('maximized');
-
-Slider.prototype.minimize = ->
-  $('body').addClass('maximized')
-
-Slider.prototype.toggle = ->
-  $('body').toggleClass('maximized')
-  @persist()
-  # TODO gotta force redraws here :/
-  element = $('<span></span>')
-  $('#top .profile').append(element)
-  Ember.run.later (-> element.remove()), 10
-
-`export default Slider`

app/utils/test-auth.coffee

@@ -14,7 +14,12 @@ Auth = Ember.Object.extend
   signInForTests: (user) ->
     @set('state', 'signed-in')
     if user.constructor.typeKey? != 'user'
-      @store.pushPayload(users: [user])
+      @store.push(
+        data:
+          type: 'user',
+          id: user.id
+          attributes: user
+      )
       user = @store.recordForId('user', user.id)
 
     @set('currentUser', user)