oj 1.3.0 → 1.3.2

data/README.md

@@ -32,9 +32,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.3.0
+### Release 1.3.2
 
- - Added an option to control the time format output when in :compat mode.
+ - Fixed compile problems with native Ruby on OS X 10.8 (Mountain Lion)
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -34,6 +34,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 
 #include "oj.h"
 #include "cache8.h"
@@ -42,8 +43,6 @@
 #define rb_eEncodingError	rb_eException
 #endif
 
-#define DBL_INF	1.e500
-
 typedef unsigned long	ulong;
 
 typedef struct _Out {
@@ -421,10 +420,10 @@ dump_float(VALUE obj, Out out) {
 	*b++ = '0';
 	*b++ = '\0';
 	cnt = 3;
-    } else if (DBL_INF == d) {
+    } else if (INFINITY == d) {
 	strcpy(buf, "Infinity");
 	cnt = 8;
-    } else if (-DBL_INF == d) {
+    } else if (-INFINITY == d) {
 	strcpy(buf, "-Infinity");
 	cnt = 9;
     } else {
@@ -970,6 +969,7 @@ dump_xml_time(VALUE obj, Out out) {
     long		nsec = NUM2LONG(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
+    long		tz_secs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
     int			tzhour, tzmin;
     char		tzsign = '+';
 
@@ -977,7 +977,19 @@ dump_xml_time(VALUE obj, Out out) {
 	grow(out, 36);
     }
     // 2012-01-05T23:58:07.123456000+09:00
-    tm = localtime(&sec);
+    //tm = localtime(&sec);
+    sec += tz_secs;
+    tm = gmtime(&sec);
+#if 1
+    if (0 > tz_secs) {
+        tzsign = '-';
+        tzhour = (int)(tz_secs / -3600);
+        tzmin = (int)(tz_secs / -60) - (tzhour * 60);
+    } else {
+        tzhour = (int)(tz_secs / 3600);
+        tzmin = (int)(tz_secs / 60) - (tzhour * 60);
+    }
+#else
     if (0 > tm->tm_gmtoff) {
         tzsign = '-';
         tzhour = (int)(tm->tm_gmtoff / -3600);
@@ -986,11 +998,27 @@ dump_xml_time(VALUE obj, Out out) {
         tzhour = (int)(tm->tm_gmtoff / 3600);
         tzmin = (int)(tm->tm_gmtoff / 60) - (tzhour * 60);
     }
-    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d",
-	    tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-	    tm->tm_hour, tm->tm_min, tm->tm_sec, nsec,
-	    tzsign, tzhour, tzmin);
-    dump_cstr(buf, 35, 0, 0, out);
+#endif
+    if (0 == nsec) {
+	if (0 == tzhour && 0 == tzmin) {
+	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ",
+		    tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+		    tm->tm_hour, tm->tm_min, tm->tm_sec);
+	    dump_cstr(buf, 20, 0, 0, out);
+	} else {
+	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
+		    tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+		    tm->tm_hour, tm->tm_min, tm->tm_sec,
+		    tzsign, tzhour, tzmin);
+	    dump_cstr(buf, 25, 0, 0, out);
+	}
+    } else {
+	sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d",
+		tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec, nsec,
+		tzsign, tzhour, tzmin);
+	dump_cstr(buf, 35, 0, 0, out);
+    }
 }
 
 static void

data/ext/oj/extconf.rb

@@ -32,7 +32,7 @@ dflags = {
 # missing #define. This is the quick and easy way around it.
 if 'x86_64-linux' == RUBY_PLATFORM && '1.9.3' == RUBY_VERSION && '2011-10-30' == RUBY_RELEASE_DATE
   begin
-    dflags['NEEDS_STPCPY'] = nil if `more /etc/issue`.include?('CentOS release 5.4')
+    dflags['NEEDS_STPCPY'] = nil if File.read('/etc/redhat-release').include?('CentOS release 5.4')
   rescue Exception => e
   end
 end

data/ext/oj/load.c

@@ -28,7 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef SAFE_CACHE
 #include <pthread.h> // TBD LOCK
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

data/ext/oj/oj.c

@@ -29,7 +29,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <pthread.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
@@ -64,6 +63,7 @@ ID	oj_to_time_id;
 ID	oj_tv_nsec_id;
 ID	oj_tv_sec_id;
 ID	oj_tv_usec_id;
+ID	oj_utc_offset_id;
 ID	oj_write_id;
 
 VALUE	oj_bag_class;
@@ -107,8 +107,9 @@ Cache	oj_attr_cache = 0;
 rb_encoding	*oj_utf8_encoding = 0;
 #endif
 
+#ifdef SAFE_CACHE
 pthread_mutex_t	oj_cache_mutex; // only used if SAFE_CACHE defined
-
+#endif
 static const char	json_class[] = "json_class";
 
 struct _Options	oj_default_options = {
@@ -628,6 +629,7 @@ mimic_dump_load(int argc, VALUE *argv, VALUE self) {
     } else {
 	return mimic_dump(argc, argv, self);
     }
+    return Qnil;
 }
 
 static VALUE
@@ -872,6 +874,7 @@ void Init_oj() {
     oj_tv_nsec_id = rb_intern("tv_nsec");
     oj_tv_sec_id = rb_intern("tv_sec");
     oj_tv_usec_id = rb_intern("tv_usec");
+    oj_utc_offset_id = rb_intern("utc_offset");
     oj_write_id = rb_intern("write");
 
     oj_bag_class = rb_const_get_at(Oj, rb_intern("Bag"));

data/ext/oj/oj.h

@@ -46,8 +46,9 @@ extern "C" {
 #endif
 
 #include "stdint.h"
-#include <pthread.h> // for SAFE_CACHE
-
+#ifdef SAFE_CACHE
+#include <pthread.h>
+#endif
 #include "cache.h"
 
 #ifdef RUBINIUS_RUBY
@@ -182,12 +183,14 @@ 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_offset_id;
 
 extern Cache	oj_class_cache;
 extern Cache	oj_attr_cache;
 
+#ifdef SAFE_CACHE
 extern pthread_mutex_t	oj_cache_mutex;
-
+#endif
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */

data/lib/oj/version.rb

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

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/{foo.rb → perf2.rb}

@@ -15,6 +15,19 @@ 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",
@@ -23,36 +36,41 @@ 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
-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]
+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
-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]
+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 "Oj is %0.1f times faster than YAJL at parsing." % [yajl_dt / oj_dt]
+puts
 
-
-obj = Oj.load(s)
 start = Time.now
 iter.times do
   Oj.dump(obj)
 end
-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]
+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
-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]
+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 "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]
+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/tests.rb

@@ -266,9 +266,43 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(%{"#{t.to_s}"}, json)
   end    
   def test_xml_time_compat
-    t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
-    json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
-    assert_equal(%{"2012-01-05T23:58:07.123456000+09:00"}, json)
+    begin
+      t = Time.new(2012, 1, 5, 23, 58, 7.123456000, 34200)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      assert_equal(%{"2012-01-05T23:58:07.123456000+09:30"}, json)
+    rescue Exception => e
+      # some Rubies (1.8.7) do not allow the timezome to be set
+      t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      tz = t.utc_offset
+      assert_equal(%{"2012-01-05T23:58:07.123456000+%02d:%02d"} % [tz / 3600, tz / 60 % 60], json)
+    end
+  end    
+  def test_xml_time_compat_no_secs
+    begin
+      t = Time.new(2012, 1, 5, 23, 58, 7.0, 34200)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      assert_equal(%{"2012-01-05T23:58:07+09:30"}, json)
+    rescue Exception => e
+      # some Rubies (1.8.7) do not allow the timezome to be set
+      t = Time.local(2012, 1, 5, 23, 58, 7, 0)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      tz = t.utc_offset
+      assert_equal(%{"2012-01-05T23:58:07+%02d:%02d"} % [tz / 3600, tz / 60 % 60], json)
+    end
+  end    
+  def test_xml_time_compat_zulu
+    begin
+      t = Time.new(2012, 1, 5, 23, 58, 7.0, 0)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      assert_equal(%{"2012-01-05T23:58:07Z"}, json)
+    rescue Exception => e
+      # some Rubies (1.8.7) do not allow the timezome to be set
+      t = Time.utc(2012, 1, 5, 23, 58, 7, 0)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema)
+      tz = t.utc_offset
+      assert_equal(%{"2012-01-05T23:58:07Z"}, json)
+    end
   end    
   def test_time_object
     t = Time.now()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -32,14 +32,13 @@ files:
 - ext/oj/fast.c
 - ext/oj/load.c
 - ext/oj/oj.c
-- test/boo.rb
-- test/bug.rb
 - test/files.rb
-- test/foo.rb
-- test/oj-test/test.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
@@ -59,7 +58,6 @@ files:
 - test/test_fast.rb
 - test/test_mimic.rb
 - test/tests.rb
-- test/where.rb
 - LICENSE
 - README.md
 homepage: http://www.ohler.com/oj

data/test/boo.rb

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

@@ -1,18 +0,0 @@
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'oj'
-require 'bigdecimal'
-
-stuff = [
-  BigDecimal.new('10'),
-  Date.today,
-  Time.now,
-  DateTime.now
-]
-
-puts Oj.dump(stuff, :mode => :strict)
-puts Oj.dump(stuff, :mode => :compat)
-puts Oj.dump(stuff, :mode => :object)
-

data/test/oj-test/test.rb

@@ -1,137 +0,0 @@
-require 'cgi'
-require 'oj'
-
-AD_MARKUP = CGI.escape("asdf" * 100)
-
-SEATBID = '{
-  "bid" : [{
-    "id": "1",
-    "impid" : "102",
-    "price": 9.43,
-    "adid" : "314",
-    "nurl": "http://adserver.com/winnotice?impid=102",
-    "adm" : "' + AD_MARKUP + '",
-    "adomain" : ["advertiserdomain.com"],
-    "iurl" : "http://adserver.com/pathtosampleimage",
-    "cid" : "campaign111",
-    "crid" : "creative112",
-    "attr" : [1,2,3,4,5,6,7,12]
-  }],
-  "seat"  : "512",
-  "group" : "128"
-}'
-
-
-LARGE_JSON = '{
-  "id": "1234567890",
-  "units" : 0,
-  "bidid": "abc1123",
-  "cur": "EUR",
-  "seatbid": [' + ([SEATBID] * 100).join(', ') +  ']
-}'
-
-
-class Bid
-
-  attr_accessor :id,
-    :bidid,
-    :cur,
-    :seat,
-    :group,
-    :impid,
-    :price,
-    :units,
-    :adid,
-    :nurl,
-    :adm,
-    :adomain,
-    :iurl,
-    :cid,
-    :crid,
-    :attr,
-    :nbr,
-    :partner_id
-
-  alias :currency   :cur
-  alias :auction_id :id
-
-  def parsed_adm
-    return replace_macros(self.adm)
-  end
-
-  def parsed_nurl
-    return replace_macros(self.nurl)
-  end
-
-  def replace_macros(template)
-    return nil if !template
-    {
-      '${AUCTION_ID}'        => self.id,
-      '${AUCTION_BID_ID}'    => self.bidid,
-      '${AUCTION_IMP_ID}'    => self.impid,
-      '${AUCTION_SEAT_ID}'   => self.seat,
-      '${AUCTION_AD_ID}'     => self.adid,
-      '${AUCTION_PRICE}'     => self.price,
-      '${AUCTION_CURRENCY}'  => self.cur,
-      '${AUCTION_UNITS}'     => self.units,
-    }.each do |macro, v|
-        template = template.gsub(macro, v.to_s)
-      end
-      template
-  end
-end
-
-class BidResponseParser
-  REQUIRED_ATTRIBUTES = [:id, :impid, :price].freeze
-
-  def self.parse(json)
-    return nil if !json
-    extract_fast(json)
-  end
-
-  def self.extract_fast(json)
-    bid = nil
-    Oj::Doc.open(json) do |doc|
-      bid = Bid.new
-
-      # bid-response object
-      bid.id      = doc.fetch '/id'
-
-      bid.bidid   = doc.fetch '/bidid'
-      bid.units   = doc.fetch('/units') || 0
-      bid.cur     = doc.fetch '/cur'
-      bid.nbr     = doc.fetch('/nbr') || 0 # Mobile RTB 1.0 only
-
-      # EM: we do not expect more than 1 bid object in the response,
-      # as we only send single ads in the bid-request (no multi-ad-auctions) atm.
-      # seatbid-obj
-      bid.seat    = doc.fetch '/seatbid/0/seat'
-      bid.group   = doc.fetch '/seatbid/0/group'
-
-      # bid-obj
-      bid_path = '/seatbid/0/bid/0'
-      bid.impid   = doc.fetch "#{bid_path}/impid"
-      bid.adid    = doc.fetch "#{bid_path}/adid"
-      bid.nurl    = doc.fetch "#{bid_path}/nurl"
-      bid.adm     = doc.fetch "#{bid_path}/adm"
-      bid.adomain = doc.fetch "#{bid_path}/adomain"
-      bid.iurl    = doc.fetch "#{bid_path}/iurl"
-      bid.cid     = doc.fetch "#{bid_path}/cid"
-      bid.crid    = doc.fetch "#{bid_path}/crid"
-      bid.attr    = doc.fetch "#{bid_path}/attr"
-
-      # sadly we need to check this explicitly, because nil.to_f returns 0.0
-      if doc.fetch("#{bid_path}/price") == nil
-        raise "required attribute price missing"
-      end
-
-      bid.price = doc.fetch("#{bid_path}/price").to_f
-    end
-
-    return bid
-  end
-end
-
-1000.times do
-  BidResponseParser.parse(LARGE_JSON)
-end

data/test/where.rb

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