oj 1.4.3 → 1.4.4

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.4.3
+### Release 1.4.4
 
- - Fixed Exception encoding in Windows version.
+ - Fixed bug in mimic that missed mimicing json_pure.
 
 ## <a name="description">Description</a>
 

data/ext/oj/cache8.c

@@ -1,32 +1,3 @@
-/* cache8.c
- * Copyright (c) 2011, 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.
- */
 
 #include <stdlib.h>
 #include <errno.h>
@@ -34,33 +5,34 @@
 #include <string.h>
 #include <stdarg.h>
 
+#include "ruby.h"
 #include "cache8.h"
 
-#define BITS            4
-#define MASK            0x000000000000000F
-#define SLOT_CNT        16
-#define DEPTH           16
+#define BITS		4
+#define MASK		0x000000000000000FULL
+#define SLOT_CNT	16
+#define DEPTH		16
+
+typedef union {
+    struct _Cache8	*child;
+    slot_t		value;
+} Bucket;
 
 struct _Cache8 {
-    union {
-	struct _Cache8	*slots[SLOT_CNT];
-	slot_t		values[SLOT_CNT];
-    };
+    Bucket	buckets[SLOT_CNT];
 };
 
 static void	cache8_delete(Cache8 cache, int depth);
-static void	slot_print(Cache8 cache, VALUE key, unsigned int depth);
+static void	slot_print(Cache8 cache, sid_t key, unsigned int depth);
 
 void
 oj_cache8_new(Cache8 *cache) {
-    Cache8     *cp;
+    Bucket	*b;
     int		i;
     
-    if (0 == (*cache = ALLOC(struct _Cache8))) {
-	rb_raise(rb_eNoMemError, "not enough memory\n");
-    }
-    for (i = SLOT_CNT, cp = (*cache)->slots; 0 < i; i--, cp++) {
-	*cp = 0;
+    *cache = ALLOC(struct _Cache8);
+    for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
+	b->value = 0;
     }
 }
 
@@ -71,13 +43,13 @@ oj_cache8_delete(Cache8 cache) {
 
 static void
 cache8_delete(Cache8 cache, int depth) {
-    Cache8		*cp;
+    Bucket		*b;
     unsigned int	i;
 
-    for (i = 0, cp = cache->slots; i < SLOT_CNT; i++, cp++) {
-	if (0 != *cp) {
+    for (i = 0, b = cache->buckets; i < SLOT_CNT; i++, b++) {
+	if (0 != b->child) {
 	    if (DEPTH - 1 != depth) {
-		cache8_delete(*cp, depth + 1);
+		cache8_delete(b->child, depth + 1);
 	    }
 	}
     }
@@ -85,44 +57,46 @@ cache8_delete(Cache8 cache, int depth) {
 }
 
 slot_t
-oj_cache8_get(Cache8 cache, VALUE key, slot_t **slot) {
-    Cache8	*cp;
+oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {
+    Bucket	*b;
     int		i;
-    VALUE	k;
+    sid_t	k8 = (sid_t)key;
+    sid_t	k;
     
     for (i = 64 - BITS; 0 < i; i -= BITS) {
-	k = (key >> i) & MASK;
-	cp = cache->slots + k;
-	if (0 == *cp) {
-	    oj_cache8_new(cp);
+	k = (k8 >> i) & MASK;
+	b = cache->buckets + k;
+	if (0 == b->child) {
+	    oj_cache8_new(&b->child);
 	}
-	cache = *cp;
+	cache = b->child;
     }
-    *slot = cache->values + (key & MASK);
+    *slot = &(cache->buckets + (k8 & MASK))->value;
 
     return **slot;
 }
 
 void
 oj_cache8_print(Cache8 cache) {
-    //printf("-------------------------------------------\n");
+    /*printf("-------------------------------------------\n"); */
     slot_print(cache, 0, 0);
 }
 
 static void
-slot_print(Cache8 c, VALUE key, unsigned int depth) {
-    Cache8		*cp;
+slot_print(Cache8 c, sid_t key, unsigned int depth) {
+    Bucket		*b;
     unsigned int	i;
-    unsigned long	k;
+    sid_t		k8 = (sid_t)key;
+    sid_t		k;
 
-    for (i = 0, cp = c->slots; i < SLOT_CNT; i++, cp++) {
-	if (0 != *cp) {
-	    k = (key << BITS) | i;
-	    //printf("*** key: 0x%016lx	 depth: %u  i: %u\n", k, depth, i);
+    for (i = 0, b = c->buckets; i < SLOT_CNT; i++, b++) {
+	if (0 != b->child) {
+	    k = (k8 << BITS) | i;
+	    /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
 	    if (DEPTH - 1 == depth) {
-		printf("0x%016lx: %4lu\n", k, (unsigned long)*cp);
+		printf("0x%016llx: %4llu\n", k, b->value);
 	    } else {
-		slot_print(*cp, k, depth + 1);
+		slot_print(b->child, k, depth + 1);
 	    }
 	}
     }

data/ext/oj/cache8.h

@@ -31,18 +31,18 @@
 #ifndef __OJ_CACHE8_H__
 #define __OJ_CACHE8_H__
 
-#define RSTRING_NOT_MODIFIED
-
 #include "ruby.h"
+#include "stdint.h"
 
-typedef struct _Cache8  *Cache8;
-typedef unsigned long   slot_t;
+typedef struct _Cache8	*Cache8;
+typedef uint64_t	slot_t;
+typedef uint64_t	sid_t;
 
-extern void     oj_cache8_new(Cache8 *cache);
-extern void     oj_cache8_delete(Cache8 cache);
+extern void	oj_cache8_new(Cache8 *cache);
+extern void	oj_cache8_delete(Cache8 cache);
 
-extern slot_t   oj_cache8_get(Cache8 cache, VALUE key, slot_t **slot);
+extern slot_t	oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
-extern void     oj_cache8_print(Cache8 cache);
+extern void	oj_cache8_print(Cache8 cache);
 
 #endif /* __OJ_CACHE8_H__ */

data/ext/oj/fast.c

@@ -66,7 +66,7 @@ typedef struct _ParseInfo {
     char	*str;		/* buffer being read from */
     char	*s;		/* current position in buffer */
     Doc		doc;
-    uint64_t	stack_min;
+    void	*stack_min;
 } *ParseInfo;
 
 static void	leaf_init(Leaf leaf, int type);
@@ -481,11 +481,7 @@ static Leaf
 read_next(ParseInfo pi) {
     Leaf	leaf = 0;
 
-#if IS_WINDOWS
-    if ((uint64_t)(uint32_t)&leaf < pi->stack_min) {
-#else
-    if ((uint64_t)&leaf < pi->stack_min) {
-#endif
+    if ((void*)&leaf < pi->stack_min) {
 	rb_raise(rb_eSysStackError, "JSON is too deeply nested");
     }
     next_non_white(pi);	// skip white space
@@ -849,13 +845,13 @@ parse_json(VALUE clas, char *json, int given, int allocated) {
     doc_init(doc);
     pi.doc = doc;
 #if IS_WINDOWS
-    pi.stack_min = (uint64_t)(uint32_t)&pi - (512 * 1024); // assume a 1M stack and give half to ruby
+    pi.stack_min = (void*)((char*)&pi - (512 * 1024)); // assume a 1M stack and give half to ruby
 #else
     {
 	struct rlimit	lim;
 
 	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
-	    pi.stack_min = (uint64_t)&pi - (lim.rlim_cur / 4 * 3); // let 3/4ths of the stack be used only
+	    pi.stack_min = (void*)((char*)&lim - (lim.rlim_cur / 4 * 3)); // let 3/4ths of the stack be used only
 	} else {
 	    pi.stack_min = 0; // indicates not to check stack limit
 	}

data/ext/oj/load.c

@@ -62,7 +62,7 @@ typedef struct _ParseInfo {
     char	*s;		/* current position in buffer */
     CircArray	circ_array;
     Options	options;
-    uint64_t	stack_min;
+    void	*stack_min;
 } *ParseInfo;
 
 static CircArray	circ_array_new(void);
@@ -323,11 +323,7 @@ static VALUE
 read_next(ParseInfo pi, int hint) {
     VALUE	obj;
 
-#if IS_WINDOWS
-    if ((uint64_t)(uint32_t)&obj < pi->stack_min) {
-#else
-    if ((uint64_t)&obj < pi->stack_min) {
-#endif
+    if ((void*)&obj < pi->stack_min) {
 	rb_raise(rb_eSysStackError, "JSON is too deeply nested");
     }
     next_non_white(pi);	// skip white space
@@ -1022,13 +1018,13 @@ oj_parse(char *json, Options options) {
     }
     pi.options = options;
 #if IS_WINDOWS
-    pi.stack_min = (uint64_t)(uint32_t)&obj - (512 * 1024); // assume a 1M stack and give half to ruby
+    pi.stack_min = (void*)((char*)&obj - (512 * 1024)); // assume a 1M stack and give half to ruby
 #else
     {
 	struct rlimit	lim;
 
 	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
-	    pi.stack_min = (uint64_t)&obj - (lim.rlim_cur / 4 * 3); // let 3/4ths of the stack be used only
+	    pi.stack_min = (void*)((char*)&obj - (lim.rlim_cur / 4 * 3)); // let 3/4ths of the stack be used only
 	} else {
 	    pi.stack_min = 0; // indicates not to check stack limit
 	}

data/lib/oj/mimic.rb

@@ -4,7 +4,7 @@ module Oj
   def self.mimic_loaded()
     gems_dir = File.dirname(File.dirname(File.dirname(File.dirname(__FILE__))))
     Dir.foreach(gems_dir) do |gem|
-      next unless gem.start_with?('json-')
+      next unless (gem.start_with?('json-') || gem.start_with?('json_pure'))
       $LOADED_FEATURES << File.join(gems_dir, gem, 'lib', 'json.rb')
     end
   end

data/lib/oj/version.rb

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

data/test/test_fast.rb

@@ -1,6 +1,12 @@
-#!/usr/bin/env ruby -wW1
+#!/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")
 
@@ -145,7 +151,7 @@ class DocTest < ::Test::Unit::TestCase
       end
       begin
         doc.move('/array/x')
-      rescue Exception => e
+      rescue Exception
         assert_equal('/', doc.where?)
         assert(true)
       end
@@ -324,7 +330,7 @@ class DocTest < ::Test::Unit::TestCase
     doc.close()
     begin
       doc.home()
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -343,7 +349,7 @@ class DocTest < ::Test::Unit::TestCase
     doc.close()
     begin
       doc.home()
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end

data/test/test_mimic.rb

@@ -1,6 +1,12 @@
-#!/usr/bin/env ruby -wW1
+#!/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")
 

data/test/tests.rb

@@ -1,6 +1,12 @@
-#!/usr/bin/env ruby -wW1
+#!/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")
 
@@ -213,9 +219,9 @@ class Juice < ::Test::Unit::TestCase
   # Symbol
   def test_symbol_strict
     begin
-      json = Oj.dump(:abc, :mode => :strict)
+      Oj.dump(:abc, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -238,9 +244,9 @@ class Juice < ::Test::Unit::TestCase
   def test_time_strict
     t = Time.local(2012, 1, 5, 23, 58, 7)
     begin
-      json = Oj.dump(t, :mode => :strict)
+      Oj.dump(t, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -266,7 +272,7 @@ class Juice < ::Test::Unit::TestCase
       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
+    rescue Exception
       # 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)
@@ -285,7 +291,7 @@ class Juice < ::Test::Unit::TestCase
       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
+    rescue Exception
       # 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)
@@ -304,11 +310,11 @@ class Juice < ::Test::Unit::TestCase
       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
+    rescue Exception
       # 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
+      #tz = t.utc_offset
       assert_equal(%{"2012-01-05T23:58:07Z"}, json)
     end
   end    
@@ -321,9 +327,9 @@ class Juice < ::Test::Unit::TestCase
   # Class
   def test_class_strict
     begin
-      json = Oj.dump(Juice, :mode => :strict)
+      Oj.dump(Juice, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -349,23 +355,23 @@ class Juice < ::Test::Unit::TestCase
   end
   def test_non_str_hash_strict
     begin
-      json = Oj.dump({ 1 => true, 0 => false }, :mode => :strict)
+      Oj.dump({ 1 => true, 0 => false }, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
   def test_non_str_hash_null
     begin
-      json = Oj.dump({ 1 => true, 0 => false }, :mode => :null)
+      Oj.dump({ 1 => true, 0 => false }, :mode => :null)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
   def test_non_str_hash_compat
     begin
-      json = Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
+      Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
       assert(false)
     rescue Exception => e
       assert(e.message.include?('Fixnum'))
@@ -393,9 +399,9 @@ class Juice < ::Test::Unit::TestCase
   def test_json_object_strict
     obj = Jeez.new(true, 58)
     begin
-      json = Oj.dump(obj, :mode => :strict)
+      Oj.dump(obj, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -439,9 +445,9 @@ class Juice < ::Test::Unit::TestCase
   def test_to_hash_object_strict
     obj = Jazz.new(true, 58)
     begin
-      json = Oj.dump(obj, :mode => :strict)
+      Oj.dump(obj, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -475,9 +481,9 @@ class Juice < ::Test::Unit::TestCase
   def test_as_json_object_strict
     obj = Orange.new(true, 58)
     begin
-      json = Oj.dump(obj, :mode => :strict)
+      Oj.dump(obj, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -492,6 +498,7 @@ class Juice < ::Test::Unit::TestCase
     Oj.default_options = { :mode => :compat }
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
+    assert(!json.nil?)
 =begin
     assert_equal(%{{
   "json_class":"Orange",
@@ -527,9 +534,9 @@ class Juice < ::Test::Unit::TestCase
   def test_object_strict
     obj = Jam.new(true, 58)
     begin
-      json = Oj.dump(obj, :mode => :strict)
+      Oj.dump(obj, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -591,9 +598,9 @@ class Juice < ::Test::Unit::TestCase
   # Range
   def test_range_strict
     begin
-      json = Oj.dump(1..7, :mode => :strict)
+      Oj.dump(1..7, :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -677,9 +684,9 @@ class Juice < ::Test::Unit::TestCase
   # Date
   def test_date_strict
     begin
-      json = Oj.dump(Date.new(2012, 6, 19), :mode => :strict)
+      Oj.dump(Date.new(2012, 6, 19), :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -706,9 +713,9 @@ class Juice < ::Test::Unit::TestCase
   # DateTime
   def test_datetime_strict
     begin
-      json = Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :strict)
+      Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :strict)
       assert(false)
-    rescue Exception => e
+    rescue Exception
       assert(true)
     end
   end
@@ -771,7 +778,7 @@ class Juice < ::Test::Unit::TestCase
     json = Oj.dump(h, :mode => :object, :indent => 2, :circular => true)
     ha = Oj.load(json, :mode => :strict)
     assert_equal({'^i' => 1, 'a' => 7, 'b' => '^r1'}, ha)
-    h2 = Oj.load(json, :mode => :object, :circular => true)
+    Oj.load(json, :mode => :object, :circular => true)
     assert_equal(h['b'].__id__, h.__id__)
   end
 
@@ -794,11 +801,24 @@ class Juice < ::Test::Unit::TestCase
     json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
     ha = Oj.load(json, :mode => :strict)
     assert_equal({'^o' => 'Jam', '^i' => 1, 'x' => { '^i' => 2, 'a' => 7, 'b' => '^r1' }, 'y' => 58 }, ha)
-    obj2 = Oj.load(json, :mode => :object, :circular => true)
+    Oj.load(json, :mode => :object, :circular => true)
     assert_equal(obj.x.__id__, h.__id__)
     assert_equal(h['b'].__id__, obj.__id__)
   end
 
+# Stream Deeply Nested
+  def test_deep_nest
+    unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
+      begin
+        n = 100000
+        Oj.load('[' * n + ']' * n)
+        assert(false)
+      rescue Exception => e
+        assert(e.class == SystemStackError)
+      end
+    end
+  end
+
 # Stream IO
   def test_io_string
     json = %{{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com