yajl-ruby 0.7.1 → 0.7.2

data/ext/yajl_bytestack.h

@@ -1,22 +1,22 @@
 /*
  * Copyright 2009, Lloyd Hilaiel.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
- * 
+ *
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in
  *     the documentation and/or other materials provided with the
  *     distribution.
- * 
+ *
  *  3. Neither the name of Lloyd Hilaiel nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,7 +28,7 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- */ 
+ */
 
 /*
  * A header only implementation of a simple stack of bytes, used in YAJL
@@ -61,7 +61,7 @@ typedef struct yajl_bytestack_t
 
 /* initialize a bytestack */
 #define yajl_bs_free(obs)                 \
-    if ((obs).stack) (obs).yaf->free((obs).yaf->ctx, (obs).stack);   
+    if ((obs).stack) (obs).yaf->free((obs).yaf->ctx, (obs).stack);
 
 #define yajl_bs_current(obs)               \
     (assert((obs).used > 0), (obs).stack[(obs).used - 1])
@@ -74,12 +74,12 @@ typedef struct yajl_bytestack_t
     }                                                   \
     (obs).stack[((obs).used)++] = (byte);               \
 }
-    
+
 /* removes the top item of the stack, returns nothing */
 #define yajl_bs_pop(obs) { ((obs).used)--; }
 
 #define yajl_bs_set(obs, byte)                          \
-    (obs).stack[((obs).used) - 1] = (byte);             
-    
+    (obs).stack[((obs).used) - 1] = (byte);
+
 
 #endif

data/ext/yajl_encode.c

@@ -1,22 +1,22 @@
 /*
  * Copyright 2007-2009, Lloyd Hilaiel.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
- * 
+ *
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in
  *     the documentation and/or other materials provided with the
  *     distribution.
- * 
+ *
  *  3. Neither the name of Lloyd Hilaiel nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,7 +28,7 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- */ 
+ */
 
 #include "yajl_encode.h"
 
@@ -58,7 +58,7 @@ yajl_string_encode2(const yajl_print_t print,
                     unsigned int len)
 {
     unsigned int beg = 0;
-    unsigned int end = 0;    
+    unsigned int end = 0;
     char hexBuf[7];
     hexBuf[0] = '\\'; hexBuf[1] = 'u'; hexBuf[2] = '0'; hexBuf[3] = '0';
     hexBuf[6] = 0;
@@ -104,7 +104,7 @@ static void hexToDigit(unsigned int * val, const unsigned char * hex)
     }
 }
 
-static void Utf32toUtf8(unsigned int codepoint, char * utf8Buf) 
+static void Utf32toUtf8(unsigned int codepoint, char * utf8Buf)
 {
     if (codepoint < 0x80) {
         utf8Buf[0] = (char) codepoint;
@@ -134,7 +134,7 @@ void yajl_string_decode(yajl_buf buf, const unsigned char * str,
                         unsigned int len)
 {
     unsigned int beg = 0;
-    unsigned int end = 0;    
+    unsigned int end = 0;
 
     while (end < len) {
         if (str[end] == '\\') {
@@ -161,8 +161,8 @@ void yajl_string_decode(yajl_buf buf, const unsigned char * str,
                             unsigned int surrogate = 0;
                             hexToDigit(&surrogate, str + end + 2);
                             codepoint =
-                                (((codepoint & 0x3F) << 10) | 
-                                 ((((codepoint >> 6) & 0xF) + 1) << 16) | 
+                                (((codepoint & 0x3F) << 10) |
+                                 ((((codepoint >> 6) & 0xF) + 1) << 16) |
                                  (surrogate & 0x3FF));
                             end += 5;
                         } else {
@@ -170,7 +170,7 @@ void yajl_string_decode(yajl_buf buf, const unsigned char * str,
                             break;
                         }
                     }
-                    
+
                     Utf32toUtf8(codepoint, utf8Buf);
                     unescaped = utf8Buf;
                     break;

data/ext/yajl_encode.h

@@ -1,22 +1,22 @@
 /*
  * Copyright 2007-2009, Lloyd Hilaiel.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
- * 
+ *
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in
  *     the documentation and/or other materials provided with the
  *     distribution.
- * 
+ *
  *  3. Neither the name of Lloyd Hilaiel nor the names of its
  *     contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,7 +28,7 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- */ 
+ */
 
 #ifndef __YAJL_ENCODE_H__
 #define __YAJL_ENCODE_H__

data/ext/yajl_ext.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2008-2009 Brian Lopez - http://github.com/brianmario
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -8,10 +8,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -23,36 +23,11 @@
 
 #include "yajl_ext.h"
 
-inline const char * strnchr(const char * s, size_t count, char c) {
-    for (; count-- && *s != '\0'; ++s) {
-        if (*s == c) {
-            return s;
-        }
-    }
-    return NULL;
-}
-
-inline double strntod(const char * s, size_t count) {
-    char buf[count+1];
-    memcpy(buf, s, count);
-    buf[count] = 0;
-    
-    return strtod(buf, NULL);
-}
-
-inline VALUE rb_cstrn2inum(const char * s, size_t count) {
-    char buf[count+1];
-    memcpy(buf, s, count);
-    buf[count] = 0;
-    
-    return rb_cstr2inum(buf, 10);
-}
-
 /* Helpers for building objects */
 inline void yajl_check_and_fire_callback(void * ctx) {
     yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
-    
+
     /* No need to do any of this if the callback isn't even setup */
     if (wrapper->parse_complete_callback != Qnil) {
         int len = RARRAY_LEN(wrapper->builderStack);
@@ -74,9 +49,9 @@ inline void yajl_set_static_value(void * ctx, VALUE val) {
     yajl_parser_wrapper * wrapper;
     VALUE lastEntry, hash;
     int len;
-    
+
     GetParser((VALUE)ctx, wrapper);
-    
+
     len = RARRAY_LEN(wrapper->builderStack);
     if (len > 0) {
         lastEntry = rb_ary_entry(wrapper->builderStack, len-1);
@@ -132,7 +107,7 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
     const unsigned char * buffer;
     const char * cptr;
     unsigned int len;
-    
+
     if (io != Qnil || w->on_progress_callback != Qnil) {
         status = yajl_gen_get_buf(w->encoder, &buffer, &len);
         if (len >= WRITE_BUFSIZE) {
@@ -145,11 +120,11 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             yajl_gen_clear(w->encoder);
         }
     }
-    
+
     switch (TYPE(obj)) {
         case T_HASH:
             status = yajl_gen_map_open(w->encoder);
-            
+
             /* TODO: itterate through keys in the hash */
             VALUE keys = rb_funcall(obj, intern_keys, 0);
             VALUE entry, keyStr;
@@ -161,7 +136,7 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
                 /* the value */
                 yajl_encode_part(w, rb_hash_aref(obj, entry), io);
             }
-            
+
             status = yajl_gen_map_close(w->encoder);
             break;
         case T_ARRAY:
@@ -186,23 +161,29 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
         case T_BIGNUM:
             str = rb_funcall(obj, intern_to_s, 0);
             cptr = RSTRING_PTR(str);
+            len = RSTRING_LEN(str);
             if (strcmp(cptr, "NaN") == 0 || strcmp(cptr, "Infinity") == 0 || strcmp(cptr, "-Infinity") == 0) {
                 rb_raise(cEncodeError, "'%s' is an invalid number", cptr);
             }
-            status = yajl_gen_number(w->encoder, cptr, (unsigned int)strlen(cptr));
+            status = yajl_gen_number(w->encoder, cptr, len);
             break;
         case T_STRING:
             cptr = RSTRING_PTR(obj);
-            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr));
+            len = RSTRING_LEN(obj);
+            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, len);
             break;
         default:
             if (rb_respond_to(obj, intern_to_json)) {
                 str = rb_funcall(obj, intern_to_json, 0);
+                cptr = RSTRING_PTR(str);
+                len = RSTRING_LEN(str);
+                status = yajl_gen_number(w->encoder, cptr, len);
             } else {
                 str = rb_funcall(obj, intern_to_s, 0);
+                cptr = RSTRING_PTR(str);
+                len = RSTRING_LEN(str);
+                status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, len);
             }
-            cptr = RSTRING_PTR(str);
-            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr));
             break;
     }
 }
@@ -225,9 +206,9 @@ void yajl_parser_wrapper_mark(void * wrapper) {
 
 void yajl_parse_chunk(const unsigned char * chunk, unsigned int len, yajl_handle parser) {
     yajl_status stat;
-    
+
     stat = yajl_parse(parser, chunk, len);
-    
+
     if (stat != yajl_status_ok && stat != yajl_status_insufficient_data) {
         unsigned char * str = yajl_get_error(parser, 1, chunk, len);
         rb_raise(cParseError, "%s", (const char *) str);
@@ -249,13 +230,16 @@ static int yajl_found_boolean(void * ctx, int boolean) {
 }
 
 static int yajl_found_number(void * ctx, const char * numberVal, unsigned int numberLen) {
-    if (strnchr(numberVal, numberLen, '.') ||
-        strnchr(numberVal, numberLen, 'e') ||
-        strnchr(numberVal, numberLen, 'E')) {
-        yajl_set_static_value(ctx, rb_float_new(strntod(numberVal, numberLen)));
-    }
-    else {
-        yajl_set_static_value(ctx, rb_cstrn2inum(numberVal, numberLen));
+    char buf[numberLen+1];
+    buf[numberLen] = 0;
+    memcpy(buf, numberVal, numberLen);
+
+    if (memchr(buf, '.', numberLen) ||
+        memchr(buf, 'e', numberLen) ||
+        memchr(buf, 'E', numberLen)) {
+        yajl_set_static_value(ctx, rb_float_new(strtod(buf, NULL)));
+    } else {
+        yajl_set_static_value(ctx, rb_cstr2inum(buf, 10));
     }
     return 1;
 }
@@ -339,7 +323,7 @@ static int yajl_found_end_array(void * ctx) {
  * The only basic requirment currently is that the IO object respond to #read(len) and #eof?
  * The IO is parsed until a complete JSON object has been read and a ruby object will be returned.
  */
- 
+
 /*
  * Document-method: new
  *
@@ -356,11 +340,11 @@ static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
     yajl_parser_config cfg;
     VALUE opts, obj;
     int allowComments = 1, checkUTF8 = 1, symbolizeKeys = 0;
-    
+
     /* Scan off config vars */
     if (rb_scan_args(argc, argv, "01", &opts) == 1) {
         Check_Type(opts, T_HASH);
-        
+
         if (rb_hash_aref(opts, sym_allow_comments) == Qfalse) {
             allowComments = 0;
         }
@@ -372,7 +356,7 @@ static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
         }
     }
     cfg = (yajl_parser_config){allowComments, checkUTF8};
-    
+
     obj = Data_Make_Struct(klass, yajl_parser_wrapper, yajl_parser_wrapper_mark, yajl_parser_wrapper_free, wrapper);
     wrapper->parser = yajl_alloc(&callbacks, &cfg, NULL, (void *)obj);
     wrapper->nestedArrayLevel = 0;
@@ -425,10 +409,11 @@ static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
     yajl_status stat;
     yajl_parser_wrapper * wrapper;
     VALUE rbufsize, input, blk;
+    unsigned int len;
     const char * cptr;
-    
+
     GetParser(self, wrapper);
-    
+
     /* setup our parameters */
     rb_scan_args(argc, argv, "11&", &input, &rbufsize, &blk);
     if (NIL_P(rbufsize)) {
@@ -439,24 +424,25 @@ static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
     if (!NIL_P(blk)) {
         rb_yajl_parser_set_complete_cb(self, blk);
     }
-    
+
     if (TYPE(input) == T_STRING) {
         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)) {
+        len = RSTRING_LEN(input);
+        yajl_parse_chunk((const unsigned char*)cptr, len, wrapper->parser);
+    } else if (rb_respond_to(input, intern_io_read)) {
         VALUE parsed = rb_str_new("", READ_BUFSIZE);
-        while (rb_funcall(input, intern_eof, 0) != Qtrue) {
-            parsed = rb_funcall(input, intern_io_read, 1, rbufsize);
+        while ((parsed = rb_funcall(input, intern_io_read, 1, rbufsize)) != Qnil) {
             cptr = RSTRING_PTR(parsed);
-            yajl_parse_chunk((const unsigned char*)cptr, (unsigned int)strlen(cptr), wrapper->parser);
+            len = RSTRING_LEN(parsed);
+            yajl_parse_chunk((const unsigned char*)cptr, len, wrapper->parser);
         }
     } else {
         rb_raise(cParseError, "input must be a string or IO");
     }
-    
+
     /* parse any remaining buffered data */
     stat = yajl_parse_complete(wrapper->parser);
-    
+
     if (wrapper->parse_complete_callback != Qnil) {
         yajl_check_and_fire_callback((void *)self);
         return Qnil;
@@ -478,16 +464,18 @@ static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
  */
 static VALUE rb_yajl_parser_parse_chunk(VALUE self, VALUE chunk) {
     yajl_parser_wrapper * wrapper;
-    
+    unsigned int len;
+
     GetParser(self, wrapper);
     if (NIL_P(chunk)) {
         rb_raise(cParseError, "Can't parse a nil string.");
         return Qnil;
     }
-    
+
     if (wrapper->parse_complete_callback != Qnil) {
         const char * cptr = RSTRING_PTR(chunk);
-        yajl_parse_chunk((const unsigned char*)cptr, (unsigned int)strlen(cptr), wrapper->parser);
+        len = RSTRING_LEN(chunk);
+        yajl_parse_chunk((const unsigned char*)cptr, len, wrapper->parser);
     } else {
         rb_raise(cParseError, "The on_parse_complete callback isn't setup, parsing useless.");
     }
@@ -540,11 +528,11 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
     VALUE opts, obj, indent;
     const char * indentString = "  ";
     int beautify = 0;
-    
+
     /* Scan off config vars */
     if (rb_scan_args(argc, argv, "01", &opts) == 1) {
         Check_Type(opts, T_HASH);
-        
+
         if (rb_hash_aref(opts, sym_pretty) == Qtrue) {
             beautify = 1;
             indent = rb_hash_aref(opts, sym_indent);
@@ -558,7 +546,7 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
         }
     }
     cfg = (yajl_gen_config){beautify, indentString};
-    
+
     obj = Data_Make_Struct(klass, yajl_encoder_wrapper, yajl_encoder_wrapper_mark, yajl_encoder_wrapper_free, wrapper);
     wrapper->encoder = yajl_gen_alloc(&cfg, NULL);
     wrapper->on_progress_callback = Qnil;
@@ -616,15 +604,15 @@ static VALUE rb_yajl_encoder_encode(int argc, VALUE * argv, VALUE self) {
     const unsigned char * buffer;
     unsigned int len;
     VALUE obj, io, blk, outBuff;
-    
+
     GetEncoder(self, wrapper);
-    
+
     rb_scan_args(argc, argv, "11&", &obj, &io, &blk);
-    
+
     if (blk != Qnil) {
         wrapper->on_progress_callback = blk;
     }
-    
+
     /* begin encode process */
     yajl_encode_part(wrapper, obj, io);
 
@@ -635,7 +623,7 @@ static VALUE rb_yajl_encoder_encode(int argc, VALUE * argv, VALUE self) {
     rb_enc_associate_index(outBuff, utf8Encoding);
 #endif
     yajl_gen_clear(wrapper->encoder);
-    
+
     if (io != Qnil) {
         rb_io_write(io, outBuff);
         if (wrapper->terminator != 0 && wrapper->terminator != Qnil) {
@@ -871,10 +859,10 @@ static VALUE rb_yajl_encoder_enable_json_gem_ext(VALUE klass) {
 /* Ruby Extension initializer */
 void Init_yajl_ext() {
     mYajl = rb_define_module("Yajl");
-    
+
     cParseError = rb_define_class_under(mYajl, "ParseError", rb_eStandardError);
     cEncodeError = rb_define_class_under(mYajl, "EncodeError", rb_eStandardError);
-    
+
     cParser = rb_define_class_under(mYajl, "Parser", rb_cObject);
     rb_define_singleton_method(cParser, "new", rb_yajl_parser_new, -1);
     rb_define_method(cParser, "initialize", rb_yajl_parser_init, -1);
@@ -882,24 +870,23 @@ void Init_yajl_ext() {
     rb_define_method(cParser, "parse_chunk", rb_yajl_parser_parse_chunk, -1);
     rb_define_method(cParser, "<<", rb_yajl_parser_parse_chunk, 1);
     rb_define_method(cParser, "on_parse_complete=", rb_yajl_parser_set_complete_cb, 1);
-    
+
     cEncoder = rb_define_class_under(mYajl, "Encoder", rb_cObject);
     rb_define_singleton_method(cEncoder, "new", rb_yajl_encoder_new, -1);
     rb_define_method(cEncoder, "initialize", rb_yajl_encoder_init, -1);
     rb_define_method(cEncoder, "encode", rb_yajl_encoder_encode, -1);
     rb_define_method(cEncoder, "on_progress=", rb_yajl_encoder_set_progress_cb, 1);
-    
+
     rb_define_singleton_method(cEncoder, "enable_json_gem_compatability", rb_yajl_encoder_enable_json_gem_ext, 0);
-    
+
     intern_io_read = rb_intern("read");
-    intern_eof = rb_intern("eof?");
     intern_call = rb_intern("call");
     intern_keys = rb_intern("keys");
     intern_to_s = rb_intern("to_s");
     intern_to_json = rb_intern("to_json");
     intern_to_sym = rb_intern("to_sym");
     intern_has_key = rb_intern("has_key?");
-    
+
     sym_allow_comments = ID2SYM(rb_intern("allow_comments"));
     sym_check_utf8 = ID2SYM(rb_intern("check_utf8"));
     sym_pretty = ID2SYM(rb_intern("pretty"));