yaji 0.0.9 → 0.0.10

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/HISTORY.markdown

@@ -1,3 +1,7 @@
+=== 0.1.0 / 2011-12-12
+
+* Skip empty and nil chunks
+
 === 0.0.9 / 2011-09-01
 
 * Optionally yield path in object iterator

data/README.markdown

@@ -2,6 +2,7 @@ Yet another JSON iterator
 =========================
 
 YAJI is a ruby wrapper to YAJL providing iterator interface to streaming JSON parser.
+[![Build Status](https://secure.travis-ci.org/avsej/yaji.png)](http://travis-ci.org/avsej/yaji)
 
 INSTALL
 -------

data/Rakefile

@@ -1,3 +1,4 @@
 require "bundler/gem_tasks"
 Dir['tasks/*.rake'].sort.each { |f| load f }
 
+task :default => [:clean, :compile, :test]

data/ext/yaji/parser_ext.c

@@ -160,10 +160,14 @@ static VALUE rb_yaji_parser_parse_chunk(VALUE chunk, VALUE self)
 {
 	yajl_status rc;
 	yaji_parser* p = (yaji_parser*) DATA_PTR(self);
-	const char* buf = RSTRING_PTR(chunk);
-	unsigned int len = RSTRING_LEN(chunk);
+	const char* buf;
+	unsigned int len;
 	int i;
 
+	if (NIL_P(chunk) || (len = RSTRING_LEN(chunk)) == 0) {
+		return INT2FIX(0);
+	}
+	buf = RSTRING_PTR(chunk);
 	p->events = rb_ary_new();
 	p->chunk = chunk;
 	rc = yajl_parse(p->handle, (const unsigned char*)buf, len);

data/lib/yaji/version.rb

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

data/test/test_parser.rb

@@ -4,6 +4,37 @@ require 'curb'
 
 class TestParser < MiniTest::Unit::TestCase
 
+  class Generator
+    def initialize(data, options = {})
+      @callback = nil
+      @options = {:chunk_size => 10}.merge(options)
+      @chunks = case data
+                when Array
+                  data
+                when String
+                  count = (data.bytesize / @options[:chunk_size].to_f).ceil
+                  data.unpack("a#{@options[:chunk_size]}" * count)
+                end
+    end
+
+    def on_body
+      old = @callback
+      if block_given?
+        @callback = Proc.new
+      end
+      old
+    end
+
+    def perform
+      size = @options[:chunk_size]
+      if @callback
+        @chunks.each do |chunk|
+          @callback.call(chunk)
+        end
+      end
+    end
+  end
+
   def test_it_generates_events
     events = []
     parser = YAJI::Parser.new(toys_json_str)
@@ -192,6 +223,28 @@ class TestParser < MiniTest::Unit::TestCase
     YAJI::Parser.new(" \n\n ").parse
   end
 
+  def test_it_parses_chunked_data
+    generator = Generator.new(['{"total_rows":', '0,"offset":0,"rows":[]', '}'])
+    iter = YAJI::Parser.new(generator).each(["total_rows", "rows/", "errors/"], :with_path => true)
+    begin
+      loop do
+        iter.next
+      end
+    rescue StopIteration
+    end
+  end
+
+  def test_it_skips_empty_chunks
+    generator = Generator.new(['{"total_rows":', '0,"offset":0,"rows":[]', '}', '', nil])
+    iter = YAJI::Parser.new(generator).each(["total_rows", "rows/", "errors/"], :with_path => true)
+    begin
+      loop do
+        iter.next
+      end
+    rescue StopIteration
+    end
+  end
+
   protected
 
   def toys_json_str

data/yaji.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.extensions    = `git ls-files -- ext/**/extconf.rb`.split("\n")
   s.require_paths = ["lib"]
 
+  s.add_development_dependency 'rake', '0.8.7'
   s.add_development_dependency 'rake-compiler'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'curb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaji
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &15274560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *15274560
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &13939240 !ruby/object:Gem::Requirement
+  requirement: &15274160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13939240
+  version_requirements: *15274160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &13938660 !ruby/object:Gem::Requirement
+  requirement: &15273700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13938660
+  version_requirements: *15273700
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &13938080 !ruby/object:Gem::Requirement
+  requirement: &15273280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13938080
+  version_requirements: *15273280
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &13937360 !ruby/object:Gem::Requirement
+  requirement: &15272820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13937360
+  version_requirements: *15272820
 description: YAJI is a ruby wrapper to YAJL providing iterator interface to streaming
   JSON parser
 email: info@couchbase.com
@@ -64,6 +75,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - HISTORY.markdown
 - LICENSE
@@ -119,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: yaji
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Yet another JSON iterator