oj 2.10.3 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 305f46dd63f131a124b3716a4d884f5dc355b80e
-  data.tar.gz: bcb452a3c8ca23658bd5f3362434fdb57c2fc5c8
+  metadata.gz: 30d74e96259d1e3ef85ebc6c587f0f0b1f2d155a
+  data.tar.gz: 0471ab90473ecbd13760d4942edf3461fdf9403d
 SHA512:
-  metadata.gz: 8c52c779973b9e6af3d5cfcd32236070a431fd16e79f204737179e00025c66c212c934c68e8a9d3c1a4838f1d9239c210ed85efe10996fd19baf63736d1a7550
-  data.tar.gz: ea85ed66665d3c10cb8b2ae96d014530cae2bed32bd1c1168a1b4e8c96308827f5032d78f5ced787aa225b9f72b1558ecc5f4282fa47ee47593919b7833cb5ff
+  metadata.gz: 04e8cae819f240f2449e19d5673c040f84e1bfb6ea6820126a862f0b1e930437542400c7af5ec4cc0472cd17ed1b5904565c8dd20eee8f69762b05407fb6e6ef
+  data.tar.gz: 7666bec8a2682042e317dc4d8ca36200a06800e59a667f71ce1b1eb34eb855481f863d0f867111290d655a5c41ae68d93e626afcadcb95dc29a736708c1f8d20

data/README.md

@@ -26,7 +26,15 @@ 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.10.3
+### Current Release 2.10.4
+
+ - Fixed Range encoding in compat mode to not use the object mode encoding.
+
+ - Fixed serialization problem with timestamps.
+
+ - Fixed compat parser to accept NaN and Infinity.
+ 
+### Release 2.10.3
 
  - Using the xmlschema option with :object mode now saves time as a string and
    preserves the timezone.
@@ -167,33 +175,3 @@ parsing.
 [Need for Speed](http://www.ohler.com/dev/need_for_speed/need_for_speed.html) for an overview of how Oj::Doc was designed.
 
 *OjC, a C JSON parser*: https://www.ohler.com/ojc also at https://github.com/ohler55/ojc
-
-### License:
-
-    Copyright (c) 2012, Peter Ohler
-    All rights reserved.
-    
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    
-     - Redistributions of source code must retain the above copyright notice, this
-       list of conditions and the following disclaimer.
-    
-     - Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-    
-     - Neither the name of Peter Ohler nor the names of its contributors may be
-       used to endorse or promote products derived from this software without
-       specific prior written permission.
-    
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/ext/oj/compat.c

@@ -84,11 +84,44 @@ end_hash(struct _ParseInfo *pi) {
     }
 }
 
+static VALUE
+calc_hash_key(ParseInfo pi, Val parent) {
+    volatile VALUE	rkey = parent->key_val;
+
+    if (Qundef == rkey) {
+	rkey = rb_str_new(parent->key, parent->klen);
+    }
+    rkey = oj_encode(rkey);
+    if (Yes == pi->options.sym_key) {
+	rkey = rb_str_intern(rkey);
+    }
+    return rkey;
+}
+
+static void
+add_num(ParseInfo pi, NumInfo ni) {
+    pi->stack.head->val = oj_num_as_value(ni);
+}
+
+static void
+hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), oj_num_as_value(ni));
+}
+
+static void
+array_append_num(ParseInfo pi, NumInfo ni) {
+    rb_ary_push(stack_peek(&pi->stack)->val, oj_num_as_value(ni));
+}
+
+
 void
 oj_set_compat_callbacks(ParseInfo pi) {
     oj_set_strict_callbacks(pi);
     pi->end_hash = end_hash;
     pi->hash_set_cstr = hash_set_cstr;
+    pi->add_num = add_num;
+    pi->hash_set_num = hash_set_num;
+    pi->array_append_num = array_append_num;
 }
 
 VALUE

data/ext/oj/dump.c

@@ -1169,8 +1169,6 @@ dump_data_null(VALUE obj, Out out) {
 
 static void
 dump_data_comp(VALUE obj, int depth, Out out) {
-    volatile VALUE	o2;
-
     if (rb_respond_to(obj, oj_to_hash_id)) {
 	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
@@ -1178,8 +1176,18 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
-    } else if (rb_respond_to(obj, oj_as_json_id) && obj != (o2 = rb_funcall(obj, oj_as_json_id, 0))) {
-	dump_val(o2, depth, out);
+    } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_as_json_id)) {
+	volatile VALUE	aj = rb_funcall(obj, oj_as_json_id, 0);
+
+	// Catch the obvious brain damaged recursive dumping.
+	if (aj == obj) {
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+	} else {
+	    dump_val(aj, depth, out);
+	}
+
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
 	const char	*s;
@@ -1272,7 +1280,16 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_as_json_id)) {
-	dump_val(rb_funcall(obj, oj_as_json_id, 0), depth, out);
+	volatile VALUE	aj = rb_funcall(obj, oj_as_json_id, 0);
+
+	// Catch the obvious brain damaged recursive dumping.
+	if (aj == obj) {
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+	} else {
+	    dump_val(aj, depth, out);
+	}
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
 	const char	*s;
@@ -1592,7 +1609,7 @@ dump_struct_comp(VALUE obj, int depth, Out out) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
-    } else if (rb_respond_to(obj, oj_to_json_id)) {
+    } 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);
 	const char	*s;
 	int		len;
@@ -1605,7 +1622,9 @@ dump_struct_comp(VALUE obj, int depth, Out out) {
 	memcpy(out->cur, s, len);
 	out->cur += len;
     } else {
-	dump_struct_obj(obj, depth, out);
+	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
     }
 }
 
@@ -1734,7 +1753,7 @@ dump_val(VALUE obj, int depth, Out out) {
     if (MAX_DEPTH < depth) {
 	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
-    switch (rb_type(obj)) {
+    switch (type) {
     case T_NIL:		dump_nil(out);				break;
     case T_TRUE:	dump_true(out);				break;
     case T_FALSE:	dump_false(out);			break;
@@ -1856,11 +1875,11 @@ oj_dump_obj_to_json(VALUE obj, Options copts, Out out) {
 	case '}':
 	    grow(out, 1);
 	    *out->cur++ = '\n';
-	    *out->cur = '\0';
 	default:
 	    break;
 	}
     }
+    *out->cur = '\0';
     if (Yes == copts->circular) {
 	oj_cache8_delete(out->circ_cache);
     }

data/ext/oj/object.c

@@ -164,9 +164,6 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
 #else
 		parent->val = rb_time_new(ni->i, (long)(nsec / 1000));
 #endif
-		// TBD if there is an exponent then if not gmt_offset
-		// add gmt_offset and then getgmt()
-		// if not 0 then getlocal(offset)
 	    }
 	    break;
 	case 'i': // circular index

data/ext/oj/oj.c

@@ -166,7 +166,7 @@ struct _Options	oj_default_options = {
     UnixTime,		// time_format
     Yes,		// bigdec_as_num
     AutoDec,		// bigdec_load
-    No,			// to_json
+    Yes,		// to_json
     No,			// nilnil
     json_class,		// create_id
     10,			// create_id_len
@@ -1734,12 +1734,17 @@ mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
     struct _Out		out;
     VALUE		rstr;
-    
+    struct _Options	copts = oj_default_options;
+
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
+    // Have to turn off to_json to avoid the Active Support recursion problem.
+    copts.to_json = No;
+    // 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, &oj_default_options, &out);
+    oj_dump_obj_to_json(self, &copts, &out);
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
@@ -1846,6 +1851,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     }
 
     oj_default_options = mimic_object_to_json_options;
+    oj_default_options.to_json = Yes;
 
     return mimic;
 }

data/lib/oj/version.rb

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

data/test/_test_mimic_rails.rb

@@ -7,6 +7,26 @@ require 'helper'
 Oj.mimic_JSON
 require 'rails/all'
 
+require 'active_model'
+require 'active_model_serializers'
+require 'active_support/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_mimic_exception
@@ -42,4 +62,26 @@ class MimicRails < Minitest::Test
 }, json)
   end
 
+  def test_dump_range
+    Oj.default_options= {:indent => 2} # JSON this will not change anything
+    json = ActiveSupport::JSON.encode([1, true, '01'..'12'])
+    assert_equal(%{[
+  1,
+  true,
+  "01..12"
+]
+}, json)
+  end
+
+  def test_dump_object
+    Oj.default_options= {:indent => 2}
+    category = Category.new(1, 'test')
+    serializer = CategorySerializer.new(category)
+
+    json = serializer.to_json()
+    json = serializer.as_json()
+    json = JSON.dump(serializer)
+  end
+
+
 end # MimicRails

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/isolated/shared.rb

@@ -26,6 +26,15 @@ class SharedMimicTest < Minitest::Test
 
   def setup
     @default_options = Oj.default_options
+    @time = Time.at(1400000000).utc
+    @expected_time_string =
+      if defined?(Rails)
+        %{"2014-05-13T16:53:20.000Z"}
+      elsif RUBY_VERSION.start_with?('1.8')
+        %{"Tue May 13 16:53:20 UTC 2014"}
+      else
+        %{"2014-05-13 16:53:20 UTC"}
+      end
   end
 
   def teardown
@@ -46,26 +55,27 @@ class SharedMimicTest < Minitest::Test
 
 # dump
   def test_dump_string
-    json = JSON.dump([1, true, nil])
-    assert_equal(%{[1,true,null]}, json)
+    json = JSON.dump([1, true, nil, @time])
+    assert_equal(%{[1,true,null,#{@expected_time_string}]}, json)
   end
 
   def test_dump_with_options
     Oj.default_options= {:indent => 2} # JSON this will not change anything
-    json = JSON.dump([1, true, nil])
+    json = JSON.dump([1, true, nil, @time])
     assert_equal(%{[
   1,
   true,
-  null
+  null,
+  #{@expected_time_string}
 ]
 }, json)
   end
 
   def test_dump_io
     s = StringIO.new()
-    json = JSON.dump([1, true, nil], s)
+    json = JSON.dump([1, true, nil, @time], s)
     assert_equal(s, json)
-    assert_equal(%{[1,true,null]}, s.string)
+    assert_equal(%{[1,true,null,#{@expected_time_string}]}, s.string)
   end
   # TBD options
 

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/{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

@@ -398,11 +398,7 @@ class Juice < Minitest::Test
         sign = '-'
         tz = -tz
       end
-      if RUBY_VERSION.start_with?('1.8')
-        assert_equal(%{"2012-01-05T23:58:07%sZ"} % [sign], json)
-      else
-        assert_equal(%{"2012-01-05T23:58:07%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
-      end
+      assert_equal(%{"2012-01-05T23:58:07%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
     end
   end
   def test_xml_time_compat_precision
@@ -440,11 +436,7 @@ class Juice < Minitest::Test
         sign = '-'
         tz = -tz
       end
-      if RUBY_VERSION.start_with?('1.8')
-        assert_equal(%{"2012-01-05T23:58:08%sZ"} % [sign], json)
-      else
-        assert_equal(%{"2012-01-05T23:58:08%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
-      end
+      assert_equal(%{"2012-01-05T23:58:08%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
     end
   end
   def test_xml_time_compat_zulu
@@ -914,12 +906,8 @@ class Juice < Minitest::Test
     rescue Oj::ParseError
       assert(true)
     end
-    begin
-      Oj.load('Infinity', :mode => :compat)
-      fail()
-    rescue Oj::ParseError
-      assert(true)
-    end
+    x = Oj.load('Infinity', :mode => :compat)
+    assert_equal('Infinity', x.to_s)
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -60,7 +60,6 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- LICENSE
 - README.md
 - ext/oj/buf.h
 - ext/oj/cache8.c
@@ -103,10 +102,8 @@ files:
 - lib/oj/version.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
@@ -114,11 +111,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
@@ -138,24 +137,21 @@ files:
 - test/sample/shape.rb
 - test/sample/text.rb
 - test/sample_json.rb
-- test/struct.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_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
-- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -181,4 +177,3 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true

data/LICENSE

@@ -1,27 +0,0 @@
-Copyright (c) 2012, Peter Ohler
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- - Neither the name of Peter Ohler nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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/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