Skip to content
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

fix(bufferCount): set default value for skip argument, do not emit em… #271

Merged
merged 1 commit into from
Sep 6, 2015
Merged

fix(bufferCount): set default value for skip argument, do not emit em… #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions spec/operators/bufferCount-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,17 @@ describe('Observable.prototype.bufferCount', function () {
expect(w).toEqual(expected.shift())
}, null, done);
}, 2000);

it('should emit buffers at buffersize of intervals if not specified', function (done) {
var expected = [
[0, 1],
[2, 3],
[4, 5]
];
Observable.range(0, 6)
.bufferCount(2)
.subscribe(function (w) {
expect(w).toEqual(expected.shift())
}, null, done);
}, 2000);
});
7 changes: 5 additions & 2 deletions src/operators/bufferCount.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class BufferCountSubscriber<T> extends Subscriber<T> {
const count = (this.count += 1);
const destination = this.destination;
const bufferSize = this.bufferSize;
const startBufferEvery = this.startBufferEvery;
const startBufferEvery = (this.startBufferEvery == null) ? bufferSize : this.startBufferEvery;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of other operator such as windowCount has default value as 0 instead of null. Not sure if there's consistent recommendation or guidelines, so did not modify default value itself but simply take buffersize if value's not specified.

const buffers = this.buffers;
const len = buffers.length;
let remove = -1;
Expand Down Expand Up @@ -64,7 +64,10 @@ class BufferCountSubscriber<T> extends Subscriber<T> {
const destination = this.destination;
const buffers = this.buffers;
while (buffers.length > 0) {
destination.next(buffers.shift());
var buffer = buffers.shift();
if (buffer.length > 0) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check intend to prevent bufferCount emits empty buffer element at the end of observable on certain condition, such as Observable.range(0,6).bufferCount(2) where empty buffer is pushed then no element is actually counted in.

destination.next(buffer);
}
}
destination.complete();
}
Expand Down