Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Migrate JSON to EJSON #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+23 −10
Open

Migrate JSON to EJSON #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f32476
added package ejson and migrated JSON => EJSON
fermuch Jan 5, 2016
2790257
modified tests to use EJSON instead of JSON
fermuch Jan 5, 2016
058fdad
added test specific to EJSON
fermuch Jan 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"webpack": "^1.10.1"
},
"dependencies": {
"ejson": "^2.1.2",
"wolfy87-eventemitter": "^4.2.11"
}
}
7 changes: 4 additions & 3 deletions src/socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import EventEmitter from "wolfy87-eventemitter";
import EJSON from "ejson";

export default class Socket extends EventEmitter {

Expand All @@ -16,10 +17,10 @@ export default class Socket extends EventEmitter {
}

send (object) {
var message = JSON.stringify(object);
var message = EJSON.stringify(object);
this.rawSocket.send(message);
// Emit a copy of the object, as the listener might mutate it.
this.emit("message:out", JSON.parse(message));
this.emit("message:out", EJSON.parse(message));
}

connect () {
Expand All @@ -38,7 +39,7 @@ export default class Socket extends EventEmitter {
this.rawSocket.onmessage = (message) => {
var object;
try {
object = JSON.parse(message.data);
object = EJSON.parse(message.data);
} catch (ignore) {
// Simply ignore the malformed message and return
return;
Expand Down
25 changes: 18 additions & 7 deletions test/socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import sinonChai from "sinon-chai";
chai.use(sinonChai);

import Socket from "../src/socket";
import EJSON from "ejson";

class SocketConstructorMock {}

Expand All @@ -29,7 +30,7 @@ describe("`Socket` class", function () {
var object = {
a: "a"
};
var expectedMessage = JSON.stringify(object);
var expectedMessage = EJSON.stringify(object);
socket.send(object);
expect(socket.rawSocket.send).to.have.been.calledWith(expectedMessage);
});
Expand Down Expand Up @@ -109,26 +110,36 @@ describe("`Socket` class", function () {

it("parses message data into an object", function () {
var socket = new Socket(SocketConstructorMock);
sinon.stub(JSON, "parse");
sinon.stub(EJSON, "parse");
socket.connect();
socket.rawSocket.onmessage({data: "message"});
expect(JSON.parse).to.have.been.calledWith("message");
JSON.parse.restore();
expect(EJSON.parse).to.have.been.calledWith("message");
EJSON.parse.restore();
});

it("ignores malformed messages", function () {
var socket = new Socket(SocketConstructorMock);
sinon.stub(JSON, "parse").throws();
sinon.stub(EJSON, "parse").throws();
socket.connect();
expect(socket.rawSocket.onmessage).not.to.throw();
JSON.parse.restore();
EJSON.parse.restore();
});

it("parses correctly EJSON-specific data types", function () {
var socket = new Socket(SocketConstructorMock);
var testDate = new Date();
sinon.stub(EJSON, "parse");
socket.connect();
socket.rawSocket.onmessage({data: testDate});
expect(EJSON.parse).to.have.been.calledWith(testDate);
EJSON.parse.restore();
});

it("emits `message:in` events", function () {
var socket = new Socket(SocketConstructorMock);
socket.emit = sinon.spy();
socket.connect();
socket.rawSocket.onmessage({data: JSON.stringify({a: "a"})});
socket.rawSocket.onmessage({data: EJSON.stringify({a: "a"})});
expect(socket.emit).to.have.been.calledWith("message:in", {a: "a"});
});

Expand Down