diff --git a/Gemfile b/Gemfile index 5f348b77b..14b1ed96d 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,8 @@ gem 'jam_db', :path => "#{workspace}/jam-db/target/ruby_package" gem 'jam_ruby', :path => "#{workspace}/jam-ruby" gem 'jampb', :path => "#{workspace}/jam-pb/target/ruby/jampb" gem 'pg', '0.14.0' +gem 'gon' + group :development, :test do gem 'rspec-rails', '2.11.0' gem 'guard-rspec', '0.5.5' diff --git a/Gemfile.lock b/Gemfile.lock index 9fbb92a0f..511134d83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,6 +91,9 @@ GEM ffi (1.1.5) gherkin (2.11.2) json (>= 1.4.6) + gon (4.0.0) + actionpack (>= 2.3.0) + json guard (1.3.2) listen (>= 0.4.2) thor (>= 0.14.6) @@ -217,6 +220,7 @@ DEPENDENCIES database_cleaner (= 0.7.0) factory_girl_rails (= 1.4.0) faker (= 1.0.1) + gon guard-rspec (= 0.5.5) guard-spork (= 0.3.2) jam_db! diff --git a/README.md b/README.md index ceb9077a5..41d96a531 100644 --- a/README.md +++ b/README.md @@ -1,15 +1 @@ -# Ruby on Rails Tutorial: sample application - -This is the sample application for -[*Ruby on Rails Tutorial: Learn Web Development with Rails*](http://railstutorial.org/) -by [Michael Hartl](http://michaelhartl.com/). You can use this reference implementation to help track down errors if you end up having trouble with code in the tutorial. In particular, as a first debugging check I suggest getting the test suite to pass on your local machine: - - $ cd /tmp - $ git clone git@github.com:railstutorial/sample_app_2nd_ed.git - $ cd sample_app_2nd_ed - $ bundle install - $ bundle exec rake db:migrate - $ bundle exec rake db:test:prepare - $ bundle exec rspec spec/ - -If the tests don't pass, it means there may be something wrong with your system. If they do pass, then you can debug your code by comparing it with the reference implementation. \ No newline at end of file +* TODO \ No newline at end of file diff --git a/app/assets/flash/WebSocketMain.swf b/app/assets/flash/WebSocketMain.swf new file mode 100644 index 000000000..817446691 Binary files /dev/null and b/app/assets/flash/WebSocketMain.swf differ diff --git a/app/assets/javascripts/jamsocket.js b/app/assets/javascripts/jamsocket.js new file mode 100644 index 000000000..c1357d50d --- /dev/null +++ b/app/assets/javascripts/jamsocket.js @@ -0,0 +1,64 @@ +// defines session-centric websocket code +(function() { + + var jamsocket = {} + + function debug_print(msg, inner) { + var msg_div = $("
") + var msg_header = $("

").text(msg.type) + msg_div.append(msg_header) + + var list = $("
") + msg_div.append(list) + + for (var key in inner) { + list.append($("
").text(key)) + list.append($("
").text(inner[key])) + } + + + $("#internal_session_activity").append(msg_div) + } + + jamsocket.init = function() { + + function send(msg) { + ws.send(JSON.stringify(msg)) + } + + // Let the library know where WebSocketMain.swf is: + WEB_SOCKET_SWF_LOCATION = "assets/flash/WebSocketMain.swf"; + + var mf = window.message_factory + + // Write your code in the same way as for native WebSocket: + var ws = new WebSocket(gon.websocket_gateway_uri); + ws.onopen = function() { + var token = $.cookie("remember_token"); + // there is a chance the token is invalid at this point + // but if it is, login should fail, and we can catch that as an error + // and deal with it then. + $("#internal_session_activity").children().remove() + var login = mf.login_with_token(token) + send(login); + }; + ws.onmessage = function(e) { + var msg = JSON.parse(e.data) + var inner = msg[msg.type.toLowerCase()] + + debug_print(msg, inner) + + if(msg.type == LOGIN_ACK) { + // we are in... sign in to jam session + + var login_jam = mf.login_jam_session(gon.jam_session_id) + send(login_jam) + } + }; + ws.onclose = function() { + alert("websocket connection closed"); + }; + } + + window.jamsocket = jamsocket +})(); \ No newline at end of file diff --git a/app/assets/javascripts/jquery/jquery.cookie.js b/app/assets/javascripts/jquery/jquery.cookie.js new file mode 100644 index 000000000..f91a9ab45 --- /dev/null +++ b/app/assets/javascripts/jquery/jquery.cookie.js @@ -0,0 +1,72 @@ +/*jshint eqnull:true */ +/*! + * jQuery Cookie Plugin v1.2 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2011, Klaus Hartl + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://www.opensource.org/licenses/mit-license.php + * http://www.opensource.org/licenses/GPL-2.0 + */ +(function ($, document, undefined) { + + var pluses = /\+/g; + + function raw(s) { + return s; + } + + function decoded(s) { + return decodeURIComponent(s.replace(pluses, ' ')); + } + + var config = $.cookie = function (key, value, options) { + + // write + if (value !== undefined) { + options = $.extend({}, config.defaults, options); + + if (value === null) { + options.expires = -1; + } + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } + + value = config.json ? JSON.stringify(value) : String(value); + + return (document.cookie = [ + encodeURIComponent(key), '=', config.raw ? value : encodeURIComponent(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // read + var decode = config.raw ? raw : decoded; + var cookies = document.cookie.split('; '); + for (var i = 0, parts; (parts = cookies[i] && cookies[i].split('=')); i++) { + if (decode(parts.shift()) === key) { + var cookie = decode(parts.join('=')); + return config.json ? JSON.parse(cookie) : cookie; + } + } + + return null; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key, options) !== null) { + $.cookie(key, null, options); + return true; + } + return false; + }; + +})(jQuery, document); diff --git a/app/assets/javascripts/message_factory.js b/app/assets/javascripts/message_factory.js new file mode 100644 index 000000000..5d8dc8ea7 --- /dev/null +++ b/app/assets/javascripts/message_factory.js @@ -0,0 +1,52 @@ +/* + Message builder for communicating over the websocket + */ +(function() { + + CLIENT_TARGET = "client" + SERVER_TARGET = "server" + SESSION_TARGET_PREFIX = "session:" + USER_TARGET_PREFIX = "user:" + + LOGIN = "LOGIN" + LOGIN_ACK = "LOGIN_ACK" + LOGIN_JAM_SESSION = "LOGIN_JAM_SESSION" + LOGIN_JAM_SESSION_ACK = "LOGIN_JAM_SESSION_ACK" + USER_JOINED_JAM_SESSION = "USER_JOINED_JAM_SESSION" + LEAVE_JAM_SESSION = "LEAVE_JAM_SESSION" + LEAVE_JAM_SESSION_ACK = "LEAVE_JAM_SESSION_ACK" + HEARTBEAT = "HEARTBEAT" + + TEST_SESSION_MESSAGE = "TEST_SESSION_MESSAGE" + SERVER_GENERIC_ERROR = "SERVER_GENERIC_ERROR" + SERVER_REJECTION_ERROR = "SERVER_REJECTION_ERROR" + + var message_factory = {} + + function client_container(type, target, inner) { + var type_field = type.toLowerCase() + var body = { "type" : type, "target" : target} + body[type_field] = inner + return body + } + + // create a login message using user/pass + message_factory.login_with_user_pass = function(username, password) { + login = { username : username , password : password} + return client_container(LOGIN, SERVER_TARGET, login) + } + + // create a login message using token (a cookie or similiar) + message_factory.login_with_token = function(token) { + login = { token : token} + return client_container(LOGIN, SERVER_TARGET, login) + } + + // create a jam session login message + message_factory.login_jam_session = function(jam_session) { + login_jam_session = { jam_session : jam_session } + return client_container(LOGIN_JAM_SESSION, SERVER_TARGET, login_jam_session) + } + + window.message_factory = message_factory +})(); \ No newline at end of file diff --git a/app/assets/javascripts/swfobject.js b/app/assets/javascripts/swfobject.js new file mode 100644 index 000000000..fd9254617 --- /dev/null +++ b/app/assets/javascripts/swfobject.js @@ -0,0 +1,4 @@ + /* SWFObject v2.2 + is released under the MIT License +*/ +var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='"+af+"";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab +// License: New BSD License +// Reference: http://dev.w3.org/html5/websockets/ +// Reference: http://tools.ietf.org/html/rfc6455 + +(function() { + + if (window.WEB_SOCKET_FORCE_FLASH) { + // Keeps going. + } else if (window.WebSocket) { + return; + } else if (window.MozWebSocket) { + // Firefox. + window.WebSocket = MozWebSocket; + return; + } + + var logger; + if (window.WEB_SOCKET_LOGGER) { + logger = WEB_SOCKET_LOGGER; + } else if (window.console && window.console.log && window.console.error) { + // In some environment, console is defined but console.log or console.error is missing. + logger = window.console; + } else { + logger = {log: function(){ }, error: function(){ }}; + } + + // swfobject.hasFlashPlayerVersion("10.0.0") doesn't work with Gnash. + if (swfobject.getFlashPlayerVersion().major < 10) { + logger.error("Flash Player >= 10.0.0 is required."); + return; + } + if (location.protocol == "file:") { + logger.error( + "WARNING: web-socket-js doesn't work in file:///... URL " + + "unless you set Flash Security Settings properly. " + + "Open the page via Web server i.e. http://..."); + } + + /** + * Our own implementation of WebSocket class using Flash. + * @param {string} url + * @param {array or string} protocols + * @param {string} proxyHost + * @param {int} proxyPort + * @param {string} headers + */ + window.WebSocket = function(url, protocols, proxyHost, proxyPort, headers) { + var self = this; + self.__id = WebSocket.__nextId++; + WebSocket.__instances[self.__id] = self; + self.readyState = WebSocket.CONNECTING; + self.bufferedAmount = 0; + self.__events = {}; + if (!protocols) { + protocols = []; + } else if (typeof protocols == "string") { + protocols = [protocols]; + } + // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc. + // Otherwise, when onopen fires immediately, onopen is called before it is set. + self.__createTask = setTimeout(function() { + WebSocket.__addTask(function() { + self.__createTask = null; + WebSocket.__flash.create( + self.__id, url, protocols, proxyHost || null, proxyPort || 0, headers || null); + }); + }, 0); + }; + + /** + * Send data to the web socket. + * @param {string} data The data to send to the socket. + * @return {boolean} True for success, false for failure. + */ + WebSocket.prototype.send = function(data) { + if (this.readyState == WebSocket.CONNECTING) { + throw "INVALID_STATE_ERR: Web Socket connection has not been established"; + } + // We use encodeURIComponent() here, because FABridge doesn't work if + // the argument includes some characters. We don't use escape() here + // because of this: + // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions + // But it looks decodeURIComponent(encodeURIComponent(s)) doesn't + // preserve all Unicode characters either e.g. "\uffff" in Firefox. + // Note by wtritch: Hopefully this will not be necessary using ExternalInterface. Will require + // additional testing. + var result = WebSocket.__flash.send(this.__id, encodeURIComponent(data)); + if (result < 0) { // success + return true; + } else { + this.bufferedAmount += result; + return false; + } + }; + + /** + * Close this web socket gracefully. + */ + WebSocket.prototype.close = function() { + if (this.__createTask) { + clearTimeout(this.__createTask); + this.__createTask = null; + this.readyState = WebSocket.CLOSED; + return; + } + if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) { + return; + } + this.readyState = WebSocket.CLOSING; + WebSocket.__flash.close(this.__id); + }; + + /** + * Implementation of {@link DOM 2 EventTarget Interface} + * + * @param {string} type + * @param {function} listener + * @param {boolean} useCapture + * @return void + */ + WebSocket.prototype.addEventListener = function(type, listener, useCapture) { + if (!(type in this.__events)) { + this.__events[type] = []; + } + this.__events[type].push(listener); + }; + + /** + * Implementation of {@link DOM 2 EventTarget Interface} + * + * @param {string} type + * @param {function} listener + * @param {boolean} useCapture + * @return void + */ + WebSocket.prototype.removeEventListener = function(type, listener, useCapture) { + if (!(type in this.__events)) return; + var events = this.__events[type]; + for (var i = events.length - 1; i >= 0; --i) { + if (events[i] === listener) { + events.splice(i, 1); + break; + } + } + }; + + /** + * Implementation of {@link DOM 2 EventTarget Interface} + * + * @param {Event} event + * @return void + */ + WebSocket.prototype.dispatchEvent = function(event) { + var events = this.__events[event.type] || []; + for (var i = 0; i < events.length; ++i) { + events[i](event); + } + var handler = this["on" + event.type]; + if (handler) handler.apply(this, [event]); + }; + + /** + * Handles an event from Flash. + * @param {Object} flashEvent + */ + WebSocket.prototype.__handleEvent = function(flashEvent) { + + if ("readyState" in flashEvent) { + this.readyState = flashEvent.readyState; + } + if ("protocol" in flashEvent) { + this.protocol = flashEvent.protocol; + } + + var jsEvent; + if (flashEvent.type == "open" || flashEvent.type == "error") { + jsEvent = this.__createSimpleEvent(flashEvent.type); + } else if (flashEvent.type == "close") { + jsEvent = this.__createSimpleEvent("close"); + jsEvent.wasClean = flashEvent.wasClean ? true : false; + jsEvent.code = flashEvent.code; + jsEvent.reason = flashEvent.reason; + } else if (flashEvent.type == "message") { + var data = decodeURIComponent(flashEvent.message); + jsEvent = this.__createMessageEvent("message", data); + } else { + throw "unknown event type: " + flashEvent.type; + } + + this.dispatchEvent(jsEvent); + + }; + + WebSocket.prototype.__createSimpleEvent = function(type) { + if (document.createEvent && window.Event) { + var event = document.createEvent("Event"); + event.initEvent(type, false, false); + return event; + } else { + return {type: type, bubbles: false, cancelable: false}; + } + }; + + WebSocket.prototype.__createMessageEvent = function(type, data) { + if (document.createEvent && window.MessageEvent && !window.opera) { + var event = document.createEvent("MessageEvent"); + event.initMessageEvent("message", false, false, data, null, null, window, null); + return event; + } else { + // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes. + return {type: type, data: data, bubbles: false, cancelable: false}; + } + }; + + /** + * Define the WebSocket readyState enumeration. + */ + WebSocket.CONNECTING = 0; + WebSocket.OPEN = 1; + WebSocket.CLOSING = 2; + WebSocket.CLOSED = 3; + + // Field to check implementation of WebSocket. + WebSocket.__isFlashImplementation = true; + WebSocket.__initialized = false; + WebSocket.__flash = null; + WebSocket.__instances = {}; + WebSocket.__tasks = []; + WebSocket.__nextId = 0; + + /** + * Load a new flash security policy file. + * @param {string} url + */ + WebSocket.loadFlashPolicyFile = function(url){ + WebSocket.__addTask(function() { + WebSocket.__flash.loadManualPolicyFile(url); + }); + }; + + /** + * Loads WebSocketMain.swf and creates WebSocketMain object in Flash. + */ + WebSocket.__initialize = function() { + + if (WebSocket.__initialized) return; + WebSocket.__initialized = true; + + if (WebSocket.__swfLocation) { + // For backword compatibility. + window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation; + } + if (!window.WEB_SOCKET_SWF_LOCATION) { + logger.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf"); + return; + } + if (!window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR && + !WEB_SOCKET_SWF_LOCATION.match(/(^|\/)WebSocketMainInsecure\.swf(\?.*)?$/) && + WEB_SOCKET_SWF_LOCATION.match(/^\w+:\/\/([^\/]+)/)) { + var swfHost = RegExp.$1; + if (location.host != swfHost) { + logger.error( + "[WebSocket] You must host HTML and WebSocketMain.swf in the same host " + + "('" + location.host + "' != '" + swfHost + "'). " + + "See also 'How to host HTML file and SWF file in different domains' section " + + "in README.md. If you use WebSocketMainInsecure.swf, you can suppress this message " + + "by WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;"); + } + } + var container = document.createElement("div"); + container.id = "webSocketContainer"; + // Hides Flash box. We cannot use display: none or visibility: hidden because it prevents + // Flash from loading at least in IE. So we move it out of the screen at (-100, -100). + // But this even doesn't work with Flash Lite (e.g. in Droid Incredible). So with Flash + // Lite, we put it at (0, 0). This shows 1x1 box visible at left-top corner but this is + // the best we can do as far as we know now. + container.style.position = "absolute"; + if (WebSocket.__isFlashLite()) { + container.style.left = "0px"; + container.style.top = "0px"; + } else { + container.style.left = "-100px"; + container.style.top = "-100px"; + } + var holder = document.createElement("div"); + holder.id = "webSocketFlash"; + container.appendChild(holder); + document.body.appendChild(container); + // See this article for hasPriority: + // http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html + swfobject.embedSWF( + WEB_SOCKET_SWF_LOCATION, + "webSocketFlash", + "1" /* width */, + "1" /* height */, + "10.0.0" /* SWF version */, + null, + null, + {hasPriority: true, swliveconnect : true, allowScriptAccess: "always"}, + null, + function(e) { + if (!e.success) { + logger.error("[WebSocket] swfobject.embedSWF failed"); + } + } + ); + + }; + + /** + * Called by Flash to notify JS that it's fully loaded and ready + * for communication. + */ + WebSocket.__onFlashInitialized = function() { + // We need to set a timeout here to avoid round-trip calls + // to flash during the initialization process. + setTimeout(function() { + WebSocket.__flash = document.getElementById("webSocketFlash"); + WebSocket.__flash.setCallerUrl(location.href); + WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG); + for (var i = 0; i < WebSocket.__tasks.length; ++i) { + WebSocket.__tasks[i](); + } + WebSocket.__tasks = []; + }, 0); + }; + + /** + * Called by Flash to notify WebSockets events are fired. + */ + WebSocket.__onFlashEvent = function() { + setTimeout(function() { + try { + // Gets events using receiveEvents() instead of getting it from event object + // of Flash event. This is to make sure to keep message order. + // It seems sometimes Flash events don't arrive in the same order as they are sent. + var events = WebSocket.__flash.receiveEvents(); + for (var i = 0; i < events.length; ++i) { + WebSocket.__instances[events[i].webSocketId].__handleEvent(events[i]); + } + } catch (e) { + logger.error(e); + } + }, 0); + return true; + }; + + // Called by Flash. + WebSocket.__log = function(message) { + logger.log(decodeURIComponent(message)); + }; + + // Called by Flash. + WebSocket.__error = function(message) { + logger.error(decodeURIComponent(message)); + }; + + WebSocket.__addTask = function(task) { + if (WebSocket.__flash) { + task(); + } else { + WebSocket.__tasks.push(task); + } + }; + + /** + * Test if the browser is running flash lite. + * @return {boolean} True if flash lite is running, false otherwise. + */ + WebSocket.__isFlashLite = function() { + if (!window.navigator || !window.navigator.mimeTypes) { + return false; + } + var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"]; + if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) { + return false; + } + return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false; + }; + + if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) { + // NOTE: + // This fires immediately if web_socket.js is dynamically loaded after + // the document is loaded. + swfobject.addDomLoadEvent(function() { + WebSocket.__initialize(); + }); + } + +})(); diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 78e252c44..974ed3a85 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -186,6 +186,11 @@ input, textarea, select, .uneditable-input { @include box_sizing; } +/** MSC: did this because firefox clips text if it's padding:4px on text input fields */ +input[type=text] { + padding: 2px !important; +} + #error_explanation { color:#f00; ul { @@ -214,17 +219,6 @@ input, textarea, select, .uneditable-input { } } -/* microposts */ - -.microposts { - list-style: none; - margin: 10px 0 0 0; - - li { - padding: 10px 0; - border-top: 1px solid #e8e8e8; - } -} .content { display: block; diff --git a/app/controllers/jam_sessions_controller.rb b/app/controllers/jam_sessions_controller.rb new file mode 100644 index 000000000..ca44c4d18 --- /dev/null +++ b/app/controllers/jam_sessions_controller.rb @@ -0,0 +1,47 @@ +class JamSessionsController < ApplicationController + + # have to be signed in currently to see this screen + before_filter :signed_in_user + + def index + @jam_sessions = JamSession.paginate(page: params[:page]) + end + + def show + @jam_session = JamSession.find(params[:id]) + + # use gon to pass variables into javascript + gon.websocket_gateway_uri = Rails.application.config.websocket_gateway_uri + gon.jam_session_id = @jam_session.id + end + + def new + @jam_session = JamSession.new + end + + def create + @jam_session = JamSession.new() + @jam_session.creator = current_user + @jam_session.name = params[:jam_ruby_jam_session][:name] + if @jam_session.save + flash[:success] = "Jam Session created" + redirect_to @jam_session + else + render 'new' + end + end + + def edit + end + + def update + + end + + def destroy + JamSession.find(params[:id]).destroy + flash[:success] = "Jam Session deleted." + redirect_to jam_sessions_url + end + +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index a45ef1dd3..fd5a6dd0f 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,3 +1,4 @@ +# this is not a jam session - this is an 'auth session' class SessionsController < ApplicationController def new @@ -7,7 +8,7 @@ class SessionsController < ApplicationController user = User.find_by_email(params[:session][:email]) if user && user.authenticate(params[:session][:password]) sign_in user - redirect_back_or user + redirect_back_or jam_sessions_url else flash.now[:error] = 'Invalid email/password combination' render 'new' diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e366cadf..46988a7f2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,6 @@ class UsersController < ApplicationController before_filter :signed_in_user, - only: [:index, :edit, :update, :destroy, :following, :followers] + only: [:index, :edit, :update, :destroy] before_filter :correct_user, only: [:edit, :update] before_filter :admin_user, only: :destroy @@ -20,7 +20,7 @@ class UsersController < ApplicationController @user = User.new(params[:jam_ruby_user]) if @user.save sign_in @user - flash[:success] = "Welcome to the Sample App!" + flash[:success] = "Welcome to Jamkazam!" redirect_to @user else render 'new' diff --git a/app/views/jam_ruby/jam_sessions/_jam_session.html.erb b/app/views/jam_ruby/jam_sessions/_jam_session.html.erb new file mode 100644 index 000000000..d51a0d770 --- /dev/null +++ b/app/views/jam_ruby/jam_sessions/_jam_session.html.erb @@ -0,0 +1,7 @@ +
  • + <%= link_to jam_session.name, jam_session %> + <% if jam_session.creator == current_user || current_user.admin %> + | <%= link_to "delete", jam_session, method: :delete, + data: { confirm: "You sure?" } %> + <% end %> +
    • \ No newline at end of file diff --git a/app/views/jam_sessions/index.html.erb b/app/views/jam_sessions/index.html.erb new file mode 100644 index 000000000..b7f7e104a --- /dev/null +++ b/app/views/jam_sessions/index.html.erb @@ -0,0 +1,13 @@ +<% provide(:title, 'Jam Sessions') %> +

    Jam Sessions

    + +<%= will_paginate %> + +
      + <%= render @jam_sessions %> +
    + +<%= link_to "Create Jam Session", new_jam_session_path, + class: "btn btn-large btn-primary" %> + +<%= will_paginate %> diff --git a/app/views/jam_sessions/new.html.erb b/app/views/jam_sessions/new.html.erb new file mode 100644 index 000000000..d89097bf3 --- /dev/null +++ b/app/views/jam_sessions/new.html.erb @@ -0,0 +1,19 @@ +<% provide(:title, 'New Jam Session') %> +

    New Jam Session

    + +
    +
    + <%= form_for(@jam_session) do |f| %> + <%= render 'shared/error_messages', object: f.object %> + <%= f.label :name %> + <%= f.text_field :name %> + + + + <%= f.submit "Create new Jam Session", class: "btn btn-large btn-primary" %> + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/jam_sessions/show.html.erb b/app/views/jam_sessions/show.html.erb new file mode 100644 index 000000000..04a4d2fcd --- /dev/null +++ b/app/views/jam_sessions/show.html.erb @@ -0,0 +1,26 @@ +<% provide(:title, "Now Playing: #{@jam_session.name}") %> +
    + +
    +

    This Jam Session is public: <%= @jam_session.public %>

    + +

    Internal Session Activity

    +
    +

    Wait a moment...

    +
    +
    +
    + +<% content_for :post_scripts do %> + +<% end %> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 079c29c49..7ec3d9cea 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,13 +1,9 @@
    - - Rails Tutorial - by Michael Hartl -
    diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 94be3b144..0916fb067 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -2,7 +2,7 @@
    - <%= link_to "sample app", root_path, id: "logo" %> + <%= link_to "Jamkazam", root_path, id: "logo" %>
    + <%= yield :post_scripts %> \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index d2d80d14c..f68e29ce7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -66,6 +66,6 @@ module SampleApp config.assets.version = '1.0' # Runs the websocket gateway within the web app - config.run_websocket_gateway = true + config.websocket_gateway_uri = "ws://localhost:6767/websocket" end end diff --git a/config/routes.rb b/config/routes.rb index cf6cb79cf..f0b6d6370 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,25 +1,21 @@ SampleApp::Application.routes.draw do - -# scope 'jam_ruby' do - #resources :jam_session_members - #resources :jam_sessions - # resources :users, :as => 'jam_ruby' - # end - scope :as => 'jam_ruby' do + scope :as => 'jam_ruby' do resources :users - end + resources :jam_sessions + end - resources :users - #resources :users + resources :users + resources :jam_sessions + resources :sessions, only: [:new, :create, :destroy] - + root to: 'static_pages#home' match '/signup', to: 'users#new' match '/signin', to: 'sessions#new' match '/signout', to: 'sessions#destroy', via: :delete - + match '/help', to: 'static_pages#help' match '/about', to: 'static_pages#about' match '/contact', to: 'static_pages#contact' diff --git a/spec/requests/static_pages_spec.rb b/spec/requests/static_pages_spec.rb index 814430468..2a145bbce 100644 --- a/spec/requests/static_pages_spec.rb +++ b/spec/requests/static_pages_spec.rb @@ -52,7 +52,7 @@ describe "Static pages" do click_link "Home" click_link "Sign up now!" page.should have_selector 'title', text: full_title('Sign up') - click_link "sample app" + click_link "Jamkazam" page.should have_selector 'h1', text: 'Jam' end end