Skip to content

Commit

Permalink
instead of lodash.assign using o.extend to get expose working for dee…
Browse files Browse the repository at this point in the history
…ply nested objects
  • Loading branch information
capaj committed May 31, 2015
1 parent e1f8d16 commit 2f2c2f4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require('error-tojson');
require('o.extend');

var express = require('express');
var socketIO = require('socket.io');

var assign = require('lodash.assign');
var socketEventHandlers = require('./socket.io-rpc-event-handlers/socket-event-handlers');
/**
* @param {Number} port
Expand All @@ -22,12 +22,12 @@ function RPCserver(port) {
if (typeof toExtendWith !== 'object') {
throw new TypeError('object expected as first argument');
}
assign(tree, toExtendWith);
Object.extend(tree, toExtendWith);
}
};
var tree = {};
rpcServer.io.on('connect', function(socket) {
assign(rpcServer, socketEventHandlers(socket, tree, 'server'));
socketEventHandlers(socket, tree, 'server');
});

rpcServer.expressApp = expApp;
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "socket.io-rpc",
"version": "0.9.7",
"version": "0.9.8",
"private": false,
"author": "capaj <capajj@gmail.com>",
"description": "Minimalistic remote procedure call(RPC/RMI) library bootstrapped on socket.io",
Expand All @@ -27,7 +27,7 @@
"dom-storage": "^2.0.1",
"error-tojson": "0.0.1",
"express": "~4",
"lodash.assign": "3.2.0",
"o.extend": "^1.0.0",
"socket.io": "^1",
"traverse": "^0.6.6"
},
Expand Down

0 comments on commit 2f2c2f4

Please sign in to comment.