Skip to content

Commit

Permalink
Merge pull request #81 from zettajs/zetta-rels-module
Browse files Browse the repository at this point in the history
Update zetta to use new zetta-rels module. Yay modularity
  • Loading branch information
Matthew Dobson committed Oct 10, 2014
2 parents bcac19c + 968a6c3 commit 38c7419
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 24 deletions.
2 changes: 1 addition & 1 deletion lib/api_formats/siren/device.siren.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var url = require('url');
var rel = require('../../api_rels');
var rel = require('zetta-rels');

module.exports = function(context) {
var loader = context.loader;
Expand Down
2 changes: 1 addition & 1 deletion lib/api_formats/siren/devices.siren.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var rel = require('../../api_rels');
var rel = require('zetta-rels');

module.exports = function(context) {

Expand Down
2 changes: 1 addition & 1 deletion lib/api_formats/siren/server.siren.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var rel = require('../../api_rels');
var rel = require('zetta-rels');
var device_format = require('./device.siren');

module.exports = function(context) {
Expand Down
15 changes: 0 additions & 15 deletions lib/api_rels.js

This file was deleted.

2 changes: 1 addition & 1 deletion lib/api_resources/peer_management.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var querystring = require('querystring');
var PeerClient = require('../peer_client');
var rels = require('../api_rels');
var rels = require('zetta-rels');
var MediaType = require('api-media-type');

var PeerManagementResource = module.exports = function(server) {
Expand Down
2 changes: 1 addition & 1 deletion lib/api_resources/root.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var rels = require('../api_rels');
var rels = require('zetta-rels');
var MediaType = require('api-media-type');

var RootResource = module.exports = function(server) {
Expand Down
2 changes: 1 addition & 1 deletion lib/http_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var PeersManagementResource = require('./api_resources/peer_management');
var RootResource = require('./api_resources/root');
var ServersResource = require('./api_resources/servers');
var PubSubResource = require('./api_resources/pubsub_subscriptions');
var rels = require('./api_rels');
var rels = require('zetta-rels');

var ZettaHttpServer = module.exports = function(zettaInstance) {
this.idCounter = 0;
Expand Down
2 changes: 1 addition & 1 deletion lib/virtual_device.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var url = require('url');
var util = require('util');
var ReadableStream = require('stream').Readable;
var EventEmitter = require('events').EventEmitter;
var rels = require('./api_rels');
var rels = require('zetta-rels');

var VirtualStream = module.exports = function(topic, socket, options) {
ReadableStream.call(this, options);
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"zetta-device": "^0.7.0",
"zetta-http-device": "^0.2.0",
"zetta-scout": "^0.3.0",
"zetta-streams": "^0.1.0"
"zetta-streams": "^0.1.0",
"zetta-rels": "^0.1.0"
},
"devDependencies": {
"memdown": "^0.10.2",
Expand Down
2 changes: 1 addition & 1 deletion test/test_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var os = require('os');
var request = require('supertest');
var zetta = require('../zetta');
var Query = require('calypso').Query;
var rels = require('../lib/api_rels');
var rels = require('zetta-rels');
var Scout = require('./fixture/example_scout');
var Driver = require('./fixture/example_driver');
var HttpDriver = require('./fixture/example_http_driver');
Expand Down

0 comments on commit 38c7419

Please sign in to comment.