oj 2.11.3 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92a7b7be45175f18661ed207bb79b4a03192c731
-  data.tar.gz: 2c2f13ed34b8d715265c4e9a5a53ee203ed042c1
+  metadata.gz: 1b53b303c6deecb0860b8b962cb5e8bdc37c0c80
+  data.tar.gz: ece33a05b8cd4f63b323cbf34dfb3a3bad67dd24
 SHA512:
-  metadata.gz: 6f195c7904b2c9de392d93e097155dbd32e028a8d0d4bf1640782e16e25aee11dbeaa73c35d1cc472804e378aeab801961c095a0501f1c6c1d976855e89ebfb0
-  data.tar.gz: ce8fadea6f3f07de21144e16f0b2b1aabeb108debbc34ee6b2b7adb22e9eaca18824b9e354dcf04c1affcd0a2610886ecd3a87b4c4dd0c42557e999f5a914fc8
+  metadata.gz: 95e7432d06edccdc616488728fb49bfd65393cf3451fe40b869de89397e0820ab64f8f5d1b252ac435d86798efdbd057fece5877655a6f97e66890d1f676ce2e
+  data.tar.gz: 6edd99edb2d3160a221c168ce30d5779cbec202908c91135c763f57df2024e6a758b6f2ff6f40bfe0ae7c68937accab77af260b951266a9b2021e00096fbf8a8

data/README.md

@@ -26,9 +26,12 @@ 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.11.3
+## Current Release 2.11.4
 
- - DateTime encoding now includes nanoseconds.
+ - DateTime second encoding is now always a Rational to preserve accuracy.
+
+ - Fixed buf in the Oj.load() callback feature that caused an endless loop when
+   a StringIO was used with a JSON that was a number.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/odd.c

@@ -38,7 +38,10 @@ static long		odd_cnt = 0;
 static ID		sec_id;
 static ID		sec_fraction_id;
 static ID		to_f_id;
+static ID		numerator_id;
+static ID		denominator_id;
 static ID		rational_id;
+static VALUE		rational_class;
 
 static void
 set_class(Odd odd, const char *classname) {
@@ -60,18 +63,16 @@ static VALUE
 get_datetime_secs(VALUE obj) {
     VALUE	rsecs = rb_funcall(obj, sec_id, 0);
     VALUE	rfrac = rb_funcall(obj, sec_fraction_id, 0);
-    double	secs = NUM2DBL(rb_funcall(rfrac, to_f_id, 0));
+    long	sec = NUM2LONG(rsecs);
+    long	num = NUM2LONG(rb_funcall(rfrac, numerator_id, 0));
+    long	den = NUM2LONG(rb_funcall(rfrac, denominator_id, 0));
 
 #if DATETIME_1_8
-    secs *= 86400.0;
-#endif
-    secs += NUM2DBL(rb_funcall(rsecs, to_f_id, 0));
- 
-#if DATETIME_1_8
-    return rb_funcall(rb_cObject, rational_id, 2, LONG2FIX((long)(secs * 1000000000)), LONG2FIX(1000000000));
-#else
-    return rb_float_new(secs);
+	num *= 86400;
 #endif
+    num += sec * den;
+
+    return rb_funcall(rb_cObject, rational_id, 2, LONG2FIX(num), LONG2FIX(den));
 }
 
 void
@@ -82,7 +83,10 @@ oj_odd_init() {
     sec_id = rb_intern("sec");
     sec_fraction_id = rb_intern("sec_fraction");
     to_f_id = rb_intern("to_f");
+    numerator_id = rb_intern("numerator");
+    denominator_id = rb_intern("denominator");
     rational_id = rb_intern("Rational");
+    rational_class = rb_const_get(rb_cObject, rational_id);
 
     memset(_odds, 0, sizeof(_odds));
     odd = odds;

data/ext/oj/oj.c

@@ -608,6 +608,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
  *
+ * A block can also be provided with a single argument. That argument will be
+ * the parsed JSON document. This is useful when parsing a string that includes
+ * multiple JSON documents.
+ *
  * @param [String|IO] json JSON String or an Object that responds to read()
  * @param [Hash] options load options (same as default_options)
  */
@@ -629,6 +633,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
  *
+ * A block can also be provided with a single argument. That argument will be
+ * the parsed JSON document. This is useful when parsing a string that includes
+ * multiple JSON documents.
+ *
  * @param [String|IO] json JSON String or an Object that responds to read()
  * @param [Hash] options load options (same as default_options)
  */
@@ -666,6 +674,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * different initializer can not be automatically decoded. A way around this is
  * to use a create function but this example shows an alternative.
  *
+ * A block can also be provided with a single argument. That argument will be
+ * the parsed JSON document. This is useful when parsing a string that includes
+ * multiple JSON documents.
+ *
  * @param [String|IO] json JSON String or an Object that responds to read()
  * @param [Hash] options load options (same as default_options)
  */
@@ -686,6 +698,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * a file object is passed as the first argument. A stream input will be parsed
  * using a stream parser but others use the slightly faster string parser.
  *
+ * A block can also be provided with a single argument. That argument will be
+ * the parsed JSON document. This is useful when parsing a string that includes
+ * multiple JSON documents.
+ *
  * @param [String|IO] json JSON String or an Object that responds to read()
  * @param [Hash] options load options (same as default_options)
  */
@@ -746,6 +762,10 @@ load(int argc, VALUE *argv, VALUE self) {
  * This is a stream based parser which allows a large or huge file to be loaded
  * without pulling the whole file into memory.
  *
+ * A block can also be provided with a single argument. That argument will be
+ * the parsed JSON document. This is useful when parsing a string that includes
+ * multiple JSON documents.
+ *
  * @param [String] path path to a file containing a JSON document
  * @param [Hash] options load options (same as default_options)
  */

data/ext/oj/parse.c

@@ -817,7 +817,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 	    return oj_pi_sparse(argc, argv, pi, 0);
 	} else {
 	    rb_raise(rb_eArgError, "strict_parse() expected a String or IO Object.");
-	}
+}
     }
     if (Yes == pi->options.circular) {
 	pi->circ_array = oj_circ_array_new();
@@ -877,7 +877,6 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
     if (err_has(&pi->err)) {
 	oj_err_raise(&pi->err);
     }
-
     if (pi->options.quirks_mode == No) {
 	switch (rb_type(result)) {
             case T_NIL:
@@ -894,6 +893,5 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 		break;
 	}
     }
-
     return result;
 }

data/ext/oj/reader.c

@@ -229,7 +229,7 @@ read_from_fd(Reader reader) {
     size_t	max = reader->end - reader->tail;
 
     cnt = read(reader->fd, reader->tail, max);
-    if (cnt < 0) {
+    if (cnt <= 0) {
 	return -1;
     } else if (0 != cnt) {
 	reader->read_end = reader->tail + cnt;

data/ext/oj/sparse.c

@@ -486,7 +486,9 @@ read_num(ParseInfo pi) {
 	}
 	ni.dec_cnt -= zero_cnt;
 	ni.len = pi->rd.tail - pi->rd.str;
-	reader_backup(&pi->rd);
+	if (0 != c) {
+	    reader_backup(&pi->rd);
+	}
     }
     if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
@@ -7,47 +5,60 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-class Handler
-  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
-
-  def array_start
-    @state << []
-    @state.last
-  end
-
+require 'oj'
+require 'securerandom'
 
-  def array_end
-    @state.pop
+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)
   end
+end
 
-  def array_append(a,v)
-    a << v
+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
   end
-
-  def add_value(v)
-    p v
+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
   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/perf1.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+#require 'test/unit'
+require 'optparse'
+require 'oj'
+require 'ox'
+
+$indent = 2
+
+opts = OptionParser.new
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+iter = 100000
+s = %{
+{ "class": "Foo::Bar",
+  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
+  "attr2": { "one": 1 }
+}
+}
+#s = File.read('sample.json')
+
+Oj.default_options = { :indent => 0 }
+
+obj = Oj.load(s)
+xml = Ox.dump(obj, :indent => 0)
+
+puts xml
+
+start = Time.now
+iter.times do
+  Oj.load(s)
+end
+dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
+
+start = Time.now
+iter.times do
+  Ox.load(xml)
+end
+dt = Time.now - start
+puts "%d Ox.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
+
+puts
+
+start = Time.now
+iter.times do
+  Oj.dump(obj)
+end
+dt = Time.now - start
+puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
+
+start = Time.now
+iter.times do
+  Ox.dump(obj)
+end
+dt = Time.now - start
+puts "%d Ox.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
+
+puts

data/test/perf2.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+#require 'test/unit'
+require 'optparse'
+require 'yajl'
+require 'oj'
+
+$indent = 2
+
+opts = OptionParser.new
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+class Foo
+  def initialize()
+    @x = true
+    @y = 58
+  end
+  def to_json()
+    %{{"x":#{@x},"y":#{@y}}}
+  end
+  def to_hash()
+    { 'x' => @x, 'y' => @y }
+  end
+end
+
+iter = 100000
+s = %{
+{ "class": "Foo::Bar",
+  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
+  "attr2": { "one": 1 }
+}
+}
+
+obj = Oj.load(s)
+obj["foo"] = Foo.new()
+
+Oj.default_options = { :indent => 0, :effort => :internal }
+
+puts
+
+start = Time.now
+iter.times do
+  Oj.load(s)
+end
+dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
+
+start = Time.now
+iter.times do
+  Yajl::Parser.parse(s)
+end
+dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, dt, iter/dt/1000.0]
+
+puts
+
+start = Time.now
+iter.times do
+  Oj.dump(obj)
+end
+dt = Time.now - start
+puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
+
+start = Time.now
+iter.times do
+  Yajl::Encoder.encode(obj)
+end
+dt = Time.now - start
+puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, dt, iter/dt/1000.0]
+
+puts

data/test/perf_obj_old.rb

@@ -0,0 +1,213 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '.'
+$: << '..'
+$: << '../lib'
+$: << '../ext'
+
+if __FILE__ == $0
+  if (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
+require 'optparse'
+require 'ox'
+require 'oj'
+require 'perf'
+require 'sample'
+require 'files'
+
+$verbose = 0
+$circular = false
+$indent = 0
+
+do_sample = false
+do_files = false
+
+do_load = false
+do_dump = false
+do_read = false
+do_write = false
+$iter = 1000
+
+opts = OptionParser.new
+opts.on("-v", "increase verbosity")                         { $verbose += 1 }
+
+opts.on("-c", "circular options")                           { $circular = true }
+
+opts.on("-s", "load and dump as sample Ruby object")        { do_sample = true }
+opts.on("-f", "load and dump as files Ruby object")         { do_files = true }
+
+opts.on("-l", "load")                                       { do_load = true }
+opts.on("-d", "dump")                                       { do_dump = true }
+opts.on("-r", "read")                                       { do_read = true }
+opts.on("-w", "write")                                      { do_write = true }
+opts.on("-a", "load, dump, read and write")                 { do_load = true; do_dump = true; do_read = true; do_write = true }
+
+opts.on("-i", "--iterations [Int]", Integer, "iterations")  { |i| $iter = i }
+
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+if files.empty?
+  data = []
+  obj = do_sample ? sample_doc(2) : files('..')
+  mars = Marshal.dump(obj)
+  xml = Ox.dump(obj, :indent => $indent, circular: $circular)
+  json = Oj.dump(obj, :indent => $indent, circular: $circular)
+  File.open('sample.xml', 'w') { |f| f.write(xml) }
+  File.open('sample.json', 'w') { |f| f.write(json) }
+  File.open('sample.marshal', 'w') { |f| f.write(mars) }
+  data << { :file => 'sample.xml', :obj => obj, :xml => xml, :marshal => mars, :json => json }
+else
+  puts "loading and parsing #{files}\n\n"
+  # TBD change to allow xml and json
+  data = files.map do |f|
+    xml = File.read(f)
+    obj = Ox.load(xml);
+    mars = Marshal.dump(obj)
+    json = Oj.dump(obj, :indent => $indent, circular: $circular)
+    { :file => f, :obj => obj, :xml => xml, :marshal => mars, :json => json }
+  end
+end
+
+$ox_load_time = 0
+$mars_load_time = 0
+$ox_dump_time = 0
+$oj_dump_time = 0
+$mars_dump_time = 0
+
+def perf_load(d)
+  filename = d[:file]
+  marshal_filename = 'sample.marshal'
+  xml = d[:xml]
+  mars = d[:marshal]
+  json = d[:json]
+
+  if 0 < $verbose
+    obj = Ox.load(xml, :mode => :object, :trace => $verbose)
+    return
+  end
+  start = Time.now
+  (1..$iter).each do
+    obj = Ox.load(xml, :mode => :object)
+  end
+  $ox_load_time = Time.now - start
+  puts "Parsing #{$iter} times with Ox took #{$ox_load_time} seconds."
+
+  start = Time.now
+  (1..$iter).each do
+    obj = Oj.load(json, :mode => :object)
+  end
+  $oj_load_time = Time.now - start
+  puts "Parsing #{$iter} times with Oj took #{$oj_load_time} seconds."
+  
+  start = Time.now
+  (1..$iter).each do
+    obj = Marshal.load(mars)
+  end
+  $mars_load_time = Time.now - start
+  puts "Marshalling #{$iter} times took #{$mars_load_time} seconds."
+  puts ">>> Ox is %0.1f faster than Marshal loading.\n\n" % [$mars_load_time/$ox_load_time]
+end
+
+def perf_dump(d)
+  obj = d[:obj]
+
+  start = Time.now
+  (1..$iter).each do
+    xml = Ox.dump(obj, :indent => $indent, :circular => $circular)
+    #puts "*** ox:\n#{xml}"
+  end
+  $ox_dump_time = Time.now - start
+  puts "Ox dumping #{$iter} times with ox took #{$ox_dump_time} seconds."
+
+  Oj.default_options = {:indent => $indent}
+  start = Time.now
+  (1..$iter).each do
+    json = Oj.dump(obj)
+  end
+  $oj_dump_time = Time.now - start
+  puts "Oj dumping #{$iter} times with oj took #{$oj_dump_time} seconds."
+
+  obj = d[:obj]
+  start = Time.now
+  (1..$iter).each do
+    m = Marshal.dump(obj)
+  end
+  $mars_dump_time = Time.now - start
+  puts "Marshal dumping #{$iter} times took #{$mars_dump_time} seconds."
+  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [$mars_dump_time/$ox_dump_time]
+end
+
+def perf_read(d)
+  ox_read_time = 0
+  mars_read_time = 0
+
+  filename = d[:file]
+  marshal_filename = 'sample.marshal'
+  xml = d[:xml]
+  mars = d[:marshal]
+
+  # now load from the file
+  start = Time.now
+  (1..$iter).each do
+    obj = Ox.load_file(filename, :mode => :object)
+  end
+  ox_read_time = Time.now - start
+  puts "Loading and parsing #{$iter} times with ox took #{ox_read_time} seconds."
+
+  start = Time.now
+  (1..$iter).each do
+    m = File.read(marshal_filename)
+    obj = Marshal.load(m)
+  end
+  mars_read_time = Time.now - start
+  puts "Reading and marshalling #{$iter} times took #{mars_read_time} seconds."
+  puts ">>> Ox is %0.1f faster than Marshal loading and parsing.\n\n" % [mars_read_time/ox_read_time]
+
+end
+
+def perf_write(d)
+  ox_write_time = 0
+  mars_write_time = 0
+  
+  ox_filename = 'out.xml'
+  marshal_filename = 'out.marshal'
+  obj = d[:obj]
+
+  start = Time.now
+  (1..$iter).each do
+    xml = Ox.to_file(ox_filename, obj, :indent => $indent)
+  end
+  ox_write_time = Time.now - start
+  puts "Ox dumping #{$iter} times with ox took #{ox_write_time} seconds."
+
+  start = Time.now
+  (1..$iter).each do
+    m = Marshal.dump(obj, circular: $circular)
+    File.open(marshal_filename, "w") { |f| f.write(m) }
+  end
+  mars_write_time = Time.now - start
+  puts "Marshal dumping and writing #{$iter} times took #{mars_write_time} seconds."
+  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [mars_write_time/ox_write_time]
+
+end
+
+#if do_sample or do_files
+  data.each do |d|
+    puts "Using file #{d[:file]}."
+    
+    perf_load(d) if do_load
+    perf_dump(d) if do_dump
+    if do_load and do_dump
+      puts ">>> Ox is %0.1f faster than Marshal dumping and loading.\n\n" % [($mars_load_time + $mars_dump_time)/($ox_load_time + $ox_dump_time)] unless 0 == $mars_load_time
+    end
+
+    perf_read(d) if do_read
+    perf_write(d) if do_write
+
+  end
+#end

data/test/test_bigd.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$VERBOSE = true
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'rubygems' if RUBY_VERSION.start_with?('1.8.')
+
+#require "minitest/spec"
+require "minitest/autorun"
+ 
+require "oj"
+ 
+# Uncomment this line and test_big_decimal will fail
+require "active_support/json"
+ 
+# With ActiveSupport 4.0, neither of these settings affect BigDecimal#to_json,
+# only BigDecimal#as_json
+#
+# ActiveSupport.encode_big_decimal_as_string = false
+# ActiveSupport::JSON::Encoding.encode_big_decimal_as_string = false
+ 
+describe Oj do
+ 
+  # Options set by default in Rails 4.0 / Rabl
+  def options
+    {
+      :bigdecimal_as_decimal=>true, # default = true
+      :use_to_json=>true, # default = false
+      :mode=>:compat, # default = object
+      :time_format=>:ruby, # default = unix
+    }
+  end
+ 
+  def test_big_decimal
+    orig = BigDecimal.new("3.14159265359")
+    puts "*** to_s: #{orig.to_s}"
+    puts "*** to_json: #{orig.to_json}"
+    puts "*** JSON.dump: #{JSON.dump(orig)}"
+    json = Oj.dump(orig, options)
+    puts "*** json: #{json}"
+ 
+    value = Oj.load(json)
+    puts "*** value: #{value.class}"
+    assert_equal(value, orig)
+ 
+    # by default, without active support
+    # assert_equal("0.314159265359E1", json)
+    # in Rails 4.1, with active support
+    # assert_equal("3.14159265359", json)
+  end
+ 
+  # Floats are unaffected
+  def test_float
+    orig = 3.14159265359
+    json = Oj.dump(orig, options)
+    assert_equal("3.14159265359", json)
+  end
+ 
+end

data/test/test_object.rb

@@ -474,6 +474,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_odd_datetime
+    dump_and_load(DateTime.new(2012, 6, 19, 13, 5, Rational(4, 3)), false)
     dump_and_load(DateTime.new(2012, 6, 19, 13, 5, Rational(7123456789, 1000000000)), false)
   end
 

data/test/{mod.rb → test_range.rb}

@@ -1,16 +1,19 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
+$VERBOSE = true
+
 %w(lib ext test).each do |dir|
   $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
 end
 
+require 'rubygems' if RUBY_VERSION.start_with?('1.8.')
 require 'oj'
 
+Oj.mimic_JSON
+
+#puts Oj.default_options
+
+range = ("01".."12")
 
-Thread.new do
-  string_io = StringIO.new('{"foo":"bar"}')
-  Oj.load(string_io)
-  string_io.rewind
-  puts string_io.read
-end.join
+puts Oj.dump(range)

data/test/test_various.rb

@@ -286,6 +286,17 @@ class Juice < Minitest::Test
     assert(false, "*** expected an exception")
   end
 
+  # multiple JSON in one string
+  def test_multiple_json_callback
+    json = %{{"a":1}
+[1,2][3,4]
+{"b":2}
+}
+    results = []
+    Oj.load(json) { |x| results << x }
+    assert_equal([{"a"=>1}, [1,2], [3,4], {"b"=>2}], results)
+  end
+
   # encoding tests
   def test_does_not_escape_entities_by_default
     Oj.default_options = { :escape_mode => :ascii } # set in mimic mode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.11.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -106,10 +106,8 @@ files:
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
 - test/bug.rb
-- test/bug2.rb
 - test/files.rb
 - test/helper.rb
-- test/io.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
@@ -117,11 +115,13 @@ files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
-- test/mod.rb
 - test/perf.rb
+- test/perf1.rb
+- test/perf2.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
 - test/perf_file.rb
+- test/perf_obj_old.rb
 - test/perf_object.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
@@ -141,21 +141,19 @@ files:
 - test/sample/shape.rb
 - test/sample/text.rb
 - test/sample_json.rb
-- test/struct.rb
+- test/test_bigd.rb
 - test/test_compat.rb
 - test/test_debian.rb
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
 - test/test_object.rb
+- test/test_range.rb
 - test/test_saj.rb
 - test/test_scp.rb
-- test/test_serializer.rb
 - test/test_strict.rb
 - test/test_various.rb
 - test/test_writer.rb
-- test/write_timebars.rb
-- test/zip.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT

data/test/bug2.rb

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

data/test/io.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-
-require 'helper'
-
-class Handler
-  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
-
-  def array_start
-    @state << []
-    @state.last
-  end
-
-
-  def array_end
-    @state.pop
-  end
-
-  def array_append(a,v)
-    a << v
-  end
-
-  def error(message, line, column); p "ERROR: #{message}" end
-end
-
-handler = Handler.new
-def handler.add_value(v)
-  p v
-end
-
-Oj.sc_parse(handler, StringIO.new('{"a":"b","c":[1,2,{"d":"e"}]}[4,5,6]'))

data/test/struct.rb

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
-# required. That can be set in the RUBYOPT environment variable.
-# export RUBYOPT=-w
-
-$VERBOSE = true
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'oj'
-
-A = Struct.new(:a,:b,:c,:d)
-B = Struct.new(:e,:f)
-
-obj = [A.new(55, B.new(1, 'X'), B.new(2, 'Y'), 3)]
-
-s = Oj.dump(obj, :mode => :object)
-
-100000.times do
-  Oj.load(s, :mode => :object)
-  # ds = Oj.dump(o, :mode => :object)
-  # if ds != s
-  #   puts ds
-  #   raise "holy crap"
-  # end
-end

data/test/test_serializer.rb

@@ -1,59 +0,0 @@
-#!/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 'minitest'
-require 'minitest/autorun'
-require 'oj'
-
-Oj.mimic_JSON
-
-require 'rails/all'
-require 'active_model'
-require 'active_model_serializers'
-require 'active_support/json'
-
-#Oj.mimic_JSON
-
-class Category
-  include ActiveModel::Model
-  include ActiveModel::SerializerSupport
-
-  attr_accessor :id, :name
-
-  def initialize(id, name)
-    @id   = id
-    @name = name
-  end
-end
-
-class CategorySerializer < ActiveModel::Serializer
-  attributes :id, :name
-end
-
-class MimicRails < Minitest::Test
-
-  def test_dump_object
-    Oj.default_options= {:indent => 0}
-    category = Category.new(1, 'test')
-    serializer = CategorySerializer.new(category)
-
-    json = serializer.to_json()
-    puts "*** serializer.to_json() #{serializer.to_json()}"
-    assert_equal(%|{"category":{"id":1,"name":"test"}}|, json)
-
-    json = serializer.as_json()
-    puts "*** serializer.as_json() #{serializer.as_json()}"
-    assert_equal({"category" => {:id => 1, :name => "test"}}, json)
-
-    json = JSON.dump(serializer)
-    puts "*** JSON.dump(serializer) #{JSON.dump(serializer)}"
-    assert_equal(%|{"category":{"id":1,"name":"test"}}|, json)
-  end
-
-end # MimicRails

data/test/write_timebars.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-%w(lib ext).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'stringio'
-require 'oj'
-
-
-filename = File.join(File.dirname(__FILE__), 'day.json')
-File.open(filename, "w") do |f|
-  w = Oj::StreamWriter.new(f, :indent => -1)
-  390.times do |i|
-    w.push_object()
-    w.push_value(12, 'msgType')
-    w.push_value(1, 'version')
-    w.push_value(1_400_074_200 + i * 60, 'bar')
-    w.push_value('TBC', 'source')
-    w.push_array('timebars')
-    w.push_object()
-    w.push_value('aapl_24', 'asset')
-    w.push_value(91.87, 'close')
-    w.pop()
-    w.pop()
-    w.pop()
-  end
-  f.write("\n")
-end
-

data/test/zip.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-
-require 'helper'
-
-require 'zlib'
-
-File.open('test.json.gz', 'r') do |file|
-  Zlib::GzipReader.wrap(file) do |f2|
-    puts "*** f2: #{f2}"
-    Oj.load(f2) do |val|
-      puts val
-    end
-  end
-end
-
-=begin
-And a json file with the following contents (then gzipped):
-
-{"a":2}
-{"b":2}
-The output is:
-
-{"a"=>2}
-{"b"=>2}
-bin/test:8:in `load': undefined method `new' for #<EOFError: end of file reached> (NoMethodError)
-    from bin/test:8:in `block (2 levels) in <main>'
-    from bin/test:7:in `wrap'
-    from bin/test:7:in `block in <main>'
-    from bin/test:6:in `open'
-    from bin/test:6:in `<main>'
-=end