oj 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5e26434d67518ead10da0ffb7f97ca0d05a0de
-  data.tar.gz: cdd5a57251a116ba7e7f1d16136821a5baa04869
+  metadata.gz: f17a28bd292a74d89703b466aa07ccbcf4ff8b1e
+  data.tar.gz: 5b38dfb5e07d744a9ef61615088a56c2f2d3d097
 SHA512:
-  metadata.gz: 1a9ab31bbf01cd8794e88a25adcbb989dead17ac17c76ea792d0580211e516f67b9224aaa64e85af62b1ba5a1a230693c6e14415443f33e04f683e2e0cb632f0
-  data.tar.gz: 6656a40ec3b1aea8de039062f76f00124c0af96e4679df3975c97e495ced5aa5811f628304ec23c52baa17b18780eee6f2705cd9dedc23e75626e733e3777872
+  metadata.gz: 5f34961546d44387a7dcdab7e033a154e3dbd6660b4679ad83c3b2bbc378f8b2e2e69007042459b38fa5968dfe9253898a0ac1d85845b1522a6a90c9438d098f
+  data.tar.gz: 9ea1e4b3afc0077240e71b16a111ce1dd238fcaaf2a1e84597c0a60a5d32171c60e4812f2c4164e454fedd6029f85cf66874a76ff021780c28c9bc12d052f678

data/README.md

@@ -63,7 +63,7 @@ See [{file:CHANGELOG.md}](CHANGELOG.md)
 
 ## Links
 
- - *Documentation*: http://www.ohler.com/oj, http://rubydoc.info/gems/oj
+ - *Documentation*: http://www.ohler.com/oj/doc, http://rubydoc.info/gems/oj
 
 - *GitHub* *repo*: https://github.com/ohler55/oj
 

data/ext/oj/dump.h

@@ -47,10 +47,6 @@ extern void	oj_dump_custom_val(VALUE obj, int depth, Out out, bool as_ok);
 extern VALUE	oj_add_to_json(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_remove_to_json(int argc, VALUE *argv, VALUE self);
 
-// TBD remove when refactor complete
-extern void	oj_dump_comp_val(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok);
-
-
 inline static void
 assure_size(Out out, size_t len) {
     if (out->end - out->cur <= (long)len) {

data/ext/oj/dump_leaf.c

@@ -10,8 +10,6 @@
 
 static void	dump_leaf(Leaf leaf, int depth, Out out);
 
-extern void	dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out);
-
 static void
 grow(Out out, size_t len) {
     size_t  size = out->end - out->buf;
@@ -52,10 +50,10 @@ static void
 dump_leaf_str(Leaf leaf, Out out) {
     switch (leaf->value_type) {
     case STR_VAL:
-	dump_cstr(leaf->str, strlen(leaf->str), 0, 0, out);
+	oj_dump_cstr(leaf->str, strlen(leaf->str), 0, 0, out);
 	break;
     case RUBY_VAL:
-	dump_cstr(rb_string_value_cstr(&leaf->value), RSTRING_LEN(leaf->value), 0, 0, out);
+	oj_dump_cstr(rb_string_value_cstr(&leaf->value), RSTRING_LEN(leaf->value), 0, 0, out);
 	break;
     case COL_VAL:
     default:
@@ -160,7 +158,7 @@ dump_leaf_hash(Leaf leaf, int depth, Out out) {
 		grow(out, size);
 	    }
 	    fill_indent(out, d2);
-	    dump_cstr(e->key, strlen(e->key), 0, 0, out);
+	    oj_dump_cstr(e->key, strlen(e->key), 0, 0, out);
 	    *out->cur++ = ':';
 	    dump_leaf(e, d2, out);
 	    if (e->next != first) {

data/ext/oj/oj.c

@@ -953,7 +953,6 @@ dump(int argc, VALUE *argv, VALUE self) {
 	oj_parse_options(argv[1], &copts);
     }
     if (CompatMode == copts.mode) {
-	copts.to_json = No;
 	copts.dump_opts.nan_dump = true;
     }
     out.buf = buf;

data/ext/oj/string_writer.c

@@ -157,7 +157,7 @@ oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
 	    *sw->out.cur++ = ':';
 	}
     }
-    oj_dump_comp_val(val, sw->depth, &sw->out, 0, 0, true);
+    oj_dump_custom_val(val, sw->depth, &sw->out, true);
 }
 
 void

data/lib/oj/version.rb

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

data/test/test_compat.rb

@@ -257,7 +257,7 @@ class CompatJuice < Minitest::Test
     # BigDecimals are dumped as strings and can not be restored to the
     # original value.
     json = Oj.dump(BigDecimal.new('3.14159265358979323846'))
-    if RUBY_VERSION == '2.4.0'
+    if RUBY_VERSION >= '2.4.0'
       # 2.4.0 changes the exponent to lowercase
       assert_equal('"0.314159265358979323846e1"', json)
     else

data/test/test_fast.rb

@@ -33,7 +33,7 @@ class DocTest < Minitest::Test
     json = %{null}
     Oj::Doc.open(json) do |doc|
       assert_equal(NilClass, doc.type)
-      assert_equal(nil, doc.fetch())
+      assert_nil(doc.fetch())
     end
   end
 
@@ -80,7 +80,7 @@ class DocTest < Minitest::Test
   def test_fixnum
     json = %{12345}
     Oj::Doc.open(json) do |doc|
-      assert_equal(Fixnum, doc.type)
+      assert_equal(Integer, doc.type)
       assert_equal(12345, doc.fetch())
     end
   end
@@ -209,10 +209,10 @@ class DocTest < Minitest::Test
       [['/', Hash],
        ['/array', Array],
        ['/array/1', Hash],
-       ['/array/1/num', Fixnum],
+       ['/array/1/num', Integer],
        ['/array/1/string', String],
        ['/array/1/hash/h2/a', Array],
-       ['/array/1/hash/../num', Fixnum],
+       ['/array/1/hash/../num', Integer],
        ['/array/1/hash/../..', Array],
       ].each do |path,type|
         assert_equal(type, doc.type(path))
@@ -233,7 +233,11 @@ class DocTest < Minitest::Test
        ['/array/1/hash/../..', 'array'],
       ].each do |path,key|
         doc.move(path)
-        assert_equal(key, doc.local_key())
+        if key.nil?
+          assert_nil(doc.local_key())
+        else
+          assert_equal(key, doc.local_key())
+        end
       end
     end
   end

data/test/test_file.rb

@@ -145,7 +145,7 @@ class FileJuice < Minitest::Test
 
   # Object with to_json()
   def test_json_object_compat
-    Oj.default_options = { :mode => :compat, :use_to_json => true }
+    Oj.default_options = { :mode => :compat, :use_to_json => true, :create_additions => true }
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(%{{"json_class":"FileJuice::Jeez","x":true,"y":58}
@@ -228,6 +228,8 @@ class FileJuice < Minitest::Test
       end
       assert_equal(obj.utc?, loaded.utc?)
       assert_equal(obj.utc_offset, loaded.utc_offset)
+    elsif obj.nil?
+      assert_nil(loaded)
     else
       assert_equal(obj, loaded)
     end

data/test/tests.rb

@@ -12,3 +12,10 @@ require 'test_null'
 require 'test_compat'
 require 'test_object'
 require 'test_custom'
+require 'test_writer'
+require 'test_fast'
+require 'test_hash'
+require 'test_file'
+require 'test_gc'
+require 'test_saj'
+require 'test_scp'

metadata

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