yajl-ruby 0.7.1 → 0.7.2

data/ext/yajl_lex.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_LEX_H__
 #define __YAJL_LEX_H__
@@ -36,21 +36,21 @@
 #include "api/yajl_common.h"
 
 typedef enum {
-    yajl_tok_bool,         
+    yajl_tok_bool,
     yajl_tok_colon,
-    yajl_tok_comma,     
+    yajl_tok_comma,
     yajl_tok_eof,
     yajl_tok_error,
-    yajl_tok_left_brace,     
+    yajl_tok_left_brace,
     yajl_tok_left_bracket,
-    yajl_tok_null,         
-    yajl_tok_right_brace,     
+    yajl_tok_null,
+    yajl_tok_right_brace,
     yajl_tok_right_bracket,
 
     /* we differentiate between integers and doubles to allow the
      * parser to interpret the number without re-scanning */
-    yajl_tok_integer, 
-    yajl_tok_double, 
+    yajl_tok_integer,
+    yajl_tok_double,
 
     /* we differentiate between strings which require further processing,
      * and strings that do not */
@@ -83,7 +83,7 @@ n * error messages.
  *
  * When you pass the next chunk of data, context should be reinitialized
  * to zero.
- * 
+ *
  * Finally, the output buffer is usually just a pointer into the jsonText,
  * however in cases where the entity being lexed spans multiple chunks,
  * the lexer will buffer the entity and the data returned will be

data/ext/yajl_parser.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_lex.h"
 #include "yajl_parser.h"
@@ -53,7 +53,7 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,
     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;
         }
@@ -148,7 +148,7 @@ yajl_do_parse(yajl_handle hand, unsigned int * offset,
         case yajl_state_parse_complete:
             return yajl_status_ok;
         case yajl_state_lexical_error:
-        case yajl_state_parse_error:            
+        case yajl_state_parse_error:
             hand->errorOffset = *offset;
             return yajl_status_error;
         case yajl_state_start:
@@ -187,13 +187,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 +287,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 +312,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 +322,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 +358,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 +373,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 +395,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 +406,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 +423,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 +440,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.
- * 
+ *
  * 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,

data/lib/yajl.rb

@@ -13,18 +13,18 @@ require 'yajl_ext'
 #
 # Ruby bindings to the excellent Yajl (Yet Another JSON Parser) ANSI C library.
 module Yajl
-  VERSION = "0.7.1"
-  
+  VERSION = "0.7.2"
+
   # For compatibility, has the same signature of Yajl::Parser.parse
   def self.load(str_or_io, options={}, read_bufsize=nil, &block)
     Parser.parse(str_or_io, options, read_bufsize, &block)
   end
-  
+
   # For compatibility, has the same signature of Yajl::Encoder.encode
   def self.dump(obj, *args, &block)
     Encoder.encode(obj, args, &block)
   end
-  
+
   class Parser
     # A helper method for parse-and-forget use-cases
     #
@@ -39,7 +39,7 @@ module Yajl
       new(options).parse(str_or_io, read_bufsize, &block)
     end
   end
-  
+
   class Encoder
     # A helper method for encode-and-forget use-cases
     #
@@ -75,7 +75,7 @@ module Yajl
       new(options).encode(obj, io, &block)
     end
   end
-  
+
   # DEPRECATED - See Yajl::Parser and Yajl::Encoder
   module Stream
     # DEPRECATED - See Yajl::Parser
@@ -83,7 +83,7 @@ module Yajl
       warn "WARNING: Yajl::Stream has be deprecated and will most likely be gone in the next release. Use the Yajl::Parser class instead."
       Parser.new.parse(str_or_io)
     end
-    
+
     # DEPRECATED - See Yajl::Encoder
     def self.encode(obj, str_or_io=nil)
       warn "WARNING: Yajl::Stream has be deprecated and will most likely be gone in the next release. Use the Yajl::Encoder class instead."

data/lib/yajl/bzip2/stream_reader.rb

@@ -4,16 +4,6 @@ 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)
-        unless buffer.nil?
-          buffer.replace super(len)
-          return buffer
-        end
-        super(len)
-      end
-
       # Helper method for one-off parsing from a bzip2-compressed stream
       #
       # See Yajl::Parser#parse for parameter documentation
@@ -21,7 +11,7 @@ module Yajl
         if input.is_a?(String)
           input = StringIO.new(input)
         end
-        
+
         Yajl::Parser.new(options).parse(new(input), buffer_size, &block)
       end
     end

data/lib/yajl/bzip2/stream_writer.rb

@@ -3,7 +3,7 @@ module Yajl
   module Bzip2
     # A wrapper around the Bzip2::Writer class for easier JSON stream encoding
     class StreamWriter < ::Bzip2::Writer
-      
+
       # A helper method for encoding to a bzip2-compressed stream
       #
       # Look up Yajl::Encoder#encode for parameter documentation

data/lib/yajl/deflate/stream_reader.rb

@@ -4,20 +4,19 @@ module Yajl
     # This is a wrapper around Zlib::Inflate, creating a #read method that adheres
     # to the IO spec, allowing for two parameters (length, and buffer)
     class StreamReader < ::Zlib::Inflate
-      
+
       # Wrapper to the initialize method so we can set the initial IO to parse from.
       def initialize(io, options)
         @io = io
         super(options)
       end
-      
+
       # A helper method to allow use similar to IO#read
-      def read(len=nil, buffer=nil)
-        buffer.replace inflate(@io.read(len)) and return unless buffer.nil?
+      def read(len=nil)
+        return nil if finished? or ended?
         inflate(@io.read(len))
       end
-      alias :eof? :finished?
-      
+
       # Helper method for one-off parsing from a deflate-compressed stream
       #
       # See Yajl::Parser#parse for parameter documentation
@@ -25,7 +24,7 @@ module Yajl
         if input.is_a?(String)
           input = StringIO.new(input)
         end
-        
+
         if options.is_a?(Hash)
           deflate_options = options.delete(:deflate_options)
           Yajl::Parser.new(options).parse(new(input, deflate_options), buffer_size, &block)