oj 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6d89419541ffeaab83eaea37802686aae4fab16
-  data.tar.gz: 0d6fd040e9438dbee988ee0ef7b5f35ea31e3b7e
+  metadata.gz: 668ead8e90334db6467d560eea8f2bb1f514fc53
+  data.tar.gz: 2556e815c19eaf4b0a2cdd432a25942420166cfe
 SHA512:
-  metadata.gz: 01a5f4dbfc93069e199591710d4bf98df329b48f58bb29eb5a54df896a5fa217a79685a63cedf2a88af86a32519083f32d608a93059104255fdffa7da6d58650
-  data.tar.gz: d16b98eedefb8e483df1f8ea14c6ed4a8036943501864334f19b8bfc7221498059343313c7aa722f592fc210b4c8eb0ce0cfefd532ba7017c82a389856a319ed
+  metadata.gz: 63163bdb7c6b7b1580072f33c8256126cf087313cd3f85ba3cb899431ce139a81ee24eafbc11fa362e1611b02ecaadb6bf58bf2cc1d2a1c55aebbbd6341d0535
+  data.tar.gz: 3fee65bcd045885bed8e744ea4f51cb6bb93c14220c2de5ef272d624aa03aa1949f3afca1da02ad10102396052cb5a898020d338e9064916dccc94a140dc3231

data/README.md

@@ -14,7 +14,7 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 *RubyGems* *repo*: https://rubygems.org/gems/oj
 
-## <a name="follow">Follow @oxgem on Twitter</a>
+## <a name="follow">Follow @peterohler on Twitter</a>
 
 [Follow @peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Oj gem.
 
@@ -32,23 +32,16 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.12
+### Release 2.0.13
 
- - Another fix for mimic.
+ - Mimic is better at masking out json gem but the oj_mimic_json gem does not
+   work with ruby 2.0.0 correctly. The Oj.mimic_JSON() method should be called
+   directly either before or after the json gem is required. Depending on the
+   situation one may work better than the other. Oj.mimic_JSON() may now be
+   called multiple times.
 
- - mimic_JSON now can now be called after loading the json gem. This will
-   replace the json gem methods after loading. This may be more compatible in
-   many cases.
-
-### Release 2.0.11
-
- - Fixed mimic issue with Debian
-
- - Added option to not cache classes when loading. This should be used when classes are dynamically unloaded and the redefined.
-
- - Float rounding improved by limiting decimal places to 15 places.
-
- - Fixed xml time dumping test.
+ - Changed dump to put closing array brackets and closing object curlies on the
+   line following the last element if :indent is set to greater than zero.
 
 ## <a name="description">Description</a>
 
@@ -362,23 +355,25 @@ without Objects or numbers (for JSON Pure, Yajl, and Messagepack) JSON:
     
 ### Simple JSON Writing and Parsing:
 
-    require 'oj'
-    
-    h = { 'one' => 1, 'array' => [ true, false ] }
-    json = Oj.dump(h)
+```ruby
+require 'oj'
     
-    # json =
-    # {
-    #   "one":1,
-    #   "array":[
-    #     true,
-    #     false
-    #   ]
-    # }
-
-    h2 = Oj.load(json)
-    puts "Same? #{h == h2}"
-    # true
+h = { 'one' => 1, 'array' => [ true, false ] }
+json = Oj.dump(h)
+
+# json =
+# {
+#   "one":1,
+#   "array":[
+#     true,
+#     false
+#   ]
+# }
+
+h2 = Oj.load(json)
+puts "Same? #{h == h2}"
+# true
+```
 
 ### Object JSON format:
 

data/ext/oj/dump.c

@@ -149,7 +149,7 @@ ascii_friendly_size(const uint8_t *str, size_t len) {
 
 inline static void
 fill_indent(Out out, int cnt) {
-    if (0 < cnt && 0 < out->indent) {
+    if (0 < out->indent) {
 	cnt *= out->indent;
 	*out->cur++ = '\n';
 	for (; 0 < cnt; cnt--) {
@@ -901,6 +901,7 @@ dump_hash(VALUE obj, int depth, int mode, Out out) {
 	    }
 	    if (0 < out->opts->dump_opts->indent_size) {
 		int	i;
+
 		for (i = depth; 0 < i; i--) {
 		    strcpy(out->cur, out->opts->dump_opts->indent);
 		    out->cur += out->opts->dump_opts->indent_size;
@@ -1425,6 +1426,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 #endif
 	out->depth = depth;
     }
+    fill_indent(out, depth);
     *out->cur++ = '}';
     *out->cur = '\0';
 }

data/ext/oj/load.c

@@ -83,9 +83,9 @@ static char*	read_quoted_value(ParseInfo pi);
 static void	skip_comment(ParseInfo pi);
 
 
-/* This XML parser is a single pass, destructive, callback parser. It is a
+/* This JSON parser is a single pass, destructive, callback parser. It is a
  * single pass parse since it only make one pass over the characters in the
- * XML document string. It is destructive because it re-uses the content of
+ * JSON document string. It is destructive because it re-uses the content of
  * the string for values in the callback and places \0 characters at various
  * places to mark the end of tokens and strings. It is a callback parser like
  * a SAX parser because it uses callback when document elements are

data/ext/oj/oj.c

@@ -968,83 +968,84 @@ mimic_create_id(VALUE self, VALUE id) {
 /* Document-method: mimic_JSON
  *    call-seq: mimic_JSON() => Module
  *
- * Creates the JSON module with methods and classes to mimic the JSON
- * gem. After this method is invoked calls that expect the JSON module will
- * use Oj instead and be faster than the original JSON. Most options that
- * could be passed to the JSON methods are supported. The calls to set parser
- * or generator will not raise an Exception but will not have any effect.
+ * Creates the JSON module with methods and classes to mimic the JSON gem. After
+ * this method is invoked calls that expect the JSON module will use Oj instead
+ * and be faster than the original JSON. Most options that could be passed to
+ * the JSON methods are supported. The calls to set parser or generator will not
+ * raise an Exception but will not have any effect. The method can also be
+ * called after the json gem is loaded. The necessary methods on the json gem
+ * will be replaced with Oj methods.
  */
 static VALUE
 define_mimic_json(int argc, VALUE *argv, VALUE self) {
-    if (Qnil == mimic) {
-	VALUE	ext;
-	VALUE	dummy;
+    VALUE	ext;
+    VALUE	dummy;
 	
-	// Either set the paths to indicate JSON has been loaded or replaces the
-	// methods if it has been loaded.
-	if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {
-	    mimic = rb_const_get_at(rb_cObject, rb_intern("JSON"));
-	} else {
-	    mimic = rb_define_module("JSON");
-	}
-	if (rb_const_defined_at(mimic, rb_intern("Ext"))) {
-	    ext = rb_const_get_at(mimic, rb_intern("Ext"));
+    // Either set the paths to indicate JSON has been loaded or replaces the
+    // methods if it has been loaded.
+    if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {
+	mimic = rb_const_get_at(rb_cObject, rb_intern("JSON"));
+    } else {
+	mimic = rb_define_module("JSON");
+    }
+    if (rb_const_defined_at(mimic, rb_intern("Ext"))) {
+	ext = rb_const_get_at(mimic, rb_intern("Ext"));
+    } else {
+	ext = rb_define_module_under(mimic, "Ext");
+    }
+    if (!rb_const_defined_at(ext, rb_intern("Parser"))) {
+	dummy = rb_define_class_under(ext, "Parser", rb_cObject);
+    }
+    if (!rb_const_defined_at(ext, rb_intern("Generator"))) {
+	dummy = rb_define_class_under(ext, "Generator", rb_cObject);
+    }
+    // convince Ruby that the json gem has already been loaded
+    dummy = rb_gv_get("$LOADED_FEATURES");
+    if (rb_type(dummy) == T_ARRAY) {
+	rb_ary_push(dummy, rb_str_new2("json"));
+	if (0 < argc) {
+	    VALUE	mimic_args[1];
+
+	    *mimic_args = *argv;
+	    rb_funcall2(Oj, rb_intern("mimic_loaded"), 1, mimic_args);
 	} else {
-	    ext = rb_define_module_under(mimic, "Ext");
+	    rb_funcall2(Oj, rb_intern("mimic_loaded"), 0, 0);
 	}
-	if (!rb_const_defined_at(ext, rb_intern("Parser"))) {
-	    dummy = rb_define_class_under(ext, "Parser", rb_cObject);
-	}
-	if (!rb_const_defined_at(ext, rb_intern("Generator"))) {
-	    dummy = rb_define_class_under(ext, "Generator", rb_cObject);
-	}
-	// convince Ruby that the json gem has already been loaded
-	dummy = rb_gv_get("$LOADED_FEATURES");
-	if (rb_type(dummy) == T_ARRAY) {
-	    rb_ary_push(dummy, rb_str_new2("json"));
-	    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);
-	    }
-	}
-	dummy = rb_gv_get("$VERBOSE");
-	rb_gv_set("$VERBOSE", Qfalse);
-	rb_define_module_function(mimic, "parser=", no_op1, 1);
-	rb_define_module_function(mimic, "generator=", no_op1, 1);
-	rb_define_module_function(mimic, "create_id=", mimic_create_id, 1);
-
-	rb_define_module_function(mimic, "dump", mimic_dump, -1);
-	rb_define_module_function(mimic, "load", mimic_load, -1);
-	rb_define_module_function(mimic, "restore", mimic_load, -1);
-	rb_define_module_function(mimic, "recurse_proc", mimic_recurse_proc, 1);
-	rb_define_module_function(mimic, "[]", mimic_dump_load, -1);
-
-	rb_define_module_function(mimic, "generate", mimic_generate, -1);
-	rb_define_module_function(mimic, "fast_generate", mimic_generate, -1);
-	rb_define_module_function(mimic, "pretty_generate", mimic_pretty_generate, -1);
-	/* for older versions of JSON, the deprecated unparse methods */
-	rb_define_module_function(mimic, "unparse", mimic_generate, -1);
-	rb_define_module_function(mimic, "fast_unparse", mimic_generate, -1);
-	rb_define_module_function(mimic, "pretty_unparse", mimic_pretty_generate, -1);
-
-	rb_define_module_function(mimic, "parse", mimic_parse, -1);
-	rb_define_module_function(mimic, "parse!", mimic_parse, -1);
-	rb_gv_set("$VERBOSE", dummy);
-
-	array_nl_sym = ID2SYM(rb_intern("array_nl"));			rb_gc_register_address(&array_nl_sym);
-	create_additions_sym = ID2SYM(rb_intern("create_additions"));	rb_gc_register_address(&create_additions_sym);
-	object_nl_sym = ID2SYM(rb_intern("object_nl"));			rb_gc_register_address(&object_nl_sym);
-	space_before_sym = ID2SYM(rb_intern("space_before"));		rb_gc_register_address(&space_before_sym);
-	space_sym = ID2SYM(rb_intern("space"));				rb_gc_register_address(&space_sym);
-	symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
-
-	oj_default_options.mode = CompatMode;
-	oj_default_options.ascii_only = Yes;
     }
+    dummy = rb_gv_get("$VERBOSE");
+    rb_gv_set("$VERBOSE", Qfalse);
+    rb_define_module_function(mimic, "parser=", no_op1, 1);
+    rb_define_module_function(mimic, "generator=", no_op1, 1);
+    rb_define_module_function(mimic, "create_id=", mimic_create_id, 1);
+
+    rb_define_module_function(mimic, "dump", mimic_dump, -1);
+    rb_define_module_function(mimic, "load", mimic_load, -1);
+    rb_define_module_function(mimic, "restore", mimic_load, -1);
+    rb_define_module_function(mimic, "recurse_proc", mimic_recurse_proc, 1);
+    rb_define_module_function(mimic, "[]", mimic_dump_load, -1);
+
+    rb_define_module_function(mimic, "generate", mimic_generate, -1);
+    rb_define_module_function(mimic, "fast_generate", mimic_generate, -1);
+    rb_define_module_function(mimic, "pretty_generate", mimic_pretty_generate, -1);
+    /* for older versions of JSON, the deprecated unparse methods */
+    rb_define_module_function(mimic, "unparse", mimic_generate, -1);
+    rb_define_module_function(mimic, "fast_unparse", mimic_generate, -1);
+    rb_define_module_function(mimic, "pretty_unparse", mimic_pretty_generate, -1);
+
+    rb_define_module_function(mimic, "parse", mimic_parse, -1);
+    rb_define_module_function(mimic, "parse!", mimic_parse, -1);
+    rb_gv_set("$VERBOSE", dummy);
+
+    array_nl_sym = ID2SYM(rb_intern("array_nl"));			rb_gc_register_address(&array_nl_sym);
+    create_additions_sym = ID2SYM(rb_intern("create_additions"));	rb_gc_register_address(&create_additions_sym);
+    object_nl_sym = ID2SYM(rb_intern("object_nl"));			rb_gc_register_address(&object_nl_sym);
+    space_before_sym = ID2SYM(rb_intern("space_before"));		rb_gc_register_address(&space_before_sym);
+    space_sym = ID2SYM(rb_intern("space"));				rb_gc_register_address(&space_sym);
+    symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
+
+    oj_default_options.mode = CompatMode;
+    oj_default_options.ascii_only = Yes;
+
     return mimic;
 }
 

data/lib/oj/mimic.rb

@@ -2,19 +2,15 @@
 module Oj
   
   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
-    # and another approach in case the first did not get all
     $LOAD_PATH.each do |d|
       next unless File.exist?(d)
-      Dir.foreach(d) do |file|
-        next unless file.end_with?('json.rb')
-        $LOADED_FEATURES << File.join(d, file) unless $LOADED_FEATURES.include?(file)
+      offset = d.size() + 1
+      Dir.glob(File.join(d, '**', '*.rb')).each do |file|
+        next unless file[offset..-1].start_with?('json')
+        $LOADED_FEATURES << file unless $LOADED_FEATURES.include?(file)
       end
     end
     mimic_paths.each { |p| $LOADED_FEATURES << p }
+    $LOADED_FEATURES << 'json' unless $LOADED_FEATURES.include?('json')
   end
 end

data/lib/oj/version.rb

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

data/test/tests.rb

@@ -507,11 +507,13 @@ class Juice < ::Test::Unit::TestCase
     assert(%{{
   "^o":"Jeez",
   "x":true,
-  "y":58}} == json ||
+  "y":58
+}} == json ||
 %{{
   "^o":"Jeez",
   "y":58,
-  "x":true}} == json)
+  "x":true
+}} == json)
     obj2 = Oj.load(json, :mode => :object)
     assert_equal(obj, obj2)
   end
@@ -543,11 +545,13 @@ class Juice < ::Test::Unit::TestCase
     assert(%{{
   "^o":"Jazz",
   "x":true,
-  "y":58}} == json ||
+  "y":58
+}} == json ||
 %{{
   "^o":"Jazz",
   "y":58,
-  "x":true}} == json)
+  "x":true
+}} == json)
     obj2 = Oj.load(json, :mode => :object)
     assert_equal(obj, obj2)
   end
@@ -596,11 +600,13 @@ class Juice < ::Test::Unit::TestCase
     assert(%{{
   "^o":"Orange",
   "x":true,
-  "y":58}} == json ||
+  "y":58
+}} == json ||
 %{{
   "^o":"Orange",
   "y":58,
-  "x":true}} == json)
+  "x":true
+}} == json)
     obj2 = Oj.load(json, :mode => :object)
     assert_equal(obj, obj2)
   end
@@ -625,10 +631,12 @@ class Juice < ::Test::Unit::TestCase
     json = Oj.dump(obj, :mode => :compat, :indent => 2)
     assert(%{{
   "x":true,
-  "y":58}} == json ||
+  "y":58
+}} == json ||
 %{{
   "y":58,
-  "x":true}} == json)
+  "x":true
+}} == json)
   end
   def test_object_object
     obj = Jam.new(true, 58)
@@ -636,11 +644,13 @@ class Juice < ::Test::Unit::TestCase
     assert(%{{
   "^o":"Jam",
   "x":true,
-  "y":58}} == json ||
+  "y":58
+}} == json ||
 %{{
   "^o":"Jam",
   "y":58,
-  "x":true}} == json)
+  "x":true
+}} == json)
     obj2 = Oj.load(json, :mode => :object)
     assert_equal(obj, obj2)
   end
@@ -651,11 +661,13 @@ class Juice < ::Test::Unit::TestCase
     assert(%{{
   "^o":"Jam",
   "x":true,
-  "y":58}} == json ||
+  "y":58
+}} == json ||
 %{{
   "^o":"Jam",
   "y":58,
-  "x":true}} == json)
+  "x":true
+}} == json)
     obj2 = Oj.load(json, :mode => :object, :class_cache => false)
     assert_equal(obj, obj2)
   end
@@ -869,12 +881,14 @@ class Juice < ::Test::Unit::TestCase
   "^o":"Jam",
   "^i":1,
   "x":"^r1",
-  "y":58}} == json ||
+  "y":58
+}} == json ||
 %{{
   "^o":"Jam",
   "^i":1,
   "y":58,
-  "x":"^r1"}} == json)
+  "x":"^r1"
+}} == json)
     obj2 = Oj.load(json, :mode => :object, :circular => true)
     assert_equal(obj2.x.__id__, obj2.__id__)
   end
@@ -896,7 +910,8 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(%{[
   "^i1",
   7,
-  "^r1"]}, json)
+  "^r1"
+]}, json)
     a2 = Oj.load(json, :mode => :object, :circular => true)
     assert_equal(a2[1].__id__, a2.__id__)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com