oj 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59068b284af14e2585b85c69b1cc182f3dd0195d
-  data.tar.gz: 963f274f3d866a2230b674fbab5890a5d2b86dcd
+  metadata.gz: 8f2645663d6b76de56402dc004a41b2299c3eb09
+  data.tar.gz: 2df5a5fdca36bb28f69130f249500cbe7ea9a148
 SHA512:
-  metadata.gz: 32d43a8666dc8f16857a7ddee5ec4080a979c3cfc12d3834b3a832f40e323e742c4ecdac97f42400805983a2c448619a5f7a5e75f79221d8c0943551d0ec7591
-  data.tar.gz: 5113342958ca4a32bdd43af03ccba31c31c588967a40bd0e6cac1846e52db25a4a15231dcd16c82bb6c7507e2a9788fe4bff74b1ec56b957f55934e99e4e511a
+  metadata.gz: b8b3d8d7a4437b06cb2b7c509042bcd83f5ad6af6dba92e05b40af29b49d89b98608ffcb0668807201ce152b13ca702276bcf8492afe04adb2a8594bafcfecc0
+  data.tar.gz: 3daeb161d0402dcdbffd7aad76551ae39203e9b797fcff261d32c8b38a63d175c270e1f0ad7f9e2db6fbd86af5de81f564cac5e9415a74a7f84e2f2f29a6c01c

data/README.md

@@ -20,31 +20,11 @@ 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.1.2
+### Current Release 2.1.3
 
- - Fixed support for Windows.
+ - Fixed bug that did not deserialize all attributes in an Exception subclass.
 
-### Current Release 2.1.1
-
- - Fixed off by 1 error in buffer for escaped strings.
-
-### Current Release 2.1.0
-
- - This version is a major rewrite of the parser. The parser now uses a constant
-   stack size no matter how deeply nested the JSON document is. The parser is
-   also slightly faster for larger documents and 30% faster for object parsing.
-
- - Oj.strict_load() was renamed to Oj.safe_load() to better represent its
-   functionality. A new Oj.strict_load() is simply Oj.load() with :mode set to
-   :strict.
-
- - Oj.compat_load() and Oj.object_load() added.
-
- - A new Simple Callback Parser was added invoked by Oj.sc_parse().
-
- - Eliminated :max_stack option as it is no longer needed.
-
- - Handle cleanup after exceptions better.
+ - Added a sample to demonstrate how to write Exception subclasses that will automatically serialize and deserialize.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -1344,7 +1344,6 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
     }
     {
 	int	cnt;
-// use encoding as the indicator for Ruby 1.8.7 or 1.9.x
 #if HAS_IVAR_HELPERS
 	cnt = (int)rb_ivar_count(obj);
 #else

data/ext/oj/hash.c

@@ -29,6 +29,7 @@
  */
 
 #include "hash.h"
+#include <stdint.h>
 
 #define HASH_MASK	0x000003FF
 #define  HASH_SLOT_CNT	1024

data/ext/oj/hash_test.c

@@ -28,11 +28,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// if windows, comment out the whole file. It's only a performance test.
 #ifndef _WIN32
 #include <sys/time.h>
 #include <time.h>
-#endif
 #include "hash.h"
+#include <stdint.h>
+
+/* Define printf formats for standard types, like PRIu64 for uint64_t. */
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 
 typedef struct _StrLen {
     const char	*str;
@@ -473,7 +478,7 @@ perf() {
 #if IS_WINDOWS
     printf("%d iterations took %ld msecs\n", iter, (long)(dt / 1000));
 #else
-    printf("%d iterations took %lld msecs\n", iter, dt / 1000);
+    printf("%d iterations took %"PRIu64" msecs\n", iter, dt / 1000);
 #endif
 }
 
@@ -505,3 +510,4 @@ oj_hash_test() {
     oj_hash_print();
     perf();
 }
+#endif

data/ext/oj/object.c

@@ -241,6 +241,23 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, VALUE value) {
     return 0;
 }
 
+static void
+copy_ivars(VALUE target, VALUE src) {
+    VALUE	vars = rb_funcall(src, oj_instance_variables_id, 0);
+    VALUE	*np = RARRAY_PTR(vars);
+    ID		vid;
+    int		i, cnt = (int)RARRAY_LEN(vars);
+    const char	*attr;
+
+    for (i = cnt; 0 < i; i--, np++) {
+	vid = rb_to_id(*np);
+	attr = rb_id2name(vid);
+	if ('@' == *attr) {
+	    rb_ivar_set(target, vid, rb_ivar_get(src, vid));
+	}
+    }
+}
+
 static void
 set_obj_ivar(Val parent, const char *key, size_t klen, VALUE value) {
     ID	var_id;
@@ -249,9 +266,11 @@ set_obj_ivar(Val parent, const char *key, size_t klen, VALUE value) {
     if ('~' == *key && Qtrue == rb_obj_is_kind_of(parent->val, rb_eException)) {
 	if (5 == klen && 0 == strncmp("~mesg", key, klen)) {
 	    VALUE	args[1];
+	    VALUE	prev = parent->val;
 
 	    args[0] = value;
 	    parent->val = rb_class_new_instance(1, args, rb_class_of(parent->val));
+	    copy_ivars(parent->val, prev);
 	} else if (3 == klen && 0 == strncmp("~bt", key, klen)) {
 	    rb_funcall(parent->val, rb_intern("set_backtrace"), 1, value);
 	}

data/ext/oj/oj.c

@@ -462,6 +462,22 @@ oj_parse_options(VALUE ropts, Options copts) {
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
  *
+ * Note: Oj is not able to automatically deserialize all classes that are a
+ * subclass of a Ruby Exception. Only exception that take one required string
+ * argument in the initialize() method are supported. This is an example of how
+ * to write an Exception subclass that supports both a single string intializer
+ * and an Exception as an argument. Additional optional arguments can be added
+ * as well.
+ *
+ * The reason for this restriction has to do with a design decision on the part
+ * of the Ruby developers. Exceptions are special Objects. They do not follow the
+ * rules of other Objects. Exceptions have 'mesg' and a 'bt' attribute. Note that
+ * these are not '@mesg' and '@bt'. They can not be set using the normal C or
+ * Ruby calls. The only way I have found to set the 'mesg' attribute is through
+ * the initializer. Unfortunately that means any subclass that provides a
+ * different initializer can not be automatically decoded. A way around this is
+ * to use a create function but this example shows an alternative.
+ *
  * @param [String|IO] json JSON String or an Object that responds to read()
  * @param [Hash] options load options (same as default_options)
  */
@@ -1046,6 +1062,16 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     return mimic;
 }
 
+/*
+extern void	oj_hash_test();
+
+static VALUE
+hash_test(VALUE self) {
+    oj_hash_test();
+    return Qnil;
+}
+*/
+
 void Init_oj() {
     Oj = rb_define_module("Oj");
 
@@ -1054,6 +1080,8 @@ void Init_oj() {
     rb_require("bigdecimal");
     rb_require("stringio");
 
+    //rb_define_module_function(Oj, "hash_test", hash_test, 0);
+
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
     rb_define_module_function(Oj, "default_options=", set_def_opts, 1);
 
@@ -1140,9 +1168,6 @@ void Init_oj() {
     pthread_mutex_init(&oj_cache_mutex, 0);
 #endif
     oj_init_doc();
-
-    //rb_define_module_function(Oj, "hash_test", hash_test, 0);
-
 }
 
 // mimic JSON documentation

data/ext/oj/val_stack.h

@@ -33,6 +33,7 @@
 
 #include "ruby.h"
 #include "odd.h"
+#include <stdint.h>
 
 #define STACK_INC	32
 

data/lib/oj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -53,42 +53,6 @@ files:
 - ext/oj/scp.c
 - ext/oj/strict.c
 - ext/oj/val_stack.c
-- test/a.rb
-- test/bug.rb
-- test/files.rb
-- test/foo.rb
-- test/mj.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_fast.rb
-- test/perf_object.rb
-- test/perf_saj.rb
-- test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/shape.rb
-- test/sample/text.rb
-- test/sample.rb
-- test/sample_json.rb
-- test/test_compat.rb
-- test/test_fast.rb
-- test/test_mimic.rb
-- test/test_mimic_after.rb
-- test/test_object.rb
-- test/test_saj.rb
-- test/test_scp.rb
-- test/test_strict.rb
-- test/tests.rb
 - LICENSE
 - README.md
 homepage: http://www.ohler.com/oj

data/test/a.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'pp'
-require 'oj'
-require 'perf'
-
-obj = [[1],[2],[3],[4],[5],[6],[7],[8],[9]]
-obj = [[],[],[],[],[],[],[],[],[]]
-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
-}
-
-json = Oj.dump(obj, mode: :compat)
-
-puts json
-#pp Oj.saj_parse(nil, json)
-pp Oj.t_parse(json)
-
-if true
-  perf = Perf.new()
-  perf.add('SAJ', 'oj') { Oj.saj_parse(nil, json) }
-  perf.add('T', 'oj') { Oj.t_parse(json) }
-  perf.add('load', 'oj') { Oj.load(json) }
-  perf.run(10000)
-end

data/test/bug.rb

@@ -1,15 +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'
-
-Oj.load_file('josh2.json', :mode => :strict)

data/test/files.rb

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby -wW2
-
-if $0 == __FILE__
-  $: << '.'
-  $: << '..'
-  $: << '../lib'
-  $: << '../ext'
-end
-
-require 'pp'
-require 'sample/file'
-require 'sample/dir'
-
-def files(dir)
-  d = ::Sample::Dir.new(dir)
-  Dir.new(dir).each do |fn|
-    next if fn.start_with?('.')
-    filename = File.join(dir, fn)
-    #filename = '.' == dir ? fn : File.join(dir, fn)
-    if File.directory?(filename)
-      d << files(filename)
-    else
-      d << ::Sample::File.new(filename)
-    end
-  end
-  #pp d
-  d
-end
-

data/test/foo.rb

@@ -1,24 +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'
-
-reltypes={}
-Oj::Doc.open_file('foo.json') do |doc|
-  doc.each_child do |target|
-    puts "#{target.local_key} is #{target.local_key.class}"
-    target.each_leaf do |score|
-      reltype=score.local_key
-      reltypes[reltype] = (reltypes[reltype] || 0) + 1
-    end
-  end
-end

data/test/mj.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-# $: << File.join(File.dirname(__FILE__), "../../multi_json/lib")
-
-require 'multi_json'
-require 'benchmark'
-require 'yajl'
-require 'json'
-require 'oj'
-
-iter = 1_000_000
-iter = 100_000
-
-json = %({"k1":"val1","k2":"val2","k3":"val3"})
-obj = { k1: "val1", k2: "val2", k3: "val3" }
-
-puts "Benchmarks for different JSON handlers with MultiJson."
-puts "  Ruby #{RUBY_VERSION}"
-puts "  #{iter} iterations"
-
-MultiJson.engine = :oj
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "    Oj decode: #{dt}  encode: #{et}"
-
-MultiJson.engine = :yajl
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "  Yajl decode: #{dt}  encode: #{et}"
-
-MultiJson.engine = :json_gem
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "  Json decode: #{dt}  encode: #{et}"
-
-Oj.default_options = { :mode => :compat, :time_format => :ruby }
-dt = Benchmark.realtime { iter.times { Oj.load(json) }}
-et = Benchmark.realtime { iter.times { Oj.dump(obj) }}
-puts "Raw Oj decode: #{dt}  encode: #{et}"
-
-ye = Yajl::Encoder.new
-dt = Benchmark.realtime { iter.times { Yajl::Parser.parse(json) }}
-et = Benchmark.realtime { iter.times { Yajl::Encoder.encode(obj) }}
-e2 = Benchmark.realtime { iter.times { ye.encode(obj) }}
-puts "Raw Yajl decode: #{dt} encode: #{et}, encoder: #{e2}"

data/test/perf.rb

@@ -1,107 +0,0 @@
-
-class Perf
-
-  def initialize()
-    @items = []
-  end
-
-  def add(title, op, &blk)
-    @items << Item.new(title, op, &blk)
-  end
-
-  def before(title, &blk)
-    @items.each do |i|
-      if title == i.title
-        i.set_before(&blk)
-        break
-      end
-    end
-  end
-  
-  def run(iter)
-    base = Item.new(nil, nil) { }
-    base.run(iter, 0.0)
-    @items.each do |i|
-      i.run(iter, base.duration)
-      if i.error.nil?
-        puts "#{i.title}.#{i.op} #{iter} times in %0.3f seconds or %0.3f #{i.op}/sec." % [i.duration, iter / i.duration]
-      else
-        puts "***** #{i.title}.#{i.op} failed! #{i.error}"
-      end
-    end
-    summary()
-  end
-
-  def summary()
-    fastest = nil
-    slowest = nil
-    width = 6
-    @items.each do |i|
-      next if i.duration.nil?
-      width = i.title.size if width < i.title.size
-    end
-    iva = @items.clone
-    iva.delete_if { |i| i.duration.nil? }
-    iva = iva.sort_by { |i| i.duration }
-    puts
-    puts "Summary:"
-    puts "%*s  time (secs)  rate (ops/sec)" % [width, 'System']
-    puts "#{'-' * width}  -----------  --------------"
-    iva.each do |i|
-      if i.duration.nil?
-      else
-        puts "%*s %11.3f  %14.3f" % [width, i.title, i.duration, i.rate ]
-      end
-    end
-    puts
-    puts "Comparison Matrix\n(performance factor, 2.0 means row is twice as fast as column)"
-    puts ([' ' * width] + iva.map { |i| "%*s" % [width, i.title] }).join('  ')
-    puts (['-' * width] + iva.map { |i| '-' * width }).join('  ')
-    iva.each do |i|
-      line = ["%*s" % [width, i.title]]
-      iva.each do |o|
-        line << "%*.2f" % [width, o.duration / i.duration]
-      end
-      puts line.join('  ')
-    end
-    puts
-  end
-
-  class Item
-    attr_accessor :title
-    attr_accessor :op
-    attr_accessor :blk
-    attr_accessor :duration
-    attr_accessor :rate
-    attr_accessor :error
-
-    def initialize(title, op, &blk)
-      @title = title
-      @blk = blk
-      @op = op
-      @duration = nil
-      @rate = nil
-      @error = nil
-      @before = nil
-    end
-
-    def set_before(&blk)
-      @before = blk
-    end
-
-    def run(iter, base)
-      begin
-        GC.start
-        @before.call unless @before.nil?
-        start = Time.now
-        iter.times { @blk.call }
-        @duration = Time.now - start - base
-        @duration = 0.0 if @duration < 0.0
-        @rate = iter / @duration
-      rescue Exception => e
-        @error = "#{e.class}: #{e.message}"
-      end
-    end
-
-  end # Item
-end # Perf