yaji 0.1.2 → 0.2.0

data/HISTORY.markdown

@@ -1,3 +1,8 @@
+=== 0.2.0 / 2012-01-12
+
+* Fix root element (broken backward compatibility, see tests)
+* Close input when work is done
+
 === 0.1.2 / 2011-12-13
 
 * Finish yajl API hiding

data/ext/yaji/parser_ext.c

@@ -242,6 +242,7 @@ static VALUE rb_yaji_parser_parse(int argc, VALUE* argv, VALUE self)
 	RETURN_ENUMERATOR(self, argc, argv);
 
 	p->path = rb_ary_new();
+	rb_ary_push(p->path, rb_str_new("", 0));
 	p->path_str = rb_str_new("", 0);
 	p->chunk = Qnil;
 
@@ -265,6 +266,9 @@ static VALUE rb_yaji_parser_parse(int argc, VALUE* argv, VALUE self)
 		rb_funcall(p->parser_cb, id_call, 1, RARRAY_PTR(p->events)[i]);
 	}
 
+	if (rb_respond_to(p->input, id_close)) {
+		rb_funcall(p->input, id_close, 0);
+	}
 	return Qnil;
 }
 
@@ -409,6 +413,7 @@ void Init_parser_ext() {
 	rb_define_method(c_yaji_parser, "each", rb_yaji_parser_each, -1);
 
 	id_call = rb_intern("call");
+	id_close = rb_intern("close");
 	id_read = rb_intern("read");
 	id_parse = rb_intern("parse");
 	id_strip = rb_intern("strip");

data/ext/yaji/parser_ext.h

@@ -41,7 +41,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 id_call, id_close, id_read, id_parse, id_perform, id_on_body, id_bytesize, id_strip;
 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,

data/lib/yaji/version.rb

@@ -18,5 +18,5 @@
 #
 
 module YAJI
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/test/test_parser.rb

@@ -42,46 +42,46 @@ class TestParser < MiniTest::Unit::TestCase
       events << [p, e, v]
     end
     expected = [
-      ["",                      :start_hash,  nil],
-      ["",                      :hash_key,    "total_rows"],
-      ["total_rows",            :number,      2],
-      ["",                      :hash_key,    "rows"],
-      ["rows",                  :start_array, nil],
-      ["rows/",                 :start_hash,  nil],
-      ["rows/",                 :hash_key,    "id"],
-      ["rows//id",              :string,      "buzz"],
-      ["rows/",                 :hash_key,    "props"],
-      ["rows//props",           :start_hash,  nil],
-      ["rows//props",           :hash_key,    "humanoid"],
-      ["rows//props/humanoid",  :boolean,     true],
-      ["rows//props",           :hash_key,    "armed"],
-      ["rows//props/armed",     :boolean,     true],
-      ["rows//props",           :end_hash,    nil],
-      ["rows/",                 :hash_key,    "movies"],
-      ["rows//movies",          :start_array, nil],
-      ["rows//movies/",         :number,      1],
-      ["rows//movies/",         :number,      2],
-      ["rows//movies/",         :number,      3],
-      ["rows//movies",          :end_array,   nil],
-      ["rows/",                 :end_hash,    nil],
-      ["rows/",                 :start_hash,  nil],
-      ["rows/",                 :hash_key,    "id"],
-      ["rows//id",              :string,      "barbie"],
-      ["rows/",                 :hash_key,    "props"],
-      ["rows//props",           :start_hash,  nil],
-      ["rows//props",           :hash_key,    "humanoid"],
-      ["rows//props/humanoid",  :boolean,     true],
-      ["rows//props",           :hash_key,    "armed"],
-      ["rows//props/armed",     :boolean,     false],
-      ["rows//props",           :end_hash,    nil],
-      ["rows/",                 :hash_key,    "movies"],
-      ["rows//movies",          :start_array, nil],
-      ["rows//movies/",         :number,      2],
-      ["rows//movies/",         :number,      3],
-      ["rows//movies",          :end_array,   nil],
-      ["rows/",                 :end_hash,    nil],
-      ["rows",                  :end_array,   nil],
-      ["",                      :end_hash,    nil]
+      ["",                       :start_hash,  nil],
+      ["",                       :hash_key,    "total_rows"],
+      ["/total_rows",            :number,      2],
+      ["",                       :hash_key,    "rows"],
+      ["/rows",                  :start_array, nil],
+      ["/rows/",                 :start_hash,  nil],
+      ["/rows/",                 :hash_key,    "id"],
+      ["/rows//id",              :string,      "buzz"],
+      ["/rows/",                 :hash_key,    "props"],
+      ["/rows//props",           :start_hash,  nil],
+      ["/rows//props",           :hash_key,    "humanoid"],
+      ["/rows//props/humanoid",  :boolean,     true],
+      ["/rows//props",           :hash_key,    "armed"],
+      ["/rows//props/armed",     :boolean,     true],
+      ["/rows//props",           :end_hash,    nil],
+      ["/rows/",                 :hash_key,    "movies"],
+      ["/rows//movies",          :start_array, nil],
+      ["/rows//movies/",         :number,      1],
+      ["/rows//movies/",         :number,      2],
+      ["/rows//movies/",         :number,      3],
+      ["/rows//movies",          :end_array,   nil],
+      ["/rows/",                 :end_hash,    nil],
+      ["/rows/",                 :start_hash,  nil],
+      ["/rows/",                 :hash_key,    "id"],
+      ["/rows//id",              :string,      "barbie"],
+      ["/rows/",                 :hash_key,    "props"],
+      ["/rows//props",           :start_hash,  nil],
+      ["/rows//props",           :hash_key,    "humanoid"],
+      ["/rows//props/humanoid",  :boolean,     true],
+      ["/rows//props",           :hash_key,    "armed"],
+      ["/rows//props/armed",     :boolean,     false],
+      ["/rows//props",           :end_hash,    nil],
+      ["/rows/",                 :hash_key,    "movies"],
+      ["/rows//movies",          :start_array, nil],
+      ["/rows//movies/",         :number,      2],
+      ["/rows//movies/",         :number,      3],
+      ["/rows//movies",          :end_array,   nil],
+      ["/rows/",                 :end_hash,    nil],
+      ["/rows",                  :end_array,   nil],
+      ["",                       :end_hash,    nil]
     ]
     assert_equal expected, events
   end
@@ -91,7 +91,7 @@ class TestParser < MiniTest::Unit::TestCase
     e = parser.parse
     assert_equal ["", :start_hash, nil], e.next
     assert_equal ["", :hash_key, "hello"], e.next
-    assert_equal ["hello", :string, "world"], e.next
+    assert_equal ["/hello", :string, "world"], e.next
     assert_equal ["", :end_hash, nil], e.next
     assert_raises(StopIteration) { e.next }
   end
@@ -102,7 +102,7 @@ class TestParser < MiniTest::Unit::TestCase
     expected = [
       ["", :start_hash, nil],
       ["", :hash_key, :hello],
-      ["hello", :string, "world"],
+      ["/hello", :string, "world"],
       ["", :end_hash, nil]
     ]
     assert_equal expected, e.to_a
@@ -133,7 +133,7 @@ class TestParser < MiniTest::Unit::TestCase
   def test_it_yields_whole_array
     parser = YAJI::Parser.new(toys_json_str)
     objects = []
-    parser.each("rows") do |o|
+    parser.each("/rows") do |o|
       objects << o
     end
     expected = [[{
@@ -152,7 +152,7 @@ class TestParser < MiniTest::Unit::TestCase
   def test_it_yeilds_array_contents_row_by_row
     parser = YAJI::Parser.new(toys_json_str)
     objects = []
-    parser.each("rows/") do |o|
+    parser.each("/rows/") do |o|
       objects << o
     end
     expected = [{
@@ -179,7 +179,7 @@ class TestParser < MiniTest::Unit::TestCase
   def test_it_allow_several_selectors
     parser = YAJI::Parser.new(toys_json_str)
     objects = []
-    parser.each(["total_rows", "rows/"]) do |o|
+    parser.each(["/total_rows", "/rows/"]) do |o|
       objects << o
     end
     expected = [2,
@@ -199,16 +199,16 @@ class TestParser < MiniTest::Unit::TestCase
   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|
+    parser.each(["/total_rows", "/rows/"], :with_path => true) do |o|
       objects << o
     end
-    expected = [["total_rows", 2],
-                ["rows/", {
+    expected = [["/total_rows", 2],
+                ["/rows/", {
                   "id" => "buzz",
                   "props" => { "humanoid"=> true, "armed"=> true },
                   "movies" => [1,2,3]
                 }],
-                ["rows/", {
+                ["/rows/", {
                   "id" => "barbie",
                   "props" => { "humanoid"=> true, "armed"=> false },
                   "movies" => [2,3]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaji
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12907280 !ruby/object:Gem::Requirement
+  requirement: &23267520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *12907280
+  version_requirements: *23267520
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &12906880 !ruby/object:Gem::Requirement
+  requirement: &23267120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12906880
+  version_requirements: *23267120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &12906420 !ruby/object:Gem::Requirement
+  requirement: &23266660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12906420
+  version_requirements: *23266660
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &12906000 !ruby/object:Gem::Requirement
+  requirement: &23266240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12906000
+  version_requirements: *23266240
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &12905540 !ruby/object:Gem::Requirement
+  requirement: &23265780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12905540
+  version_requirements: *23265780
 description: YAJI is a ruby wrapper to YAJL providing iterator interface to streaming
   JSON parser
 email: info@couchbase.com
@@ -138,3 +138,4 @@ summary: Yet another JSON iterator
 test_files:
 - test/fixture.json
 - test/test_parser.rb
+has_rdoc: