Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
0.4.0
Browse files Browse the repository at this point in the history
* add client support for server
  • Loading branch information
sergioramos committed Feb 11, 2013
1 parent 4cc2316 commit 64b10d1
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 19 deletions.
1 change: 0 additions & 1 deletion .npmignore
Expand Up @@ -3,6 +3,5 @@ node_modules
components
build
component.json
src/client
dist
docs
2 changes: 1 addition & 1 deletion bower.json
@@ -1,5 +1,5 @@
{
"name": "restio",
"version": "0.3.2",
"version": "0.4.0",
"main": "./dist/restio.js"
}
2 changes: 1 addition & 1 deletion component.json
@@ -1,7 +1,7 @@
{
"name": "restio",
"license": "MIT",
"version": "0.3.2",
"version": "0.4.0",
"twitter": "@ramitos",
"description": "REST-like syntax for WebSockets",
"main": "src/client/restio.js",
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "restio",
"license": "MIT",
"version": "0.3.2",
"version": "0.4.0",
"author": "Sérgio Ramos",
"description": "REST-like syntax for WebSockets",
"main": "src/server/restio.js",
Expand Down
12 changes: 7 additions & 5 deletions src/client/restio.js
@@ -1,17 +1,19 @@
var methods = require('../methods'),
var requires = require('../requires'),
methods = require('../methods'),
packet = require('../packet'),
setup = require('../setup'),
mr = require('match-route'),
eio = require('engine.io'),
getOn = require('../on'),
ev = require('emitter');
getOn = require('../on');

var eio = requires.eio;
var ev = requires.ev;

module.exports.connect = function (addr, callback) {
var socket = new eio.Socket(addr);
var callbacks = {};
var io = new ev();
var routes = {};

methods.forEach(function (method) {
setup.methods(method, callbacks, routes);
setup.request(method, io, socket, callbacks);
Expand Down
6 changes: 3 additions & 3 deletions src/on.js
@@ -1,7 +1,7 @@
var platform = require('./platform'),
var type = require('./requires').type,
platform = require('./platform'),
packet = require('./packet'),
mr = require('match-route'),
type = require('./type');
mr = require('match-route')

module.exports = function (socket, callbacks, routes) {
var on = {};
Expand Down
11 changes: 11 additions & 0 deletions src/requires.js
@@ -0,0 +1,11 @@
var platform = require('./platform');

if(platform == 'browser') {
module.exports.eio = require('engine.io');
module.exports.ev = require('emitter');
module.exports.type = require('type');
} else {
module.exports.ev = require('events').EventEmitter;
module.exports.eio = require('engine.io-client');
module.exports.type = require('type-component');
}
4 changes: 3 additions & 1 deletion src/server/restio.js
@@ -1,9 +1,11 @@
var ev = require('events').EventEmitter,
var ev = require('../requires').ev,
methods = require('../methods'),
setup = require('../setup'),
cookie = require('cookie'),
getOn = require('../on');

module.exports.client = require('../client/restio');

module.exports.listen = function () {
var server = setup.server(Array.prototype.slice.call(arguments).shift());
var callbacks = {};
Expand Down
8 changes: 5 additions & 3 deletions src/setup.js
@@ -1,11 +1,13 @@
var methods = require('./methods'),
engine = require('engine.io'),
var requires = require('../requires'),
methods = require('./methods'),
packet = require('./packet'),
assert = require('assert'),
type = require('./type'),
sgen = require('sgen'),
noop = function () {};

var engine = requires.eio
var type = requires.type

module.exports.methods = function (method, callbacks, routes) {
callbacks[method] = {};
routes[method] = {};
Expand Down
3 changes: 0 additions & 3 deletions src/type.js

This file was deleted.

0 comments on commit 64b10d1

Please sign in to comment.