oj 2.12.5 → 2.12.6

data/README.md

@@ -26,9 +26,9 @@ 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)
 
-## Release 2.12.5
+## Release 2.12.6
 
- - In :null mode Oj now dumps Infinity and NaN as null.
+ - Fixed a number of 32bit related bugs.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -399,7 +399,7 @@ static void
 dump_fixnum(VALUE obj, Out out) {
     char	buf[32];
     char	*b = buf + sizeof(buf) - 1;
-    long	num = NUM2LONG(obj);
+    long long	num = rb_num2ll(obj);
     int		neg = 0;
 
     if (0 > num) {
@@ -1031,9 +1031,9 @@ dump_time(VALUE obj, Out out, int withZone) {
 #else
     time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
 #if HAS_NANO_TIME
-    long		nsec = NUM2LONG(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+    long long		nsec = rb_num2ll((rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #else
-    long		nsec = NUM2LONG(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
     
@@ -1127,9 +1127,9 @@ dump_xml_time(VALUE obj, Out out) {
 #else
     time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
 #if HAS_NANO_TIME
-    long		nsec = NUM2LONG(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #else
-    long		nsec = NUM2LONG(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
     long		tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));

data/ext/oj/fast.c

@@ -345,7 +345,7 @@ leaf_fixnum_value(Leaf leaf) {
 	if (neg) {
 	    n = -n;
 	}
-	leaf->value = LONG2NUM(n);
+	leaf->value = rb_ll2inum(n);
     }
     leaf->value_type = RUBY_VAL;
 }

data/ext/oj/object.c

@@ -180,7 +180,7 @@ parse_xml_time(const char *str, int len) {
 	char	c = *str++;
 
 	if ('.' == c) {
-	    long	nsec = 0;
+	    long long	nsec = 0;
 
 	    for (; str < end; str++) {
 		c = *str;
@@ -192,7 +192,7 @@ parse_xml_time(const char *str, int len) {
 	    }
 	    args[5] = rb_float_new((double)n + ((double)nsec + 0.5) / 1000000000.0);
 	} else {
-	    args[5] = LONG2NUM(n);
+	    args[5] = rb_ll2inum(n);
 	}
 	if (end < str) {
 	    args[6] = LONG2NUM(0);

data/ext/oj/odd.c

@@ -64,15 +64,15 @@ get_datetime_secs(VALUE obj) {
     VALUE	rsecs = rb_funcall(obj, sec_id, 0);
     VALUE	rfrac = rb_funcall(obj, sec_fraction_id, 0);
     long	sec = NUM2LONG(rsecs);
-    long	num = NUM2LONG(rb_funcall(rfrac, numerator_id, 0));
-    long	den = NUM2LONG(rb_funcall(rfrac, denominator_id, 0));
+    long long	num = rb_num2ll(rb_funcall(rfrac, numerator_id, 0));
+    long long	den = rb_num2ll(rb_funcall(rfrac, denominator_id, 0));
 
 #if DATETIME_1_8
-	num *= 86400;
+    num *= 86400;
 #endif
     num += sec * den;
 
-    return rb_funcall(rb_cObject, rational_id, 2, LONG2FIX(num), LONG2FIX(den));
+    return rb_funcall(rb_cObject, rational_id, 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
 void

data/ext/oj/oj.c

@@ -1442,7 +1442,7 @@ stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
     return Qnil;
 }
 
-/* call-seq: push_value(value, key=nil)
+/* call-seq: push_json(value, key=nil)
  *
  * Pushes a string onto the JSON document. The String must be a valid JSON
  * encoded string. No additional checking is done to verify the validity of the

data/ext/oj/parse.c

@@ -438,6 +438,7 @@ read_num(ParseInfo pi) {
 		} else {
 		    zero_cnt = 0;
 		}
+		// TBD move size check here
 		ni.i = ni.i * 10 + d;
 		if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
 		    ni.big = 1;
@@ -455,6 +456,7 @@ read_num(ParseInfo pi) {
 		    zero_cnt = 0;
 		}
 		ni.dec_cnt++;
+		// TBD move size check here
 		ni.num = ni.num * 10 + d;
 		ni.div *= 10;
 		if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
@@ -702,9 +704,9 @@ oj_num_as_value(NumInfo ni) {
 	    }
 	} else {
 	    if (ni->neg) {
-		rnum = LONG2NUM(-ni->i);
+		rnum = rb_ll2inum(-ni->i);
 	    } else {
-		rnum = LONG2NUM(ni->i);
+		rnum = rb_ll2inum(ni->i);
 	    }
 	}
     } else { // decimal

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.12.5'
+  VERSION = '2.12.6'
 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/{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)

metadata

@@ -1,58 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.12.5
+  version: 2.12.6
+  prerelease: 
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
-description: 'The fastest JSON parser and object serializer. '
+description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
 executables: []
 extensions:
@@ -60,60 +67,52 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- LICENSE
-- README.md
+- lib/oj/active_support_helper.rb
+- lib/oj/bag.rb
+- lib/oj/error.rb
+- lib/oj/mimic.rb
+- lib/oj/saj.rb
+- lib/oj/schandler.rb
+- lib/oj/version.rb
+- lib/oj.rb
+- ext/oj/extconf.rb
 - ext/oj/buf.h
-- ext/oj/cache8.c
 - ext/oj/cache8.h
-- ext/oj/circarray.c
 - ext/oj/circarray.h
+- ext/oj/encode.h
+- ext/oj/err.h
+- ext/oj/hash.h
+- ext/oj/odd.h
+- ext/oj/oj.h
+- ext/oj/parse.h
+- ext/oj/reader.h
+- ext/oj/resolve.h
+- ext/oj/val_stack.h
+- ext/oj/cache8.c
+- ext/oj/circarray.c
 - ext/oj/compat.c
 - ext/oj/dump.c
-- ext/oj/encode.h
 - ext/oj/err.c
-- ext/oj/err.h
-- ext/oj/extconf.rb
 - ext/oj/fast.c
 - ext/oj/hash.c
-- ext/oj/hash.h
 - ext/oj/hash_test.c
 - ext/oj/object.c
 - ext/oj/odd.c
-- ext/oj/odd.h
 - ext/oj/oj.c
-- ext/oj/oj.h
 - ext/oj/parse.c
-- ext/oj/parse.h
 - ext/oj/reader.c
-- ext/oj/reader.h
 - ext/oj/resolve.c
-- ext/oj/resolve.h
 - ext/oj/saj.c
 - ext/oj/scp.c
 - ext/oj/sparse.c
 - ext/oj/strict.c
 - ext/oj/val_stack.c
-- ext/oj/val_stack.h
-- lib/oj.rb
-- lib/oj/active_support_helper.rb
-- lib/oj/bag.rb
-- lib/oj/error.rb
-- lib/oj/mimic.rb
-- lib/oj/saj.rb
-- lib/oj/schandler.rb
-- lib/oj/version.rb
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
 - test/bug.rb
-- test/bug2.rb
-- test/bug3.rb
-- test/bug_fast.rb
-- test/bug_load.rb
-- test/example.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
@@ -121,17 +120,18 @@ 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
 - test/perf_simple.rb
 - test/perf_strict.rb
-- test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -144,47 +144,49 @@ files:
 - test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
+- test/sample.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
+- LICENSE
+- README.md
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.md
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.4.5
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e34ba8c73f9262974880d2fcf2be2b7d541b636b
-  data.tar.gz: 11828007a4ddd9c8817e0039e86ff7c8e555a0d2
-SHA512:
-  metadata.gz: 45f5d1cc476dded1921261dbb4ab1eda551ade35d6f66a97174167fed2b09f05d9c6fa8b1c3a1daa8a6f73238a5b48aad8cd81609aa2c5cf99dd696f71be46ce
-  data.tar.gz: 9e89459bceb129fd3607b938c304ebcd6a7c92fdd1aa055b9cea9086a1cdcfa2768c2015c15128840be049e9dac91c76227d4f3b46a5761339babb397a62f183

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/bug3.rb

@@ -1,46 +0,0 @@
-#!/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

@@ -1,32 +0,0 @@
-#!/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
-}

data/test/bug_load.rb

@@ -1,24 +0,0 @@
-#!/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)
-  item_id = doc['source']
-  # ...
-  puts item_id
-end
-
-File.open('log.json') { |f|
-  Oj::load(f, mode: :compat) { |doc|
-    begin
-      create_item(doc) if doc['msgType'] == 1
-    rescue Exception => e
-      puts "*** #{e.class}: #{e.message}"
-    end
-  }
-}

data/test/example.rb

@@ -1,11 +0,0 @@
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-require 'oj'
-require 'json'
- 
-Oj::Doc.open([{:name => "T-Shirt"}].to_json) do |doc|
-  doc.each_child do |child|
-    p child.fetch("name")
-  end
-end

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