yajl-ruby 0.7.8 → 0.7.9

data/.gitignore

@@ -6,4 +6,5 @@ benchmark/subjects/contacts.*
 *.bundle
 TODO.txt
 tmp/*
-pkg/*
+pkg/*
+vendor/gems

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--colour

data/CHANGELOG.md

@@ -1,9 +1,19 @@
 # Changelog
 
+## 0.7.9 (January 11th, 2011)
+* moved to rspec2
+* fixed some compilation warnings on 1.9.3
+* brought over latest from Yajl upstream
+* finally removed the deprecated Yajl::Stream methods
+* moved to rake-compiler
+* moved to Bundler for development
+* fix memory corruption bug when using :pretty => true and a custom indent string
+* fixed memory leak when exceptions were being raised during a parse
+
 ## 0.7.8 (September 27th, 2010)
-* bugfix due to improper usage of rb_define_method
-* bugfix to make sure json gem compability API doesn't break ActiveSupport#to_json
 * fix a bug in chunked http response regex (thanks to http://github.com/kevn for catching this)
+* Make sure json compability doesn't break ActiveSupport#to_json
+* fix improper usage of rb_define_method
 
 ## 0.7.7 (July 12th, 2010)
 * full string encoding support for 1.9, respecting Encoding.default_internal

data/Gemfile

@@ -0,0 +1,7 @@
+source :rubygems
+
+group :development do
+  gem 'rake-compiler', '>= 0.7.5'
+  gem 'jeweler'
+  gem 'rspec'
+end

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rake-compiler (0.7.5)
+      rake
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  rake-compiler (>= 0.7.5)
+  rspec

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010 Brian Lopez - http://github.com/brianmario
+Copyright (c) 2008-2011 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

data/Rakefile

@@ -1,40 +1,8 @@
 # encoding: UTF-8
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "yajl-ruby"
-    gem.summary = "Ruby C bindings to the excellent Yajl JSON stream-based parser library."
-    gem.email = "seniorlopez@gmail.com"
-    gem.homepage = "http://github.com/brianmario/yajl-ruby"
-    gem.authors = ["Brian Lopez", "Lloyd Hilaiel"]
-    gem.require_paths = ["lib", "ext"]
-    gem.extra_rdoc_files = `git ls-files *.rdoc`.split("\n") << 'ext/yajl.c'
-    gem.files = `git ls-files`.split("\n")
-    gem.extensions = ["ext/extconf.rb"]
-    gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
-    gem.rubyforge_project = "yajl-ruby"
-  end
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler -s http://gems.github.com"
-end
+require 'bundler'
+Bundler.setup
 
-begin
-  require 'rake'
-  require 'spec/rake/spectask'
+require 'rake'
 
-  desc "Run all examples with RCov"
-  Spec::Rake::SpecTask.new('spec:rcov') do |t|
-    t.spec_files = FileList['spec/']
-    t.rcov = true
-    t.rcov_opts = lambda do
-      IO.readlines("spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
-    end
-  end
-  Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_files = FileList['spec/']
-    t.libs << 'ext'
-    t.spec_opts << '--options' << 'spec/spec.opts'
-  end
-rescue LoadError
-  puts "RSpec, or one of its dependencies, is not available. Install it with: sudo gem install rspec"
-end
+# Load custom tasks
+Dir['tasks/*.rake'].sort.each { |f| load f }

data/VERSION.yml

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

data/benchmark/encode.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
-require 'yajl_ext'
+require 'yajl'
 require 'stringio'
 begin
   require 'json'

data/benchmark/encode_json_and_marshal.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
-require 'yajl_ext'
+require 'yajl'
 require 'stringio'
 begin
   require 'json'

data/benchmark/encode_json_and_yaml.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
-require 'yajl_ext'
+require 'yajl'
 begin
   require 'json'
 rescue LoadError

data/benchmark/http.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'

data/benchmark/parse.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
-require 'yajl_ext'
+require 'yajl'
 begin
   require 'json'
 rescue LoadError

data/benchmark/parse_json_and_marshal.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
-require 'yajl_ext'
+require 'yajl'
 begin
   require 'json'
 rescue LoadError

data/benchmark/parse_json_and_yaml.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
-require 'yajl_ext'
+require 'yajl'
 begin
   require 'json'
 rescue LoadError

data/benchmark/parse_stream.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
-require 'yajl_ext'
+require 'yajl'
 begin
   require 'json'
 rescue LoadError

data/examples/encoding/chunked_encoding.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl'

data/examples/encoding/one_shot.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl'

data/examples/encoding/to_an_io.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl'

data/examples/http/twitter_search_api.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl/http_stream'

data/examples/http/twitter_stream_api.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl/gzip'

data/examples/parsing/from_file.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl'

data/examples/parsing/from_stdin.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl'

data/examples/parsing/from_string.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
 require 'yajl'

data/ext/{api → yajl/api}/yajl_common.h

@@ -49,7 +49,11 @@ extern "C" {
 #    define YAJL_API __declspec(dllimport)
 #  endif
 #else
-#  define YAJL_API
+#  if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#    define YAJL_API __attribute__ ((visibility("default")))
+#  else
+#    define YAJL_API
+#  endif
 #endif 
 
 /** pointer to a malloc function, supporting client overriding memory

data/ext/{api → yajl/api}/yajl_gen.h

@@ -134,7 +134,7 @@ extern "C" {
                                              const unsigned char * str,
                                              unsigned int len);
     YAJL_API yajl_gen_status yajl_gen_null(yajl_gen hand);
-    YAJL_API yajl_gen_status yajl_gen_bool(yajl_gen hand, int boolean);    
+    YAJL_API yajl_gen_status yajl_gen_bool(yajl_gen hand, int boolean);
     YAJL_API yajl_gen_status yajl_gen_map_open(yajl_gen hand);
     YAJL_API yajl_gen_status yajl_gen_map_close(yajl_gen hand);
     YAJL_API yajl_gen_status yajl_gen_array_open(yajl_gen hand);

data/ext/{api → yajl/api}/yajl_parse.h

@@ -131,12 +131,12 @@ extern "C" {
                                     const yajl_parser_config * config,
                                     const yajl_alloc_funcs * allocFuncs,
                                     void * ctx);
-
+    
     /** allow resetting of the lexer without the need to realloc a new parser */
     void yajl_reset_parser(yajl_handle hand);
 
-    /** free a parser handle */
-    void YAJL_API yajl_free(yajl_handle handle);
+    /** free a parser handle */    
+    YAJL_API void yajl_free(yajl_handle handle);
 
     /** Parse some json!
      *  \param hand - a handle to the json parser allocated with yajl_alloc

data/ext/yajl/api/yajl_version.h

@@ -0,0 +1,23 @@
+#ifndef YAJL_VERSION_H_
+#define YAJL_VERSION_H_
+
+#include "api/yajl_common.h"
+
+#define YAJL_MAJOR 1
+#define YAJL_MINOR 0
+#define YAJL_MICRO 11
+
+#define YAJL_VERSION ((YAJL_MAJOR * 10000) + (YAJL_MINOR * 100) + YAJL_MICRO)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int YAJL_API yajl_version(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* YAJL_VERSION_H_ */
+

data/ext/yajl/extconf.rb

@@ -0,0 +1,8 @@
+# encoding: UTF-8
+require 'mkmf'
+require 'rbconfig'
+
+$CFLAGS << ' -Wall -funroll-loops'
+$CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
+
+create_makefile("yajl")

data/ext/{yajl_ext.c → yajl/yajl_ext.c}

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2009 Brian Lopez - http://github.com/brianmario
+ * Copyright (c) 2008-2011 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
@@ -24,9 +24,9 @@
 #include "yajl_ext.h"
 
 #define YAJL_RB_TO_JSON                                   \
- VALUE rb_encoder;                                        \
+ VALUE rb_encoder, cls;                                   \
  rb_scan_args(argc, argv, "01", &rb_encoder);             \
- VALUE cls = rb_obj_class(rb_encoder);                    \
+ cls = rb_obj_class(rb_encoder);                          \
  if (rb_encoder == Qnil || cls != cEncoder) {             \
      rb_encoder = rb_yajl_encoder_new(0, NULL, cEncoder); \
  }                                                        \
@@ -95,6 +95,9 @@ inline void yajl_set_static_value(void * ctx, VALUE val) {
 static void yajl_encoder_wrapper_free(void * wrapper) {
     yajl_encoder_wrapper * w = wrapper;
     if (w) {
+        if (w->indentString) {
+          free(w->indentString);
+        }
         yajl_gen_free(w->encoder);
         free(w);
     }
@@ -116,6 +119,7 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
     const unsigned char * buffer;
     const char * cptr;
     unsigned int len;
+    VALUE keys, entry, keyStr;
 
     if (io != Qnil || w->on_progress_callback != Qnil) {
         status = yajl_gen_get_buf(w->encoder, &buffer, &len);
@@ -135,8 +139,7 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             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;
+            keys = rb_funcall(obj, intern_keys, 0);
             for(idx=0; idx<RARRAY_LEN(keys); idx++) {
                 entry = rb_ary_entry(keys, idx);
                 keyStr = rb_funcall(entry, intern_to_s, 0); /* key must be a string */
@@ -220,8 +223,9 @@ void yajl_parse_chunk(const unsigned char * chunk, unsigned int len, yajl_handle
 
     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);
+        VALUE errobj = rb_exc_new2(cParseError, (const char*) str);
         yajl_free_error(parser, str);
+        rb_exc_raise(errobj);
     }
 }
 
@@ -269,10 +273,13 @@ static int yajl_found_string(void * ctx, const unsigned char * stringVal, unsign
 
 static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsigned int stringLen) {
     yajl_parser_wrapper * wrapper;
-    GetParser((VALUE)ctx, wrapper);
     VALUE keyStr;
 #ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding *default_internal_enc = rb_default_internal_encoding();
+    rb_encoding *default_internal_enc;
+#endif
+    GetParser((VALUE)ctx, wrapper);
+#ifdef HAVE_RUBY_ENCODING_H
+    default_internal_enc = rb_default_internal_encoding();
 #endif
 
     if (wrapper->symbolizeKeys) {
@@ -488,7 +495,6 @@ static VALUE rb_yajl_parser_parse_chunk(VALUE self, VALUE chunk) {
     GetParser(self, wrapper);
     if (NIL_P(chunk)) {
         rb_raise(cParseError, "Can't parse a nil string.");
-        return Qnil;
     }
 
     if (wrapper->parse_complete_callback != Qnil) {
@@ -526,6 +532,7 @@ static VALUE rb_yajl_parser_set_complete_cb(VALUE self, VALUE callback) {
  * The JSON stream created is written to the IO in chunks, as it's being created.
  */
 
+static unsigned char * defaultIndentString = (unsigned char *)"  ";
 /*
  * Document-method: new
  *
@@ -545,7 +552,7 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
     yajl_encoder_wrapper * wrapper;
     yajl_gen_config cfg;
     VALUE opts, obj, indent;
-    const char * indentString = "  ";
+    unsigned char *indentString = NULL, *actualIndent = NULL;
     int beautify = 0;
 
     /* Scan off config vars */
@@ -560,13 +567,20 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
                 indent = rb_str_export_to_enc(indent, utf8Encoding);
 #endif
                 Check_Type(indent, T_STRING);
-                indentString = RSTRING_PTR(indent);
+                indentString = (unsigned char*)malloc(RSTRING_LEN(indent)+1);
+                memcpy(indentString, RSTRING_PTR(indent), RSTRING_LEN(indent));
+                indentString[RSTRING_LEN(indent)] = '\0';
+                actualIndent = indentString;
             }
         }
     }
-    cfg = (yajl_gen_config){beautify, indentString};
+    if (!indentString) {
+      indentString = defaultIndentString;
+    }
+    cfg = (yajl_gen_config){beautify, (const char *)indentString};
 
     obj = Data_Make_Struct(klass, yajl_encoder_wrapper, yajl_encoder_wrapper_mark, yajl_encoder_wrapper_free, wrapper);
+    wrapper->indentString = actualIndent;
     wrapper->encoder = yajl_gen_alloc(&cfg, NULL);
     wrapper->on_progress_callback = Qnil;
     if (opts != Qnil && rb_funcall(opts, intern_has_key, 1, sym_terminator) == Qtrue) {
@@ -836,7 +850,7 @@ static VALUE rb_yajl_encoder_enable_json_gem_ext(VALUE klass) {
 
 
 /* Ruby Extension initializer */
-void Init_yajl_ext() {
+void Init_yajl() {
     mYajl = rb_define_module("Yajl");
 
     cParseError = rb_define_class_under(mYajl, "ParseError", rb_eStandardError);