Merge pull request #10 from kamilkisiela/master

Add forward method and prefix option

Author: nullivex

README.md

@@ -161,8 +161,10 @@ angular.module('app')
 
 ## Changelog
 
-### 1.1.0
+### 1.1.1
+* Add `forward` support
 
+### 1.1.0
 * .receive will acknowledge any .emit events with a callback as the last parameter
 
 ### 1.0.0

angular-socket.io-mock.js

@@ -1,8 +1,12 @@
 /* global angular: false */
 var ng = angular.module('btford.socket-io',[])
 ng.provider('socketFactory',function(){
+  var defaultPrefix = 'socket:';
   this.$get = function($rootScope){
-    return function socketFactory () {
+    return function socketFactory (options) {
+      options = options || {};
+      var prefix = options.prefix === undefined ? defaultPrefix : options.prefix;
+      var defaultScope = options.scope || $rootScope;
       var obj = {};
       obj.events = {};
       obj.emits = {};
@@ -25,6 +29,24 @@ ng.provider('socketFactory',function(){
         this.emits[eventName].push(args);
       };
 
+      // when socket.on('someEvent', fn (data) { ... }),
+      // call scope.$broadcast('someEvent', data)
+      obj.forward = function (events, scope) {
+        var self = this;
+        if (events instanceof Array === false) {
+          events = [events];
+        }
+        if (!scope) {
+          scope = $rootScope;
+        }
+        events.forEach(function (eventName) {
+          var prefixedEvent = prefix + eventName;
+          obj.on(eventName, function (data) {
+            scope.$broadcast(prefixedEvent, data);
+          });
+        });
+      };
+
       //simulate an inbound message to the socket from the server (only called from the test)
       obj.receive = function(eventName){
         var args = Array.prototype.slice.call(arguments,1);

angular-socket.io-mock.spec.js

@@ -1,36 +1,65 @@
 /* global expect: false, it: false, describe: false */
 'use strict';
 
-describe('Angular Socket.io Mock',function(){
-  var socketFactory;
-  beforeEach(module('btford.socket-io'))
-  beforeEach(inject(function(_socketFactory_){ socketFactory = _socketFactory_ }));
-  it('should be able to listen on an event', function(){
-    expect(new socketFactory().on('test-event',function(){})).not.toBe(false)
-  });
-  it('should be able to listen once event', function(){
-    expect(new socketFactory().once('test-event',function(){})).not.toBe(false)
-  });
-  it('should be able to emit an event', function(){
-    expect(new socketFactory().emit('test-event',{})).not.toBe(false)
-  });
-  it('should be able to receive an event', function(){
-    expect(new socketFactory().receive('test-event',{})).not.toBe(false)
-  });
-  it('should be able to acknowledge an emited event only once',function(done){
-    var socket = new socketFactory();
-    var timesCalled = 0;
-
-    socket.emit('test-event',{}, function(resp){
-      expect(resp).not.toBe(false);
-      expect(++timesCalled).toEqual(1);
+describe('Angular Socket.io Mock', function () {
+    var socketFactory;
+    var $rootScope;
+    beforeEach(module('btford.socket-io'))
+    beforeEach(inject(function (_socketFactory_, _$rootScope_) {
+        socketFactory = _socketFactory_
+        $rootScope = _$rootScope_;
+    }));
+    it('should be able to listen on an event', function () {
+        expect(new socketFactory().on('test-event', function () {
+        })).not.toBe(false)
+    });
+    it('should be able to listen once event', function () {
+        expect(new socketFactory().once('test-event', function () {
+        })).not.toBe(false)
+    });
+    it('should be able to emit an event', function () {
+        expect(new socketFactory().emit('test-event', {})).not.toBe(false)
     });
+    it('should be able to receive an event', function () {
+        expect(new socketFactory().receive('test-event', {})).not.toBe(false)
+    });
+    it('should be able to acknowledge an emited event only once', function (done) {
+        var socket = new socketFactory();
+        var timesCalled = 0;
+
+        socket.emit('test-event', {}, function (resp) {
+            expect(resp).not.toBe(false);
+            expect(++timesCalled).toEqual(1);
+        });
 
-    socket.receive('test-event', {});
-    socket.receive('test-event', {});
+        socket.receive('test-event', {});
+        socket.receive('test-event', {});
 
-    setTimeout(function() { // Wait to see if the event was acknowledged twice
-      done();
-    }, 100);
-  });
+        setTimeout(function () { // Wait to see if the event was acknowledged twice
+            done();
+        }, 100);
+    });
+    it('should be able to forward an event with default prefix', function () {
+        var socket = new socketFactory();
+        spyOn($rootScope, "$broadcast");
+        socket.forward('test-event');
+        socket.receive('test-event', {'test-data': 'test-value'});
+        expect($rootScope.$broadcast).toHaveBeenCalledWith('socket:test-event', {'test-data': 'test-value'});
+    });
+    it('should be able to forward an event with custom prefix', function () {
+        var socket = new socketFactory({prefix: 'test-prefix:'});
+        spyOn($rootScope, "$broadcast");
+        socket.forward('test-event');
+        socket.receive('test-event', {'test-data': 'test-value'});
+        expect($rootScope.$broadcast).toHaveBeenCalledWith('test-prefix:test-event', {'test-data': 'test-value'});
+    });
+    it('should be able to forward events', function () {
+        var socket = new socketFactory({prefix: 'test-prefix:'});
+        spyOn($rootScope, "$broadcast").and.callThrough;
+        socket.forward(['test-event1', 'test-event2']);
+        socket.receive('test-event1', {'test-data1': 'test-value1'});
+        socket.receive('test-event2', {'test-data2': 'test-value2'});
+        expect($rootScope.$broadcast).toHaveBeenCalledWith('test-prefix:test-event1', {'test-data1': 'test-value1'});
+        expect($rootScope.$broadcast).toHaveBeenCalledWith('test-prefix:test-event2', {'test-data2': 'test-value2'});
+    });
 })

bower.json

@@ -1,8 +1,9 @@
 {
   "name": "angular-socket.io-mock",
-  "version": "1.1.1",
+  "version": "1.1.2",
+  "main": "./angular-socket.io-mock.js",
   "dependencies": {
-    "angular": "latest",
-    "angular-socket-io": "latest"
+    "angular": "~1.4.5",
+    "angular-socket-io": "~0.7.0"
   }
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-socket.io-mock",
   "description": "Drop in Mock replacement for angular-socket-io",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "authors": [
     {
       "name": "Bryan Tong",