yajl-ruby 0.6.9 → 0.7.0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.7.0 (February 5th, 2010)
+* ensure utf8 encoding is set on relevant strings during parse/encode in 1.9
+
 ## 0.6.9 (January 26th, 2010)
 * HttpStream patches merged in from Luke Redpath <contact@lukeredpath.co.uk>
 * Changed how Yajl::Parser was calling IO#read to better conform to the Rack spec and thus can be used to directly parse a rack.input stream

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 9
 :major: 0
-:minor: 6
+:minor: 7
 :build: 
+:patch: 0

data/ext/yajl_ext.c

@@ -263,7 +263,11 @@ static int yajl_found_number(void * ctx, const char * numberVal, unsigned int nu
 }
 
 static int yajl_found_string(void * ctx, const unsigned char * stringVal, unsigned int stringLen) {
-    yajl_set_static_value(ctx, rb_str_new((const char *)stringVal, stringLen));
+    VALUE str = rb_str_new((const char *)stringVal, stringLen);
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_enc_associate_index(str, utf8Encoding);
+#endif
+    yajl_set_static_value(ctx, str);
     yajl_check_and_fire_callback(ctx);
     return 1;
 }
@@ -280,6 +284,9 @@ static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsi
         yajl_set_static_value(ctx, ID2SYM(rb_intern(buf)));
     } else {
         keyStr = rb_str_new((const char *)stringVal, stringLen);
+#ifdef HAVE_RUBY_ENCODING_H
+        rb_enc_associate_index(keyStr, utf8Encoding);
+#endif
         yajl_set_static_value(ctx, keyStr);
     }
     yajl_check_and_fire_callback(ctx);
@@ -439,7 +446,7 @@ static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
         cptr = RSTRING_PTR(input);
         yajl_parse_chunk((const unsigned char*)cptr, (unsigned int)strlen(cptr), wrapper->parser);
     } else if (rb_respond_to(input, intern_eof)) {
-        VALUE parsed = rb_str_new2("");
+        VALUE parsed = rb_str_new("", READ_BUFSIZE);
         while (rb_funcall(input, intern_eof, 0) != Qtrue) {
             parsed = rb_funcall(input, intern_io_read, 1, rbufsize);
             cptr = RSTRING_PTR(parsed);
@@ -544,6 +551,9 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
             beautify = 1;
             indent = rb_hash_aref(opts, sym_indent);
             if (indent != Qnil) {
+#ifdef HAVE_RUBY_ENCODING_H
+                rb_enc_associate_index(indent, utf8Encoding);
+#endif
                 Check_Type(indent, T_STRING);
                 indentString = RSTRING_PTR(indent);
             }
@@ -556,6 +566,11 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
     wrapper->on_progress_callback = Qnil;
     if (opts != Qnil && rb_funcall(opts, intern_has_key, 1, sym_terminator) == Qtrue) {
         wrapper->terminator = rb_hash_aref(opts, sym_terminator);
+#ifdef HAVE_RUBY_ENCODING_H
+        if (TYPE(wrapper->terminator) == T_STRING) {
+            rb_enc_associate_index(wrapper->terminator, utf8Encoding);
+        }
+#endif
     } else {
         wrapper->terminator = 0;
     }
@@ -618,6 +633,9 @@ static VALUE rb_yajl_encoder_encode(int argc, VALUE * argv, VALUE self) {
     /* just make sure we output the remaining buffer */
     yajl_gen_get_buf(wrapper->encoder, &buffer, &len);
     outBuff = rb_str_new((const char *)buffer, len);
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_enc_associate_index(outBuff, utf8Encoding);
+#endif
     yajl_gen_clear(wrapper->encoder);
     
     if (io != Qnil) {
@@ -890,4 +908,8 @@ void Init_yajl_ext() {
     sym_indent = ID2SYM(rb_intern("indent"));
     sym_terminator = ID2SYM(rb_intern("terminator"));
     sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
+
+#ifdef HAVE_RUBY_ENCODING_H
+    utf8Encoding = rb_enc_find_index("UTF-8");
+#endif
 }

data/ext/yajl_ext.h

@@ -25,6 +25,11 @@
 #include "api/yajl_gen.h"
 #include <ruby.h>
 
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+int utf8Encoding;
+#endif
+
 #define READ_BUFSIZE 8192
 #define WRITE_BUFSIZE 8192
 

data/lib/yajl.rb

@@ -13,7 +13,7 @@ require 'yajl_ext'
 #
 # Ruby bindings to the excellent Yajl (Yet Another JSON Parser) ANSI C library.
 module Yajl
-  VERSION = "0.6.9"
+  VERSION = "0.7.0"
   
   # For compatibility, has the same signature of Yajl::Parser.parse
   def self.load(str_or_io, options={}, read_bufsize=nil, &block)

data/spec/json_gem_compatibility/compatibility_spec.rb

@@ -81,7 +81,6 @@ describe "JSON Gem compatability API" do
   
   context "ported tests for Unicode" do
     it "should be able to encode and parse unicode" do
-      pending if RUBY_VERSION.include?('1.9') # FIXME: Some string encoding problem with 1.9
       '""'.should eql(''.to_json)
       '"\\b"'.should eql("\b".to_json)
       '"\u0001"'.should eql(0x1.chr.to_json)
@@ -89,7 +88,7 @@ describe "JSON Gem compatability API" do
       '" "'.should eql(' '.to_json)
       "\"#{0x7f.chr}\"".should eql(0x7f.chr.to_json)
       utf8 = [ "© ≠ €! \01" ]
-      json = '["© ≠ €! \u0001"]'
+      json = "[\"© ≠ €! \\u0001\"]"
       json.should eql(utf8.to_json)
       utf8.should eql(JSON.parse(json))
       utf8 = ["\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"]

data/yajl-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.6.9"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez", "Lloyd Hilaiel"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-02-05}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -08:00
+date: 2010-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: []