* jam-web working for milestone1

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'

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!

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.
+* TODO

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 = $("<div style='margin-top:20px; border-width:0 0 1px; border-color:#ccc; border-style:solid'>")
+        var msg_header = $("<h4 style='margin-bottom:2px'>").text(msg.type)
+        msg_div.append(msg_header)
+
+        var list = $("<dl style='margin-left:20px; margin-top:0'>")
+        msg_div.append(list)
+
+        for (var key in inner) {
+            list.append($("<dt>").text(key))
+            list.append($("<dd>").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
+})();

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);

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
+})();

app/assets/javascripts/web_socket.js

@@ -0,0 +1,391 @@
+// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
+// 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 <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
+   *
+   * @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 <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
+   *
+   * @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 <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
+   *
+   * @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();
+    });
+  }
+  
+})();

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;

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

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'

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'

app/views/jam_ruby/jam_sessions/_jam_session.html.erb

@@ -0,0 +1,7 @@
+<li>
+  <%= 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 %>
+</li>

app/views/jam_sessions/index.html.erb

@@ -0,0 +1,13 @@
+<% provide(:title, 'Jam Sessions') %>
+<h1>Jam Sessions</h1>
+
+<%= will_paginate %>
+
+<ul class="Jam Sessions">
+  <%= render @jam_sessions %>
+</ul>
+
+<%= link_to "Create Jam Session", new_jam_session_path, 
+                                class: "btn btn-large btn-primary" %>
+
+<%= will_paginate %>

app/views/jam_sessions/new.html.erb

@@ -0,0 +1,19 @@
+<% provide(:title, 'New Jam Session') %>
+<h1>New Jam Session</h1>
+
+<div class="row">
+  <div class="span6 offset3">
+    <%= form_for(@jam_session) do |f| %>
+      <%= render 'shared/error_messages', object: f.object %>
+      <%= f.label :name %>
+      <%= f.text_field :name %>
+
+      <!-- doesn't make sense to allow private sessions until we have friend lists 
+      <%= f.label :public %>
+      <%= f.check_box :public  %>
+      -->
+
+      <%= f.submit "Create new Jam Session", class: "btn btn-large btn-primary" %>
+    <% end %>
+  </div>
+</div>

app/views/jam_sessions/show.html.erb

@@ -0,0 +1,26 @@
+<% provide(:title, "Now Playing: #{@jam_session.name}") %>
+<div class="row">
+  <aside class="span4">
+    <section>
+      <h1>
+        <%= "Now Playing: #{@jam_session.name}" %>
+      </h1>
+    </section>
+  </aside>
+  <div class="span8">
+      <h2>This Jam Session is public: <%= @jam_session.public %></h2>
+
+      <h3>Internal Session Activity</h3>
+      <div id="internal_session_activity">
+          <p>Wait a moment... </p>
+      </div>
+  </div>
+</div>
+
+<% content_for :post_scripts do %>
+<script type="text/javascript">
+    $(function() {
+        window.jamsocket.init()
+    })
+</script>
+<% end %>

app/views/layouts/_footer.html.erb

@@ -1,13 +1,9 @@
 <footer class="footer">
-  <small>
-    <a href="http://railstutorial.org/">Rails Tutorial</a>
-    by Michael Hartl
-  </small>
   <nav>
     <ul>
       <li><%= link_to "About",   about_path %></li>
       <li><%= link_to "Contact", contact_path %></li>
-      <li><a href="http://news.railstutorial.org/">News</a></li>
+      <li><a href="http://www.jamkazam.com/">Jamkazam</a></li>
     </ul>
   </nav>
 </footer>

app/views/layouts/_header.html.erb

@@ -2,7 +2,7 @@
 <header class="navbar navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container">
-      <%= link_to "sample app", root_path, id: "logo" %>
+      <%= link_to "Jamkazam", root_path, id: "logo" %>
       <nav>
         <ul class="nav pull-right">
           <li><%= link_to "Home", root_path %></li>

app/views/layouts/application.html.erb

@@ -3,6 +3,7 @@
   <head>
     <title><%= full_title(yield(:title)) %></title>
     <%= stylesheet_link_tag    "application", media: "all" %>
+    <%= include_gon %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
     <%= render 'layouts/shim' %>    
@@ -17,5 +18,6 @@
       <%= render 'layouts/footer' %>
       <%= debug(params) if Rails.env.development? %>
     </div>
+    <%= yield :post_scripts %>
   </body>
 </html>

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

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'

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