nbtfile 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/nbtfile.rb

@@ -34,13 +34,42 @@ class String
   begin
     alias_method :_nbtfile_force_encoding, :force_encoding
   rescue NameError
-    def _nbtfile_force_encoding(encoding)
+    def _nbtfile_force_encoding(encoding) ; end
+  end
+
+  begin
+    alias_method :_nbtfile_encode, :encode
+  rescue NameError
+    def _nbtfile_encode(encoding) ; dup ; end
+  end
+
+  begin
+    alias_method :_nbtfile_bytesize, :bytesize
+  rescue NameError
+    alias_method :_nbtfile_bytesize, :size
+  end
+
+  begin
+    alias_method :_nbtfile_valid_encoding?, :valid_encoding?
+  rescue NameError
+    require 'iconv'
+
+    def _nbtfile_valid_encoding?
+      begin
+        Iconv.conv("UTF-8", "UTF-8", self)
+        true
+      rescue Iconv::IllegalSequence
+        false
+      end
     end
   end
 end
 
 module NBTFile
 
+class EncodingError < RuntimeError
+end
+
 TOKEN_CLASSES_BY_INDEX = []
 TOKEN_INDICES_BY_CLASS = {}
 
@@ -118,7 +147,9 @@ module ReadMethods
 
   def read_byte_array(io)
     length = read_int(io)
-    read_raw(io, length)
+    value = read_raw(io, length)
+    value._nbtfile_force_encoding("BINARY")
+    value
   end
 
   def read_list_header(io)
@@ -292,12 +323,18 @@ module WriteMethods
   end
 
   def emit_byte_array(io, value)
-    emit_int(io, value.length)
+    value = value.dup
+    value._nbtfile_force_encoding("BINARY")
+    emit_int(io, value._nbtfile_bytesize)
     io.write(value)
   end
 
   def emit_string(io, value)
-    emit_short(io, value.length)
+    value = value._nbtfile_encode("UTF-8")
+    unless value._nbtfile_valid_encoding?
+      raise EncodingError, "Invalid character sequence"
+    end
+    emit_short(io, value._nbtfile_bytesize)
     io.write(value)
   end
 
@@ -436,7 +473,7 @@ class EndWriterState
 end
 
 class Writer
-  include WriteMethods
+  include Tokens
 
   def initialize(stream)
     @gz = Zlib::GzipWriter.new(stream)

data/spec/nbtfile_spec.rb

@@ -196,6 +196,28 @@ describe "NBTFile::emit" do
     end
   end
 
+  it "should convert strings to UTF-8 (on encoding-aware rubies)" do
+    check_reader_or_writer "\x0a\x00\x03foo" \
+                           "\x08\x00\x03bar\x00\x04hoge" \
+                           "\x00",
+                           [Tokens::TAG_Compound["foo", nil],
+                            Tokens::TAG_String["bar", "hoge"._nbtfile_encode("UTF-16LE")],
+                            Tokens::TAG_End["", nil]]
+  end
+
+  it "should reject malformed UTF-8 strings" do
+    io = StringIO.new
+    NBTFile.emit(io) do |writer|
+      writer.emit_compound("foo") do
+        lambda {
+          str = "hoge\xff"
+          str._nbtfile_force_encoding("UTF-8")
+          writer.emit_token(Tokens::TAG_String["bar", str])
+        }.should raise_error(NBTFile::EncodingError)
+      end
+    end
+  end
+
   emit_shorthand "should support shorthand for emitting lists",
                  "\x0a\x00\x04test" \
                  "\x09\x00\x03foo\x01\x00\x00\x00\x02" \

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - MenTaLguY