message_bus 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540d941673f27bbce348815bdc0e76b5dda46f54
-  data.tar.gz: 7497c9ff05c2c0752f40dd4e11fe892fecaef57e
+  metadata.gz: ef40442bfe83abc9cd8b0a7be99fcb4e27f76a56
+  data.tar.gz: cfb98a433dd8a32d7dc405ec4e95c59297046bae
 SHA512:
-  metadata.gz: 3d139e29977062c4072488a6b3d49dbf3795aa7d0a2ffedb51d80f6b7f5a0b73d432a7d2d467a1a0e70fc57accd1d8214cb5245e8864c7eadb846d298257c1f7
-  data.tar.gz: 29913ebc677903bc51f89e94b01ae1c357b349ba154615131dfd682ee26007bcf59f7cf2bca22fae54ec766822913b4c5391118397fb8f5dec8e4bdf433f32e0
+  metadata.gz: 8c8a9b6a258c7dbdbc35b3b675a3b67b278060a95249f8c2ac8de3a1761654941a7251e62267901ecb75ae8af7bb6fd6c08c3a6e5b4ff74f41325bcdd9ea3960
+  data.tar.gz: 401b34231fc26a549cb4443e7306b9675b1457d07ec717375882a58818d74f418350441421381b6d055d64774703d1d9e462892e9d0585adc139cf847e0617cb

data/CHANGELOG

@@ -1,3 +1,8 @@
+23-09-2014
+- Version 1.0.1
+- Feature: $.ajax dependency can be passed in.
+- Feature: unsubscribe accepts a second param for the function to unsubscribe.
+
 22-09-2014
 - Version 1.0.0
 - Feature: add backgroundCallbackInterval - interval to send polls when page is in the background

data/assets/message-bus.js

@@ -59,8 +59,8 @@ window.MessageBus = (function() {
     var aborted = false;
     lastAjax = new Date();
     totalAjaxCalls += 1;
-    
-    return $.ajax({
+
+    return me.ajax({
       url: me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!shouldLongPoll() || !me.enableLongPolling ? "dlp=t" : ""),
       data: data,
       cache: false,
@@ -145,6 +145,9 @@ 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,
 
     diagnostics: function(){
       console.log("Stopped: " + stopped + " Started: " + started);
@@ -227,7 +230,7 @@ window.MessageBus = (function() {
     },
 
     // Unsubscribe from a channel
-    unsubscribe: function(channel) {
+    unsubscribe: function(channel, func) {
       // TODO proper globbing
       var glob;
       if (channel.indexOf("*", channel.length - 1) !== -1) {
@@ -235,12 +238,21 @@ window.MessageBus = (function() {
         glob = true;
       }
       callbacks = $.grep(callbacks,function(callback) {
+        var keep;
+
         if (glob) {
-          return callback.channel.substr(0, channel.length) !== channel;
+          keep = callback.channel.substr(0, channel.length) !== channel;
         } else {
-          return callback.channel !== channel;
+          keep = callback.channel !== channel;
+        }
+
+        if(!keep && func && callback.func !== func){
+          keep = true;
         }
+
+        return keep;
       });
+
       if (me.longPoll) {
         return me.longPoll.abort();
       }

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

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

@@ -59,8 +59,8 @@ window.MessageBus = (function() {
     var aborted = false;
     lastAjax = new Date();
     totalAjaxCalls += 1;
-    
-    return $.ajax({
+
+    return me.ajax({
       url: me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!shouldLongPoll() || !me.enableLongPolling ? "dlp=t" : ""),
       data: data,
       cache: false,
@@ -145,6 +145,9 @@ 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,
 
     diagnostics: function(){
       console.log("Stopped: " + stopped + " Started: " + started);
@@ -227,7 +230,7 @@ window.MessageBus = (function() {
     },
 
     // Unsubscribe from a channel
-    unsubscribe: function(channel) {
+    unsubscribe: function(channel, func) {
       // TODO proper globbing
       var glob;
       if (channel.indexOf("*", channel.length - 1) !== -1) {
@@ -235,12 +238,21 @@ window.MessageBus = (function() {
         glob = true;
       }
       callbacks = $.grep(callbacks,function(callback) {
+        var keep;
+
         if (glob) {
-          return callback.channel.substr(0, channel.length) !== channel;
+          keep = callback.channel.substr(0, channel.length) !== channel;
         } else {
-          return callback.channel !== channel;
+          keep = callback.channel !== channel;
+        }
+
+        if(!keep && func && callback.func !== func){
+          keep = true;
         }
+
+        return keep;
       });
+
       if (me.longPoll) {
         return me.longPoll.abort();
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack