oj 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451501e86625385b0362d776ad531e20f8be0aa5
-  data.tar.gz: fc691b28aba6381bec1aebe7acfe25f0483f0b82
+  metadata.gz: c6d89419541ffeaab83eaea37802686aae4fab16
+  data.tar.gz: 0d6fd040e9438dbee988ee0ef7b5f35ea31e3b7e
 SHA512:
-  metadata.gz: 6f779275172ff00267a5c7d9398b831253c0582abc2eb93f1e9b1f74d7863bf0e16156a9926d5008006329bb5d78549f799e8f54bf9d4b6effa422849171d767
-  data.tar.gz: 0d971692dce841116f198fc6c190c906ce613784b647908e706d8a8e76d965b4e9d7fc16a960e776da5dbb5426a8f53dd4d5b0744aafe36a0831532f1cf97490
+  metadata.gz: 01a5f4dbfc93069e199591710d4bf98df329b48f58bb29eb5a54df896a5fa217a79685a63cedf2a88af86a32519083f32d608a93059104255fdffa7da6d58650
+  data.tar.gz: d16b98eedefb8e483df1f8ea14c6ed4a8036943501864334f19b8bfc7221498059343313c7aa722f592fc210b4c8eb0ce0cfefd532ba7017c82a389856a319ed

data/README.md

@@ -32,6 +32,14 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 2.0.12
+
+ - Another fix for mimic.
+
+ - 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

data/ext/oj/oj.c

@@ -979,15 +979,25 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     if (Qnil == mimic) {
 	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"))) {
-	    rb_raise(rb_const_get_at(Oj, rb_intern("MimicError")),
-		     "JSON module already exists. Can not mimic. Do not require 'json' before calling mimic_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);
 	}
-	mimic = rb_define_module("JSON");
-	ext = rb_define_module_under(mimic, "Ext");
-	dummy = rb_define_class_under(ext, "Parser", rb_cObject);
-	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) {
@@ -1001,7 +1011,8 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
 		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);
@@ -1022,6 +1033,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
 
 	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);

data/lib/oj/mimic.rb

@@ -4,15 +4,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'))
+      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.entries(d) do |file|
-        next unless file.ends_with?('jsob.rb')
-        $LOADED_FEATURES << file unless $LOADED_FEATURES.include?(file)
+      Dir.foreach(d) do |file|
+        next unless file.end_with?('json.rb')
+        $LOADED_FEATURES << File.join(d, file) unless $LOADED_FEATURES.include?(file)
       end
     end
     mimic_paths.each { |p| $LOADED_FEATURES << p }

data/lib/oj/version.rb

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

data/test/test_mimic_after.rb

@@ -0,0 +1,35 @@
+#!/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 'test/unit'
+require 'stringio'
+require 'oj'
+require 'json'
+
+class MimicAfter < ::Test::Unit::TestCase
+
+  def test0_mimic_json
+    assert(!defined?(JSON).nil?)
+    Oj.mimic_JSON
+  end
+
+# dump
+  def test_dump_string
+    Oj.default_options= {:indent => 2} # JSON this will not change anything
+    json = JSON.dump([1, true, nil])
+    assert_equal(%{[
+  1,
+  true,
+  null]}, json)
+  end
+
+end # MimicAfter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -65,6 +65,7 @@ files:
 - test/sample_json.rb
 - test/test_fast.rb
 - test/test_mimic.rb
+- test/test_mimic_after.rb
 - test/test_saj.rb
 - test/tests.rb
 - LICENSE