torquebox-stomp 3.0.0.beta2 → 3.0.0

data/lib/torquebox/stomp/rack/stilts-stomp-client-js.js

@@ -1,6 +1,6 @@
-// Stilts stomp-client.js 0.1.38
+// Stilts stomp-client.js 0.1.40
 // Some parts (c) 2010 Jeff Mesnil -- http://jmesnil.net/
-// 0.1.38
+// 0.1.40
 
 var Stomp = {
 
@@ -34,7 +34,8 @@ var Stomp = {
       if (headers[Stomp.Headers.CONTENT_LENGTH]) {
         var len = parseInt( headers[Stomp.Headers.CONTENT_LENGTH] );
         var start = divider + 2;
-        body = (''+ data).substring(start, start+len);
+        // content-length is bytes, substring operates on characters
+        body = Stomp.bytes_to_chars(Stomp.chars_to_bytes('' + data).substring(start, start+len))
       } else {
         // Parse body, stopping at the first \0 found.
         var chr = null;
@@ -66,13 +67,13 @@ var Stomp = {
         var out = command + '\n';
         if (headers) {
           for (header in headers) {
-            if (headers.hasOwnProperty(header)) {
+            if (header != 'content-length' && headers.hasOwnProperty(header)) {
               out = out + header + ':' + headers[header] + '\n';
             }
           }
         }
         if (body) {
-          out = out + 'content-length:' + body.length + '\n';
+          out = out + 'content-length:' + Stomp.chars_to_bytes(body).length + '\n';
         }
         out = out + '\n';
         if (body) {
@@ -82,9 +83,27 @@ var Stomp = {
       }
     }
   },
+
+  chars_to_bytes: function(chars) {
+    return unescape(encodeURIComponent(chars));
+  },
+
+  bytes_to_chars: function(bytes) {
+    return decodeURIComponent(escape(bytes));
+  },
+
+  logger: ( function() {
+    if (typeof(console) == 'undefined') {
+      return { log: function() { }, debug: function() { } };
+    } else {
+      return console;
+    }
+  } )()
   
 };
 
+Stomp
+
 
 Stomp.Client = function(host, port, secure) {
   this._host   = host   || Stomp.DEFAULT_HOST;
@@ -174,7 +193,7 @@ Stomp.Client.prototype = {
   },
   
   connectionFailed: function() {
-    console.log( "unable to connect" );
+    Stomp.logger.log( "unable to connect" );
   },
   
   disconnect: function(disconnectCallback) {
@@ -184,10 +203,6 @@ Stomp.Client.prototype = {
       disconnectCallback();
     }
   },
-
-  waitForDisconnect: function() {
-    this._transport.waitForClosedState();
-  },
   
   send: function(destination, headers, body) {
     var headers = headers || {};
@@ -312,14 +327,13 @@ Stomp.Transport.WebSocket.prototype = {
   
   _issueConnect: function() {
     var headers = {};
-    this._ws.onerror = this.client.onerror;
     if ( this._login ) {
       headers['login'] = this._login;
     }
     if ( this._passcode ) {
       headers['passcode'] = this._passcode;
     }
-    console.debug( this.client );
+    Stomp.logger.debug( this.client );
     headers[Stomp.Headers.ACCEPT_VERSION] = this.client.supportedVersions();
     this.transmit( "CONNECT", headers)
   },
@@ -822,7 +836,7 @@ Stomp.Transport.HTTP.prototype = {
         transport.client.processMessage( message );
       };
     } catch (err) {
-      console.debug( err );
+      Stomp.logger.debug( err );
       this._eventSource.close();
       this._eventSource = undefined;
       this.connectLongPoll();
@@ -884,14 +898,14 @@ Stomp.Transport.HTTP.prototype = {
     var request = new XMLHttpRequest();
     request.open( "POST", this._url(), true );
     request.withCredentials = true;
-    console.debug( request );
+    Stomp.logger.debug( request );
     if ( callbacks['load'] ) {
       request.onload = function() {
         callbacks['load'](request);
       }
     }
     if ( callbacks['error'] ) {
-      requrest.onerror = function() {
+      request.onerror = function() {
         callbacks['error'](request);
       }
     }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-stomp
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 3.0.0.beta2
+  prerelease:
+  version: 3.0.0
 platform: ruby
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: torquebox-core
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
     none: false
   prerelease: false
   type: :runtime
@@ -33,13 +33,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
     none: false
   prerelease: false
   type: :runtime
@@ -68,14 +68,14 @@ extra_rdoc_files: []
 files:
 - licenses/cc0-1.0.txt
 - lib/torquebox-stomp.rb
-- lib/torquebox/stomp/message.rb
 - lib/torquebox/stomp/jms_stomplet.rb
-- lib/torquebox/stomp/rack/stilts-stomp-client-js.js
-- lib/torquebox/stomp/rack/stomp_javascript_client_provider.rb
+- lib/torquebox/stomp/message.rb
+- lib/torquebox/stomp/ext/stomplet_config.rb
 - lib/torquebox/stomp/ext/http_stomp_session.rb
-- lib/torquebox/stomp/ext/subscriber.rb
 - lib/torquebox/stomp/ext/stomp_session.rb
-- lib/torquebox/stomp/ext/stomplet_config.rb
+- lib/torquebox/stomp/ext/subscriber.rb
+- lib/torquebox/stomp/rack/stomp_javascript_client_provider.rb
+- lib/torquebox/stomp/rack/stilts-stomp-client-js.js
 homepage: http://torquebox.org/
 licenses:
 - Public Domain
@@ -91,9 +91,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: