message_bus 2.0.0.beta.5 → 2.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91a7d621707536a33738a736ffd00bba4639d46
-  data.tar.gz: b5a445c066617c126b4bfaeb6444ad0f473ec670
+  metadata.gz: 686569cf588c00aa211a970eab14d37cf979c844
+  data.tar.gz: 167ad799942ea8f8de1e945015bae4f687c4629f
 SHA512:
-  metadata.gz: adb5ec754024c6a62873a98dd2e3978d669f057bda86ffac0a6842787a9b8e14d0280315d6f499f40da9e86ed0a412c8ce0675262318f9330d023e2e58afe4c3
-  data.tar.gz: 50c1ee4d6b4e485198011c08a5632014321f34ceb388dd93568513d2762d1d9c539a0a3c7b4d2e6e74d7485e4ce5d3ace9d7f0e9bf8be6812df5f4d72f27c10a
+  metadata.gz: 6810d52979d00f065b8de475f8cbeb81edbe7ae8fc706d1a818d32ac2f1c36f2f9ee94c3585968beba594dde53064f82a58348c0948a2b0d64326e356880cb32
+  data.tar.gz: 0bd9ac5196a77f53797e834b3e296bdad9328fcc6a28331b5e53456527eb5be8df25de76fd3aa05e960f4927531d19f7bfb8ffafdb163006bb1264273d0987d1

data/CHANGELOG

@@ -1,5 +1,13 @@
 29-02-2016
 
+- Version 2.0.0.beta.6
+
+- Feature: Support standalone opertion without depending on jQuery @nathanstitt
+- Feature: Support a noconflict mode @nathanstitt
+- Feature: Support JSON POST payload @nathanstitt
+
+29-02-2016
+
 - Version 2.0.0.beta.5
 
 - Fix: JavaScript unsubscribe was not updating publicly visible MessageBus.callbacks @sam

data/README.md

@@ -20,7 +20,7 @@ Live chat demo per [examples/chat](https://github.com/SamSaffron/message_bus/tre
 
 ## Is this used in production at scale?
 
-**Yes**, MessageBus was extracted out of [Discourse](http://www.discourse.org/) and is used in thousands of production Discourse sites at scale. 
+**Yes**, MessageBus was extracted out of [Discourse](http://www.discourse.org/) and is used in thousands of production Discourse sites at scale.
 
 ## Installation
 
@@ -174,7 +174,7 @@ backgroundCallbackInterval|60000|Interval to poll when long polling is disabled
 maxPollInterval|180000|If request to the server start failing, MessageBus will backoff, this is the upper limit of the backoff.
 alwaysLongPoll|false|For debugging you may want to disable the "is browser in background" check and always long-poll
 baseUrl|/|If message bus is mounted in a subdirectory of different domain, you may configure it to perform requests there
-ajax|$.ajax|The only dependency on jQuery, you may set up a custom ajax function here
+ajax|$.ajax or XMLHttpRequest|MessageBus will first attempt to use jQuery and then fallback to a plain XMLHttpRequest version that's contained in the `messsage-bus-ajax.js` file. `messsage-bus-ajax.js` must be loaded after `messsage-bus.js` for it to be used.
 
 **API**:
 
@@ -192,6 +192,8 @@ ajax|$.ajax|The only dependency on jQuery, you may set up a custom ajax function
 
 `MessageBus.unsubscribe(channel,func)` : Unsubscribe callback from a particular channel
 
+`MessageBus.noConflict()` : Removes MessageBus from the global namespace by replacing it with whatever was present before MessageBus was loaded.  Returns a reference to the MessageBus object.
+
 ## Running tests
 
 To run tests you need both Postgres and Redis installed. By default we will connect to the database `message_bus_test` with the current username. If you wish to override this:
@@ -288,7 +290,7 @@ after_fork do |server, worker|
 end
 ```
 
-### 
+###
 
 ## Want to help?
 
@@ -299,5 +301,3 @@ If you are looking to contribute to this project here are some ideas
 - Improve and properly document admin dashboard (add opt-in stats, better diagnostics into queues)
 - Improve general documentation (Add examples, refine existing examples)
 - Make MessageBus a nice website
-
-

data/Rakefile

@@ -3,6 +3,10 @@ require 'rake/testtask'
 require 'bundler'
 require 'bundler/gem_tasks'
 require 'bundler/setup'
+require 'jasmine'
+
+ENV['JASMINE_CONFIG_PATH'] ||= File.join(Dir.pwd, 'spec', 'assets', 'support', 'jasmine.yml')
+load 'jasmine/tasks/jasmine.rake'
 
 Bundler.require(:default, :test)
 
@@ -17,7 +21,9 @@ run_spec = proc do |backend|
   end
 end
 
-task :spec => [:spec_redis, :spec_postgres, :spec_memory]
+task :spec => [:spec_redis, :spec_postgres, :spec_memory, :spec_client_js]
+
+task :spec_client_js => 'jasmine:ci'
 
 task :spec_redis do
   run_spec.call('redis')

data/assets/message-bus-ajax.js

@@ -0,0 +1,44 @@
+// A bare-bones implementation of $.ajax that MessageBus will use
+// as a fallback if jQuery is not present
+//
+// Only implements methods & options used by MessageBus
+(function(global, undefined) {
+  'use strict';
+  if (!global.MessageBus){
+      throw new Error("MessageBus must be loaded before the ajax adapter");
+  }
+
+  var cacheBuster =  Math.random() * 10000 | 0;
+
+  global.MessageBus.ajax = function(options){
+    var XHRImpl = (global.MessageBus && global.MessageBus.xhrImplementation) || global.XMLHttpRequest;
+    var xhr = new XHRImpl();
+    xhr.dataType = options.dataType;
+    var url = options.url;
+    if (!options.cache){
+      url += ((-1 == url.indexOf('?')) ? '?' : '&') + '_=' + (cacheBuster++)
+    }
+    xhr.open('POST', url);
+    for (var name in options.headers){
+      xhr.setRequestHeader(name, options.headers[name]);
+    }
+    xhr.setRequestHeader('Content-Type', 'application/json');
+    if (options.messageBus.chunked){
+      options.messageBus.onProgressListener(xhr);
+    }
+    xhr.onreadystatechange = function(){
+      if (xhr.readyState === 4){
+        var status = xhr.status;
+        if (status >= 200 && status < 300 || status === 304){
+          options.success(xhr.responseText);
+        } else {
+          options.error(xhr, xhr.statusText);
+        }
+        options.complete();
+      }
+    }
+    xhr.send(JSON.stringify(options.data));
+    return xhr;
+  };
+
+})(window);

data/assets/message-bus.js

@@ -1,10 +1,11 @@
 /*jshint bitwise: false*/
-"use strict;"
+(function(global, document, undefined) {
+  'use strict';
+  var previousMessageBus = global.MessageBus;
 
-window.MessageBus = (function() {
   // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
   var callbacks, clientId, failCount, shouldLongPoll, queue, responseCallbacks, uniqueId, baseUrl;
-  var me, started, stopped, longPoller, pollTimeout, paused, later;
+  var me, started, stopped, longPoller, pollTimeout, paused, later, jQuery, interval, chunkedBackoff;
 
   uniqueId = function() {
     return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
@@ -25,10 +26,9 @@ window.MessageBus = (function() {
   paused = false;
   later = [];
   chunkedBackoff = 0;
-
+  jQuery = global.jQuery;
   var hiddenProperty;
 
-
   (function(){
     var prefixes = ["","webkit","ms","moz"];
     for(var i=0; i<prefixes.length; i++) {
@@ -161,38 +161,55 @@ window.MessageBus = (function() {
       }
     };
 
+    var setOnProgressListener = function(xhr) {
+      var position = 0;
+      // if it takes longer than 3000 ms to get first chunk, we have some proxy
+      // this is messing with us, so just backoff from using chunked for now
+      var chunkedTimeout = setTimeout(disableChunked,3000);
+      xhr.onprogress = function () {
+        clearTimeout(chunkedTimeout);
+        if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
+          // not chunked we are sending json back
+          chunked = false;
+          return;
+        }
+        position = handle_progress(xhr.responseText, position);
+      }
+    };
+    if (!me.ajax){
+      throw new Error("Either jQuery or the ajax adapter must be loaded");
+    }
     var req = me.ajax({
-      url: me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!longPoll ? "dlp=t" : ""),
+      url: me.baseUrl + "message-bus/" + me.clientId + "/poll" + (!longPoll ? "?dlp=t" : ""),
       data: data,
       cache: false,
       dataType: dataType,
       type: 'POST',
       headers: headers,
+      messageBus: {
+        chunked: chunked,
+        onProgressListener: function(xhr) {
+          var position = 0;
+          // if it takes longer than 3000 ms to get first chunk, we have some proxy
+          // this is messing with us, so just backoff from using chunked for now
+          var chunkedTimeout = setTimeout(disableChunked,3000);
+          return xhr.onprogress = function () {
+            clearTimeout(chunkedTimeout);
+            if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
+              chunked = false; // not chunked, we are sending json back
+            } else {
+              position = handle_progress(xhr.responseText, position);
+            }
+          }
+        }
+      },
       xhr: function() {
-         var xhr = jQuery.ajaxSettings.xhr();
-
-         if (!chunked) {
-            return xhr;
-         }
-
-         var position = 0;
-
-         // if it takes longer than 3000 ms to get first chunk, we have some proxy
-         // this is messing with us, so just backoff from using chunked for now
-         var chunkedTimeout = setTimeout(disableChunked,3000);
-
-         xhr.onprogress = function () {
-           clearTimeout(chunkedTimeout);
-
-           if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
-             // not chunked we are sending json back
-             chunked = false;
-             return;
-           }
-           position = handle_progress(xhr.responseText, position);
-         }
-
-         return xhr;
+        var xhr = jQuery.ajaxSettings.xhr();
+        if (!chunked) {
+          return xhr;
+        }
+        this.messageBus.onProgressListener(xhr);
+        return xhr;
       },
       success: function(messages) {
          if (!chunked) {
@@ -257,10 +274,11 @@ window.MessageBus = (function() {
     clientId: clientId,
     alwaysLongPoll: false,
     baseUrl: baseUrl,
-    // TODO we can make the dependency on $ and jQuery conditional
-    // all we really need is an implementation of ajax
-    ajax: ($ && $.ajax),
-
+    ajax: (jQuery && jQuery.ajax),
+    noConflict: function(){
+      global.MessageBus = global.MessageBus.previousMessageBus;
+      return this;
+    },
     diagnostics: function(){
       console.log("Stopped: " + stopped + " Started: " + started);
       console.log("Current callbacks");
@@ -317,7 +335,7 @@ window.MessageBus = (function() {
 
       // monitor visibility, issue a new long poll when the page shows
       if(document.addEventListener && 'hidden' in document){
-        me.visibilityEvent = document.addEventListener('visibilitychange', function(){
+        me.visibilityEvent = global.document.addEventListener('visibilitychange', function(){
           if(!document.hidden && !me.longPoll && pollTimeout){
             clearTimeout(pollTimeout);
             pollTimeout = null;
@@ -366,7 +384,7 @@ window.MessageBus = (function() {
 
       for (var i=callbacks.length-1; i>=0; i--) {
 
-        callback = callbacks[i];
+        var callback = callbacks[i];
         var keep;
 
         if (glob) {
@@ -392,6 +410,5 @@ window.MessageBus = (function() {
       return removed;
     }
   };
-
-  return me;
-})();
+  global.MessageBus = me;
+})(window, document);

data/lib/message_bus/rack/middleware.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 # our little message bus, accepts long polling and polling
 module MessageBus::Rack; end
 
@@ -93,7 +95,8 @@ class MessageBus::Rack::Middleware
       end
     else
       request = Rack::Request.new(env)
-      request.POST.each do |k,v|
+      data = request.content_type.include?('application/json') ? JSON.parse(request.body.read) : request.POST
+      data.each do |k,v|
         if k == "__seq".freeze
           client.seq = v.to_i
         else
@@ -203,4 +206,3 @@ class MessageBus::Rack::Middleware
     }
   end
 end
-

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "2.0.0.beta.5"
+  VERSION = "2.0.0.beta.6"
 end

data/message_bus.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rack', '>= 1.1.3'
   gem.add_development_dependency 'redis'
   gem.add_development_dependency 'pg'
+  gem.add_development_dependency 'jasmine'
 end

data/spec/assets/SpecHelper.js

@@ -0,0 +1,93 @@
+var message_id = 1;
+var SEPARATOR = "\r\n|\r\n";
+
+var encodeChunks = function(xhr, chunks) {
+  if (!chunks || !chunks.length){
+    return '';
+  }
+  for (var i=0;i<chunks.length;i++) {
+    var chunk = chunks[i];
+    chunk.global_id = Math.random() * 10000 | 0;
+    chunk.message_id = message_id++;
+  }
+  if (xhr.onprogress){ // using longPoll if onprogress is set
+    var responses = []
+    for (var i=0;i<chunks.length;i++) {
+      responses.push( JSON.stringify([chunk]) );
+    }
+    return responses.join(SEPARATOR) + SEPARATOR;
+  } else {
+    return chunks;
+  }
+}
+
+beforeEach(function () {
+  var spec = this;
+
+  function MockedXMLHttpRequest(options){ this.options = options; }
+  MockedXMLHttpRequest.prototype.send              = function(){
+    this.readyState = 4
+    this.responseText = encodeChunks(this, spec.responseChunks);
+    this.statusText = 'OK';
+    this.status = 200;
+    if (this.onprogress){ this.onprogress(); }
+    this.onreadystatechange()
+  }
+  MockedXMLHttpRequest.prototype.open              = function(){ }
+  MockedXMLHttpRequest.prototype.abort             = function(){ }
+  MockedXMLHttpRequest.prototype.setRequestHeader  = function(){ }
+  MockedXMLHttpRequest.prototype.getResponseHeader = function(){
+    return 'text/plain; charset=utf-8';
+  }
+  MessageBus.xhrImplementation = MockedXMLHttpRequest
+  this.MockedXMLHttpRequest = MockedXMLHttpRequest
+  MessageBus.start()
+  this.responseChunks = [
+    {channel: '/test', data: {password: 'MessageBusRocks!'}}
+  ];
+
+});
+
+window.testMB = function(description, testFn, path, data){
+  this.responseChunks = [
+    {channel: path || '/test', data: data || {password: 'MessageBusRocks!'}}
+  ];
+  it(description, function(done){
+    spec = this;
+    promisy = {
+      finally: function(fn){
+        this.resolve = fn;
+      }
+    }
+    this.perform = function(specFn){
+      var xhrRequest = null;
+      spyOn(this.MockedXMLHttpRequest.prototype, 'open').and.callFake(function(method, url){
+        xhrRequest = this;
+        xhrRequest.url = url
+        xhrRequest.method = method
+        spec.MockedXMLHttpRequest.prototype.open.and.callThrough(this, method, url);
+      })
+      MessageBus.subscribe(path || '/test', function(message){
+        try {
+          specFn.call(spec, message, xhrRequest);
+        } catch( error ){
+          promisy.resolve.call(spec);
+          throw(error);
+        }
+        promisy.resolve.call(spec);
+        done();
+      });
+      return promisy;
+    };
+    testFn.call(this);
+  });
+
+}
+
+afterEach(function(){
+  MessageBus.stop()
+  if (MessageBus.longPoll){
+    MessageBus.longPoll.abort();
+  }
+  MessageBus.callbacks.splice(0, MessageBus.callbacks.length)
+});

data/spec/assets/message-bus.spec.js

@@ -0,0 +1,77 @@
+describe("Messagebus", function() {
+
+  it("submits change requests", function(done){
+    spyOn(this.MockedXMLHttpRequest.prototype, 'send').and.callThrough();
+    var spec = this;
+    MessageBus.subscribe('/test', function(){
+      expect(spec.MockedXMLHttpRequest.prototype.send)
+        .toHaveBeenCalled()
+      var req = JSON.parse(spec.MockedXMLHttpRequest.prototype.send.calls.argsFor(0)[0]);
+      expect(req['/test']).toEqual(-1)
+      expect(req['__seq']).not.toBeUndefined();
+      done()
+    });
+  });
+
+  it("calls callbacks", function(done){
+    MessageBus.subscribe('/test', function(message){
+      expect(message.password).toEqual('MessageBusRocks!');
+      done();
+    });
+  });
+
+  it('stores messages when paused, then delivers them when resumed', function(done){
+    MessageBus.pause()
+    spyOn(this.MockedXMLHttpRequest.prototype, 'send').and.callThrough();
+    var spec = this;
+    var onMessageSpy = jasmine.createSpy('onMessageSpy');
+    MessageBus.subscribe('/test', onMessageSpy);
+    setTimeout(function(){
+      expect(spec.MockedXMLHttpRequest.prototype.send).toHaveBeenCalled()
+      expect(onMessageSpy).not.toHaveBeenCalled()
+      MessageBus.resume()
+    }, 510) // greater than delayPollTimeout of 500
+    setTimeout(function(){
+      expect(onMessageSpy).toHaveBeenCalled()
+      done()
+    }, 550) // greater than first timeout above
+  });
+
+  it('can unsubscribe from callbacks', function(done){
+    var onMessageSpy = jasmine.createSpy('onMessageSpy');
+    MessageBus.subscribe('/test', onMessageSpy);
+    MessageBus.unsubscribe('/test', onMessageSpy);
+    MessageBus.subscribe('/test', function(){
+      expect(onMessageSpy).not.toHaveBeenCalled()
+      done()
+    });
+  });
+
+  testMB('sets dlp paramater when longPolling is disabled', function(){
+    MessageBus.enableLongPolling = false
+    this.perform(function(message, xhr){
+      expect(xhr.url).toMatch("dlp=t");
+    }).finally(function(){
+      MessageBus.enableLongPolling = true
+    })
+  });
+
+  testMB('respects baseUrl setting', function(){
+    MessageBus.baseUrl = "/a/test/base/url/";
+    this.perform(function(message, xhr){
+      expect(xhr.url).toMatch("/a/test/base/url/");
+    }).finally(function(){
+      MessageBus.baseUrl = "/";
+    })
+  });
+
+  it('removes itself from root namespace when noConflict is called', function(){
+    expect(window.MessageBus).not.toBeUndefined();
+    var mb = window.MessageBus;
+    expect(mb).toEqual(window.MessageBus.noConflict());
+    expect(window.MessageBus).toBeUndefined();
+    // reset it so afterEach has something to work on
+    window.MessageBus = mb;
+  });
+
+});

data/spec/assets/support/jasmine.yml

@@ -0,0 +1,136 @@
+# src_files
+#
+# Return an array of filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# src_files:
+#   - lib/source1.js
+#   - lib/source2.js
+#   - dist/**/*.js
+#
+src_files:
+  - assets/message-bus.js
+  - assets/message-bus-ajax.js
+
+
+# stylesheets
+#
+# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# stylesheets:
+#   - css/style.css
+#   - stylesheets/*.css
+#
+# stylesheets:
+#   - stylesheets/**/*.css
+
+# helpers
+#
+# Return an array of filepaths relative to spec_dir to include before jasmine specs.
+# Default: ["helpers/**/*.js"]
+#
+# EXAMPLE:
+#
+# helpers:
+#   - helpers/**/*.js
+#
+helpers:
+  - 'SpecHelper.js'
+
+# spec_files
+#
+# Return an array of filepaths relative to spec_dir to include.
+# Default: ["**/*[sS]pec.js"]
+#
+# EXAMPLE:
+#
+# spec_files:
+#   - **/*[sS]pec.js
+#
+spec_files:
+  - '**/*[sS]pec.js'
+
+# src_dir
+#
+# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+# Default: project root
+#
+# EXAMPLE:
+#
+# src_dir: public
+#
+src_dir:
+
+# spec_dir
+#
+# Spec directory path. Your spec_files must be returned relative to this path.
+# Default: spec/javascripts
+#
+# EXAMPLE:
+#
+# spec_dir: spec/javascripts
+#
+spec_dir: spec/assets
+
+# spec_helper
+#
+# Ruby file that Jasmine server will require before starting.
+# Returned relative to your root path
+# Default spec/javascripts/support/jasmine_helper.rb
+#
+# EXAMPLE:
+#
+# spec_helper: spec/javascripts/support/jasmine_helper.rb
+#
+# spec_helper: spec/javascripts/support/jasmine_helper.rb
+
+# boot_dir
+#
+# Boot directory path. Your boot_files must be returned relative to this path.
+# Default: Built in boot file
+#
+# EXAMPLE:
+#
+# boot_dir: spec/javascripts/support/boot
+#
+boot_dir:
+
+# boot_files
+#
+# Return an array of filepaths relative to boot_dir to include in order to boot Jasmine
+# Default: Built in boot file
+#
+# EXAMPLE
+#
+# boot_files:
+#   - '**/*.js'
+#
+boot_files:
+
+# rack_options
+#
+# Extra options to be passed to the rack server
+# by default, Port and AccessLog are passed.
+#
+# This is an advanced options, and left empty by default
+#
+# EXAMPLE
+#
+# rack_options:
+#   server: 'thin'
+
+# random
+#
+# Run specs in semi-random order.
+# Default: false
+#
+# EXAMPLE:
+#
+# random: true
+#
+random:

data/spec/lib/message_bus/rack/middleware_spec.rb

@@ -38,7 +38,7 @@ describe MessageBus::Rack::Middleware do
 
   module LongPolling
     extend Minitest::Spec::DSL
-    
+
     before do
       @bus.long_polling_enabled = true
     end
@@ -300,6 +300,15 @@ describe MessageBus::Rack::Middleware do
       parsed.length.must_equal 1
     end
 
+    it "can decode a JSON encoded request" do
+      id = @bus.last_id('/foo')
+      @bus.publish("/foo", {json: true})
+      post( "/message-bus/1234",
+            JSON.generate({'/foo' => id}),
+            { "CONTENT_TYPE" => "application/json" })
+      JSON.parse(last_response.body).first["data"].must_equal({'json' => true})
+    end
+
     describe "messagebus.channels env support" do
       let(:extra_middleware) do
         Class.new do

data/vendor/assets/javascripts/message-bus.js

@@ -1,10 +1,11 @@
 /*jshint bitwise: false*/
-"use strict;"
+(function(global, document, undefined) {
+  'use strict';
+  var previousMessageBus = global.MessageBus;
 
-window.MessageBus = (function() {
   // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
   var callbacks, clientId, failCount, shouldLongPoll, queue, responseCallbacks, uniqueId, baseUrl;
-  var me, started, stopped, longPoller, pollTimeout, paused, later;
+  var me, started, stopped, longPoller, pollTimeout, paused, later, jQuery, interval, chunkedBackoff;
 
   uniqueId = function() {
     return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
@@ -25,10 +26,9 @@ window.MessageBus = (function() {
   paused = false;
   later = [];
   chunkedBackoff = 0;
-
+  jQuery = global.jQuery;
   var hiddenProperty;
 
-
   (function(){
     var prefixes = ["","webkit","ms","moz"];
     for(var i=0; i<prefixes.length; i++) {
@@ -161,38 +161,55 @@ window.MessageBus = (function() {
       }
     };
 
+    var setOnProgressListener = function(xhr) {
+      var position = 0;
+      // if it takes longer than 3000 ms to get first chunk, we have some proxy
+      // this is messing with us, so just backoff from using chunked for now
+      var chunkedTimeout = setTimeout(disableChunked,3000);
+      xhr.onprogress = function () {
+        clearTimeout(chunkedTimeout);
+        if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
+          // not chunked we are sending json back
+          chunked = false;
+          return;
+        }
+        position = handle_progress(xhr.responseText, position);
+      }
+    };
+    if (!me.ajax){
+      throw new Error("Either jQuery or the ajax adapter must be loaded");
+    }
     var req = me.ajax({
-      url: me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!longPoll ? "dlp=t" : ""),
+      url: me.baseUrl + "message-bus/" + me.clientId + "/poll" + (!longPoll ? "?dlp=t" : ""),
       data: data,
       cache: false,
       dataType: dataType,
       type: 'POST',
       headers: headers,
+      messageBus: {
+        chunked: chunked,
+        onProgressListener: function(xhr) {
+          var position = 0;
+          // if it takes longer than 3000 ms to get first chunk, we have some proxy
+          // this is messing with us, so just backoff from using chunked for now
+          var chunkedTimeout = setTimeout(disableChunked,3000);
+          return xhr.onprogress = function () {
+            clearTimeout(chunkedTimeout);
+            if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
+              chunked = false; // not chunked, we are sending json back
+            } else {
+              position = handle_progress(xhr.responseText, position);
+            }
+          }
+        }
+      },
       xhr: function() {
-         var xhr = jQuery.ajaxSettings.xhr();
-
-         if (!chunked) {
-            return xhr;
-         }
-
-         var position = 0;
-
-         // if it takes longer than 3000 ms to get first chunk, we have some proxy
-         // this is messing with us, so just backoff from using chunked for now
-         var chunkedTimeout = setTimeout(disableChunked,3000);
-
-         xhr.onprogress = function () {
-           clearTimeout(chunkedTimeout);
-
-           if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
-             // not chunked we are sending json back
-             chunked = false;
-             return;
-           }
-           position = handle_progress(xhr.responseText, position);
-         }
-
-         return xhr;
+        var xhr = jQuery.ajaxSettings.xhr();
+        if (!chunked) {
+          return xhr;
+        }
+        this.messageBus.onProgressListener(xhr);
+        return xhr;
       },
       success: function(messages) {
          if (!chunked) {
@@ -257,10 +274,11 @@ window.MessageBus = (function() {
     clientId: clientId,
     alwaysLongPoll: false,
     baseUrl: baseUrl,
-    // TODO we can make the dependency on $ and jQuery conditional
-    // all we really need is an implementation of ajax
-    ajax: ($ && $.ajax),
-
+    ajax: (jQuery && jQuery.ajax),
+    noConflict: function(){
+      global.MessageBus = global.MessageBus.previousMessageBus;
+      return this;
+    },
     diagnostics: function(){
       console.log("Stopped: " + stopped + " Started: " + started);
       console.log("Current callbacks");
@@ -317,7 +335,7 @@ window.MessageBus = (function() {
 
       // monitor visibility, issue a new long poll when the page shows
       if(document.addEventListener && 'hidden' in document){
-        me.visibilityEvent = document.addEventListener('visibilitychange', function(){
+        me.visibilityEvent = global.document.addEventListener('visibilitychange', function(){
           if(!document.hidden && !me.longPoll && pollTimeout){
             clearTimeout(pollTimeout);
             pollTimeout = null;
@@ -366,7 +384,7 @@ window.MessageBus = (function() {
 
       for (var i=callbacks.length-1; i>=0; i--) {
 
-        callback = callbacks[i];
+        var callback = callbacks[i];
         var keep;
 
         if (glob) {
@@ -392,6 +410,5 @@ window.MessageBus = (function() {
       return removed;
     }
   };
-
-  return me;
-})();
+  global.MessageBus = me;
+})(window, document);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.5
+  version: 2.0.0.beta.6
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jasmine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A message bus for rack
 email:
 - sam.saffron@gmail.com
@@ -73,6 +87,7 @@ files:
 - assets/handlebars.js
 - assets/index.handlebars
 - assets/jquery-1.8.2.js
+- assets/message-bus-ajax.js
 - assets/message-bus.js
 - examples/bench/bench.lua
 - examples/bench/config.ru
@@ -102,6 +117,9 @@ files:
 - lib/message_bus/timer_thread.rb
 - lib/message_bus/version.rb
 - message_bus.gemspec
+- spec/assets/SpecHelper.js
+- spec/assets/message-bus.spec.js
+- spec/assets/support/jasmine.yml
 - spec/lib/fake_async_middleware.rb
 - spec/lib/message_bus/assets/asset_encoding_spec.rb
 - spec/lib/message_bus/backends/postgres_spec.rb
@@ -139,6 +157,9 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
+- spec/assets/SpecHelper.js
+- spec/assets/message-bus.spec.js
+- spec/assets/support/jasmine.yml
 - spec/lib/fake_async_middleware.rb
 - spec/lib/message_bus/assets/asset_encoding_spec.rb
 - spec/lib/message_bus/backends/postgres_spec.rb