yaji 0.0.8 → 0.0.9

data/HISTORY.markdown

@@ -1,3 +1,7 @@
+=== 0.0.9 / 2011-09-01
+
+* Optionally yield path in object iterator
+
 === 0.0.8 / 2011-08-30
 
 * Use rb_str_new2 for backward comatibility with ruby 1.8.x

data/ext/yaji/parser_ext.c

@@ -296,6 +296,7 @@ static VALUE rb_yaji_each_iter(VALUE chunk, VALUE* params_p)
 	VALUE proc = params[0];
 	VALUE stack = params[1];
 	VALUE query = params[2];
+	VALUE with_path = params[3];
 	VALUE last_entry, object, container, key, hash;
 
 	if (NIL_P(query) || rb_yaji_str_start_with(path, query)) {
@@ -317,7 +318,11 @@ static VALUE rb_yaji_each_iter(VALUE chunk, VALUE* params_p)
 		} else if (event == sym_end_hash || event == sym_end_array) {
 			object = rb_ary_pop(stack);
 			if (RARRAY_LEN(stack) == 0) {
-				rb_funcall(proc, id_call, 1, object);
+				if (with_path == Qnil || with_path == Qfalse) {
+					rb_funcall(proc, id_call, 1, object);
+				} else {
+					rb_funcall(proc, id_call, 1, rb_ary_new3(2, path, object));
+				}
 			}
 		} else {
 			last_entry = rb_ary_entry(stack, -1);
@@ -331,7 +336,11 @@ static VALUE rb_yaji_each_iter(VALUE chunk, VALUE* params_p)
 				rb_ary_push(last_entry, value);
 				break;
 			case T_NIL:
-				rb_funcall(proc, id_call, 1, value);
+				if (with_path == Qnil || with_path == Qfalse) {
+					rb_funcall(proc, id_call, 1, value);
+				} else {
+					rb_funcall(proc, id_call, 1, rb_ary_new3(2, path, value));
+				}
 				break;
 			}
 		}
@@ -341,12 +350,18 @@ static VALUE rb_yaji_each_iter(VALUE chunk, VALUE* params_p)
 
 static VALUE rb_yaji_parser_each(int argc, VALUE* argv, VALUE self)
 {
-	VALUE query, proc, params[3];
-	rb_scan_args(argc, argv, "01&", &query, &proc);
+	VALUE query, proc, options, params[4];
 	RETURN_ENUMERATOR(self, argc, argv);
+	rb_scan_args(argc, argv, "02&", &query, &options, &proc);
 	params[0] = proc;	    // callback
 	params[1] = rb_ary_new();   // stack
 	params[2] = query;
+	if (options != Qnil) {
+		Check_Type(options, T_HASH);
+		params[3] = rb_hash_aref(options, sym_with_path);
+	} else {
+		params[3] = Qnil;
+	}
 	rb_block_call(self, id_parse, 0, NULL, rb_yaji_each_iter, (VALUE)params);
 	return Qnil;
 }
@@ -401,6 +416,7 @@ void Init_parser_ext() {
 	sym_check_utf8 = ID2SYM(rb_intern("check_utf8"));
 	sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
 	sym_read_buffer_size = ID2SYM(rb_intern("read_buffer_size"));
+	sym_with_path = ID2SYM(rb_intern("with_path"));
 	sym_null = ID2SYM(rb_intern("null"));
 	sym_boolean = ID2SYM(rb_intern("boolean"));
 	sym_number = ID2SYM(rb_intern("number"));

data/ext/yaji/parser_ext.h

@@ -42,7 +42,7 @@ static rb_encoding *utf8_encoding;
 static VALUE m_yaji, c_yaji_parser, c_parse_error, c_stringio;
 
 static ID id_call, id_read, id_parse, id_perform, id_on_body, id_bytesize, id_strip;
-static ID sym_allow_comments, sym_check_utf8, sym_symbolize_keys,
+static ID sym_allow_comments, sym_check_utf8, sym_symbolize_keys, sym_with_path,
 	  sym_read_buffer_size, sym_null, sym_boolean, sym_number, sym_string,
 	  sym_hash_key, sym_start_hash, sym_end_hash, sym_start_array,
 	  sym_end_array;

data/lib/yaji/version.rb

@@ -18,5 +18,5 @@
 #
 
 module YAJI
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/test_parser.rb

@@ -165,6 +165,26 @@ class TestParser < MiniTest::Unit::TestCase
     assert_equal expected, objects
   end
 
+  def test_it_optionally_yeilds_object_path
+    parser = YAJI::Parser.new(toys_json_str)
+    objects = []
+    parser.each(["total_rows", "rows/"], :with_path => true) do |o|
+      objects << o
+    end
+    expected = [["total_rows", 2],
+                ["rows/", {
+                  "id" => "buzz",
+                  "props" => { "humanoid"=> true, "armed"=> true },
+                  "movies" => [1,2,3]
+                }],
+                ["rows/", {
+                  "id" => "barbie",
+                  "props" => { "humanoid"=> true, "armed"=> false },
+                  "movies" => [2,3]
+                }]]
+    assert_equal expected, objects
+  end
+
   def test_it_doesnt_raise_exception_on_empty_input
     YAJI::Parser.new("").parse
     YAJI::Parser.new("  ").parse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaji
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &11061180 !ruby/object:Gem::Requirement
+  requirement: &13939240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11061180
+  version_requirements: *13939240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &11060740 !ruby/object:Gem::Requirement
+  requirement: &13938660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11060740
+  version_requirements: *13938660
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &11060320 !ruby/object:Gem::Requirement
+  requirement: &13938080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11060320
+  version_requirements: *13938080
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &11059800 !ruby/object:Gem::Requirement
+  requirement: &13937360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11059800
+  version_requirements: *13937360
 description: YAJI is a ruby wrapper to YAJL providing iterator interface to streaming
   JSON parser
 email: info@couchbase.com
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: yaji
-rubygems_version: 1.8.6
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Yet another JSON iterator