oj 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17a28bd292a74d89703b466aa07ccbcf4ff8b1e
-  data.tar.gz: 5b38dfb5e07d744a9ef61615088a56c2f2d3d097
+  metadata.gz: d4567e9da6a54d9e4867e415e0618c17e5108f90
+  data.tar.gz: 66813867faafbab6d5f2eb758abf5b757e73ef58
 SHA512:
-  metadata.gz: 5f34961546d44387a7dcdab7e033a154e3dbd6660b4679ad83c3b2bbc378f8b2e2e69007042459b38fa5968dfe9253898a0ac1d85845b1522a6a90c9438d098f
-  data.tar.gz: 9ea1e4b3afc0077240e71b16a111ce1dd238fcaaf2a1e84597c0a60a5d32171c60e4812f2c4164e454fedd6029f85cf66874a76ff021780c28c9bc12d052f678
+  metadata.gz: 16d1a220652f96d07f6a4fbaa589185d332b0d067eebdca3426f875e050d5d8307dd96c29e16093b2356f8ce45d7ca9e831c09a0454e5af2a54718bc25b8b8cb
+  data.tar.gz: 4cfd12ba09c4a035776f126e7d7ed719ab62bf515ae1716487a57b92ce919397b0074baade3aec6d66166e0c399ac760c11bf99fcd9b630d795db94f3c345fef

data/ext/oj/dump.c

@@ -529,6 +529,7 @@ oj_dump_obj_to_json_using_params(VALUE obj, Options copts, Out out, int argc, VA
     out->indent = copts->indent;
     out->argc = argc;
     out->argv = argv;
+    out->ropts = NULL;
     if (Yes == copts->circular) {
 	oj_cache8_new(&out->circ_cache);
     }

data/lib/oj/json.rb

@@ -94,6 +94,10 @@ module JSON
   
   State = ::JSON::Ext::Generator::State
 
+  begin
+    Object.send(:remove_const, :Parser)
+  rescue
+  end
   Parser = ::JSON::Ext::Parser
   self.parser = ::JSON::Ext::Parser
   self.generator = ::JSON::Ext::Generator

data/lib/oj/version.rb

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

data/test/test_custom.rb

@@ -203,14 +203,17 @@ class CustomJuice < Minitest::Test
   end
 
   def test_bigdecimal
-    assert_equal('0.314159265358979323846e1', Oj.dump(BigDecimal.new('3.14159265358979323846'), :bigdecimal_load => true))
+    if '2.4.0' <= RUBY_VERSION
+      assert_equal('0.314159265358979323846e1', Oj.dump(BigDecimal.new('3.14159265358979323846'), :bigdecimal_load => true))
+    else
+      assert_equal('0.314159265358979323846E1', Oj.dump(BigDecimal.new('3.14159265358979323846'), :bigdecimal_load => true))
+    end
     dump_and_load(BigDecimal.new('3.14159265358979323846'), false, :bigdecimal_load => true)
   end
 
   def test_object
     obj = Jeez.new(true, 58)
-    json = Oj.dump(obj, :create_id => "^o", :use_to_json => false, :use_as_json => false, :use_to_hash => false)
-    #puts "*** #{json}"
+    Oj.dump(obj, :create_id => "^o", :use_to_json => false, :use_as_json => false, :use_to_hash => false)
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
 

data/test/test_fast.rb

@@ -80,7 +80,11 @@ class DocTest < Minitest::Test
   def test_fixnum
     json = %{12345}
     Oj::Doc.open(json) do |doc|
-      assert_equal(Integer, doc.type)
+      if '2.4.0' <= RUBY_VERSION
+        assert_equal(Integer, doc.type)
+      else
+        assert_equal(Fixnum, doc.type)
+      end
       assert_equal(12345, doc.fetch())
     end
   end
@@ -205,14 +209,19 @@ class DocTest < Minitest::Test
   end
 
   def test_type
+    if '2.4.0' <= RUBY_VERSION
+      num_class = Integer
+    else
+      num_class = Fixnum
+    end
     Oj::Doc.open($json1) do |doc|
       [['/', Hash],
        ['/array', Array],
        ['/array/1', Hash],
-       ['/array/1/num', Integer],
+       ['/array/1/num', num_class],
        ['/array/1/string', String],
        ['/array/1/hash/h2/a', Array],
-       ['/array/1/hash/../num', Integer],
+       ['/array/1/hash/../num', num_class],
        ['/array/1/hash/../..', Array],
       ].each do |path,type|
         assert_equal(type, doc.type(path))

data/test/tests.rb

@@ -19,3 +19,4 @@ require 'test_file'
 require 'test_gc'
 require 'test_saj'
 require 'test_scp'
+require 'test_various'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler