oj 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35634d84fa9efd54d2c6a5c82572386ab76dcbd9
-  data.tar.gz: b53f05e6cbb2159d88b800165e5e843bd0f8f10f
+  metadata.gz: ae9a5959e58d7693a350810b42cfc2f48237f9db
+  data.tar.gz: 71a1069996f76bdbffeb6f32100ae51c420f43ef
 SHA512:
-  metadata.gz: 6a7fd255fb03915f2d5bef8d5d9093693a7544345b9dcc3a5208d26db2009b264797a1879e70e1d25e2144813d90e690cbab992092fc65fa0b7aaf22e93fa265
-  data.tar.gz: 29166d47b6bdd0ef4fde76c532fd6227f163786ca1f9dd4b5f2a9f507658d078a8ef47ff25ffb59dfe98e5981f70a964e7b62c8703f246fa183f946d00ae115b
+  metadata.gz: 3aefcc5d370f348159091358e9728e5fff4e5c7a03bb6500bfd57e1e8f9033f66420a69f1750043e0bc1a3cdecb44e40593cb75aed1021d8799371934b1cea83
+  data.tar.gz: 04fd575199bdd4d23edf3cc3d473e2b970917728b55598f61cedf2d1d213b33fd8a324d93de7360490d29234b53f79784bdedc4b659612784a1b5bfa96cefb6f

data/ext/oj/mimic_json.c

@@ -200,7 +200,9 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
     out.caller = CALLER_DUMP;
-    
+    copts.escape_mode = JXEsc;
+    copts.mode = CompatMode;
+
     /* seems like this is not correct
     if (No == copts.nilnil && Qnil == *argv) {
 	rb_raise(rb_eTypeError, "nil not allowed.");

data/ext/oj/oj.c

@@ -274,7 +274,7 @@ get_def_opts(VALUE self) {
     case StrictMode:	rb_hash_aset(opts, mode_sym, strict_sym);	break;
     case CompatMode:	rb_hash_aset(opts, mode_sym, compat_sym);	break;
     case NullMode:	rb_hash_aset(opts, mode_sym, null_sym);		break;
-    case ObjectMode:
+    case ObjectMode:	rb_hash_aset(opts, mode_sym, object_sym);	break;
     case CustomMode:	rb_hash_aset(opts, mode_sym, custom_sym);	break;
     case RailsMode:	rb_hash_aset(opts, mode_sym, rails_sym);	break;
     default:		rb_hash_aset(opts, mode_sym, object_sym);	break;
@@ -1315,7 +1315,7 @@ extern VALUE	oj_remove_to_json(int argc, VALUE *argv, VALUE self);
  * will be replaced with Oj methods.
  *
  * Note that this also sets the default options of :mode to :compat and
- * :encoding to :ascii.
+ * :encoding to :unicode_xss.
  *
  * Returns [_Module_] the JSON module.
  */

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -9,7 +9,11 @@ require 'rails'
 require 'active_support/json'
 require 'oj'
 
+puts Oj.default_options[:mode]
+puts Oj.dump({1=>'a',2=>'b'})
+
 Oj.optimize_rails
 
-JSON.pretty_generate({'a'=>1,'b'=>[true,false]})
+puts JSON.pretty_generate({'a'=>1,'b'=>[true,false]})
+puts JSON.dump({1=>'a',2=>'b'})
 

data/test/test_various.rb

@@ -738,18 +738,21 @@ class Juice < Minitest::Test
   end
 
   def test_empty_string_true
-    10.times do
-      result = Oj.load(gen_whitespaced_string, :empty_string => true)
-      assert_nil(result)
-    end
+    result = Oj.load(gen_whitespaced_string, :empty_string => true)
+    assert_nil(result)
   end
 
   def test_empty_string_false
-    10.times do
-      assert_raises(Oj::ParseError) do
-        Oj.load(gen_whitespaced_string, :empty_string => false)
-      end
+    # Could be either a Oj::ParseError or an EncodingError depending on
+    # whether mimic_JSON has been called. Since we don't know when the test
+    # will be called either is okay.
+    begin
+      Oj.load(gen_whitespaced_string, :empty_string => false)
+    rescue Exception => e
+      assert(Oj::ParseError == e.class || EncodingError == e.class)
+      return
     end
+    assert(false, "*** expected an exception")
   end
 
   def test_quirks_null_mode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler