From 510be92eb700895f246957793650dbb8a18f27a2 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 16 Oct 2012 22:46:10 +0200 Subject: [PATCH] stashing some work on the events log --- Gemfile.lock | 4 ++-- assets/scripts/app/models/event.coffee | 24 +++++++++++++------- assets/scripts/app/templates/events/list.hbs | 8 +++++++ public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/version | 2 +- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9c926cea..2c8815ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: 816ebc66c8b65c44d6144e721b1b4f048e86d7df + revision: 558847f6555202adb7da4f7d31a7b2b80ab4bac2 specs: travis-api (0.0.1) backports (~> 2.5) @@ -61,7 +61,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 56ca16046cba99cc0b4cd0c520c6bb13ace9932a + revision: aae3e646dc73c3196d173baea9265d2b1cb0cd97 branch: sf-travis-api specs: travis-core (0.0.1) diff --git a/assets/scripts/app/models/event.coffee b/assets/scripts/app/models/event.coffee index 6482fb73..920e4e40 100644 --- a/assets/scripts/app/models/event.coffee +++ b/assets/scripts/app/models/event.coffee @@ -3,17 +3,25 @@ require 'travis/model' @Travis.Event = Travis.Model.extend event: DS.attr('string') repoId: DS.attr('number', key: 'repository_id') + sourceId: DS.attr('number', key: 'source_id') + sourceType: DS.attr('string', key: 'source_type') createdAt: DS.attr('string', key: 'created_at') - message: (-> - message = "#{@get('event')}: #{@get('_data.result')}" - message = "#{message}: #{@get('_data.message')}" - message - ).property('_data.result', '_data.message') + event_: (-> + @get('event') + ).property('event') - _data: (-> - @get('data.data') - ).property('data.data') + result: (-> + @get('data.data.result') + ).property('data.data.result') + + message: (-> + @get('data.data.message') + ).property('data.data.message') + + source: (-> + Travis[type].find(@get('sourceId')) if type = @get('sourceType') + ).property('sourceType', 'sourceId') @Travis.Event.reopenClass byRepoId: (id) -> diff --git a/assets/scripts/app/templates/events/list.hbs b/assets/scripts/app/templates/events/list.hbs index ce180b94..4c4ab743 100644 --- a/assets/scripts/app/templates/events/list.hbs +++ b/assets/scripts/app/templates/events/list.hbs @@ -3,6 +3,8 @@ Time + Event + Result Message @@ -13,6 +15,12 @@ {{formatTime createdAt}} + + {{event.event_}} + + + {{event.result}} + {{event.message}} diff --git a/public/scripts/app.js b/public/scripts/app.js index 40adecf5..26d76382 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n autoSignIn: function() {\n return this.get('auth').autoSignIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('afterSignOut');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('