oj 2.12.11 → 2.12.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 13e345b717fb9e6ce7ab0c1f7e96c23586148c16
+  data.tar.gz: 19dd28489fcd97c301e4ea744f3b9114c3de107b
+SHA512:
+  metadata.gz: cdc08e19e3621678e07531b89831fda57c23b4b4efa1f50ec94573058e0f82864dab1cfd62b4a9bc4a97732d17fb77c49d1f88bad7c7503334cc78e15981095e
+  data.tar.gz: 46a77fd33b9b2b2424082f84e401d39bad85da74887e35cc4450310c4b0798f490e440a4a21e2987868e0f0c07486020bf885a1ec4d85314682164d0b7537d9a

data/README.md

@@ -26,7 +26,11 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-## Current Release 2.12.11
+## Current Release 2.12.12
+
+ - Thanks to asurin for adding support for arguments to to_json() that rails uses.
+
+## Release 2.12.11
 
  - Oj::ParseError is now thrown instead of SyntaxError when there are multiple 
    JSON documents in a string or file and there is no proc or block associated

data/ext/oj/dump.c

@@ -59,7 +59,7 @@
 typedef unsigned long	ulong;
 
 static void	raise_strict(VALUE obj);
-static void	dump_val(VALUE obj, int depth, Out out);
+static void	dump_val(VALUE obj, int depth, Out out, int argc, VALUE *argv);
 static void	dump_nil(Out out);
 static void	dump_true(Out out);
 static void	dump_false(Out out);
@@ -87,7 +87,7 @@ static void	dump_data_strict(VALUE obj, Out out);
 static void	dump_data_null(VALUE obj, Out out);
 static void	dump_data_comp(VALUE obj, int depth, Out out);
 static void	dump_data_obj(VALUE obj, int depth, Out out);
-static void	dump_obj_comp(VALUE obj, int depth, Out out);
+static void	dump_obj_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv);
 static void	dump_obj_obj(VALUE obj, int depth, Out out);
 static void	dump_struct_comp(VALUE obj, int depth, Out out);
 static void	dump_struct_obj(VALUE obj, int depth, Out out);
@@ -728,7 +728,7 @@ dump_array(VALUE a, VALUE clas, int depth, Out out) {
 		    }
 		}
 	    }
-	    dump_val(rb_ary_entry(a, i), d2, out);
+	    dump_val(rb_ary_entry(a, i), d2, out, 0, 0);
 	    if (i < cnt) {
 		*out->cur++ = ',';
 	    }
@@ -806,7 +806,7 @@ hash_cb_strict(VALUE key, VALUE value, Out out) {
 	    out->cur += out->opts->dump_opts->after_size;
 	}
     }
-    dump_val(value, depth, out);
+    dump_val(value, depth, out, 0, 0);
     out->depth = depth;
     *out->cur++ = ',';
 
@@ -870,7 +870,7 @@ hash_cb_compat(VALUE key, VALUE value, Out out) {
 	    out->cur += out->opts->dump_opts->after_size;
 	}
     }
-    dump_val(value, depth, out);
+    dump_val(value, depth, out, 0, 0);
     out->depth = depth;
     *out->cur++ = ',';
 
@@ -889,11 +889,11 @@ hash_cb_object(VALUE key, VALUE value, Out out) {
     if (rb_type(key) == T_STRING) {
 	dump_str_obj(key, Qundef, depth, out);
 	*out->cur++ = ':';
-	dump_val(value, depth, out);
+	dump_val(value, depth, out, 0, 0);
     } else if (rb_type(key) == T_SYMBOL) {
 	dump_sym_obj(key, out);
 	*out->cur++ = ':';
-	dump_val(value, depth, out);
+	dump_val(value, depth, out, 0, 0);
     } else {
 	int	d2 = depth + 1;
 	long	s2 = size + out->indent + 1;
@@ -921,13 +921,13 @@ hash_cb_object(VALUE key, VALUE value, Out out) {
 	*out->cur++ = ':';
 	*out->cur++ = '[';
 	fill_indent(out, d2);
-	dump_val(key, d2, out);
+	dump_val(key, d2, out, 0, 0);
 	if (out->end - out->cur <= (long)s2) {
 	    grow(out, s2);
 	}
 	*out->cur++ = ',';
 	fill_indent(out, d2);
-	dump_val(value, d2, out);
+	dump_val(value, d2, out, 0, 0);
 	if (out->end - out->cur <= (long)size) {
 	    grow(out, size);
 	}
@@ -1266,7 +1266,7 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 
 	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	} else {
-	    dump_val(aj, depth, out);
+	    dump_val(aj, depth, out, 0, 0);
 	}
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
@@ -1349,7 +1349,7 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 }
 
 static void
-dump_obj_comp(VALUE obj, int depth, Out out) {
+dump_obj_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv) {
     if (rb_respond_to(obj, oj_to_hash_id)) {
 	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
@@ -1358,7 +1358,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id)) {
-	volatile VALUE	aj = rb_funcall(obj, oj_as_json_id, 0);
+	volatile VALUE	aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
 
 	// Catch the obvious brain damaged recursive dumping.
 	if (aj == obj) {
@@ -1366,7 +1366,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 
 	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	} else {
-	    dump_val(aj, depth, out);
+	    dump_val(aj, depth, out, 0, 0);
 	}
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
@@ -1477,7 +1477,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
 	dump_cstr(buf, strlen(buf), 0, 0, out);
     }
     *out->cur++ = ':';
-    dump_val(value, depth, out);
+    dump_val(value, depth, out, 0, 0);
     out->depth = depth;
     *out->cur++ = ',';
     
@@ -1631,7 +1631,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 		dump_cstr(buf, strlen(attr) + 1, 0, 0, out);
 	    }
 	    *out->cur++ = ':';
-	    dump_val(rb_ivar_get(obj, vid), d2, out);
+	    dump_val(rb_ivar_get(obj, vid), d2, out, 0, 0);
 	    if (out->end - out->cur <= 2) {
 		grow(out, 2);
 	    }
@@ -1652,7 +1652,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    dump_cstr("~mesg", 5, 0, 0, out);
 	    *out->cur++ = ':';
 	    rv = rb_funcall2(obj, rb_intern("message"), 0, 0);
-	    dump_val(rv, d2, out);
+	    dump_val(rv, d2, out, 0, 0);
 	    if (out->end - out->cur <= 2) {
 		grow(out, 2);
 	    }
@@ -1665,7 +1665,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    dump_cstr("~bt", 3, 0, 0, out);
 	    *out->cur++ = ':';
 	    rv = rb_funcall2(obj, rb_intern("backtrace"), 0, 0);
-	    dump_val(rv, d2, out);
+	    dump_val(rv, d2, out, 0, 0);
 	    if (out->end - out->cur <= 2) {
 		grow(out, 2);
 	    }
@@ -1696,7 +1696,7 @@ dump_struct_comp(VALUE obj, int depth, Out out) {
 
 	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	} else {
-	    dump_val(aj, depth, out);
+	    dump_val(aj, depth, out, 0, 0);
 	}
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs = rb_funcall(obj, oj_to_json_id, 0);
@@ -1778,7 +1778,7 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
 		grow(out, size);
 	    }
 	    fill_indent(out, d3);
-	    dump_val(*vp, d3, out);
+	    dump_val(*vp, d3, out, 0, 0);
 	    *out->cur++ = ',';
 	}
     }
@@ -1793,7 +1793,7 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
 		grow(out, size);
 	    }
 	    fill_indent(out, d3);
-	    dump_val(rb_struct_aref(obj, INT2FIX(i)), d3, out);
+	    dump_val(rb_struct_aref(obj, INT2FIX(i)), d3, out, 0, 0);
 	    *out->cur++ = ',';
 	}
     }
@@ -1876,7 +1876,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	fill_indent(out, d2);
 	dump_cstr(name, nlen, 0, 0, out);
 	*out->cur++ = ':';
-	dump_val(v, d2, out);
+	dump_val(v, d2, out, 0, 0);
 	if (out->end - out->cur <= 2) {
 	    grow(out, 2);
 	}
@@ -1893,7 +1893,7 @@ raise_strict(VALUE obj) {
 }
 
 static void
-dump_val(VALUE obj, int depth, Out out) {
+dump_val(VALUE obj, int depth, Out out, int argc, VALUE *argv) {
     int	type = rb_type(obj);
 
     if (MAX_DEPTH < depth) {
@@ -1965,7 +1965,7 @@ dump_val(VALUE obj, int depth, Out out) {
 		switch (out->opts->mode) {
 		case StrictMode:	dump_data_strict(obj, out);	break;
 		case NullMode:		dump_data_null(obj, out);	break;
-		case CompatMode:	dump_obj_comp(obj, depth, out);	break;
+		case CompatMode:	dump_obj_comp(obj, depth, out, argc, argv);	break;
 		case ObjectMode:
 		default:		dump_obj_obj(obj, depth, out);	break;
 		}
@@ -1988,7 +1988,7 @@ dump_val(VALUE obj, int depth, Out out) {
 		case NullMode:		dump_nil(out);			break;
 		case CompatMode:
 		case ObjectMode:
-		default:		dump_obj_comp(obj, depth, out);	break;
+		default:		dump_obj_comp(obj, depth, out, argc, argv);	break;
 		}
 		break;
 	    default:
@@ -2002,6 +2002,11 @@ dump_val(VALUE obj, int depth, Out out) {
 
 void
 oj_dump_obj_to_json(VALUE obj, Options copts, Out out) {
+    oj_dump_obj_to_json_using_params(obj, copts, out, 0, 0);
+}
+
+void
+oj_dump_obj_to_json_using_params(VALUE obj, Options copts, Out out, int argc, VALUE *argv) {
     if (0 == out->buf) {
 	out->buf = ALLOC_N(char, 4096);
 	out->end = out->buf + 4095 - BUFFER_EXTRA; // 1 less than end plus extra for possible errors
@@ -2015,7 +2020,7 @@ oj_dump_obj_to_json(VALUE obj, Options copts, Out out) {
 	oj_cache8_new(&out->circ_cache);
     }
     out->indent = copts->indent;
-    dump_val(obj, 0, out);
+    dump_val(obj, 0, out, argc, argv);
     if (0 < out->indent) {
 	switch (*(out->cur - 1)) {
 	case ']':
@@ -2462,7 +2467,7 @@ oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
 	    *sw->out.cur++ = ':';
 	}
     }
-    dump_val(val, sw->depth, &sw->out);
+    dump_val(val, sw->depth, &sw->out, 0, 0);
 }
 
 void

data/ext/oj/oj.c

@@ -1821,7 +1821,7 @@ mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
     // To be strict the mimic_object_to_json_options should be used but people
     // seem to prefer the option of changing that.
     //oj_dump_obj_to_json(self, &mimic_object_to_json_options, &out);
-    oj_dump_obj_to_json(self, &copts, &out);
+    oj_dump_obj_to_json_using_params(self, &copts, &out, argc, argv);
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }

data/ext/oj/oj.h

@@ -216,6 +216,7 @@ extern VALUE	oj_object_parse_cstr(int argc, VALUE *argv, char *json, size_t len)
 extern void	oj_parse_options(VALUE ropts, Options copts);
 
 extern void	oj_dump_obj_to_json(VALUE obj, Options copts, Out out);
+extern void	oj_dump_obj_to_json_using_params(VALUE obj, Options copts, Out out, int argc, VALUE *argv);
 extern void	oj_write_obj_to_file(VALUE obj, const char *path, Options copts);
 extern void	oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts);
 extern void	oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out);

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.12.11'
+  VERSION = '2.12.12'
 end

data/test/bug.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
@@ -5,60 +7,47 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-require 'oj'
-require 'securerandom'
-
 class Handler
-  def hash_start()      {} end
-  def hash_set(h,k,v)   h.store(k,v) end
-  def array_start()     [] end
-  def array_append(a,v) a << v end
-  def error(message, line, column)
-    raise Exception.new(message, line, column)
+  def initialize
+    @state = []
+  end
+
+  def hash_start
+    @state << {}
+    @state.last
+  end
+
+  def hash_end
+    @state.pop
+  end
+
+  def hash_set(h,k,v)
+    h.store(k,v)
   end
-end
 
-json = Oj.dump({"this"=>"object"})
-
-if true
-  name = "/tmp/#{SecureRandom.uuid}"
-  `mkfifo #{name}`
-  if fork
-    open(name, 'r+') do |read_io|
-      p "start reading #{read_io.stat.ftype}"
-      Oj.sc_parse(Handler.new, read_io) {|v| p v}
-      p "stop reading"
-    end
-  else
-    open(name, 'w+') do |write_io|
-      p "start writing #{write_io.stat.ftype}  autoclose: #{write_io.autoclose?}"
-      write_io.write json
-      write_io.write json
-      p "stop writing"
-    end
-    sleep(1) # make it obvious that there are two threads
-    open(name, 'w+') do |write_io|
-      p "start writing #{write_io.stat.ftype}"
-      write_io.write json
-      write_io.write json
-      p "stop writing"
-    end
+  def array_start
+    @state << []
+    @state.last
   end
-else
-  IO.pipe do |read_io, write_io|
-    if fork
-      write_io.close
-      p "start reading #{read_io.stat.ftype}"
-      Oj.sc_parse(Handler.new, read_io) {|v| p v}
-      p "stop reading"
-      read_io.close
-    else
-      read_io.close
-      p "start writing #{write_io.stat.ftype}"
-      write_io.write json
-      write_io.write json
-      p "stop writing"
-      write_io.close
-    end
+
+
+  def array_end
+    @state.pop
+  end
+
+  def array_append(a,v)
+    a << v
+  end
+
+  def add_value(v)
+    p v
   end
+
+  def error(message, line, column); p "ERROR: #{message}" end
 end
+
+$handler = Handler.new
+
+IO.popen("cat tst") { |p| puts Oj.sc_parse($handler, p) }
+
+#File.open('tst', 'r') { |file|  Oj.sc_parse($handler, file) }

data/test/bug2.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+

data/test/bug3.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+require 'stringio'
+
+class Parser < Oj::Saj
+
+  def parse(json)
+    Oj.saj_parse(self, StringIO.new(json))
+  end
+
+  def hash_start(key)
+    puts "START: #{key}"
+  end
+
+  def error(message, line, column)
+    puts "Error callback: #{message}"
+  end
+
+end
+
+parser = Parser.new
+
+begin
+  # truncated JSON, Oj.saj_parse raises, #error not called
+  parser.parse('{"foo{"bar":')
+rescue Exception => e
+  puts "*** #{e.class}: #{e.message}"
+end
+
+puts "\n\n"
+
+begin
+  # invalid JSON, doesn't raise an error
+  parser.parse('{"foo":{"bar":}')
+rescue Exception => e
+  puts "*** #{e.class}: #{e.message}"
+end

data/test/bug_fast.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+
+def create_item(doc)
+  #puts "#{doc.fetch('/id')}: #{doc.fetch('/labels/it/value')} - #{doc.fetch('/descriptions/it/value')}"
+  doc.fetch('/id')
+  doc.fetch('/labels/it/value')
+  doc.fetch('/descriptions/it/value')
+end
+
+100.times { |i|
+  File.open('dump_10k.json') { |f|
+    f.each { |line|
+      #Oj::Doc.open(line) { |doc|
+      doc = Oj::Doc.open(line)
+        begin
+          create_item(doc) if doc.fetch('/type') == 'item'
+        rescue Exception => e
+          puts "*** #{e.class}: #{e.message}"
+        end
+      doc.close
+      #}
+    }
+  }
+  puts i
+}