Skip to content

Commit fe0f5b9

Browse files
committed
specs merged for both of CRuby and JRuby
1 parent 534b705 commit fe0f5b9

2 files changed

Lines changed: 53 additions & 10 deletions

File tree

‎spec/jruby/unpacker_spec.rb‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,18 @@
102102
end
103103
end
104104

105+
def flatten(struct, results = [])
106+
case struct
107+
when Array
108+
struct.each { |v| flatten(v, results) }
109+
when Hash
110+
struct.each { |k, v| flatten(v, flatten(k, results)) }
111+
else
112+
results << struct
113+
end
114+
results
115+
end
116+
105117
context 'encoding', :encodings do
106118
before :all do
107119
@default_internal = Encoding.default_internal
@@ -126,15 +138,15 @@
126138
Encoding.default_external = Encoding::ISO_8859_1
127139
end
128140

129-
it 'produces results with default internal encoding' do
141+
it 'produces results with encoding as binary or string(utf8)' do
130142
unpacker.execute(buffer, 0)
131143
strings = flatten(unpacker.data).grep(String)
132-
strings.map(&:encoding).uniq.sort.should == [Encoding.default_internal]
144+
strings.map(&:encoding).uniq.sort{|a,b| a.to_s <=> b.to_s}.should == [Encoding::ASCII_8BIT, Encoding::UTF_8]
133145
end
134146

135147
it 'recodes to internal encoding' do
136148
unpacker.execute(buffer, 0)
137-
unpacker.data['nested'][1].keys.should == ["sk\xC3\xA5l".force_encoding(Encoding.default_internal)]
149+
unpacker.data['nested'][1].keys.should == ["sk\xC3\xA5l".force_encoding(Encoding::UTF_8)]
138150
end
139151
end
140152

@@ -160,14 +172,14 @@
160172
end
161173

162174
let :unpacker do
163-
described_class.new(:encoding => 'UTF-8')
175+
described_class.new()
164176
end
165177

166-
it 'can hardcode encoding when using #execute' do
178+
it 'decode binary as ascii-8bit string when using #execute' do
167179
unpacker.execute(buffer, 0)
168180
strings = flatten(unpacker.data).grep(String)
169181
strings.should == %w[hello world nested object structure]
170-
strings.map(&:encoding).uniq.should == [Encoding::UTF_8]
182+
strings.map(&:encoding).uniq.should == [Encoding::ASCII_8BIT]
171183
end
172184
end
173185
end

‎spec/unpacker_spec.rb‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,16 +519,47 @@ def flatten(struct, results = [])
519519
end
520520
end
521521

522-
context 'encoding', :encodings do
522+
context 'binary encoding', :encodings do
523523
let :buffer do
524524
MessagePack.pack({'hello' => 'world', 'nested' => ['object', {'structure' => true}]})
525525
end
526526

527527
let :unpacker do
528-
described_class.new(:encoding => 'UTF-8')
528+
described_class.new()
529529
end
530530

531-
it 'can hardcode encoding when using #each' do
531+
it 'decodes binary as ascii-8bit when using #feed' do
532+
objs = []
533+
unpacker.feed(buffer)
534+
unpacker.each do |obj|
535+
objs << obj
536+
end
537+
strings = flatten(objs).grep(String)
538+
strings.should == %w[hello world nested object structure]
539+
strings.map(&:encoding).uniq.should == [Encoding::ASCII_8BIT]
540+
end
541+
542+
it 'decodes binary as ascii-8bit when using #feed_each' do
543+
objs = []
544+
unpacker.feed_each(buffer) do |obj|
545+
objs << obj
546+
end
547+
strings = flatten(objs).grep(String)
548+
strings.should == %w[hello world nested object structure]
549+
strings.map(&:encoding).uniq.should == [Encoding::ASCII_8BIT]
550+
end
551+
end
552+
553+
context 'string encoding', :encodings do
554+
let :buffer do
555+
MessagePack.pack({'hello'.force_encoding(Encoding::UTF_8) => 'world'.force_encoding(Encoding::UTF_8), 'nested'.force_encoding(Encoding::UTF_8) => ['object'.force_encoding(Encoding::UTF_8), {'structure'.force_encoding(Encoding::UTF_8) => true}]})
556+
end
557+
558+
let :unpacker do
559+
described_class.new()
560+
end
561+
562+
it 'decodes string as utf-8 when using #feed' do
532563
objs = []
533564
unpacker.feed(buffer)
534565
unpacker.each do |obj|
@@ -539,7 +570,7 @@ def flatten(struct, results = [])
539570
strings.map(&:encoding).uniq.should == [Encoding::UTF_8]
540571
end
541572

542-
it 'can hardcode encoding when using #feed_each' do
573+
it 'decodes binary as ascii-8bit when using #feed_each' do
543574
objs = []
544575
unpacker.feed_each(buffer) do |obj|
545576
objs << obj

0 commit comments

Comments
 (0)