Skip to content

Commit

Permalink
Upgrade Proof to 0.0.50.
Browse files Browse the repository at this point in the history
Closes #326.
  • Loading branch information
flatheadmill committed Sep 30, 2014
1 parent 3d9c87e commit c16b8e8
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -12,7 +12,7 @@
"bugs": "https://github.com/bigeasy/packet/issues",
"devDependencies":
{
"proof": "0.0.47",
"proof": "0.0.50",
"uglify-js": "~1.3"
},
"dependencies":
Expand Down
3 changes: 3 additions & 0 deletions release.ft
@@ -0,0 +1,3 @@
### Issue by Issue

* Upgrade Proof to 0.0.50. #326.
34 changes: 17 additions & 17 deletions t/cycle/proof.js
@@ -1,4 +1,4 @@
module.exports = require('proof')(function (counter, equal, deepEqual) {
require('proof')(module, function (body, assert) {
var __slice = [].slice

var options = {}
Expand All @@ -21,28 +21,28 @@ module.exports = require('proof')(function (counter, equal, deepEqual) {
var self = {}
var prefix = cycle.message + ' ' + type + ' incremental '

counter(cycle.buffer.length * 4 + 2)
assert.inc(cycle.buffer.length * 4 + 2)

function increment (i) {
var prefix = cycle.message + ' ' + type + ' offset of ' + i + ' '
self.parse = cycle.parser({}, function (object) {
deepEqual(object, cycle.object, prefix + 'parse')
assert(object, cycle.object, prefix + 'parse')
var buffer = new Buffer(cycle.buffer.length)
self.write = cycle.serializer(object)
var start = self.write(buffer, 0, i)
var end = cycle.buffer.length
while (start != end) {
start = self.write(buffer, start, start + 1)
}
equal(start, cycle.buffer.length, prefix + 'bytes written')
deepEqual(toArray(buffer), cycle.buffer, prefix + 'serialize')
assert(start, cycle.buffer.length, prefix + 'bytes written')
assert(toArray(buffer), cycle.buffer, prefix + 'serialize')
})
var start = self.parse(cycle.buffer, 0, i)
var end = cycle.buffer.length
while (start != end) {
start = self.parse(cycle.buffer, start, start + 1)
}
equal(start, cycle.buffer.length, prefix + 'bytes parsed')
assert(start, cycle.buffer.length, prefix + 'bytes parsed')
}

for (var i = 0, I = cycle.buffer.length; i < I; i++) {
Expand All @@ -52,13 +52,13 @@ module.exports = require('proof')(function (counter, equal, deepEqual) {
self.parse = cycle.parser({}, function (object) {
var buffer = new Buffer(cycle.buffer.length + 1)
return subsequent.parser({}, function (next) {
deepEqual(next, { foo: 1 }, prefix + 'subsequent parser')
assert(next, { foo: 1 }, prefix + 'subsequent parser')
self.write = cycle.serializer(object, function () {
return subsequent.serializer({ foo: 1 })
})
self.write(null, 0, 0)
self.write(buffer, 0, buffer.length)
deepEqual(toArray(buffer), cycle.buffer.concat([ 1 ]), prefix + 'subsequent serializer')
assert(toArray(buffer), cycle.buffer.concat([ 1 ]), prefix + 'subsequent serializer')
})
})
self.parse(null, 0, 0)
Expand All @@ -69,30 +69,30 @@ module.exports = require('proof')(function (counter, equal, deepEqual) {
var self = {}
var prefix = cycle.message + ' ' + type + ' '

counter(7)
assert.inc(7)

equal(cycle.sizeOf(cycle.object), cycle.buffer.length, prefix + 'sizeOf')
assert(cycle.sizeOf(cycle.object), cycle.buffer.length, prefix + 'sizeOf')

self.parse = cycle.parser({}, function (object) {
deepEqual(object, cycle.object, prefix + 'parse')
assert(object, cycle.object, prefix + 'parse')
var buffer = new Buffer(cycle.buffer.length)
self.write = cycle.serializer(object)
var start = self.write(buffer, 0, buffer.length)
equal(start, cycle.buffer.length, prefix + 'written')
deepEqual(toArray(buffer), cycle.buffer, prefix + 'serialize')
assert(start, cycle.buffer.length, prefix + 'written')
assert(toArray(buffer), cycle.buffer, prefix + 'serialize')
})
var start = self.parse(cycle.buffer, 0, cycle.buffer.length)
equal(start, cycle.buffer.length, prefix + 'parsed')
assert(start, cycle.buffer.length, prefix + 'parsed')

self.parse = cycle.parser({}, function (object) {
var buffer = new Buffer(cycle.buffer.length + 1)
return subsequent.parser({}, function (next) {
deepEqual(next, { foo: 1 }, prefix + 'subsequent parser')
assert(next, { foo: 1 }, prefix + 'subsequent parser')
self.write = cycle.serializer(object, function () {
return subsequent.serializer({ foo: 1 })
})
self.write(buffer, 0, buffer.length)
deepEqual(toArray(buffer), cycle.buffer.concat([ 1 ]), prefix + 'subsequent serializer')
assert(toArray(buffer), cycle.buffer.concat([ 1 ]), prefix + 'subsequent serializer')
})
})
self.parse(cycle.buffer.concat([ 1 ]), 0, cycle.buffer.length + 1)
Expand Down Expand Up @@ -121,5 +121,5 @@ module.exports = require('proof')(function (counter, equal, deepEqual) {
})
}

return { cycle: cycle }
body(cycle)
})
4 changes: 2 additions & 2 deletions t/jibberish/proof.js
@@ -1,3 +1,3 @@
module.exports = require('proof')(function () {
return { parse: require('../../tokenizer').parse }
require('proof')(module, function (body, assert) {
body(require('../../tokenizer').parse, assert)
})
7 changes: 2 additions & 5 deletions t/proof.js
@@ -1,9 +1,6 @@

module.exports = require('proof')(function (counter, equal, deepEqual) {
require('proof')(module, function (body, assert) {
var options = {}
options.precompiler = require('./require')
options.directory = 't/generated'
return {
packet: require('..').createPacketizer(options)
}
body(require('..').createPacketizer(options), assert)
})
6 changes: 3 additions & 3 deletions t/tokenizer/proof.js
@@ -1,4 +1,4 @@
module.exports = require("proof")(function (deepEqual) {
require('proof')(module, function (body, assert) {
var parse = require('../../tokenizer').parse
var parseEqual = function (pattern, expected, message) {
// TODO: Remove after completing object first.
Expand All @@ -19,7 +19,7 @@ module.exports = require("proof")(function (deepEqual) {
return field;
}
var parsed = parse(pattern).map(unname);
deepEqual(parsed, expected, message);
assert(parsed, expected, message);
}
return { parseEqual: parseEqual };
body(parseEqual);
});

0 comments on commit c16b8e8

Please sign in to comment.