yajl-ruby 0.7.4 → 0.7.5

data/ext/yajl_parser.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_lex.h"
 #include "yajl_parser.h"
@@ -48,12 +48,12 @@ unsigned char *
 yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,
                          unsigned int jsonTextLen, int verbose)
 {
-    unsigned int offset = hand->errorOffset;
+    unsigned int offset = hand->bytesConsumed;
     unsigned char * str;
     const char * errorType = NULL;
     const char * errorText = NULL;
     char text[72];
-    const char * arrow = "                     (right here) ------^\n";
+    const char * arrow = "                     (right here) ------^\n";    
 
     if (yajl_bs_current(hand->stateStack) == yajl_state_parse_error) {
         errorType = "parse";
@@ -70,18 +70,18 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,
         memneeded += strlen(errorType);
         memneeded += strlen(" error");
         if (errorText != NULL) {
-            memneeded += strlen(": ");
-            memneeded += strlen(errorText);
+            memneeded += strlen(": ");            
+            memneeded += strlen(errorText);            
         }
         str = (unsigned char *) YA_MALLOC(&(hand->alloc), memneeded + 2);
         str[0] = 0;
         strcat((char *) str, errorType);
-        strcat((char *) str, " error");
+        strcat((char *) str, " error");    
         if (errorText != NULL) {
-            strcat((char *) str, ": ");
-            strcat((char *) str, errorText);
+            strcat((char *) str, ": ");            
+            strcat((char *) str, errorText);            
         }
-        strcat((char *) str, "\n");
+        strcat((char *) str, "\n");    
     }
 
     /* now we append as many spaces as needed to make sure the error
@@ -93,7 +93,7 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,
         spacesNeeded = (offset < 30 ? 40 - offset : 10);
         start = (offset >= 30 ? offset - 30 : 0);
         end = (offset + 30 > jsonTextLen ? jsonTextLen : offset + 30);
-
+    
         for (i=0;i<spacesNeeded;i++) text[i] = ' ';
 
         for (;start < end;start++, i++) {
@@ -117,7 +117,7 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,
             newStr[0] = 0;
             strcat((char *) newStr, (char *) str);
             strcat((char *) newStr, text);
-            strcat((char *) newStr, arrow);
+            strcat((char *) newStr, arrow);    
             YA_FREE(&(hand->alloc), str);
             str = (unsigned char *) newStr;
         }
@@ -136,20 +136,23 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,
 
 
 yajl_status
-yajl_do_parse(yajl_handle hand, unsigned int * offset,
-              const unsigned char * jsonText, unsigned int jsonTextLen)
+yajl_do_parse(yajl_handle hand, const unsigned char * jsonText,
+              unsigned int jsonTextLen)
 {
     yajl_tok tok;
     const unsigned char * buf;
     unsigned int bufLen;
+    unsigned int * offset = &(hand->bytesConsumed);
+
+    *offset = 0;
+    
 
   around_again:
     switch (yajl_bs_current(hand->stateStack)) {
         case yajl_state_parse_complete:
             return yajl_status_ok;
         case yajl_state_lexical_error:
-        case yajl_state_parse_error:
-            hand->errorOffset = *offset;
+        case yajl_state_parse_error:            
             return yajl_status_error;
         case yajl_state_start:
         case yajl_state_map_need_val:
@@ -187,13 +190,13 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
                                     yajl_buf_len(hand->decodeBuf)));
                     }
                     break;
-                case yajl_tok_bool:
+                case yajl_tok_bool: 
                     if (hand->callbacks && hand->callbacks->yajl_boolean) {
                         _CC_CHK(hand->callbacks->yajl_boolean(hand->ctx,
                                                               *buf == 't'));
                     }
                     break;
-                case yajl_tok_null:
+                case yajl_tok_null: 
                     if (hand->callbacks && hand->callbacks->yajl_null) {
                         _CC_CHK(hand->callbacks->yajl_null(hand->ctx));
                     }
@@ -287,13 +290,13 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
                             _CC_CHK(hand->callbacks->yajl_end_array(hand->ctx));
                         }
                         yajl_bs_pop(hand->stateStack);
-                        goto around_again;
+                        goto around_again;                        
                     }
                     /* intentional fall-through */
                 }
-                case yajl_tok_colon:
-                case yajl_tok_comma:
-                case yajl_tok_right_bracket:
+                case yajl_tok_colon: 
+                case yajl_tok_comma: 
+                case yajl_tok_right_bracket:                
                     yajl_bs_set(hand->stateStack, yajl_state_parse_error);
                     hand->parseError =
                         "unallowed token at this point in JSON text";
@@ -312,7 +315,7 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
                     yajl_reset_parser(hand);
                 } else if (s == yajl_state_map_need_val) {
                     yajl_bs_set(hand->stateStack, yajl_state_map_got_val);
-                } else {
+                } else { 
                     yajl_bs_set(hand->stateStack, yajl_state_array_got_val);
                 }
             }
@@ -322,7 +325,7 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
 
             goto around_again;
         }
-        case yajl_state_map_start:
+        case yajl_state_map_start: 
         case yajl_state_map_need_key: {
             /* only difference between these two states is that in
              * start '}' is valid, whereas in need_key, we've parsed
@@ -358,12 +361,12 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
                             _CC_CHK(hand->callbacks->yajl_end_map(hand->ctx));
                         }
                         yajl_bs_pop(hand->stateStack);
-                        goto around_again;
+                        goto around_again;                        
                     }
                 default:
                     yajl_bs_set(hand->stateStack, yajl_state_parse_error);
                     hand->parseError =
-                        "invalid object key (must be a string)";
+                        "invalid object key (must be a string)"; 
                     goto around_again;
             }
         }
@@ -373,7 +376,7 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
             switch (tok) {
                 case yajl_tok_colon:
                     yajl_bs_set(hand->stateStack, yajl_state_map_need_val);
-                    goto around_again;
+                    goto around_again;                    
                 case yajl_tok_eof:
                     return yajl_status_insufficient_data;
                 case yajl_tok_error:
@@ -395,10 +398,10 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
                         _CC_CHK(hand->callbacks->yajl_end_map(hand->ctx));
                     }
                     yajl_bs_pop(hand->stateStack);
-                    goto around_again;
+                    goto around_again;                        
                 case yajl_tok_comma:
                     yajl_bs_set(hand->stateStack, yajl_state_map_need_key);
-                    goto around_again;
+                    goto around_again;                    
                 case yajl_tok_eof:
                     return yajl_status_insufficient_data;
                 case yajl_tok_error:
@@ -406,8 +409,8 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
                     goto around_again;
                 default:
                     yajl_bs_set(hand->stateStack, yajl_state_parse_error);
-                    hand->parseError = "after key and value, inside map, "
-                                       "I expect ',' or '}'";
+                    hand->parseError = "after key and value, inside map, " 
+                                       "I expect ',' or '}'"; 
                     /* try to restore error offset */
                     if (*offset >= bufLen) *offset -= bufLen;
                     else *offset = 0;
@@ -423,10 +426,10 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
                         _CC_CHK(hand->callbacks->yajl_end_array(hand->ctx));
                     }
                     yajl_bs_pop(hand->stateStack);
-                    goto around_again;
+                    goto around_again;                        
                 case yajl_tok_comma:
                     yajl_bs_set(hand->stateStack, yajl_state_array_need_val);
-                    goto around_again;
+                    goto around_again;                    
                 case yajl_tok_eof:
                     return yajl_status_insufficient_data;
                 case yajl_tok_error:
@@ -440,7 +443,7 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
             }
         }
     }
-
+    
     abort();
     return yajl_status_error;
 }

data/ext/yajl_parser.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_PARSER_H__
 #define __YAJL_PARSER_H__
@@ -44,7 +44,7 @@ typedef enum {
     yajl_state_parse_error,
     yajl_state_lexical_error,
     yajl_state_map_start,
-    yajl_state_map_sep,
+    yajl_state_map_sep,    
     yajl_state_map_need_val,
     yajl_state_map_got_val,
     yajl_state_map_need_key,
@@ -58,7 +58,10 @@ struct yajl_handle_t {
     void * ctx;
     yajl_lexer lexer;
     const char * parseError;
-    unsigned int errorOffset;
+    /* the number of bytes consumed from the last client buffer,
+     * in the case of an error this will be an error offset, in the
+     * case of an error this can be used as the error offset */
+    unsigned int bytesConsumed;
     /* temporary storage for decoded strings */
     yajl_buf decodeBuf;
     /* a stack of states.  access with yajl_state_XXX routines */
@@ -68,8 +71,8 @@ struct yajl_handle_t {
 };
 
 yajl_status
-yajl_do_parse(yajl_handle handle, unsigned int * offset,
-              const unsigned char * jsonText, unsigned int jsonTextLen);
+yajl_do_parse(yajl_handle handle, const unsigned char * jsonText,
+              unsigned int jsonTextLen);
 
 unsigned char *
 yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,

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.7.4"
+  VERSION = "0.7.5"
 
   # For compatibility, has the same signature of Yajl::Parser.parse
   def self.load(str_or_io, options={}, read_bufsize=nil, &block)

data/lib/yajl/bzip2/stream_reader.rb

@@ -4,6 +4,19 @@ module Yajl
     # This is a wrapper around Bzip::Reader to allow it's #read method to adhere
     # to the IO spec, allowing for two parameters (length, and buffer)
     class StreamReader < ::Bzip2::Reader
+      # A helper method to allow use similar to IO#read
+      def read(len=nil, buffer=nil)
+        if val = super(len)
+          unless buffer.nil?
+            buffer.replace(val)
+            return buffer
+          end
+          super(len)
+        else
+          nil
+        end
+      end
+
       # Helper method for one-off parsing from a bzip2-compressed stream
       #
       # See Yajl::Parser#parse for parameter documentation

data/lib/yajl/deflate/stream_reader.rb

@@ -12,9 +12,16 @@ module Yajl
       end
 
       # A helper method to allow use similar to IO#read
-      def read(len=nil)
-        return nil if finished? or ended?
-        inflate(@io.read(len))
+      def read(len=nil, buffer=nil)
+        if val = @io.read(len)
+          unless buffer.nil?
+            buffer.replace(inflate(val))
+            return buffer
+          end
+          inflate(@io.read(len))
+        else
+          nil
+        end
       end
 
       # Helper method for one-off parsing from a deflate-compressed stream

data/lib/yajl/gzip/stream_reader.rb

@@ -4,6 +4,19 @@ module Yajl
     # This is a wrapper around Zlib::GzipReader to allow it's #read method to adhere
     # to the IO spec, allowing for two parameters (length, and buffer)
     class StreamReader < ::Zlib::GzipReader
+      # A helper method to allow use similar to IO#read
+      def read(len=nil, buffer=nil)
+        if val = super(len)
+          unless buffer.nil?
+            buffer.replace(val)
+            return buffer
+          end
+          super(len)
+        else
+          nil
+        end
+      end
+
       # Helper method for one-off parsing from a gzip-compressed stream
       #
       # See Yajl::Parser#parse for parameter documentation

data/spec/encoding/encoding_spec.rb

@@ -3,7 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 class Dummy2
   def to_json
-    "hawtness".dump
+    "{\"hawtness\":true}"
+  end
+end
+
+class Dummy3
+  def as_json
+    {:hawtness => true}
   end
 end
 
@@ -152,7 +158,12 @@ describe "Yajl JSON encoder" do
 
   it "should check for and call #to_json if it exists on custom objects" do
     d = Dummy2.new
-    Yajl::Encoder.encode({:foo => d}).should eql('{"foo":"hawtness"}')
+    Yajl::Encoder.encode({:foo => d}).should eql('{"foo":{"hawtness":true}}')
+  end
+
+  it "should check for and call #as_json if it exists on custom objects" do
+    d = Dummy3.new
+    Yajl::Encoder.encode(d).should eql('{"hawtness":true}')
   end
 
   it "should encode a hash where the key and value can be symbols" do

data/spec/spec_helper.rb

@@ -4,3 +4,4 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'rubygems'
 require 'yajl'
 require 'active_support/core_ext/kernel/reporting'
+require 'date'

data/yajl-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   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-03-03}
+  s.date = %q{2010-03-23}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Brian Lopez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -08:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: []