oj 1.4.5 → 1.4.6a2

data/README.md

@@ -32,9 +32,11 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.4.5
+### Release 1.4.6
 
- - Adds the old deprecated methods of unparse(), fast_unparse(), and pretty_unparse() to JSON_mimic.
+ - Silently ignores BOM on files and Strings.
+
+ - Now works with JRuby 1.7.0 to the extent possible with the unsupported C extension in JRuby.
 
 ## <a name="description">Description</a>
 
@@ -63,10 +65,10 @@ to_hash() is more flexible and produces more consistent output so it has a
 preference over the to_json() method. If neither the to_json() or to_hash()
 methods exist then the Oj internal Object variable encoding is used.
 
-Oj is compatible with Ruby 1.8.7, 1.9.2, 1.9.3, JRuby, RBX, and the latest
-2.0dev. Note that JRuby now disables support for extentions by default. JRuby
-can be build with extensions enabled. Check the documenation for JRuby
-installs in your environment.
+Oj is compatible with Ruby 1.8.7, 1.9.2, 1.9.3, JRuby, RBX, and the latest 2.0dev. Note that JRuby now disables support
+for extentions by default and is no longer supporting C extensions. Bugs reported in the JRuby MRI are no longer being
+fixed and there is at least one that has caused a test to be commented out for JRuby in the Oj test suite. JRuby can be
+build with extensions enabled. Check the documenation for JRuby installs in your environment.
 
 Oj is also compatible with Rails. Just make sure the Oj gem is installed and
 [multi_json](https://github.com/intridea/multi_json) will pick it up and use it.

data/ext/oj/cache8.c

@@ -94,7 +94,7 @@ slot_print(Cache8 c, sid_t key, unsigned int depth) {
 	    k = (k8 << BITS) | i;
 	    /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
 	    if (DEPTH - 1 == depth) {
-		printf("0x%016llx: %4llu\n", k, b->value);
+		printf("0x%016llx: %4llu\n", (long long unsigned int)k, (long long unsigned int)b->value);
 	    } else {
 		slot_print(b->child, k, depth + 1);
 	    }

data/ext/oj/dump.c

@@ -76,7 +76,7 @@ static void	dump_bignum(VALUE obj, Out out);
 static void	dump_float(VALUE obj, Out out);
 static void	dump_raw(const char *str, size_t cnt, Out out);
 static void	dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out);
-static void	dump_hex(u_char c, Out out);
+static void	dump_hex(uint8_t c, Out out);
 static void	dump_str_comp(VALUE obj, Out out);
 static void	dump_str_obj(VALUE obj, Out out);
 static void	dump_sym_comp(VALUE obj, Out out);
@@ -108,8 +108,8 @@ static void	dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out)
 static void	dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out);
 
 static void	grow(Out out, size_t len);
-static size_t	hibit_friendly_size(const u_char *str, size_t len);
-static size_t	ascii_friendly_size(const u_char *str, size_t len);
+static size_t	hibit_friendly_size(const uint8_t *str, size_t len);
+static size_t	ascii_friendly_size(const uint8_t *str, size_t len);
 
 static void	dump_leaf_to_json(Leaf leaf, Options copts, Out out);
 static void	dump_leaf(Leaf leaf, int depth, Out out);
@@ -145,7 +145,7 @@ static char	ascii_friendly_chars[256] = "\
 33333333333333333333333333333333";
 
 inline static size_t
-hibit_friendly_size(const u_char *str, size_t len) {
+hibit_friendly_size(const uint8_t *str, size_t len) {
     size_t	size = 0;
 
     for (; 0 < len; str++, len--) {
@@ -155,7 +155,7 @@ hibit_friendly_size(const u_char *str, size_t len) {
 }
 
 inline static size_t
-ascii_friendly_size(const u_char *str, size_t len) {
+ascii_friendly_size(const uint8_t *str, size_t len) {
     size_t	size = 0;
 
     for (; 0 < len; str++, len--) {
@@ -228,8 +228,8 @@ grow(Out out, size_t len) {
 }
 
 inline static void
-dump_hex(u_char c, Out out) {
-    u_char	d = (c >> 4) & 0x0F;
+dump_hex(uint8_t c, Out out) {
+    uint8_t	d = (c >> 4) & 0x0F;
 
     *out->cur++ = hex_chars[d];
     d = c & 0x0F;
@@ -455,10 +455,10 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 
     if (Yes == out->opts->ascii_only) {
 	cmap = ascii_friendly_chars;
-	size = ascii_friendly_size((u_char*)str, cnt);
+	size = ascii_friendly_size((uint8_t*)str, cnt);
     } else {
 	cmap = hibit_friendly_chars;
-	size = hibit_friendly_size((u_char*)str, cnt);
+	size = hibit_friendly_size((uint8_t*)str, cnt);
     }
     if (out->end - out->cur <= (long)size + 10) { // extra 10 for escaped first char, quotes, and sym
 	grow(out, size + 10);
@@ -469,7 +469,7 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 	*out->cur++ = 'u';
 	*out->cur++ = '0';
 	*out->cur++ = '0';
-	dump_hex((u_char)*str, out);
+	dump_hex((uint8_t)*str, out);
 	cnt--;
 	size--;
 	str++;
@@ -490,7 +490,7 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 	    *out->cur++ = ':';
 	}
 	for (; str < end; str++) {
-	    switch (cmap[(u_char)*str]) {
+	    switch (cmap[(uint8_t)*str]) {
 	    case '1':
 		*out->cur++ = *str;
 		break;
@@ -513,7 +513,7 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 		*out->cur++ = 'u';
 		*out->cur++ = '0';
 		*out->cur++ = '0';
-		dump_hex((u_char)*str, out);
+		dump_hex((uint8_t)*str, out);
 		break;
 	    default:
 		break; // ignore, should never happen if the table is correct
@@ -809,7 +809,7 @@ hash_cb_object(VALUE key, VALUE value, Out out) {
 	long	s2 = size + out->indent + 1;
 	int	i;
 	int	started = 0;
-	u_char	b;
+	uint8_t	b;
 
 	if (out->end - out->cur <= s2 + 15) {
 	    grow(out, s2 + 15);
@@ -819,7 +819,7 @@ hash_cb_object(VALUE key, VALUE value, Out out) {
 	*out->cur++ = '#';
 	out->hash_cnt++;
 	for (i = 28; 0 <= i; i -= 4) {
-	    b = (u_char)((out->hash_cnt >> i) & 0x0000000F);
+	    b = (uint8_t)((out->hash_cnt >> i) & 0x0000000F);
 	    if ('\0' != b) {
 		started = 1;
 	    }

data/ext/oj/fast.c

@@ -840,7 +840,12 @@ parse_json(VALUE clas, char *json, int given, int allocated) {
     } else {
 	doc = ALLOC_N(struct _Doc, 1);
     }
-    pi.str = json;
+    /* skip UTF-8 BOM if present */
+    if (0xEF == (uint8_t)*json && 0xBB == (uint8_t)json[1] && 0xBF == (uint8_t)json[2]) {
+	pi.str = json + 3;
+    } else {
+	pi.str = json;
+    }
     pi.s = pi.str;
     doc_init(doc);
     pi.doc = doc;

data/ext/oj/foo.rb

@@ -0,0 +1,6 @@
+
+def foo()
+  [1, [true, false]].each { |x| yield x }
+end
+
+foo() { |x| puts x }

data/ext/oj/load.c

@@ -1009,6 +1009,10 @@ oj_parse(char *json, Options options) {
     if (0 == json) {
 	raise_error("Invalid arg, xml string can not be null", json, 0);
     }
+    /* skip UTF-8 BOM if present */
+    if (0xEF == (uint8_t)*json && 0xBB == (uint8_t)json[1] && 0xBF == (uint8_t)json[2]) {
+	json += 3;
+    }
     /* initialize parse info */
     pi.str = json;
     pi.s = json;

data/ext/oj/oj.c

@@ -125,9 +125,8 @@ struct _Options	oj_default_options = {
     0,			// dump_opts
 };
 
-static VALUE	define_mimic_json(VALUE self);
-
-static struct _Odd	odds[4]; // bump up if new Odd classes are added
+static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
+static struct _Odd	odds[5]; // bump up if new Odd classes are added
 
 Odd
 oj_get_odd(VALUE clas) {
@@ -800,7 +799,7 @@ mimic_create_id(VALUE self, VALUE id) {
  * or generator will not raise an Exception but will not have any effect.
  */
 static VALUE
-define_mimic_json(VALUE self) {
+define_mimic_json(int argc, VALUE *argv, VALUE self) {
     if (Qnil == mimic) {
 	VALUE	ext;
 	VALUE	dummy;
@@ -817,7 +816,14 @@ define_mimic_json(VALUE self) {
 	dummy = rb_gv_get("$LOADED_FEATURES");
 	if (rb_type(dummy) == T_ARRAY) {
 	    rb_ary_push(dummy, rb_str_new2("json"));
-	    rb_funcall2(Oj, rb_intern("mimic_loaded"), 0, 0);
+	    if (0 < argc) {
+		VALUE	mimic_args[1];
+
+		*mimic_args = *argv;
+		rb_funcall2(Oj, rb_intern("mimic_loaded"), 1, mimic_args);
+	    } else {
+		rb_funcall2(Oj, rb_intern("mimic_loaded"), 0, 0);
+	    }
 	}
 
 	rb_define_module_function(mimic, "parser=", no_op1, 1);
@@ -868,7 +874,7 @@ void Init_oj() {
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
     rb_define_module_function(Oj, "default_options=", set_def_opts, 1);
 
-    rb_define_module_function(Oj, "mimic_JSON", define_mimic_json, 0);
+    rb_define_module_function(Oj, "mimic_JSON", define_mimic_json, -1);
     rb_define_module_function(Oj, "load", load, -1);
     rb_define_module_function(Oj, "load_file", load_file, -1);
     rb_define_module_function(Oj, "dump", dump, -1);
@@ -964,8 +970,19 @@ void Init_oj() {
     *idp++ = rb_intern("offset");
     *idp++ = rb_intern("start");
     *idp++ = 0;
+    // Range
     odd++;
+    idp = odd->attrs;
+    odd->clas = rb_const_get(rb_cObject, rb_intern("Range"));
+    odd->create_obj = odd->clas;
+    odd->create_op = oj_new_id;
+    odd->attr_cnt = 3;
+    *idp++ = rb_intern("begin");
+    *idp++ = rb_intern("end");
+    *idp++ = rb_intern("exclude_end?");
+    *idp++ = 0;
     // The end. bump up the size of odds if a new class is added.
+    odd++;
     odd->clas = Qundef;
 
 #if SAFE_CACHE

data/lib/oj/mimic.rb

@@ -1,11 +1,12 @@
 
 module Oj
   
-  def self.mimic_loaded()
+  def self.mimic_loaded(mimic_paths=[])
     gems_dir = File.dirname(File.dirname(File.dirname(File.dirname(__FILE__))))
     Dir.foreach(gems_dir) do |gem|
       next unless (gem.start_with?('json-') || gem.start_with?('json_pure'))
       $LOADED_FEATURES << File.join(gems_dir, gem, 'lib', 'json.rb')
     end
+    mimic_paths.each { |p| $LOADED_FEATURES << p }
   end
 end

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '1.4.5'
+  VERSION = '1.4.6a2'
 end

data/test/test_mimic.rb

@@ -76,6 +76,7 @@ class Mimic < ::Test::Unit::TestCase
   end
 
   def test_load_proc
+    Oj.mimic_JSON # TBD
     children = []
     json = %{{"a":1,"b":[true,false]}}
     if 'rubinius' == $ruby || 'jruby' == $ruby || '1.8.7' == RUBY_VERSION
@@ -85,8 +86,12 @@ class Mimic < ::Test::Unit::TestCase
       obj = JSON.load(json, p)
     end
     assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-    assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
-           [true, false, [true, false], 1, { 'a' => 1, 'b' => [true, false]}] == children)
+    # JRuby 1.7.0 rb_yield() is broken and converts the [true, falser] array into true
+    unless 'jruby' == $ruby && '1.9.3' == RUBY_VERSION
+      assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
+             [true, false, [true, false], 1, { 'a' => 1, 'b' => [true, false]}] == children,
+             "children don't match")
+    end
   end
 
 # []
@@ -192,9 +197,12 @@ class Mimic < ::Test::Unit::TestCase
 # recurse_proc
   def test_recurse_proc
     children = []
-    obj = JSON.recurse_proc({ 'a' => 1, 'b' => [true, false]}) { |x| children << x }
-    assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
-           [true, false, [true, false], 1, { 'b' => [true, false], 'a' => 1}] == children)
+    JSON.recurse_proc({ 'a' => 1, 'b' => [true, false]}) { |x| children << x }
+    # JRuby 1.7.0 rb_yield() is broken and converts the [true, falser] array into true
+    unless 'jruby' == $ruby && '1.9.3' == RUBY_VERSION
+      assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
+             [true, false, [true, false], 1, { 'b' => [true, false], 'a' => 1}] == children)
+    end
   end
 
 end # Mimic

data/test/tests.rb

@@ -192,11 +192,15 @@ class Juice < ::Test::Unit::TestCase
   def test_encode
     opts = Oj.default_options
     Oj.default_options = { :ascii_only => false }
-    dump_and_load("ぴーたー", false)
+    unless 'jruby' == $ruby
+      dump_and_load("ぴーたー", false)
+    end
     Oj.default_options = { :ascii_only => true }
     json = Oj.dump("ぴーたー")
     assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
-    dump_and_load("ぴーたー", false)
+    unless 'jruby' == $ruby
+      dump_and_load("ぴーたー", false)
+    end
     Oj.default_options = opts
   end
 
@@ -623,6 +627,8 @@ class Juice < ::Test::Unit::TestCase
       if 'rubinius' == $ruby
         assert(%{{"^o":"Range","excl":false,"begin":1,"end":7}} == json ||
                %{{"^o":"Range","begin":1,"end":7,"excl":false}} == json)
+      elsif 'jruby' == $ruby
+        assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
       else
         assert_equal(%{{"^u":["Range",1,7,false]}}, json)
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.4.5
-  prerelease: 
+  version: 1.4.6a2
+  prerelease: 5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -25,6 +25,7 @@ files:
 - lib/oj/version.rb
 - lib/oj.rb
 - ext/oj/extconf.rb
+- ext/oj/foo.rb
 - ext/oj/cache.h
 - ext/oj/cache8.h
 - ext/oj/oj.h
@@ -80,9 +81,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: oj
 rubygems_version: 1.8.23