oj 2.11.5 → 2.12.0

data/ext/oj/oj.h

@@ -82,6 +82,7 @@ typedef enum {
 
 typedef enum {
     UnixTime	= 'u',
+    UnixZTime	= 'z',
     XmlTime	= 'x',
     RubyTime	= 'r'
 } TimeFormat;
@@ -247,7 +248,6 @@ extern VALUE	oj_stream_writer_class;
 extern VALUE	oj_string_writer_class;
 extern VALUE	oj_stringio_class;
 extern VALUE	oj_struct_class;
-extern VALUE	oj_time_class;
 
 extern VALUE	oj_slash_string;
 
@@ -269,6 +269,7 @@ extern ID	oj_instance_variables_id;
 extern ID	oj_json_create_id;
 extern ID	oj_length_id;
 extern ID	oj_new_id;
+extern ID	oj_parse_id;
 extern ID	oj_pos_id;
 extern ID	oj_read_id;
 extern ID	oj_readpartial_id;
@@ -283,7 +284,9 @@ extern ID	oj_to_time_id;
 extern ID	oj_tv_nsec_id;
 extern ID	oj_tv_sec_id;
 extern ID	oj_tv_usec_id;
+extern ID	oj_utc_id;
 extern ID	oj_utc_offset_id;
+extern ID	oj_utcq_id;
 extern ID	oj_write_id;
 
 #if USE_PTHREAD_MUTEX

data/ext/oj/parse.c

@@ -47,7 +47,8 @@
 #else
 #define NUM_MAX		(FIXNUM_MAX >> 8)
 #endif
-#define EXP_MAX		1023
+//#define EXP_MAX		1023
+#define EXP_MAX		100000
 #define DEC_MAX		15
 
 static void
@@ -401,6 +402,7 @@ read_num(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 0;
     ni.neg = 0;
+    ni.hasExp = 0;
     ni.no_big = (FloatDec == pi->options.bigdec_load);
 
     if ('-' == *pi->cur) {
@@ -463,6 +465,7 @@ read_num(ParseInfo pi) {
 	if ('e' == *pi->cur || 'E' == *pi->cur) {
 	    int	eneg = 0;
 
+	    ni.hasExp = 1;
 	    pi->cur++;
 	    if ('-' == *pi->cur) {
 		pi->cur++;

data/ext/oj/parse.h

@@ -52,6 +52,7 @@ typedef struct _NumInfo {
     int		infinity;
     int		nan;
     int		neg;
+    int		hasExp;
     int		no_big;
 } *NumInfo;
 

data/ext/oj/sparse.c

@@ -48,7 +48,7 @@
 #else
 #define NUM_MAX		(FIXNUM_MAX >> 8)
 #endif
-#define EXP_MAX		1023
+#define EXP_MAX		100000
 #define DEC_MAX		15
 
 static void
@@ -413,6 +413,7 @@ read_num(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 0;
     ni.neg = 0;
+    ni.hasExp = 0;
     ni.no_big = (FloatDec == pi->options.bigdec_load);
     c = reader_get(&pi->rd);
     if ('-' == c) {
@@ -467,6 +468,7 @@ read_num(ParseInfo pi) {
 	if ('e' == c || 'E' == c) {
 	    int	eneg = 0;
 
+	    ni.hasExp = 1;
 	    c = reader_get(&pi->rd);
 	    if ('-' == c) {
 		c = reader_get(&pi->rd);

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.11.5'
+  VERSION = '2.12.0'
 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/io.rb

@@ -0,0 +1,48 @@
+#!/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/{test_range.rb → mod.rb}

@@ -1,19 +1,16 @@
 #!/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")
 
-puts Oj.dump(range)
+Thread.new do
+  string_io = StringIO.new('{"foo":"bar"}')
+  Oj.load(string_io)
+  string_io.rewind
+  puts string_io.read
+end.join

data/test/struct.rb

@@ -0,0 +1,29 @@
+#!/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_compat.rb

@@ -192,6 +192,68 @@ class CompatJuice < Minitest::Test
     assert_equal(orig, bg)
   end
 
+  # Time
+  def test_time_ruby
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456-08:00')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456, -8 * 3600)
+    end
+    expect = '"' + t.to_s + '"'
+    json = Oj.dump(t, :mode => :compat, :time_format => :ruby)
+    assert_equal(expect, json)
+  end
+  def test_time_xml
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456-08:00')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456, -8 * 3600)
+    end
+    json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 6)
+    assert_equal('"2015-01-05T21:37:07.123456-08:00"', json)
+  end
+  unless RUBY_VERSION.start_with?('1.8')
+    def test_time_xml_12345
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456, 12345)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 6)
+      assert_equal('"2015-01-05T21:37:07.123456+03:25"', json)
+    end
+  end
+  def test_time_unix
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456-08:00')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456, -8 * 3600)
+    end
+    json = Oj.dump(t, :mode => :compat, :time_format => :unix, :second_precision => 6)
+    assert_equal('1420522627.123456', json)
+  end
+  def test_time_unix_zone
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456-08:00')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456, -8 * 3600)
+    end
+    json = Oj.dump(t, :mode => :compat, :time_format => :unix_zone, :second_precision => 6)
+    assert_equal('1420493827.123456e-28800', json)
+  end
+  unless RUBY_VERSION.start_with?('1.8')
+    def test_time_unix_zone_12345
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456, 12345)
+      json = Oj.dump(t, :mode => :compat, :time_format => :unix_zone, :second_precision => 6)
+      assert_equal('1420493827.123456e12345', json)
+    end
+  end
+  def test_time_unix_zone_early
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('1954-01-05T21:37:07.123456-08:00')
+    else
+      t = Time.new(1954, 1, 5, 21, 37, 7.123456, -8 * 3600)
+    end
+    json = Oj.dump(t, :mode => :compat, :time_format => :unix_zone, :second_precision => 6)
+    assert_equal('-504498172.876544e-28800', json)
+  end
+
   # Stream IO
   def test_io_string
     json = %{{

data/test/test_file.rb

@@ -126,12 +126,12 @@ class FileJuice < Minitest::Test
   # Time
   def test_time_object
     t = Time.now()
-    Oj.default_options = { :mode => :object }
+    Oj.default_options = { :mode => :object, :time_format => :unix_zone }
     dump_and_load(t, false)
   end
   def test_time_object_early
     t = Time.xmlschema("1954-01-05T00:00:00.123456")
-    Oj.default_options = { :mode => :object }
+    Oj.default_options = { :mode => :object, :time_format => :unix_zone }
     dump_and_load(t, false)
   end
 
@@ -227,7 +227,18 @@ class FileJuice < Minitest::Test
     }
     puts "\n*** file: '#{File.read(filename)}'" if trace
     loaded = Oj.load_file(filename)
-    assert_equal(obj, loaded)
+    if obj.is_a?(Time) && loaded.is_a?(Time)
+      assert_equal(obj.tv_sec, loaded.tv_sec)
+      if obj.respond_to?(:tv_nsec)
+        assert_equal(obj.tv_nsec, loaded.tv_nsec)
+      else
+        assert_equal(obj.tv_usec, loaded.tv_usec)
+      end
+      assert_equal(obj.utc?, loaded.utc?)
+      assert_equal(obj.utc_offset, loaded.utc_offset)
+    else
+      assert_equal(obj, loaded)
+    end
     loaded
   end
 

data/test/test_object.rb

@@ -346,32 +346,200 @@ class ObjectJuice < Minitest::Test
     dump_and_load(obj, false)
   end
 
-  def test_time
-    t = Time.now()
-    dump_and_load(t, false)
-  end
-
   def test_xml_time
-    Oj.default_options = { :mode => :object, :time_format => :xmlschema }
-    t = Time.now()
-    dump_and_load(t, false)
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456789-08:00')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :xmlschema)
+    #puts "*** json for test_xml_time '#{json}'"
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
   end
 
-  def test_utc_time
-    Oj.default_options = { :mode => :object, :time_format => :xmlschema }
-    t = Time.now().utc
-    dump_and_load(t, false)
+  def test_xml_time_utc
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456789Z')
+    else
+      t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :xmlschema)
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
   end
 
   def test_ruby_time
-    Oj.default_options = { :mode => :object, :time_format => :ruby }
-    t = Time.now()
-    dump_and_load(t, false)
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456789-08:00')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :ruby)
+    #puts "*** json for test_ruby_time '#{json}'"
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
+  end
+
+  def test_ruby_time_12345
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456789+03:25')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, 12345/60*60)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :ruby)
+    #puts "*** json for test_ruby_time '#{json}'"
+    loaded = Oj.object_load(json);
+    #puts "*** loaded: #{loaded}"
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
+  end
+
+  def test_ruby_time_utc
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456789Z')
+    else
+      t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :ruby)
+    #puts json
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
   end
 
   def test_time_early
-    t = Time.xmlschema("1954-01-05T00:00:00.123456")
-    dump_and_load(t, false)
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('1954-01-05T21:37:07.123456789-08:00')
+    else
+      t = Time.new(1954, 1, 5, 21, 37, 7.123456789, -8 * 3600)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :unix_zone)
+    #puts json
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
+  end
+
+  def test_time_unix_zone
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456789-08:00')
+    else
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :unix_zone)
+    #puts json
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
+  end
+
+  unless RUBY_VERSION.start_with?('1.8')
+    def test_time_unix_zone_12345
+      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, 12345)
+      # The fractional seconds are not always recreated exactly which causes a
+      # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+      # separately along with utc.
+      json = Oj.dump(t, :mode => :object, :time_format => :unix_zone)
+      #puts json
+      loaded = Oj.object_load(json);
+      assert_equal(t.tv_sec, loaded.tv_sec)
+      if t.respond_to?(:tv_nsec)
+        assert_equal(t.tv_nsec, loaded.tv_nsec)
+      else
+        assert_equal(t.tv_usec, loaded.tv_usec)
+      end
+      assert_equal(t.utc?, loaded.utc?)
+      assert_equal(t.utc_offset, loaded.utc_offset)
+    end
+  end
+
+  def test_time_unix_zone_utc
+    if RUBY_VERSION.start_with?('1.8')
+      t = Time.parse('2015-01-05T21:37:07.123456789Z')
+    else
+      t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
+    end
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :unix_zone)
+    #puts json
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
+    end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
   end
 
   def test_json_object