From 1d2e4943718d32a0228c67b71de051e98a3d6126 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sat, 23 Jun 2012 23:57:13 +0200 Subject: [PATCH] upgrade ember to current master, use camelized attributes --- AssetFile | 4 + assets/javascripts/app/app.coffee | 34 - .../javascripts/app/helpers/handlebars.coffee | 4 +- assets/javascripts/app/helpers/urls.coffee | 4 +- assets/javascripts/app/models/commit.coffee | 24 +- .../javascripts/app/models/repository.coffee | 11 +- assets/javascripts/app/routes.coffee | 34 +- .../javascripts/app/templates/builds/show.hbs | 12 +- .../app/templates/repositories/list.hbs | 37 +- assets/javascripts/app/views.coffee | 13 +- assets/javascripts/vendor/ember.js | 717 ++++++++++++++---- assets/stylesheets/application.css | 6 + public/index.html | 1 + public/javascripts/application.js | 2 +- public/javascripts/vendor.js | 717 ++++++++++++++---- public/stylesheets/application.css | 6 + 16 files changed, 1249 insertions(+), 377 deletions(-) diff --git a/AssetFile b/AssetFile index 2e8c10f6..035412ff 100644 --- a/AssetFile +++ b/AssetFile @@ -33,6 +33,10 @@ input 'assets/javascripts' do concat 'app/templates.js' end + match 'mocks.js' do + concat 'mocks.js' + end + match '{app,config,lib}/**/*.js' do minispade( string: true, diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee index 46f14e56..07057342 100644 --- a/assets/javascripts/app/app.coffee +++ b/assets/javascripts/app/app.coffee @@ -1,37 +1,3 @@ -$.mockjax - url: '/repositories', - responseTime: 0, - responseText: - repositories: [ - { id: 1, owner: 'travis-ci', name: 'travis-core', slug: 'travis-ci/travis-core', build_ids: [1, 2], last_build_id: 1, last_build_number: 1, last_build_result: 0 }, - { id: 2, owner: 'travis-ci', name: 'travis-assets', slug: 'travis-ci/travis-assets', build_ids: [3], last_build_id: 3, last_build_number: 3}, - { id: 3, owner: 'travis-ci', name: 'travis-hub', slug: 'travis-ci/travis-hub', build_ids: [4], last_build_id: 4, last_build_number: 4}, - ], - -$.mockjax - url: '/travis-ci/travis-core', - responseTime: 0, - responseText: - repository: { id: 1, owner: 'travis-ci', name: 'travis-core', slug: 'travis-ci/travis-core', build_ids: [1, 2], last_build_id: 1, last_build_number: 1, last_build_result: 0 } - -$.mockjax - url: '/travis-ci/travis-assets', - responseTime: 0, - responseText: - repository: { id: 1, owner: 'travis-ci', name: 'travis-core', slug: 'travis-ci/travis-core', build_ids: [1, 2], last_build_id: 1, last_build_number: 1, last_build_result: 0 } - -$.mockjax - url: '/builds/1', - resposeTime: 0, - responseText: - build: { id: 1, repository_id: 'travis-ci/travis-core', commit_id: 1, job_ids: [1, 2], number: 1, event_type: 'push', config: { rvm: ['rbx', '1.9.3'] }, finished_at: '2012-06-20T00:21:20Z', duration: 35, result: 0 } - -$.mockjax - url: '/builds/2', - resposeTime: 0, - responseText: - build: { id: 1, repository_id: 'travis-ci/travis-assets', commit_id: 1, job_ids: [1, 2], number: 1, event_type: 'push', config: { rvm: ['rbx'] }, finished_at: '2012-06-20T00:21:20Z', duration: 35, result: 0 } - @Travis = Em.Application.create() require 'ext/jquery' diff --git a/assets/javascripts/app/helpers/handlebars.coffee b/assets/javascripts/app/helpers/handlebars.coffee index 26546a20..35fd235d 100644 --- a/assets/javascripts/app/helpers/handlebars.coffee +++ b/assets/javascripts/app/helpers/handlebars.coffee @@ -19,8 +19,8 @@ Ember.registerBoundHelper 'formatDuration', (duration, options) -> safe Travis.Helpers.timeInWords(duration) Ember.registerBoundHelper 'formatCommit', (commit, options) -> - branch = commit.get('branch') - branch = " #{branch}" if branch + branch = commit.get('branch') || '' + branch = " (#{branch})" if branch safe (commit.get('sha') || '').substr(0, 7) + branch Ember.registerBoundHelper 'formatSha', (sha, options) -> diff --git a/assets/javascripts/app/helpers/urls.coffee b/assets/javascripts/app/helpers/urls.coffee index 2107cbfc..4fb01c04 100644 --- a/assets/javascripts/app/helpers/urls.coffee +++ b/assets/javascripts/app/helpers/urls.coffee @@ -22,11 +22,11 @@ Commit: urlAuthor: (-> - 'mailto:%@'.fmt @getPath('commit.author_email') + 'mailto:%@'.fmt @getPath('commit.authorEmail') ).property('commit') urlCommitter: (-> - 'mailto:%@'.fmt @getPath('commit.committer_email') + 'mailto:%@'.fmt @getPath('commit.committerEmail') ).property('commit') Build: diff --git a/assets/javascripts/app/models/commit.coffee b/assets/javascripts/app/models/commit.coffee index c26fdf0d..9e76b20e 100644 --- a/assets/javascripts/app/models/commit.coffee +++ b/assets/javascripts/app/models/commit.coffee @@ -1,21 +1,13 @@ require 'travis/model' @Travis.Commit = Travis.Model.extend - sha: DS.attr('string') - branch: DS.attr('string') - message: DS.attr('string') - compare_url: DS.attr('string') - author_name: DS.attr('string') - author_email: DS.attr('string') - committer_name: DS.attr('string') - committer_email: DS.attr('string') + sha: DS.attr('string') + branch: DS.attr('string') + message: DS.attr('string') + compareUrl: DS.attr('string') + authorName: DS.attr('string') + authorEmail: DS.attr('string') + committerName: DS.attr('string') + committerEmail: DS.attr('string') build: DS.belongsTo('Travis.Build') - -@Travis.Commit.FIXTURES = [ - { id: 1, sha: '123456', branch: 'master', message: 'the commit message', compare_url: 'http://github.com/compare', author_name: 'Author', author_email: 'author@email.org', committer_name: 'Committer', committer_email: 'committer@email.org' } - { id: 2, sha: '234567', branch: 'feature', message: 'the commit message', compare_url: 'http://github.com/compare', author_name: 'Author', author_email: 'author@email.org', committer_name: 'Committer', committer_email: 'committer@email.org' } - { id: 3, sha: '345678', branch: 'master', message: 'the commit message', compare_url: 'http://github.com/compare', author_name: 'Author', author_email: 'author@email.org', committer_name: 'Committer', committer_email: 'committer@email.org' } - { id: 4, sha: '456789', branch: 'master', message: 'the commit message', compare_url: 'http://github.com/compare', author_name: 'Author', author_email: 'author@email.org', committer_name: 'Committer', committer_email: 'committer@email.org' } -] - diff --git a/assets/javascripts/app/models/repository.coffee b/assets/javascripts/app/models/repository.coffee index 828aa8d1..66bc7f55 100644 --- a/assets/javascripts/app/models/repository.coffee +++ b/assets/javascripts/app/models/repository.coffee @@ -11,6 +11,8 @@ require 'travis/model' primaryKey: 'slug' + lastBuild: DS.belongsTo('Travis.Build') + builds: (-> Travis.Build.byRepositoryId @get('id'), event_type: 'push' ).property() @@ -27,15 +29,6 @@ require 'travis/model' (@get('slug') || @_id).split('/')[1] ).property('owner', 'name'), - # TODO this is used in router#serializeObject for the last_build links in the - # repositories list. should be in some item controller i guess, but i'm not - # sure how to use one with #each - lastBuild: (-> - owner: @get('owner') - name: @get('name') - id: @get('last_build_id') - ).property('last_build_id') - last_build_duration: (-> duration = @getPath('data.last_build_duration') duration = Travis.Helpers.durationFrom(@get('last_build_started_at'), @get('last_build_finished_at')) unless duration diff --git a/assets/javascripts/app/routes.coffee b/assets/javascripts/app/routes.coffee index 9bdd6eb6..6e82ff01 100644 --- a/assets/javascripts/app/routes.coffee +++ b/assets/javascripts/app/routes.coffee @@ -52,36 +52,34 @@ require 'hax0rs' current: Em.Route.extend route: '/' - connectOutlets: (router, repository) -> - console.log(repository) - build = Travis.Build.find(repository.get('last_build_id')) - router.connectTabs(repository) - router.connectCurrent(build) + connectOutlets: (router) -> + repository = router.get('repository') + onceLoaded repository, => # TODO should need to wait here, right? + build = repository.get('lastBuild') + router.connectTabs(repository) + router.connectCurrent(build) builds: Em.Route.extend route: '/builds' - connectOutlets: (router, repository) -> + connectOutlets: (router) -> + repository = router.get('repository') router.connectBuilds(repository.get('builds')) build: Em.Route.extend route: '/builds/:build_id' connectOutlets: (router, build) -> - repository = build.get('repository') - onceLoaded repository, => - router.setPath('tabsController.build', build) - router.connectBuild(build) + router.setPath('tabsController.build', build) + router.connectBuild(build) job: Em.Route.extend route: '/jobs/:job_id' connectOutlets: (router, job) -> - build = job.get('build') - onceLoaded build, => - router.setPath('tabsController.build', build) - router.setPath('tabsController.job', job) - router.connectJob(job) + router.setPath('tabsController.build', build) + router.setPath('tabsController.job', job) + router.connectJob(job) connectLeft: (repositories) -> @@ -108,13 +106,11 @@ require 'hax0rs' serializeRepository: (object) -> - result = if object instanceof DS.Model + if object instanceof DS.Model slug = object.get('slug') || object._id # wat. - { owner: slug.split('/')[0], name: slug.split[1] } + { owner: slug.split('/')[0], name: slug.split('/')[1] } else object - console.log(result) - result deserializeRepository: (params) -> Travis.Repository.find("#{params.owner}/#{params.name}") diff --git a/assets/javascripts/app/templates/builds/show.hbs b/assets/javascripts/app/templates/builds/show.hbs index ce26b626..75163542 100644 --- a/assets/javascripts/app/templates/builds/show.hbs +++ b/assets/javascripts/app/templates/builds/show.hbs @@ -13,17 +13,17 @@
{{t builds.commit}}
{{formatCommit commit}}
- {{#if commit.compare_url}} + {{#if commit.compareUrl}}
{{t builds.compare}}
-
{{pathFrom commit.compare_url}}
+
{{pathFrom commit.compareUrl}}
{{/if}} - {{#if commit.author_name}} + {{#if commit.authorName}}
{{t builds.author}}
-
{{commit.author_name}}
+
{{commit.authorName}}
{{/if}} - {{#if commit.committer_name}} + {{#if commit.committerName}}
{{t builds.committer}}
-
{{commit.committer_name}}
+
{{commit.committerName}}
{{/if}}
diff --git a/assets/javascripts/app/templates/repositories/list.hbs b/assets/javascripts/app/templates/repositories/list.hbs index 76c50b3c..733f3274 100644 --- a/assets/javascripts/app/templates/repositories/list.hbs +++ b/assets/javascripts/app/templates/repositories/list.hbs @@ -1,22 +1,25 @@ {{#if content.lastObject.isLoaded}}