brianmario-yajl-ruby 0.2.1 → 0.3.0

data/CHANGELOG.rdoc

@@ -0,0 +1,27 @@
+= Changelog
+
+0.3.0 (April 23rd, 2009)
+ * slight refactor of ActiveSupport tests to better reflect how they actually
+ exist in ActiveSupport
+ * typo correction in the changelog which had the years in 2008
+ * added some initial spec tests
+ ** ported some from ActiveSupport to ensure proper compatibility
+ ** included 57 JSON fixtures to test against, all of which pass
+ * changed parser config to not check for invalid unicode characters as Ruby is
+ going to do this anyway (?). This resolves the remaining test failures around unicode.
+ * changed how the parser was dealing with numbers to prevent overflows
+ * added an exception class Yajl::ParseError which is now used in place of simply
+ printing to STDERR upon a parsing error
+ * renamed a couple of JSON test files in the benchmark folder to better represent their
+ contents
+ * misc README updates
+
+0.2.1 (April 23rd, 2009)
+ * fixed parsing bug - also fixed failing ActiveSupport test failures
+ (except for the unicode one, which is an issue in Yajl itself)
+
+0.2.0 (April 22nd, 2009)
+ * updated gemspec and README
+
+0.1.0 (April 21st, 2009)
+ * initial release - gemified

data/README.rdoc

@@ -28,7 +28,13 @@ or maybe STDIN
 
 There are a lot more possibilities, some of which I'm going to write other gems/plugins for.
 
-Some ideas are parsing logs in JSON format, an ActiveSupport patch, Rack middleware, use with ohai, JSON API clients, etc...
+Some ideas are:
+* parsing logs in JSON format
+* an  ActiveSupport patch (http://github.com/technoweenie/rails/commit/f9abcc93a3660fcf46172c4cd8a2f36ba5a5510d)
+* Rack middleware (ideally the JSON body could be handed to the parser while it's still being received)
+* use with ohai
+* JSON API clients
+* etc...
 
 == How to install
 
@@ -72,4 +78,5 @@ Here's a list of things I need to get done to improve the awesomeness of this li
 
 * Write up a test suite 
 * Fix known parsing issues with certain JSON strings (Yajl itself works fine, it's the logic in this library that needs a little tweaking)
-* Write more docs
+* Write more docs
+* Change API so it can accept a String or an IO

data/Rakefile

@@ -5,8 +5,8 @@ begin
     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.description = "Ruby C bindings to the excellent Yajl JSON stream-based parser library."
     gem.authors = ["Brian Lopez"]
+    gem.require_paths = ["ext"]
     gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
     # gem.rubyforge_project = "yajl-ruby"
   end

data/VERSION.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Brian Lopez
@@ -9,24 +9,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -07:00
+date: 2009-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: ""
+description: 
 email: seniorlopez@gmail.com
 executables: []
 
-extensions: 
-- ext/extconf.rb
-extra_rdoc_files: []
+extensions: []
 
+extra_rdoc_files: 
+- README.rdoc
 files: 
+- CHANGELOG.rdoc
 - README.rdoc
 - Rakefile
 - VERSION.yml
-- ext/extconf.rb
-- ext/yajl.c
 has_rdoc: true
 homepage: http://github.com/brianmario/yajl-ruby
 post_install_message: 

data/ext/extconf.rb

@@ -1,6 +0,0 @@
-require 'mkmf'
-dir_config('yajl')
-have_header('yajl/yajl_parse.h')
-have_header('yajl/yajl_gen.h')
-have_library('yajl')
-create_makefile("yajl")

data/ext/yajl.c

@@ -1,150 +0,0 @@
-#include <yajl/yajl_parse.h>
-#include <yajl/yajl_gen.h>
-#include <ruby.h>
-
-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_integer(void * ctx, long integerVal) {
-    set_static_value(ctx, LONG2FIX(integerVal));
-    return 1;
-}
-
-static int found_double(void * ctx, double doubleVal) {
-    set_static_value(ctx, rb_float_new(doubleVal));
-    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,
-    found_integer,
-    found_double,
-    NULL,
-    found_string,
-    found_start_hash,
-    found_hash_key,
-    found_end_hash,
-    found_start_array,
-    found_end_array
-};
-
-ID intern_io_read, intern_eof;
-yajl_parser_config cfg = {1, 1};
-
-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));
-            fprintf(stderr, (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);
-}
-
-VALUE mYajl;
-VALUE 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);
-}