oj 1.2.2 → 1.2.3

data/README.md

@@ -16,7 +16,7 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="links">Links of Interest</a>
 
-[Need for Speed](http://www.ohler.com/software/thoughts/Blog/Entries/2012/3/13_Need_for_Speed.html) for an overview of how Oj::Doc was designed.
+[Need for Speed](http://www.ohler.com/dev/need_for_speed/need_for_speed.html) for an overview of how Oj::Doc was designed.
 
 *Fast XML parser and marshaller on RubyGems*: https://rubygems.org/gems/ox
 
@@ -24,11 +24,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.2.2
+### Release 1.2.3
 
- - minor bug fixes for different rubies along with test updates
-
- - Oj::Doc will now automatically close on GC.
+ - Fixed compile error for the latest RBX on Travis.
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -39,7 +39,7 @@
 #include "oj.h"
 #include "cache8.h"
 
-#if !HAS_ENCODING_SUPPORT
+#if !HAS_ENCODING_SUPPORT || defined(RUBINIUS_RUBY)
 #define rb_eEncodingError	rb_eException
 #endif
 

data/ext/oj/extconf.rb

@@ -17,7 +17,7 @@ dflags = {
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
   'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && '1.9.3' == RUBY_VERSION) ? 1 : 0,
-  'HAS_ENCODING_SUPPORT' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) && '1' == version[0] && '9' == version[1]) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
   'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
   'HAS_IVAR_HELPERS' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,

data/ext/oj/load.c

@@ -246,10 +246,7 @@ circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
 		}
 		memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
 	    } else { 
-		ca->objs = REALLOC_N(ca->objs, VALUE, cnt);
-		if (0 == ca->objs) {
-		    rb_raise(rb_eNoMemError, "not enough memory\n");
-		}
+		REALLOC_N(ca->objs, VALUE, cnt);
 	    }
 	    ca->size = cnt;
 	}

data/lib/oj/version.rb

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

data/test/boo.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'yajl'
+require 'oj'
+
+iter = 100
+s = File.read("boo.json")
+start = Time.now
+iter.times do
+  Oj.load(s)
+end
+oj_dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/second" % [iter, oj_dt, iter/oj_dt]
+
+start = Time.now
+iter.times do
+  Yajl::Parser.parse(s)
+end
+yajl_dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parsed/second" % [iter, yajl_dt, iter/yajl_dt]
+
+puts "Oj is %0.1f times faster than YAJL" % [yajl_dt / oj_dt]

data/test/{perf2.rb → foo.rb}

@@ -15,19 +15,6 @@ 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",
@@ -36,41 +23,36 @@ s = %{
 }
 }
 
-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]
+oj_dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, oj_dt, iter/oj_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]
+yajl_dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at parsing." % [yajl_dt / oj_dt]
 
+
+obj = Oj.load(s)
 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]
+oj_dt = Time.now - start
+puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, oj_dt, iter/oj_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]
+yajl_dt = Time.now - start
+puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]

data/test/where.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'optparse'
+require 'perf'
+require 'oj'
+
+$verbose = false
+$indent = 0
+$iter = 1000000
+
+opts = OptionParser.new
+opts.on("-v", "verbose")                                    { $verbose = true }
+opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
+opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+$obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  'c' => 12345,   # number
+  'd' => [ true, [false, [12345, nil], 3.967, ['something', false], nil]], # mix it up array
+  'e' => { 'one' => 1, 'two' => 2 }, # hash
+  'f' => nil,     # nil
+  'g' => 12345678901234567890123456789, # big number
+  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
+  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
+}
+
+Oj.default_options = { :indent => $indent, :mode => :strict }
+
+$json = Oj.dump($obj)
+
+if $verbose
+  puts "json:\n#{$json}\n"
+end
+
+puts '-' * 80
+puts "Parse Performance"
+Oj::Fast.open($json) do |fast|
+  fast.move('/d/2/4/2')
+  puts fast.where2?
+  puts fast.where?
+  perf = Perf.new()
+  perf.add('Oj:fast', 'where') { fast.where? }
+  perf.add('Oj:fast2', 'where2') { fast.where2? }
+  perf.run($iter)
+end
+puts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -32,13 +32,12 @@ files:
 - ext/oj/fast.c
 - ext/oj/load.c
 - ext/oj/oj.c
+- test/boo.rb
 - test/files.rb
+- test/foo.rb
 - test/perf.rb
-- test/perf1.rb
-- test/perf2.rb
 - test/perf_fast.rb
 - test/perf_obj.rb
-- test/perf_obj_old.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/sample/change.rb
@@ -58,9 +57,10 @@ files:
 - test/test_fast.rb
 - test/test_mimic.rb
 - test/tests.rb
+- test/where.rb
 - LICENSE
 - README.md
-homepage: https://github.com/ohler55/oj
+homepage: http://www.ohler.com/oj
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A fast JSON parser and serializer.

data/test/perf1.rb

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

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