diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 1e750ae0..2f3409aa 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -53,5 +53,5 @@ Travis.reopen $('#top .profile').append(element) Em.run.later (-> element.remove()), 10 element = $('') - $('#repository').append(element) + $('#repo').append(element) Em.run.later (-> element.remove()), 10 diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee index 2a760bce..26a6043c 100644 --- a/assets/scripts/app/controllers.coffee +++ b/assets/scripts/app/controllers.coffee @@ -29,7 +29,7 @@ require 'controllers/accounts' require 'controllers/builds' require 'controllers/home' require 'controllers/profile' -require 'controllers/repositories' -require 'controllers/repository' +require 'controllers/repos' +require 'controllers/repo' require 'controllers/sidebar' require 'controllers/stats' diff --git a/assets/scripts/app/controllers/builds.coffee b/assets/scripts/app/controllers/builds.coffee index e52fee10..3f945639 100644 --- a/assets/scripts/app/controllers/builds.coffee +++ b/assets/scripts/app/controllers/builds.coffee @@ -1,5 +1,5 @@ Travis.BuildsController = Em.ArrayController.extend # sortAscending: false - repositoryBinding: 'parent.repository' + repo: 'parent.repo' contentBinding: 'parent.builds' diff --git a/assets/scripts/app/controllers/repository.coffee b/assets/scripts/app/controllers/repo.coffee similarity index 73% rename from assets/scripts/app/controllers/repository.coffee rename to assets/scripts/app/controllers/repo.coffee index 2cd80a23..08d66059 100644 --- a/assets/scripts/app/controllers/repository.coffee +++ b/assets/scripts/app/controllers/repo.coffee @@ -1,4 +1,4 @@ -Travis.RepositoryController = Travis.Controller.extend +Travis.RepoController = Travis.Controller.extend bindings: [] init: -> @@ -20,25 +20,25 @@ Travis.RepositoryController = Travis.Controller.extend this["view#{$.camelize(action)}"]() viewIndex: -> - @_bind('repository', 'controllers.repositoriesController.firstObject') - @_bind('build', 'repository.lastBuild') + @_bind('repo', 'controllers.reposController.firstObject') + @_bind('build', 'repo.lastBuild') @connectTab('current') viewCurrent: -> @connectTab('current') - @_bind('build', 'repository.lastBuild') + @_bind('build', 'repo.lastBuild') viewBuilds: -> @connectTab('builds') - @_bind('builds', 'repository.builds') + @_bind('builds', 'repo.builds') viewPullRequests: -> @connectTab('pull_requests') - @_bind('builds', 'repository.pullRequests') + @_bind('builds', 'repo.pullRequests') viewBranches: -> @connectTab('branches') - @_bind('builds', 'repository.branches') + @_bind('builds', 'repo.branches') viewBuild: -> @connectTab('build') @@ -47,10 +47,10 @@ Travis.RepositoryController = Travis.Controller.extend @_bind('build', 'job.build') @connectTab('job') - repositoryObserver: (-> - repository = @get('repository') - repository.select() if repository - ).observes('repository.id') + repoObserver: (-> + repo = @get('repo') + repo.select() if repo + ).observes('repo.id') connectTab: (tab) -> name = if tab == 'current' then 'build' else tab @@ -68,4 +68,3 @@ Travis.RepositoryController = Travis.Controller.extend _unbind: -> binding.disconnect(this) for binding in @bindings @bindings.length = 0 - diff --git a/assets/scripts/app/controllers/repositories.coffee b/assets/scripts/app/controllers/repos.coffee similarity index 72% rename from assets/scripts/app/controllers/repositories.coffee rename to assets/scripts/app/controllers/repos.coffee index 42bdb69e..fb31f626 100644 --- a/assets/scripts/app/controllers/repositories.coffee +++ b/assets/scripts/app/controllers/repos.coffee @@ -1,4 +1,4 @@ -Travis.RepositoriesController = Ember.ArrayController.extend +Travis.ReposController = Ember.ArrayController.extend defaultTab: 'recent' sortProperties: ['sortOrder'] @@ -17,13 +17,13 @@ Travis.RepositoriesController = Ember.ArrayController.extend this["view#{$.camelize(tab)}"](params) viewRecent: -> - @set('content', Travis.Repository.find()) + @set('content', Travis.Repo.find()) viewOwned: -> - @set('content', Travis.Repository.ownedBy(Travis.app.get('currentUser.login'))) + @set('content', Travis.Repo.ownedBy(Travis.app.get('currentUser.login'))) viewSearch: (params) -> - @set('content', Travis.Repository.search(params.search)) + @set('content', Travis.Repo.search(params.search)) searchObserver: (-> search = @get('search') diff --git a/assets/scripts/app/helpers/urls.coffee b/assets/scripts/app/helpers/urls.coffee index 07d89be6..18777375 100644 --- a/assets/scripts/app/helpers/urls.coffee +++ b/assets/scripts/app/helpers/urls.coffee @@ -1,5 +1,5 @@ @Travis.Urls = - repository: (slug) -> + repo: (slug) -> "/#{slug}" builds: (slug) -> @@ -20,7 +20,7 @@ githubCommit: (slug, sha) -> "http://github.com/#{slug}/commit/#{sha}" - githubRepository: (slug) -> + githubRepo: (slug) -> "http://github.com/#{slug}" githubWatchers: (slug) -> diff --git a/assets/scripts/app/models.coffee b/assets/scripts/app/models.coffee index 3d9831b4..b116ae0f 100644 --- a/assets/scripts/app/models.coffee +++ b/assets/scripts/app/models.coffee @@ -6,7 +6,7 @@ require 'models/build' require 'models/commit' require 'models/hook' require 'models/job' -require 'models/repository' +require 'models/repo' require 'models/sponsor' require 'models/user' require 'models/worker' diff --git a/assets/scripts/app/models/branch.coffee b/assets/scripts/app/models/branch.coffee index 0648ad0f..6b6702e5 100644 --- a/assets/scripts/app/models/branch.coffee +++ b/assets/scripts/app/models/branch.coffee @@ -1,7 +1,7 @@ require 'travis/model' @Travis.Branch = Travis.Model.extend Travis.Helpers, - repositoryId: DS.attr('number') + repoId: DS.attr('number', key: 'repository_id') commitId: DS.attr('number') number: DS.attr('number') branch: DS.attr('string') @@ -13,9 +13,9 @@ require 'travis/model' commit: DS.belongsTo('Travis.Commit') - repository: (-> - Travis.Repository.find @get('repositoryId') if @get('repositoryId') - ).property('repositoryId') + repo: (-> + Travis.Repo.find @get('repoId') if @get('repoId') + ).property('repoId') updateTimes: -> @notifyPropertyChange 'started_at' @@ -23,6 +23,6 @@ require 'travis/model' @Travis.Branch.reopenClass - byRepositoryId: (id) -> + byRepoId: (id) -> @find repository_id: id diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 081d1eb2..07d601e0 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -2,7 +2,7 @@ require 'travis/model' @Travis.Build = Travis.Model.extend Travis.DurationCalculations, eventType: DS.attr('string') - repositoryId: DS.attr('number') + repoId: DS.attr('number') commitId: DS.attr('number') state: DS.attr('string') @@ -14,7 +14,7 @@ require 'travis/model' startedAt: DS.attr('string', key: 'started_at') finishedAt: DS.attr('string', key: 'finished_at') - repository: DS.belongsTo('Travis.Repository') + repo: DS.belongsTo('Travis.Repo') commit: DS.belongsTo('Travis.Commit') jobs: DS.hasMany('Travis.Job', key: 'job_ids') @@ -42,7 +42,7 @@ require 'travis/model' ).property('config') @Travis.Build.reopenClass - byRepositoryId: (id, parameters) -> + byRepoId: (id, parameters) -> @find($.extend(parameters || {}, repository_id: id)) olderThanNumber: (id, build_number) -> diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 73e094e1..99aa875a 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -1,7 +1,7 @@ require 'travis/model' @Travis.Job = Travis.Model.extend Travis.DurationCalculations, - repositoryId: DS.attr('number') + repoId: DS.attr('number', key: 'repository_id') buildId: DS.attr('number') commitId: DS.attr('number') logId: DS.attr('number') @@ -15,7 +15,7 @@ require 'travis/model' finishedAt: DS.attr('string') allowFailure: DS.attr('boolean', key: 'allow_failure') - repository: DS.belongsTo('Travis.Repository', key: 'repository_id') + repo: DS.belongsTo('Travis.Repo', key: 'repository_id') build: DS.belongsTo('Travis.Build', key: 'build_id') commit: DS.belongsTo('Travis.Commit', key: 'commit_id') log: DS.belongsTo('Travis.Artifact', key: 'log_id') diff --git a/assets/scripts/app/models/repository.coffee b/assets/scripts/app/models/repo.coffee similarity index 83% rename from assets/scripts/app/models/repository.coffee rename to assets/scripts/app/models/repo.coffee index 77921440..42a0a6e9 100644 --- a/assets/scripts/app/models/repository.coffee +++ b/assets/scripts/app/models/repo.coffee @@ -1,7 +1,7 @@ require 'travis/expandable_record_array' require 'travis/model' -@Travis.Repository = Travis.Model.extend +@Travis.Repo = Travis.Model.extend slug: DS.attr('string') description: DS.attr('string') lastBuildId: DS.attr('number') @@ -14,7 +14,7 @@ require 'travis/model' builds: (-> id = @get('id') - builds = Travis.Build.byRepositoryId id, event_type: 'push' + builds = Travis.Build.byRepoId id, event_type: 'push' array = Travis.ExpandableRecordArray.create type: Travis.Build content: Ember.A([]) @@ -27,7 +27,7 @@ require 'travis/model' pullRequests: (-> id = @get('id') - builds = Travis.Build.byRepositoryId id, event_type: 'pull_request' + builds = Travis.Build.byRepoId id, event_type: 'pull_request' array = Travis.ExpandableRecordArray.create type: Travis.Build content: Ember.A([]) @@ -39,7 +39,7 @@ require 'travis/model' ).property() branches: (-> - Travis.Branch.byRepositoryId @get('id') + Travis.Branch.byRepoId @get('id') ).property() owner: (-> @@ -72,12 +72,14 @@ require 'travis/model' ).property() select: -> - Travis.Repository.select(@get('id')) + Travis.Repo.select(@get('id')) updateTimes: -> @notifyPropertyChange 'lastBuildDuration' -@Travis.Repository.reopenClass +@Travis.Repo.reopenClass + url: 'repositories' + recent: -> @find() @@ -92,10 +94,10 @@ require 'travis/model' if repo.length > 0 then repo else @find(slug: slug) select: (id) -> - @find().forEach (repository) -> - repository.set('selected', repository.get('id') == id) + @find().forEach (repo) -> + repo.set('selected', repo.get('id') == id) # buildURL: (slug) -> - # if slug then slug else 'repositories' + # if slug then slug else 'repos' diff --git a/assets/scripts/app/models/worker.coffee b/assets/scripts/app/models/worker.coffee index df13f7f9..6164da13 100644 --- a/assets/scripts/app/models/worker.coffee +++ b/assets/scripts/app/models/worker.coffee @@ -18,9 +18,9 @@ require 'travis/model' @get('state') == 'working' ).property('state') - repository: (-> - Travis.Repository.find(@get('payload.repository.id')) - ).property('payload.repository.id') + repo: (-> + Travis.Repo.find(@get('payload.repo.id')) + ).property('payload.repo.id') job_id: (-> @get('payload.job.id') diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 6517bbaa..49bca579 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -6,12 +6,12 @@ Travis.Router = Ember.Router.extend showRoot: Ember.Route.transitionTo('root.home.show') showStats: Ember.Route.transitionTo('root.stats') - showRepository: Ember.Route.transitionTo('root.home.repository.show') - showBuilds: Ember.Route.transitionTo('root.home.repository.builds.index') - showBuild: Ember.Route.transitionTo('root.home.repository.builds.show') - showPullRequests: Ember.Route.transitionTo('root.home.repository.pullRequests') - showBranches: Ember.Route.transitionTo('root.home.repository.branches') - showJob: Ember.Route.transitionTo('root.home.repository.job') + showRepo: Ember.Route.transitionTo('root.home.repo.show') + showBuilds: Ember.Route.transitionTo('root.home.repo.builds.index') + showBuild: Ember.Route.transitionTo('root.home.repo.builds.show') + showPullRequests: Ember.Route.transitionTo('root.home.repo.pullRequests') + showBranches: Ember.Route.transitionTo('root.home.repo.branches') + showJob: Ember.Route.transitionTo('root.home.repo.job') showProfile: Ember.Route.transitionTo('root.profile') showAccount: Ember.Route.transitionTo('root.profile.account') @@ -113,26 +113,26 @@ Travis.Router = Ember.Router.extend connectOutlets: (router) -> router.get('applicationController').connectOutlet 'home' $('body').attr('id', 'home') - router.get('homeController').connectOutlet 'left', 'repositories' + router.get('homeController').connectOutlet 'left', 'repos' router.get('homeController').connectOutlet 'right', 'sidebar' router.get('homeController').connectOutlet 'top', 'top' - router.get('homeController').connectOutlet 'main', 'repository' + router.get('homeController').connectOutlet 'main', 'repo' show: Ember.Route.extend route: '/' connectOutlets: (router) -> - router.get('repositoryController').activate('index') + router.get('repoController').activate('index') - repository: Ember.Route.extend + repo: Ember.Route.extend initialState: 'show' route: '/:owner/:name' - connectOutlets: (router, repository) -> - router.get('repositoryController').set 'repository', repository + connectOutlets: (router, repo) -> + router.get('repoController').set 'repo', repo deserialize: (router, params) -> slug = "#{params.owner}/#{params.name}" - repos = Travis.Repository.bySlug(slug) + repos = Travis.Repo.bySlug(slug) deferred = $.Deferred() observer = -> @@ -144,16 +144,16 @@ Travis.Router = Ember.Router.extend deferred.promise() - serialize: (router, repository) -> - if repository - { owner: repository.get('owner'), name: repository.get('name') } + serialize: (router, repo) -> + if repo + { owner: repo.get('owner'), name: repo.get('name') } else {} show: Ember.Route.extend route: '/' connectOutlets: (router) -> - router.get('repositoryController').activate('current') + router.get('repoController').activate('current') builds: Ember.Route.extend route: '/builds' @@ -161,8 +161,8 @@ Travis.Router = Ember.Router.extend index: Ember.Route.extend route: '/' - connectOutlets: (router, repository) -> - router.get('repositoryController').activate 'builds' + connectOutlets: (router, repo) -> + router.get('repoController').activate 'builds' show: Ember.Route.extend route: '/:build_id' @@ -171,8 +171,8 @@ Travis.Router = Ember.Router.extend # TODO: apparently when I use id in url, it will pass it # here, why doesn't it use deserialize? build = Travis.Build.find(build) - router.get('repositoryController').set 'build', build - router.get('repositoryController').activate 'build' + router.get('repoController').set 'build', build + router.get('repoController').activate 'build' serialize: (router, build) -> if build.get @@ -200,13 +200,13 @@ Travis.Router = Ember.Router.extend pullRequests: Ember.Route.extend route: '/pull_requests' - connectOutlets: (router, repository) -> - router.get('repositoryController').activate 'pull_requests' + connectOutlets: (router, repo) -> + router.get('repoController').activate 'pull_requests' branches: Ember.Route.extend route: '/branches' - connectOutlets: (router, repository) -> - router.get('repositoryController').activate 'branches' + connectOutlets: (router, repo) -> + router.get('repoController').activate 'branches' job: Ember.Route.extend @@ -215,8 +215,8 @@ Travis.Router = Ember.Router.extend unless job.get # In case I use id job = Travis.Job.find(job) - router.get('repositoryController').set 'job', job - router.get('repositoryController').activate 'job' + router.get('repoController').set 'job', job + router.get('repoController').activate 'job' serialize: (router, job) -> if job.get diff --git a/assets/scripts/app/store/rest_adapter.coffee b/assets/scripts/app/store/rest_adapter.coffee index 8158288b..8c7fd4cd 100644 --- a/assets/scripts/app/store/rest_adapter.coffee +++ b/assets/scripts/app/store/rest_adapter.coffee @@ -3,8 +3,10 @@ require 'models' @Travis.RestAdapter = DS.RESTAdapter.extend Travis.Ajax, mappings: - repositories: Travis.Repository - repository: Travis.Repository + repositories: Travis.Repo + repository: Travis.Repo + repos: Travis.Repo + repo: Travis.Repo builds: Travis.Build build: Travis.Build commits: Travis.Commit @@ -17,9 +19,11 @@ require 'models' workers: Travis.Worker plurals: + repositories: 'repositories', repository: 'repositories', - build: 'builds' - branch: 'branches' - job: 'jobs' - worker: 'workers' - profile: 'profile' + repo: 'repos', + build: 'builds' + branch: 'branches' + job: 'jobs' + worker: 'workers' + profile: 'profile' diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs index 9647a6ab..43f3a751 100644 --- a/assets/scripts/app/templates/jobs/list.hbs +++ b/assets/scripts/app/templates/jobs/list.hbs @@ -24,7 +24,7 @@ {{#if job.id}} - {{number}} + {{number}} {{/if}} diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index db905a56..5dd669e6 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -7,7 +7,7 @@
{{#if job.id}} - {{job.number}} + {{job.number}} {{/if}}
{{t jobs.finished_at}}
diff --git a/assets/scripts/app/templates/queues/list.hbs b/assets/scripts/app/templates/queues/list.hbs index a2e20081..0e133f07 100644 --- a/assets/scripts/app/templates/queues/list.hbs +++ b/assets/scripts/app/templates/queues/list.hbs @@ -5,9 +5,9 @@