-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace buftok due to incorrect delimiter handling
- Loading branch information
Showing
4 changed files
with
48 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
module Twitter | ||
module Streaming | ||
class BufferedTokenizer | ||
def initialize(delimiter) | ||
@delimiter = delimiter | ||
@buffer = "" | ||
end | ||
|
||
def extract(data) | ||
@buffer << data | ||
items = @buffer.split(@delimiter) | ||
if @buffer.end_with?(@delimiter) | ||
@buffer.clear | ||
items | ||
else | ||
@buffer = items.pop | ||
items | ||
end | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
require 'buftok' | ||
require 'twitter/streaming/buffered_tokenizer' | ||
|
||
module Twitter | ||
module Streaming | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
require 'helper' | ||
|
||
describe Twitter::Streaming::BufferedTokenizer do | ||
let(:tokenizer) { described_class.new("\r\n") } | ||
|
||
describe '#extract' do | ||
it 'returns an empty array when no delimiter is given' do | ||
expect(tokenizer.extract("foo bar")).to be_empty | ||
end | ||
|
||
it 'returns a token' do | ||
expect(tokenizer.extract("foo\r\n")).to eq ["foo"] | ||
end | ||
|
||
it 'returns multiple tokens' do | ||
expect(tokenizer.extract("foo")).to be_empty | ||
expect(tokenizer.extract("bar\r\nbaz\r\n")).to eq ["foobar", "baz"] | ||
end | ||
|
||
it 'handles splitted delimiter' do | ||
expect(tokenizer.extract("foo\r")).to be_empty | ||
expect(tokenizer.extract("\n")).to eq ["foo"] | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters