Skip to content
Browse files

First attempt upgrading it to Cramp 0.12 and Tramp

  • Loading branch information...
1 parent d30dee3 commit 7e2f8d3f4458711fdf451411149813d5cc656823 @akitaonrails committed
View
2 .gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+*.swp
View
7 README.textile
@@ -9,10 +9,9 @@ h2. Usage
This should install all the dependencies
<pre>
- gem install arel --pre
- gem install activemodel --pre
gem install thin
gem install cramp
+ gem install tramp
</pre>
This demo uses MySQL, so you will need to create your own database. Read @config/database.sql@ to create it and edit @config/database.yml@ with the correct server, username and password.
@@ -62,6 +61,10 @@ h2. TODO
* Add multiple room and user registration support, but this requires exchanging session information as well. Making Rack::Session work may be a requirement
* Add templating than just static file to allow for some HAML or ERB views, adding Tilt to Cramp would be good as well
+h2. Changelog
+
+* 02/14/2011 - Updated to Cramp 0.12 and the new Tramp gem.
+
h2. Credits
* "Pratik Naik":http://m.onkey.org/ for Cramp
View
6 app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
-class ApplicationController < Cramp::Controller::Action
+class ApplicationController < Cramp::Action
include ApplicationHelper
end
-class WebSocketApplicationController < Cramp::Controller::Websocket
+class WebSocketApplicationController < Cramp::Websocket
include ApplicationHelper
-end
+end
View
4 app/models/chat.rb
@@ -1,4 +1,4 @@
-class Chat < Cramp::Model::Base
+class Chat < Tramp::Base
attribute :id, :type => Integer, :primary_key => true
attribute :name
attribute :sent_at
@@ -18,4 +18,4 @@ def self.recent(last_message)
end
validates_presence_of :name
-end
+end
View
28 chatserver.rb
@@ -2,22 +2,22 @@
require 'thin'
require 'usher'
require 'erb'
-require 'cramp/controller'
-require 'cramp/model'
+require 'cramp'
+require 'tramp'
require 'active_support/all'
require 'active_support/json'
-require 'config/routes'
-require 'app/helpers/application'
-require 'app/controllers/application_controller'
-require 'app/controllers/chat_controller'
-require 'app/controllers/retrieve_controller'
-require 'app/controllers/receive_controller'
-require 'app/controllers/static_controller'
-require 'app/models/chat'
-require 'lib/fixes'
+require './config/routes'
+require './app/helpers/application'
+require './app/controllers/application_controller'
+require './app/controllers/chat_controller'
+require './app/controllers/retrieve_controller'
+require './app/controllers/receive_controller'
+require './app/controllers/static_controller'
+require './app/models/chat'
+require './lib/fixes'
-Cramp::Model.init(YAML.load(File.read('./config/database.yml')))
-Cramp::Controller::Websocket.backend = :thin
+Tramp.init(YAML.load(File.read('./config/database.yml')))
+Cramp::Websocket.backend = :thin
Thin::Logging.trace = true
-Rack::Handler::Thin.run app_routes, :Port => 3000
+Rack::Handler::Thin.run app_routes, :Port => 3000
View
1 config/database.yml
@@ -1,3 +1,4 @@
---
:database: cramp_chat_development
:username: root
+:password: root
View
2 public/javascript/FABridge.js
@@ -362,7 +362,7 @@ FABridge.prototype =
// accepts a type structure, returns a constructed type
addTypeDataToCache: function(typeData)
{
- newType = new ASProxy(this, typeData.name);
+ var newType = new ASProxy(this, typeData.name);
var accessors = typeData.accessors;
for (var i = 0; i < accessors.length; i++)
{
View
BIN public/javascript/WebSocketMain.swf
Binary file not shown.
View
537 public/javascript/web_socket.js
@@ -1,160 +1,377 @@
-// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
-// Lincense: New BSD Lincense
-// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-31
-
-if (!window.WebSocket) {
-
- if (!window.console) console = {log: function(){ }, error: function(){ }};
-
- WebSocket = function(url, protocol, proxyHost, proxyPort) {
- var self = this;
- self.readyState = WebSocket.CONNECTING;
- self.bufferedAmount = 0;
- WebSocket.__addTask(function() {
- self.__flash = WebSocket.__flash.create(url, protocol, proxyHost || null, proxyPort || 0);
-
- self.__flash.addEventListener("open", function(fe) {
- try {
- if (self.onopen) self.onopen();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- self.__flash.addEventListener("close", function(fe) {
- try {
- if (self.onopen) self.onclose();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- self.__flash.addEventListener("message", function(fe) {
- var data = fe.getData();
- try {
- if (self.onmessage) {
- var e;
- if (window.MessageEvent) {
- e = document.createEvent("MessageEvent");
- e.initMessageEvent("message", false, false, data, null, null, window);
- } else { // IE
- e = {data: data};
- }
- self.onmessage(e);
- }
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- self.__flash.addEventListener("stateChange", function(fe) {
- try {
- self.readyState = fe.getReadyState();
- self.bufferedAmount = fe.getBufferedAmount();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- //console.log("[WebSocket] Flash object is ready");
- });
- }
-
- WebSocket.prototype.send = function(data) {
- if (!this.__flash || this.readyState == WebSocket.CONNECTING) {
- throw "INVALID_STATE_ERR: Web Socket connection has not been established";
- }
- var result = this.__flash.send(data);
- if (result < 0) { // success
- return true;
- } else {
- this.bufferedAmount = result;
- return false;
- }
- };
-
- WebSocket.prototype.close = function() {
- if (!this.__flash) return;
- if (this.readyState != WebSocket.OPEN) return;
- this.__flash.close();
- // Sets/calls them manually here because Flash WebSocketConnection.close cannot fire events
- // which causes weird error:
- // > You are trying to call recursively into the Flash Player which is not allowed.
- this.readyState = WebSocket.CLOSED;
- if (this.onclose) this.onclose();
- };
-
- WebSocket.prototype.addEventListener = function() {
- throw "Not implemented. Use e.g. onopen etc. instead."
- };
-
- WebSocket.CONNECTING = 0;
- WebSocket.OPEN = 1;
- WebSocket.CLOSED = 2;
-
- WebSocket.__tasks = [];
-
- WebSocket.__initialize = function() {
- if (!WebSocket.__swfLocation) {
- console.error("[WebSocket] set WebSocket.__swfLocation to location of WebSocketMain.swf");
- return;
- }
- var container = document.createElement("div");
- container.id = "webSocketContainer";
- // Puts the Flash out of the window. Note that we cannot use display: none or visibility: hidden
- // here because it prevents Flash from loading at least in IE.
- container.style.position = "absolute";
- container.style.left = "-100px";
- container.style.top = "-100px";
- var holder = document.createElement("div");
- holder.id = "webSocketFlash";
- container.appendChild(holder);
- document.body.appendChild(container);
- swfobject.embedSWF(
- WebSocket.__swfLocation, "webSocketFlash", "10", "10", "9.0.0",
- null, {bridgeName: "webSocket"}, null, null,
- function(e) {
- if (!e.success) console.error("[WebSocket] swfobject.embedSWF failed");
- }
- );
- FABridge.addInitializationCallback("webSocket", function() {
- try {
- //console.log("[WebSocket] FABridge initializad");
- WebSocket.__flash = FABridge.webSocket.root();
- WebSocket.__flash.setCallerUrl(location.href);
- for (var i = 0; i < WebSocket.__tasks.length; ++i) {
- WebSocket.__tasks[i]();
- }
- WebSocket.__tasks = [];
- } catch (e) {
- console.error("[WebSocket] " + e.toString());
- }
- });
- };
-
- WebSocket.__addTask = function(task) {
- if (WebSocket.__flash) {
- task();
- } else {
- WebSocket.__tasks.push(task);
- }
- }
-
- // called from Flash
- function webSocketLog(message) {
- console.log(message);
- }
-
- // called from Flash
- function webSocketError(message) {
- console.error(message);
- }
-
- if (window.addEventListener) {
- window.addEventListener("load", WebSocket.__initialize, false);
- } else {
- window.attachEvent("onload", WebSocket.__initialize);
- }
-
-}
+// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
+// License: New BSD License
+// Reference: http://dev.w3.org/html5/websockets/
+// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol
+
+(function() {
+
+ if (window.WebSocket) return;
+
+ var console = window.console;
+ if (!console || !console.log || !console.error) {
+ console = {log: function(){ }, error: function(){ }};
+ }
+
+ if (!swfobject.hasFlashPlayerVersion("9.0.0")) {
+ console.error("Flash Player is not installed.");
+ return;
+ }
+ if (location.protocol == "file:") {
+ console.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://...");
+ }
+
+ WebSocket = function(url, protocol, proxyHost, proxyPort, headers) {
+ var self = this;
+ self.readyState = WebSocket.CONNECTING;
+ self.bufferedAmount = 0;
+ // 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.
+ setTimeout(function() {
+ WebSocket.__addTask(function() {
+ self.__createFlash(url, protocol, proxyHost, proxyPort, headers);
+ });
+ }, 0);
+ };
+
+ WebSocket.prototype.__createFlash = function(url, protocol, proxyHost, proxyPort, headers) {
+ var self = this;
+ self.__flash =
+ WebSocket.__flash.create(url, protocol, proxyHost || null, proxyPort || 0, headers || null);
+ self.__flash.addEventListener("event", function(fe) {
+ // Uses setTimeout() to workaround the error:
+ // > You are trying to call recursively into the Flash Player which is not allowed.
+ setTimeout(function() { self.__handleEvents(); }, 0);
+ });
+ //console.log("[WebSocket] Flash object is ready");
+ };
+
+ WebSocket.prototype.send = function(data) {
+ if (!this.__flash || 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.
+ var result = this.__flash.send(encodeURIComponent(data));
+ if (result < 0) { // success
+ return true;
+ } else {
+ this.bufferedAmount += result;
+ return false;
+ }
+ };
+
+ WebSocket.prototype.close = function() {
+ var self = this;
+ if (!self.__flash) return;
+ if (self.readyState == WebSocket.CLOSED || self.readyState == WebSocket.CLOSING) return;
+ self.__flash.close();
+ // Sets/calls them manually here because Flash WebSocketConnection.close cannot fire events
+ // which causes weird error:
+ // > You are trying to call recursively into the Flash Player which is not allowed.
+ self.readyState = WebSocket.CLOSED;
+ if (self.__timer) clearInterval(self.__timer);
+ if (self.onclose) {
+ // Make it asynchronous so that it looks more like an actual
+ // close event
+ setTimeout(self.onclose, 0);
+ }
+ };
+
+ /**
+ * 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 !NB Not implemented yet
+ * @return void
+ */
+ WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
+ if (!('__events' in this)) {
+ this.__events = {};
+ }
+ if (!(type in this.__events)) {
+ this.__events[type] = [];
+ if ('function' == typeof this['on' + type]) {
+ this.__events[type].defaultHandler = this['on' + type];
+ this['on' + type] = this.__createEventHandler(this, 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 NB! Not implemented yet
+ * @return void
+ */
+ WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
+ if (!('__events' in this)) {
+ this.__events = {};
+ }
+ if (!(type in this.__events)) return;
+ for (var i = this.__events.length; i > -1; --i) {
+ if (listener === this.__events[type][i]) {
+ this.__events[type].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 {WebSocketEvent} event
+ * @return void
+ */
+ WebSocket.prototype.dispatchEvent = function(event) {
+ if (!('__events' in this)) throw 'UNSPECIFIED_EVENT_TYPE_ERR';
+ if (!(event.type in this.__events)) throw 'UNSPECIFIED_EVENT_TYPE_ERR';
+
+ for (var i = 0, l = this.__events[event.type].length; i < l; ++ i) {
+ this.__events[event.type][i](event);
+ if (event.cancelBubble) break;
+ }
+
+ if (false !== event.returnValue &&
+ 'function' == typeof this.__events[event.type].defaultHandler)
+ {
+ this.__events[event.type].defaultHandler(event);
+ }
+ };
+
+ WebSocket.prototype.__handleEvents = function() {
+ // 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 = this.__flash.receiveEvents();
+ for (var i = 0; i < events.length; i++) {
+ try {
+ var event = events[i];
+ if ("readyState" in event) {
+ this.readyState = event.readyState;
+ }
+ if (event.type == "open") {
+
+ if (this.__timer) clearInterval(this.__timer);
+ if (window.opera) {
+ // Workaround for weird behavior of Opera which sometimes drops events.
+ var self = this;
+ this.__timer = setInterval(function () {
+ self.__handleEvents();
+ }, 500);
+ }
+ if (this.onopen) this.onopen();
+
+ } else if (event.type == "close") {
+
+ if (this.__timer) clearInterval(this.__timer);
+ if (this.onclose) this.onclose();
+
+ } else if (event.type == "message") {
+
+ if (this.onmessage) {
+ var data = decodeURIComponent(event.data);
+ var e;
+ if (window.MessageEvent && !window.opera) {
+ e = document.createEvent("MessageEvent");
+ e.initMessageEvent("message", false, false, data, null, null, window, null);
+ } else {
+ // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
+ e = {data: data};
+ }
+ this.onmessage(e);
+ }
+
+ } else if (event.type == "error") {
+
+ if (this.__timer) clearInterval(this.__timer);
+ if (this.onerror) this.onerror();
+
+ } else {
+ throw "unknown event type: " + event.type;
+ }
+ } catch (e) {
+ console.error(e.toString());
+ }
+ }
+ };
+
+ /**
+ * @param {object} object
+ * @param {string} type
+ */
+ WebSocket.prototype.__createEventHandler = function(object, type) {
+ return function(data) {
+ var event = new WebSocketEvent();
+ event.initEvent(type, true, true);
+ event.target = event.currentTarget = object;
+ for (var key in data) {
+ event[key] = data[key];
+ }
+ object.dispatchEvent(event, arguments);
+ };
+ };
+
+ /**
+ * Basic implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface">DOM 2 EventInterface</a>}
+ *
+ * @class
+ * @constructor
+ */
+ function WebSocketEvent(){}
+
+ /**
+ *
+ * @type boolean
+ */
+ WebSocketEvent.prototype.cancelable = true;
+
+ /**
+ *
+ * @type boolean
+ */
+ WebSocketEvent.prototype.cancelBubble = false;
+
+ /**
+ *
+ * @return void
+ */
+ WebSocketEvent.prototype.preventDefault = function() {
+ if (this.cancelable) {
+ this.returnValue = false;
+ }
+ };
+
+ /**
+ *
+ * @return void
+ */
+ WebSocketEvent.prototype.stopPropagation = function() {
+ this.cancelBubble = true;
+ };
+
+ /**
+ *
+ * @param {string} eventTypeArg
+ * @param {boolean} canBubbleArg
+ * @param {boolean} cancelableArg
+ * @return void
+ */
+ WebSocketEvent.prototype.initEvent = function(eventTypeArg, canBubbleArg, cancelableArg) {
+ this.type = eventTypeArg;
+ this.cancelable = cancelableArg;
+ this.timeStamp = new Date();
+ };
+
+
+ WebSocket.CONNECTING = 0;
+ WebSocket.OPEN = 1;
+ WebSocket.CLOSING = 2;
+ WebSocket.CLOSED = 3;
+
+ WebSocket.__tasks = [];
+
+ WebSocket.loadFlashPolicyFile = function(url) {
+ WebSocket.__addTask(function() {
+ WebSocket.__flash.loadManualPolicyFile(url);
+ });
+ }
+
+ WebSocket.__initialize = function() {
+ if (WebSocket.__swfLocation) {
+ // For backword compatibility.
+ window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
+ }
+ if (!window.WEB_SOCKET_SWF_LOCATION) {
+ console.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
+ return;
+ }
+ 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 */, "9.0.0" /* SWF version */,
+ null, {bridgeName: "webSocket"}, {hasPriority: true, allowScriptAccess: "always"}, null,
+ function(e) {
+ if (!e.success) console.error("[WebSocket] swfobject.embedSWF failed");
+ }
+ );
+ FABridge.addInitializationCallback("webSocket", function() {
+ try {
+ //console.log("[WebSocket] FABridge initializad");
+ WebSocket.__flash = FABridge.webSocket.root();
+ 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 = [];
+ } catch (e) {
+ console.error("[WebSocket] " + e.toString());
+ }
+ });
+ };
+
+ WebSocket.__addTask = function(task) {
+ if (WebSocket.__flash) {
+ task();
+ } else {
+ WebSocket.__tasks.push(task);
+ }
+ };
+
+ 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;
+ };
+
+ // called from Flash
+ window.webSocketLog = function(message) {
+ console.log(decodeURIComponent(message));
+ };
+
+ // called from Flash
+ window.webSocketError = function(message) {
+ console.error(decodeURIComponent(message));
+ };
+
+ if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
+ if (window.addEventListener) {
+ window.addEventListener("load", WebSocket.__initialize, false);
+ } else {
+ window.attachEvent("onload", WebSocket.__initialize);
+ }
+ }
+
+})();

0 comments on commit 7e2f8d3

Please sign in to comment.
Something went wrong with that request. Please try again.