brianmario-yajl-ruby 0.3.1 → 0.3.2

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 = Changelog
 
+0.3.2 (April 24th, 2009)
+ * version bump: forgot to include yajl.c in the gem
+
 0.3.1 (April 23rd, 2009)
  * fixed borked gemspec
 

data/Rakefile

@@ -7,6 +7,17 @@ begin
     gem.homepage = "http://github.com/brianmario/yajl-ruby"
     gem.authors = ["Brian Lopez"]
     gem.require_paths = ["ext"]
+    gem.extra_rdoc_files = [
+      "README.rdoc",
+      "CHANGELOG.rdoc"
+    ]
+    gem.files = [
+      "CHANGELOG.rdoc",
+      "README.rdoc",
+      "Rakefile",
+      "VERSION.yml",
+      "ext/yajl.c"
+    ]
     gem.extensions = ["ext/extconf.rb"]
     gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
     # gem.rubyforge_project = "yajl-ruby"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 3

data/ext/yajl.c

@@ -0,0 +1,148 @@
+#include <yajl/yajl_parse.h>
+#include <yajl/yajl_gen.h>
+#include <ruby.h>
+
+static VALUE cParseError;
+
+void set_static_value(void * ctx, VALUE val) {
+    VALUE len = RARRAY((VALUE)ctx)->len;
+    
+    if (len > 0) {
+        VALUE lastEntry = rb_ary_entry((VALUE)ctx, len-1);
+        VALUE hash;
+        switch (TYPE(lastEntry)) {
+            case T_ARRAY:
+                rb_ary_push(lastEntry, val);
+                if (TYPE(val) == T_HASH || TYPE(val) == T_ARRAY) {
+                    rb_ary_push((VALUE)ctx, val);
+                }
+                break;
+            case T_HASH:
+                rb_hash_aset(lastEntry, val, Qnil);
+                rb_ary_push((VALUE)ctx, val);
+                break;
+            case T_STRING:
+                hash = rb_ary_entry((VALUE)ctx, len-2);
+                if (TYPE(hash) == T_HASH) {
+                    rb_hash_aset(hash, lastEntry, val);
+                    rb_ary_pop((VALUE)ctx);
+                    if (TYPE(val) == T_HASH || TYPE(val) == T_ARRAY) {
+                        rb_ary_push((VALUE)ctx, val);
+                    }
+                }
+                break;
+        }
+    } else {
+        rb_ary_push((VALUE)ctx, val);
+    }
+}
+
+static int found_null(void * ctx) {
+    set_static_value(ctx, Qnil);
+    return 1;
+}
+
+static int found_boolean(void * ctx, int boolean) {
+    set_static_value(ctx, boolean ? Qtrue : Qfalse);
+    return 1;
+}
+
+static int found_number(void * ctx, const char * numberVal, unsigned int numberLen) {
+    set_static_value(ctx, rb_str2inum(rb_str_new(numberVal, numberLen), 10));
+    return 1;
+}
+
+static int found_string(void * ctx, const unsigned char * stringVal, unsigned int stringLen) {
+    set_static_value(ctx, rb_str_new((char *)stringVal, stringLen));
+    return 1;
+}
+
+static int found_hash_key(void * ctx, const unsigned char * stringVal, unsigned int stringLen) {
+    set_static_value(ctx, rb_str_new((char *)stringVal, stringLen));
+    return 1;
+}
+
+static int found_start_hash(void * ctx) {
+    set_static_value(ctx, rb_hash_new());
+    return 1;
+}
+
+static int found_end_hash(void * ctx) {
+    if (RARRAY((VALUE)ctx)->len > 1) {
+        rb_ary_pop((VALUE)ctx);
+    }
+    return 1;
+}
+
+static int found_start_array(void * ctx) {
+    set_static_value(ctx, rb_ary_new());
+    return 1;
+}
+
+static int found_end_array(void * ctx) {
+    if (RARRAY((VALUE)ctx)->len > 1) {
+        rb_ary_pop((VALUE)ctx);
+    }
+    return 1;
+}
+
+static yajl_callbacks callbacks = {
+    found_null,
+    found_boolean,
+    NULL,
+    NULL,
+    found_number,
+    found_string,
+    found_start_hash,
+    found_hash_key,
+    found_end_hash,
+    found_start_array,
+    found_end_array
+};
+
+static ID intern_io_read, intern_eof;
+yajl_parser_config cfg = {1, 0};
+
+static VALUE t_parse(VALUE self, VALUE io) {
+    yajl_handle hand;
+    yajl_status stat;
+    int bufferSize = 8192;
+    intern_io_read = rb_intern("read");
+    intern_eof = rb_intern("eof?");
+    VALUE ctx = rb_ary_new();
+    
+    // allocate our parser
+    hand = yajl_alloc(&callbacks, &cfg, NULL, (void *)ctx);
+    VALUE parsed = rb_str_new("", 0);
+    VALUE rbufsize = INT2FIX(bufferSize);
+    
+    // now parse from the IO
+    while (rb_funcall(io, intern_eof, 0) == Qfalse) {
+        rb_funcall(io, intern_io_read, 2, rbufsize, parsed);
+        
+        stat = yajl_parse(hand, (const unsigned char *)RSTRING(parsed)->ptr, RSTRING(parsed)->len);
+        
+        if (stat != yajl_status_ok && stat != yajl_status_insufficient_data) {
+            unsigned char * str = yajl_get_error(hand, 1, (const unsigned char *)RSTRING_PTR(parsed), RSTRING_LEN(parsed));
+            rb_raise(cParseError, "%s", (const char *) str);
+            yajl_free_error(hand, str);
+            break;
+        }
+    }
+    
+    // parse any remaining buffered data
+    stat = yajl_parse_complete(hand);
+    yajl_free(hand);
+
+    return rb_ary_pop(ctx);
+}
+
+static VALUE mYajl, mNative;
+
+void Init_yajl() {
+    mYajl = rb_define_module("Yajl");
+    mNative = rb_define_module_under(mYajl, "Native");
+    rb_define_module_function(mNative, "parse", t_parse, 1);
+    VALUE rb_cStandardError = rb_const_get(rb_cObject, rb_intern("StandardError"));
+    cParseError = rb_define_class_under(mYajl, "ParseError", rb_cStandardError);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Brian Lopez
@@ -26,6 +26,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- ext/yajl.c
 has_rdoc: true
 homepage: http://github.com/brianmario/yajl-ruby
 post_install_message: