Correctly symbolize multibyte characters.

ext/yajl/yajl_ext.c

@@ -286,7 +286,11 @@ static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsi
         char buf[stringLen+1];
         memcpy(buf, stringVal, stringLen);
         buf[stringLen] = 0;
-        yajl_set_static_value(ctx, ID2SYM(rb_intern(buf)));
+        VALUE stringEncoded = rb_str_new2(buf);
+        int enc = rb_enc_find_index("UTF-8");
+        rb_enc_associate_index(stringEncoded, enc);
+
+        yajl_set_static_value(ctx, ID2SYM(rb_to_id(stringEncoded)));
     } else {
         keyStr = rb_str_new((const char *)stringVal, stringLen);
 #ifdef HAVE_RUBY_ENCODING_H

spec/parsing/one_off_spec.rb

@@ -40,10 +40,14 @@
     Yajl::Parser.parse(io).should == {"key" => 1234}
   end
 
-  it "should parse using it's class method, from an IO with symbolized keys" do
+  it "should parse using it's class method, from a string with symbolized keys" do
     Yajl::Parser.parse('{"key": 1234}', :symbolize_keys => true).should == {:key => 1234}
   end
 
+  it "should parse using it's class method, from a utf-8 string with multibyte characters, with symbolized keys" do
+    Yajl::Parser.parse('{"日本語": 1234}', :symbolize_keys => true).should == {:日本語 => 1234}
+  end
+
   it "should parse using it's class method, from a string" do
     Yajl::Parser.parse('{"key": 1234}').should == {"key" => 1234}
   end
@@ -78,4 +82,4 @@
       Yajl::Parser.parse('{"key": "value"}').values.first.encoding.should eql(Encoding.default_internal)
     end
   end
-end
+end