yajl-ruby 0.7.4 → 0.7.5

data/ext/yajl_alloc.c

@@ -1,22 +1,22 @@
 /*
- * Copyright 2007-2009, Lloyd Hilaiel.
- *
+ * Copyright 2010, 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.
- */
+ */ 
 
 /**
  * \file yajl_alloc.h

data/ext/yajl_alloc.h

@@ -1,22 +1,22 @@
 /*
- * Copyright 2007-2009, Lloyd Hilaiel.
- *
+ * Copyright 2010, 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.
- */
+ */ 
 
 /**
  * \file yajl_alloc.h

data/ext/yajl_buf.c

@@ -1,22 +1,22 @@
 /*
- * Copyright 2007-2009, Lloyd Hilaiel.
- *
+ * Copyright 2010, 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_buf.h"
 
@@ -49,7 +49,7 @@ static
 void yajl_buf_ensure_available(yajl_buf buf, unsigned int want)
 {
     unsigned int need;
-
+    
     assert(buf != NULL);
 
     /* first call */

data/ext/yajl_buf.h

@@ -1,22 +1,22 @@
 /*
- * Copyright 2007-2009, Lloyd Hilaiel.
- *
+ * Copyright 2010, 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_BUF_H__
 #define __YAJL_BUF_H__
@@ -38,7 +38,7 @@
 
 /*
  * Implementation/performance notes.  If this were moved to a header
- * only implementation using #define's where possible we might be
+ * only implementation using #define's where possible we might be 
  * able to sqeeze a little performance out of the guy by killing function
  * call overhead.  YMMV.
  */

data/ext/yajl_bytestack.h

@@ -1,22 +1,22 @@
 /*
- * Copyright 2009, Lloyd Hilaiel.
- *
+ * Copyright 2010, 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.
- *
+ * Copyright 2010, 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"
 
@@ -48,7 +48,7 @@ void
 yajl_string_encode(yajl_buf buf, const unsigned char * str,
                    unsigned int len)
 {
-    yajl_string_encode2((yajl_print_t) &yajl_buf_append, buf, str, len);
+    yajl_string_encode2((const yajl_print_t) &yajl_buf_append, buf, str, len);
 }
 
 void
@@ -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.
- *
+ * Copyright 2010, 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__
@@ -36,7 +36,7 @@
 #include "yajl_buf.h"
 #include "api/yajl_gen.h"
 
-void yajl_string_encode2(yajl_print_t printer,
+void yajl_string_encode2(const yajl_print_t printer,
                          void * ctx,
                          const unsigned char * str,
                          unsigned int length);

data/ext/yajl_ext.c

@@ -173,7 +173,10 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, len);
             break;
         default:
-            if (rb_respond_to(obj, intern_to_json)) {
+            if (rb_respond_to(obj, intern_as_json)) {
+                obj = rb_funcall(obj, intern_as_json, 0);
+                yajl_encode_part(w, obj, io);
+            } else if (rb_respond_to(obj, intern_to_json)) {
                 str = rb_funcall(obj, intern_to_json, 0);
                 cptr = RSTRING_PTR(str);
                 len = RSTRING_LEN(str);
@@ -430,8 +433,8 @@ static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
         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 ((parsed = rb_funcall(input, intern_io_read, 1, rbufsize)) != Qnil) {
+        VALUE parsed = rb_str_new(0, FIX2LONG(rbufsize));
+        while (rb_funcall(input, intern_io_read, 2, rbufsize, parsed) != Qnil) {
             cptr = RSTRING_PTR(parsed);
             len = RSTRING_LEN(parsed);
             yajl_parse_chunk((const unsigned char*)cptr, len, wrapper->parser);
@@ -886,6 +889,7 @@ void Init_yajl_ext() {
     intern_to_json = rb_intern("to_json");
     intern_to_sym = rb_intern("to_sym");
     intern_has_key = rb_intern("has_key?");
+    intern_as_json = rb_intern("as_json");
 
     sym_allow_comments = ID2SYM(rb_intern("allow_comments"));
     sym_check_utf8 = ID2SYM(rb_intern("check_utf8"));

data/ext/yajl_ext.h

@@ -49,7 +49,7 @@ int utf8Encoding;
 
 static VALUE cParseError, cEncodeError, mYajl, cParser, cEncoder;
 static ID intern_io_read, intern_call, intern_keys, intern_to_s,
-            intern_to_json, intern_has_key, intern_to_sym;
+            intern_to_json, intern_has_key, intern_to_sym, intern_as_json;
 static ID sym_allow_comments, sym_check_utf8, sym_pretty, sym_indent, sym_terminator, sym_symbolize_keys;
 
 #define GetParser(obj, sval) (sval = (yajl_parser_wrapper*)DATA_PTR(obj));

data/ext/yajl_gen.c

@@ -1,22 +1,22 @@
 /*
- * Copyright 2007-2009, Lloyd Hilaiel.
- *
+ * Copyright 2010, 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 "api/yajl_gen.h"
 #include "yajl_buf.h"
@@ -50,7 +50,7 @@ typedef enum {
     yajl_gen_error
 } yajl_gen_state;
 
-struct yajl_gen_t
+struct yajl_gen_t 
 {
     unsigned int depth;
     unsigned int pretty;
@@ -70,7 +70,7 @@ yajl_gen_alloc(const yajl_gen_config * config,
 }
 
 yajl_gen
-yajl_gen_alloc2(yajl_print_t callback,
+yajl_gen_alloc2(const yajl_print_t callback,
                 const yajl_gen_config * config,
                 const yajl_alloc_funcs * afs,
                 void * ctx)
@@ -125,7 +125,7 @@ yajl_gen_free(yajl_gen g)
     } else if (g->state[g->depth] == yajl_gen_map_val) {        \
         g->print(g->ctx, ":", 1);                               \
         if (g->pretty) g->print(g->ctx, " ", 1);                \
-   }
+   } 
 
 #define INSERT_WHITESPACE                                               \
     if (g->pretty) {                                                    \
@@ -187,14 +187,14 @@ yajl_gen_integer(yajl_gen g, long int number)
 #ifdef WIN32
 #include <float.h>
 #define isnan _isnan
-#define isinf _finite
+#define isinf !_finite
 #endif
 
 yajl_gen_status
 yajl_gen_double(yajl_gen g, double number)
 {
     char i[32];
-    ENSURE_VALID_STATE; ENSURE_NOT_KEY;
+    ENSURE_VALID_STATE; ENSURE_NOT_KEY; 
     if (isnan(number) || isinf(number)) return yajl_gen_invalid_number;
     INSERT_SEP; INSERT_WHITESPACE;
     sprintf(i, "%g", number);
@@ -222,8 +222,6 @@ yajl_gen_string(yajl_gen g, const unsigned char * str,
     g->print(g->ctx, "\"", 1);
     yajl_string_encode2(g->print, g->ctx, str, len);
     g->print(g->ctx, "\"", 1);
-
-
     APPENDED_ATOM;
     FINAL_NEWLINE;
     return yajl_gen_status_ok;
@@ -255,8 +253,8 @@ yajl_gen_status
 yajl_gen_map_open(yajl_gen g)
 {
     ENSURE_VALID_STATE; ENSURE_NOT_KEY; INSERT_SEP; INSERT_WHITESPACE;
-    INCREMENT_DEPTH;
-
+    INCREMENT_DEPTH; 
+    
     g->state[g->depth] = yajl_gen_map_start;
     g->print(g->ctx, "{", 1);
     if (g->pretty) g->print(g->ctx, "\n", 1);
@@ -267,7 +265,7 @@ yajl_gen_map_open(yajl_gen g)
 yajl_gen_status
 yajl_gen_map_close(yajl_gen g)
 {
-    ENSURE_VALID_STATE;
+    ENSURE_VALID_STATE; 
     (g->depth)--;
     if (g->pretty) g->print(g->ctx, "\n", 1);
     APPENDED_ATOM;
@@ -281,7 +279,7 @@ yajl_gen_status
 yajl_gen_array_open(yajl_gen g)
 {
     ENSURE_VALID_STATE; ENSURE_NOT_KEY; INSERT_SEP; INSERT_WHITESPACE;
-    INCREMENT_DEPTH;
+    INCREMENT_DEPTH; 
     g->state[g->depth] = yajl_gen_array_start;
     g->print(g->ctx, "[", 1);
     if (g->pretty) g->print(g->ctx, "\n", 1);