make symbolizing and the spec work again on 1.8

pbanos · Aug 7, 2011 · b823c35 · b823c35
1 parent eb6877d
commit b823c35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ext/yajl/yajl_ext.c b/ext/yajl/yajl_ext.c
@@ -287,8 +287,9 @@ static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsi
         memcpy(buf, stringVal, stringLen);
         buf[stringLen] = 0;
         VALUE stringEncoded = rb_str_new2(buf);
-        int enc = rb_enc_find_index("UTF-8");
-        rb_enc_associate_index(stringEncoded, enc);
+#ifdef HAVE_RUBY_ENCODING_H
+        rb_enc_associate(stringEncoded, rb_utf8_encoding());
+#endif
 
         yajl_set_static_value(ctx, ID2SYM(rb_to_id(stringEncoded)));
     } else {

diff --git a/spec/parsing/one_off_spec.rb b/spec/parsing/one_off_spec.rb
@@ -45,7 +45,7 @@
   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}
+    Yajl::Parser.parse('{"日本語": 1234}', :symbolize_keys => true).should == {:"日本語" => 1234}
   end
 
   it "should parse using it's class method, from a string" do