torquebox-web 1.1.1-java → 2.0.0.beta1-java

data/lib/gem_hook.rb

@@ -1,3 +1,20 @@
+# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'action_dispatch/session/torque_box_store'
 require 'action_controller/session/torque_box_store'
+

data/lib/torquebox/session/servlet_store.rb

@@ -27,23 +27,23 @@ module TorqueBox
       end 
       
       def call(env)
-        load_session(env)
+        ServletStore.load_session(env)
         status, headers, body = @app.call(env)
-        commit_session(env, status, headers, body)
+        ServletStore.commit_session(env, status, headers, body)
         return [ status, headers, body ]
       end
       
-      def load_session(env)
+      def self.load_session(env)
         env['rack.session'] = load_session_data( env['java.servlet_request'].getSession(true) )
         env['rack.session.options' ] = {}
       end
       
-      def commit_session(env, status, headers, body) 
+      def self.commit_session(env, status, headers, body) 
         session_data = env['rack.session' ]        
-        store_session_data( env['java.servlet_request'].getSession(true), session_data )
+        ServletStore.store_session_data( env['java.servlet_request'].getSession(true), session_data )
       end
       
-      def load_session_data(session)
+      def self.load_session_data(session)
         session_data = SessionData.new
         session_data.java_session = session
         session.getAttributeNames.each do |key|
@@ -64,7 +64,7 @@ module TorqueBox
         session_data
       end
 
-      def symbolize_keys!(session_data)
+      def self.symbolize_keys!(session_data)
         symbol_keys = session_data[ SYMBOL_KEYS ] || []
         keys = session_data.keys
         keys.each do |key|
@@ -74,7 +74,7 @@ module TorqueBox
         end
       end
       
-      def store_session_data(session, session_data)
+      def self.store_session_data(session, session_data)
         hash = session_data.dup
         # java session shouldn't be marshalled
         hash.java_session = nil if hash.respond_to?(:java_session=)

data/lib/torquebox-web.rb

@@ -1,6 +1,6 @@
 module TorqueboxWeb
-  VERSION = '1.1.1'
-  MAVEN_VERSION = '1.1.1'
+  VERSION = '2.0.0.beta1'
+  MAVEN_VERSION = '2.0.0.beta1'
 end
 begin
   require 'java'

data/licenses/lgpl-2.1.txt

@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-web
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.1
+  prerelease: 6
+  version: 2.0.0.beta1
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
+date: 2011-12-02 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -21,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 3.0.5
+            version: 3.0.10
     type: :development
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -32,7 +31,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.3.0
+            version: 2.7.0
     type: :development
     version_requirements: *id002
 description: ""
@@ -51,12 +50,8 @@ files:
   - lib/gem_hook.rb
   - lib/action_controller/session/torque_box_store.rb
   - lib/action_dispatch/session/torque_box_store.rb
-  - lib/generators/websockets_client/USAGE
-  - lib/generators/websockets_client/websockets_client_generator.rb
-  - lib/generators/websockets_client/templates/torquebox_ws_client.js
   - lib/torquebox/session/servlet_store.rb
-has_rdoc: true
-homepage: http://www.torquebox.org/gem-parent/torquebox-web/
+homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-web/
 licenses: 
   - lgpl
 post_install_message: 
@@ -73,15 +68,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
-summary: TorqueBox Base Gem
+summary: TorqueBox Web Gem
 test_files: []
 

data/lib/generators/websockets_client/USAGE

@@ -1,17 +0,0 @@
-Usage:
-  rails generate websockets_client [options]
-
-Runtime options:
-  -f, [--force]    # Overwrite files that already exist
-  -p, [--pretend]  # Run but do not make any changes
-  -s, [--skip]     # Skip files that already exist
-  -q, [--quiet]    # Suppress status output
-
-Description:
-    Generates the websockets javascript client library for this app.
-
-Example:
-    rails generate websockets_client
-
-    This will create:
-        public/javascripts/torquebox_ws_client.js

data/lib/generators/websockets_client/templates/torquebox_ws_client.js

@@ -1,358 +0,0 @@
-/*
- * Based upon Stomp client (c) 2010 by Jeff Mesnil -- http://jmesnil.net/
- * 
- */
-
-(function(window) {
-
-	var Stomp = {};
-	var TorqueBox = {};
-	TorqueBox.WebSockets = {};
-	TorqueBox.WebSockets.Assembly = {};
-	
-
-	TorqueBox.WebSockets.Types = {
-		
-		any		: 0,
-		generic : 1,
-		
-		registerMediaType: function(mediaName, mediaType) {
-			this[mediaName] = mediaType;
-			return this[mediaName];
-		}
-		
-	};
-
-	TorqueBox.WebSockets.Commands = {
-		handshake : 0x01,
-		handshake_response : 0x02,
-		normal : 0x03
-	};
-
-	TorqueBox.WebSockets.State = {
-		disconnected : 0,
-		handshake : 1,
-		ready : 2
-	};
-	
-	TorqueBox.WebSockets.Frame = function(type, command, data) {
-		this.type = type || TorqueBox.WebSockets.Types.generic;
-		this.command = command || TorqueBox.WebSockets.Commands.normal;
-		this.data = data;
-		return this;
-	}
-	
-	TorqueBox.WebSockets.Assembly.decode = function(message) {
-		return new TorqueBox.WebSockets.Frame(
-				message.charCodeAt(0), 
-				message.charCodeAt(1),
-				message.substring(2));
-	};
-	
-	TorqueBox.WebSockets.Assembly.encode = function(frame) {
-		var encodedFrame = [ String.fromCharCode(frame.type),String.fromCharCode(frame.command), frame.data ].join('');
-		return encodedFrame;
-	};
-
-	TorqueBox.WebSockets.client = function(id, url) {
-
-		var uuid = id;
-		var websocket = null;
-		var state = TorqueBox.WebSockets.State.disconnected;
-		var log = window.console;
-		var listeners = {};
-
-		var onopen = function(event) {
-			state = TorqueBox.WebSockets.State.handshake;
-			log.debug("Sending UUID handshake " + uuid);
-			var frame = new TorqueBox.WebSockets.Frame(TorqueBox.WebSockets.Types.generic, 
-					TorqueBox.WebSockets.Commands.handshake,
-					uuid);
-			this.send(TorqueBox.WebSockets.Assembly.encode(frame));
-		};
-		
-		var onerror = function(error, event) {
-			raise('THERE IS AN ERROR');
-		};
-		
-		this.addEventListener = function(event, type, callback, scopeObject) {
-			if (!listeners[event]) listeners[event] = [];
-			listeners[event].push({
-				mediaType: type,
-				fn: callback,
-				scope: scopeObject || this
-			});
-		};
-
-		this.connect = function() {
-			var that = this;
-			websocket = new WebSocket(url);
-			websocket.onmessage = function(message) {
-				onmessage(message, that);
-			}
-			websocket.onclose = function() {
-				onclose(that);
-			};
-			websocket.onerror = onerror;
-			websocket.onopen = onopen;
-		};
-		
-		this.notifyListeners = function(event, type, arguments) {
-			var evtListeners = listeners[event];
-			for (var i = 0; i < evtListeners.length; i++) {
-				if (evtListeners[i].mediaType == type || evtListeners[i].mediaType == TorqueBox.WebSockets.Types.any)
-					evtListeners[i].fn.apply(evtListeners[i].scope, arguments);
-			}
-		};
-
-		var onmessage = function(message, client) {
-			var frame = TorqueBox.WebSockets.Assembly.decode(message.data);
-			if (state == TorqueBox.WebSockets.State.handshake) {
-				if (frame.data != uuid) {
-					client.onerror("UUID received from server does not match generated UUID.");
-					websocket.close();
-				} // end if
-				state = TorqueBox.WebSockets.State.ready;
-				client.onready();
-			} else {
-				client.notifyListeners('onmessage', frame.type, [message]);
-			}
-		};
-		
-		var onclose = function(client) {
-			client.state = TorqueBox.WebSockets.State.disconnected;
-			client.onclose();
-		}
-
-		this.send = function(frame) {
-			if (state != TorqueBox.WebSockets.State.ready) {
-				this.onerror("The websocket client is not ready!");
-			}
-			var message = TorqueBox.WebSockets.Assembly.encode(frame);
-			websocket.send(message);
-		}
-
-		this.close = function() {
-			websocket.close();
-		};
-
-		this.onready = function() {
-		};
-
-		this.onclose = function() {
-		};
-
-		this.onerror = function(error) {
-			log.error(error);
-			if (state != TorqueBox.WebSockets.State.ready) {
-				log.error("Closing web socket, since we haven't completed the handshake yet.");
-				websocket.close(); // start again if we haven't completed the handshake.
-			}
-		};
-
-	};	
-
-	Stomp.mediaType = TorqueBox.WebSockets.Types.registerMediaType('stomp', 0x02);
-
-	Stomp.frame = function(command, headers, body) {
-		return {
-			command : command,
-			headers : headers,
-			body : body,
-			toString : function() {
-				var out = command + '\n';
-				if (headers) {
-					for (header in headers) {
-						if (headers.hasOwnProperty(header)) {
-							out = out + header + ': ' + headers[header] + '\n';
-						}
-					}
-				}
-				out = out + '\n';
-				if (body) {
-					out = out + body;
-				}
-				return out;
-			}
-		}
-	};
-
-	trim = function(str) {
-		return str.replace(/^\s+/g, '').replace(/\s+$/g, '');
-	};
-
-	Stomp.unmarshal = function(data) {
-		var divider = data.search(/\n\n/), headerLines = data.substring(0,
-				divider).split('\n'), command = headerLines.shift(), headers = {}, body = '';
-
-		// Parse headers
-		var line = idx = null;
-		for ( var i = 0; i < headerLines.length; i++) {
-			line = headerLines[i];
-			idx = line.indexOf(':');
-			headers[trim(line.substring(0, idx))] = trim(line
-					.substring(idx + 1));
-		}
-
-		// Parse body, stopping at the first \0 found.
-		// TODO: Add support for content-length header.
-		var chr = null;
-		for ( var i = divider + 2; i < data.length; i++) {
-			chr = data.charAt(i);
-			if (chr === '\0') {
-				break;
-			}
-			body += chr;
-		}
-
-		return Stomp.frame(command, headers, body);
-	};
-
-	Stomp.marshal = function(command, headers, body) {
-		return Stomp.frame(command, headers, body).toString() + '\0';
-	};
-
-	Stomp.client = function(name, url) {
-
-		var that, login, passcode;
-		var ws = null;
-		var counter = 0; // used to index subscribers
-		// subscription callbacks indexed by subscriber's ID
-		var subscriptions = {};
-		var listeners = {};
-		
-		var log = window.console;
-
-		var notifyListeners = function(event, arguments) {
-			var ocListeners = listeners[event];
-			if (ocListeners) {
-				for ( var i = 0; i < ocListeners.length; i++) {
-					ocListeners[i].fn.apply(ocListeners[i].scope, arguments);
-				}
-			} // end if (listeners are defined)
-		}
-
-		onmessage = function(event) {
-			var tbFrame = TorqueBox.WebSockets.Assembly.decode(event.data);
-			log.debug('<<< ' + tbFrame.data);
-			var frame = Stomp.unmarshal(tbFrame.data);
-			if (frame.command === "CONNECTED") {
-				notifyListeners('onconnect', [ frame ]);
-			} else if (frame.command === "MESSAGE") {
-				var onreceive = subscriptions[frame.headers.subscription];
-				if (onreceive) {
-					onreceive(frame);
-				}
-			} else if (frame.command === "RECEIPT" && that.onreceipt) {
-				that.onreceipt(frame);
-			} else if (frame.command === "ERROR" && that.onerror) {
-				notifyListeners('onerror', [ frame ]);
-			} else if (frame.command == "DISCONNECTED")
-				alert('disconnected');
-		};
-
-		transmit = function(command, headers, body) {
-			var out = Stomp.marshal(command, headers, body);
-			log.debug(">>> " + out);
-			var frame = new TorqueBox.WebSockets.Frame();
-			frame.type = Stomp.mediaType;
-			frame.data = out;
-			ws.send(frame);
-		};
-
-		that = {};
-
-		that.addEventListener = function(event, callback, scopeObject) {
-			if (!listeners[event])
-				listeners[event] = [];
-			listeners[event].push({
-				scope : scopeObject || this,
-				fn : callback
-			});
-		}
-		
-		that.close = function() {
-			ws.close();
-		}
-
-		that.connect = function(login_, passcode_) {
-			log.debug("Opening Web Socket...");
-			ws = new TorqueBox.WebSockets.client(name, url);
-			ws.addEventListener('onmessage', Stomp.mediaType, onmessage);
-			ws.addEventListener('ondisconnect', Stomp.mediaType, function() {
-				this.close();
-			});
-			ws.onclose = function() {
-				var msg = "Disconnected from STOMP server.";
-				log.debug(msg);
-				notifyListeners('onerror', [ msg ]);
-			};
-			ws.onready = function() {
-				log.debug("Web socket opened... connecting to STOMP server.")
-				transmit("CONNECT", {
-					login : login,
-					passcode : passcode
-				});
-			};
-			login = login_;
-			passcode = passcode_;
-			ws.connect();
-		};
-
-		that.disconnect = function(disconnectCallback) {
-			transmit("DISCONNECT");
-		};
-
-		that.send = function(destination, headers, body) {
-			var headers = headers || {};
-			headers.destination = destination;
-			transmit("SEND", headers, body);
-		};
-
-		that.subscribe = function(destination, callback, headers) {
-			var headers = headers || {};
-			var id = "sub-" + counter++;
-			headers.destination = destination;
-			headers.id = id;
-			subscriptions[id] = callback;
-			transmit("SUBSCRIBE", headers);
-			return id;
-		};
-
-		that.unsubscribe = function(id, headers) {
-			var headers = headers || {};
-			headers.id = id;
-			delete subscriptions[id];
-			transmit("UNSUBSCRIBE", headers);
-		};
-
-		that.begin = function(transaction, headers) {
-			var headers = headers || {};
-			headers.transaction = transaction;
-			transmit("BEGIN", headers);
-		};
-
-		that.commit = function(transaction, headers) {
-			var headers = headers || {};
-			headers.transaction = transaction;
-			transmit("COMMIT", headers);
-		};
-
-		that.abort = function(transaction, headers) {
-			var headers = headers || {};
-			headers.transaction = transaction;
-			transmit("ABORT", headers);
-		};
-
-		that.ack = function(message_id, headers) {
-			var headers = headers || {};
-			headers["message-id"] = message_id;
-			transmit("ACK", headers);
-		};
-		return that;
-	};
-
-	window.Stomp = Stomp;
-	window.TorqueBox = TorqueBox;
-
-})(window);

data/lib/generators/websockets_client/websockets_client_generator.rb

@@ -1,12 +0,0 @@
-
-class WebsocketsClientGenerator < Rails::Generators::Base
-  
-  source_root File.expand_path('../templates', __FILE__) 
-  
-  def generate
-    puts "generating ws client"
-    copy_file "torquebox_ws_client.js", "public/javascripts/torquebox_ws_client.js"
-    puts "done generating ws client"
-  end
-   
-end