transistor 0.1.5 → 0.1.6

data/lib/assets/javascripts/transistor.js

@@ -84,7 +84,7 @@ var JSONP = function(){
     };
 };
 
-/*global JSONP, Faye */
+/*global Faye */
 if (window.Transistor === undefined) {
     window.Transistor = {};
 }
@@ -93,60 +93,62 @@ if (window.Transistor === undefined) {
 
     var Radio = (function () {
 
-        return function (station_finder, station_uid, token, cache) {
-            var jsonp, init_url, bayeux, listeners, turnOn, error, tune, build_channel_path;
+        return function (aerial_url, station_uid, token, cache) {
+            var radio = this,
+                faye,
+                H,
+                Extension;
 
-            jsonp = JSONP();
-
-            init_url = station_finder + '/init/' + station_uid + '/' + token;
-            listeners = [];
-
-            turnOn = function () {
-                var initial_value;
+            H = (function () {
+                var callbacks = {},
+                    buildChannel;
 
-                jsonp.get(init_url, {}, function (init) {
-                    if (init.error !== undefined) {
-                        error(init);
-                    }
+                buildChannel = function (channel_path) {
+                    return ['', station_uid, token, channel_path].join('/');
+                };
 
-                    bayeux = new Faye.Client(init.aerial_url, { retry: 3 });
+                return {
+                    registerCallback: function (channel_path, callback) {
+                        var channel = buildChannel(channel_path),
+                            listener = function (message) {
+                                callback(message.event, message.args);
+                            };
 
-                    for (var i = 0; i < listeners.length; i += 1) {
-                        initial_value = init.channels[listeners[i].channel_path];
+                        callbacks[channel_path] = listener;
 
-                        if (initial_value !== undefined) { 
-                            listeners[i].callback({
-                                event:  'init',
-                                args:   initial_value
-                            });
-                        }
+                        faye.subscribe(channel, listener);
+                    },
+                    triggerCallback: function (channel_path, message) {
+                        callbacks[channel_path](message);
+                    }
+                };
+            }());
 
-                        bayeux.subscribe(build_channel_path(listeners[i].channel_path), listeners[i].callback);
+            Extension = (function () {
+                var process = function (message, callback) {
+                    if (message.ext && message.ext.init) {
+                        var channel_path = message.subscription.split('/').splice(3).join('/');
+                        H.triggerCallback(channel_path, {
+                            event: 'init',
+                            args: message.ext.init.collection
+                        });
                     }
-                });
-            };
+                    callback(message);
+                };
 
-            error = function (args) {
-                throw "Init error: \"" + args.error + "\"";
-            };
+                return function () {
+                    this.incoming = process;
+                };
+            }());
 
-            tune = function (channel_path, callback) {
-                listeners.push({
-                    channel_path: channel_path,
-                    callback: function (event) {
-                        callback(event.event, event.args);
-                    }
-                });
-            };
+            faye = new Faye.Client(aerial_url);
+            faye.addExtension(new Extension());
 
-            build_channel_path = function (channel_path) {
-                return '/' + station_uid + '/' + token + '/' + channel_path;
+            radio.tune = function (channel_path, callback) {
+                H.registerCallback(channel_path, callback);
             };
 
-            return {
-                tune: tune,
-                turnOn: turnOn
-            };
+            return radio;
         };
     }());
 
@@ -333,12 +335,10 @@ if (window.Transistor === undefined) {
                 }
             };
 
-            return {
-                set: set,
-                insert: insert,
-                update: update,
-                remove: remove
-            };
+            this.set = set;
+            this.insert = insert;
+            this.update = update;
+            this.remove = remove;
         };
     }());
 

data/spec/javascripts/TransistorBackboneCollectionSpec.js

@@ -19,7 +19,7 @@ describe("Transistor.Backbone.Collection", function () {
             return stub;
         }());
 
-        collection = Transistor.Backbone.Collection({
+        collection = new Transistor.Backbone.Collection({
             channel: 'news',
             radio: radio
         })

data/spec/javascripts/TransistorControlSpec.js

@@ -48,7 +48,7 @@ describe("Transistor.Control", function () {
             return me;
         }());
 
-        control = Transistor.Control("broadcaster_url", "station_uid", "token");
+        control = new Transistor.Control("broadcaster_url", "station_uid", "token");
     });
 
     describe("set", function () {

data/spec/javascripts/TransistorRadioSpec.js

@@ -0,0 +1,112 @@
+describe("Transistor.Radio", function () {
+    var faye = {}, 
+        servers = {
+            'without_collection': 'http://localhost:12001/faye',
+            'with_collection': 'http://localhost:12002/faye'
+        };
+
+    beforeEach(function () {
+        _.each(servers, function (url, key) {
+            faye[key] = new Faye.Client(url);
+        })
+    });
+
+    afterEach(function () {
+    });
+
+    describe('subscription to empty collection', function () {
+        var radio, calls;
+
+        it('triggers an init event', function () {
+            radio = new Transistor.Radio(servers['without_collection'], 'station_uid', 'token');
+
+            calls = [];
+
+            runs(function () {
+                radio.tune('test/channel', function (event, args) {
+                    calls.push({
+                        event: event,
+                        args: args
+                    });
+                });
+            });
+
+            waits(100);
+
+            runs(function () {
+                assertEqual(calls.length, 1);
+                assertEqual(calls[0].event, 'init');
+                assertEqual(calls[0].args, []);
+            });
+        });
+    });
+
+    describe('subscription to filled collection', function () {
+        var radio, calls;
+
+        it('triggers an init event', function () {
+            radio = new Transistor.Radio(servers['with_collection'], 'station_uid', 'token');
+
+            calls = [];
+
+            runs(function () {
+                radio.tune('test/channel', function (event, args) {
+                    calls.push({
+                        event: event,
+                        args: args
+                    });
+                });
+            });
+
+            waits(100);
+
+            runs(function () {
+                assertEqual(calls.length, 1);
+                assertEqual(calls[0].event, 'init');
+                assertEqual(calls[0].args, [{abcd: 1}, {efgh: 23}]);
+            });
+        });
+    });
+
+    describe('channel events', function () {
+        var radio, calls;
+
+        it('triggers the callback', function () {
+            radio = new Transistor.Radio(servers['with_collection'], 'station_uid', 'token');
+
+            calls = [];
+
+            runs(function () {
+                radio.tune('test/channel', function (event, args) {
+                    calls.push({
+                        event: event,
+                        args: args
+                    });
+                });
+            });
+
+            waits(100);
+
+            runs(function () {
+                channel_path = '/station_uid/token/test/channel'
+                message = {
+                    event: 'insert',
+                    args: {
+                        entry: {}
+                    }
+                }
+
+                faye['with_collection'].publish(channel_path, message)
+            });
+
+            waits(100);
+
+            runs(function () {
+                assertEqual(calls.length, 2);
+                assertEqual(calls[1].event, 'insert');
+                assertEqual(calls[1].args, {entry: {}});
+            });
+        });
+    });
+
+});

data/spec/servers.rb

@@ -0,0 +1,41 @@
+require 'faye'
+
+class Extension
+  attr_reader :collection
+
+  def initialize(collection = [])
+    @collection = collection  
+  end
+
+  def outgoing(message, callback)
+    if(message['channel'] == '/meta/subscribe')
+      (message['ext'] ||= {}).tap do |ext|
+        ext[:init] ||= {}
+        ext[:init][:collection] = collection
+      end
+    end
+    callback.call(message)
+  end
+end
+
+servers = []
+
+servers << Thread.new do
+  Faye::RackAdapter.new({
+    :mount => '/faye',
+    :extensions => [
+      Extension.new
+    ]
+  }).listen(12001)
+end
+
+servers << Thread.new do
+  Faye::RackAdapter.new({
+    :mount => '/faye',
+    :extensions => [
+      Extension.new([{abcd: 1}, {efgh: 23}])
+    ]
+  }).listen(12002)
+end
+
+servers.each(&:join)

data/transistor.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = "transistor"
-  spec.version        = "0.1.5"
+  spec.version        = "0.1.6"
 
   spec.authors        = ["Jakob Holderbaum"]
   spec.email          = ["jakob@featurefabrik.de"]
@@ -20,4 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "jslint-v8"
   spec.add_development_dependency "jake"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "faye"
+  spec.add_development_dependency "thin"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transistor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jakob Holderbaum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faye
+  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'
+- !ruby/object:Gem::Dependency
+  name: thin
+  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: 
 email:
 - jakob@featurefabrik.de
@@ -120,10 +148,12 @@ files:
 - spec/javascripts/TransistorBackboneCollectionSpec.js
 - spec/javascripts/TransistorBinderSpec.js
 - spec/javascripts/TransistorControlSpec.js
+- spec/javascripts/TransistorRadioSpec.js
 - spec/javascripts/helpers/AssertHelpers.js
 - spec/javascripts/support/backbone.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/underscore.js
+- spec/servers.rb
 - transistor.gemspec
 homepage: http://www.featurefabrik.de
 licenses:
@@ -153,7 +183,9 @@ test_files:
 - spec/javascripts/TransistorBackboneCollectionSpec.js
 - spec/javascripts/TransistorBinderSpec.js
 - spec/javascripts/TransistorControlSpec.js
+- spec/javascripts/TransistorRadioSpec.js
 - spec/javascripts/helpers/AssertHelpers.js
 - spec/javascripts/support/backbone.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/underscore.js
+- spec/servers.rb