yaji 0.0.2 → 0.0.3

data/HISTORY.markdown

@@ -1,3 +1,7 @@
+=== 0.0.3 / 2011-08-19
+
+* Allow multiple filters to select sibling JSON nodes
+
 === 0.0.2 / 2011-08-19
 
 * Integration with curb gem

data/README.markdown

@@ -6,7 +6,7 @@ YAJI is a ruby wrapper to YAJL providing iterator interface to streaming JSON pa
 INSTALL
 -------
 
-This gem depend on [yajl][1]. So you need development headers installed
+This gem depends on [yajl][1]. So you need development headers installed
 on your system to build this gem. For Debian GNU/Linux family it will be something like:
 
     sudo apt-get install libyajl-dev
@@ -87,7 +87,20 @@ code above will print two lines:
     {"id"=>2}
 
 You can use this iterator when the data is huge and you'd like to allow
-GC to collect yielded object before parser finish its job.
+GC to collect yielded object before parser finish its job. You can also
+specify additional selector if you need to fetch some sibling nodes,
+e.g. `"size"` from previous example:
+
+    parser = YAJI::Parser.new('{"size":2,"items":[{"id":1}, {"id":2}]}')
+    parser.each("size", "items/") do |obj|
+      puts obj.inspect
+    end
+
+it yields
+
+    2
+    {"id"=>1}
+    {"id"=>2}
 
 
 LICENSE

data/ext/yaji/parser_ext.c

@@ -261,8 +261,28 @@ static VALUE rb_yaji_parser_parse(int argc, VALUE* argv, VALUE self)
 	return Qnil;
 }
 
-#define YAJI_STR_START_WITH(str, head) \
-	(RSTRING_LEN(head) <= RSTRING_LEN(str) && memcmp(RSTRING_PTR(head), RSTRING_PTR(str), RSTRING_LEN(head)) == 0)
+static int rb_yaji_str_start_with(VALUE str, VALUE query)
+{
+	int i;
+	const char *ptr = RSTRING_PTR(str);
+	int len = RSTRING_LEN(str);
+	VALUE entry;
+
+	switch(TYPE(query)) {
+	case T_STRING:
+		return RSTRING_LEN(query) <= len && memcmp(RSTRING_PTR(query), ptr, RSTRING_LEN(query)) == 0;
+		break;
+	case T_ARRAY:
+		for (i=0; i<RARRAY_LEN(query); i++) {
+			entry = RARRAY_PTR(query)[i];
+			if (RSTRING_LEN(entry) <= len && memcmp(RSTRING_PTR(entry), ptr, RSTRING_LEN(entry)) == 0) {
+				return 1;
+			}
+		}
+		break;
+	}
+	return 0;
+}
 
 static VALUE rb_yaji_each_iter(VALUE chunk, VALUE* params_p)
 {
@@ -275,7 +295,7 @@ static VALUE rb_yaji_each_iter(VALUE chunk, VALUE* params_p)
 	VALUE query = params[2];
 	VALUE last_entry, object, container, key, hash;
 
-	if (NIL_P(query) || YAJI_STR_START_WITH(path, query)) {
+	if (NIL_P(query) || rb_yaji_str_start_with(path, query)) {
 		if (event == sym_hash_key) {
 			rb_ary_push(stack, value);
 		} else if (event == sym_start_hash || event == sym_start_array) {
@@ -319,7 +339,7 @@ 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);
+	rb_scan_args(argc, argv, "0*&", &query, &proc);
 	RETURN_ENUMERATOR(self, argc, argv);
 	params[0] = proc;	    // callback
 	params[1] = rb_ary_new();   // stack

data/lib/yaji.rb

@@ -18,7 +18,7 @@
 #
 
 require "yaji/version"
-require "yaji/parser_ext"
+require "parser_ext"
 
 module YAJI
 end

data/lib/yaji/version.rb

@@ -18,5 +18,5 @@
 #
 
 module YAJI
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/tasks/compile.rake

@@ -7,7 +7,6 @@ end
 
 Rake::ExtensionTask.new("parser_ext", gemspec) do |ext|
   ext.ext_dir = File.join('ext', 'yaji')
-  ext.lib_dir = File.join('lib', 'yaji')
 
   # clean compiled extension
   CLEAN.include "#{ext.lib_dir}/*.#{RbConfig::CONFIG['DLEXT']}"

data/test/test_parser.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaji
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000Z
+date: 2011-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &8959040 !ruby/object:Gem::Requirement
+  requirement: &20429520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8959040
+  version_requirements: *20429520
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &8958360 !ruby/object:Gem::Requirement
+  requirement: &20428740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8958360
+  version_requirements: *20428740
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &8957820 !ruby/object:Gem::Requirement
+  requirement: &20427980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8957820
+  version_requirements: *20427980
 description: YAJI is a ruby wrapper to YAJL providing iterator interface to streaming
   JSON parser
 email: info@couchbase.com