oj 3.8.1 → 3.10.1

data/test/test_compat.rb

@@ -147,16 +147,9 @@ class CompatJuice < Minitest::Test
 
   def test_encode
     opts = Oj.default_options
-    Oj.default_options = { :ascii_only => false }
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
     Oj.default_options = { :ascii_only => true }
     json = Oj.dump("ぴーたー")
     assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
     Oj.default_options = opts
   end
 

data/test/test_custom.rb

@@ -20,11 +20,12 @@ class CustomJuice < Minitest::Test
   end
 
   class Jeez
-    attr_accessor :x, :y
+    attr_accessor :x, :y, :_z
 
     def initialize(x, y)
       @x = x
       @y = y
+      @_z = x.to_s
     end
     def ==(o)
       self.class == o.class && @x == o.x && @y = o.y
@@ -247,7 +248,10 @@ class CustomJuice < Minitest::Test
 
   def test_object
     obj = Jeez.new(true, 58)
-    Oj.dump(obj, :create_id => "^o", :use_to_json => false, :use_as_json => false, :use_to_hash => false)
+    json = Oj.dump(obj, create_id: "^o", use_to_json: false, use_as_json: false, use_to_hash: false)
+    assert_equal(%|{"x":true,"y":58,"_z":"true"}|, json)
+    json = Oj.dump(obj, create_id: "^o", use_to_json: false, use_as_json: false, use_to_hash: false, ignore_under: true)
+    assert_equal(%|{"x":true,"y":58}|, json)
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
 
@@ -466,10 +470,10 @@ class CustomJuice < Minitest::Test
 
   def test_time
     obj = Time.now()
-    dump_and_load(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
   end
 
   def dump_and_load(obj, trace=false, options={})
@@ -500,4 +504,19 @@ class CustomJuice < Minitest::Test
     loaded
   end
 
+  def dump_load_dump(obj, trace=false, options={})
+    options = options.merge(:indent => 2, :mode => :custom)
+    json = Oj.dump(obj, options)
+    puts json if trace
+
+    loaded = Oj.load(json, options);
+    if obj.nil?
+      assert_nil(loaded)
+    else
+      json2 = Oj.dump(loaded, options)
+      assert_equal(json, json2)
+    end
+    loaded
+  end
+
 end

data/test/test_integer_range.rb

@@ -15,7 +15,7 @@ class IntegerRangeTest < Minitest::Test
   def setup
     @default_options = Oj.default_options
     # in null mode other options other than the number formats are not used.
-    Oj.default_options = { :mode => :null }
+    Oj.default_options = { :mode => :null, bigdecimal_as_decimal: true }
   end
 
   def teardown
@@ -70,4 +70,3 @@ class IntegerRangeTest < Minitest::Test
     assert_equal(exp, Oj.dump(test, integer_range: false))
   end
 end
-

data/test/test_object.rb

@@ -7,11 +7,12 @@ require 'helper'
 
 class ObjectJuice < Minitest::Test
   class Jeez
-    attr_accessor :x, :y
+    attr_accessor :x, :y, :_z
 
     def initialize(x, y)
       @x = x
       @y = y
+      @_z = x.to_s
     end
 
     def eql?(o)
@@ -687,7 +688,7 @@ class ObjectJuice < Minitest::Test
 
   def test_json_object_object
     obj = Jeez.new(true, 58)
-    json = Oj.dump(obj, :mode => :object, :indent => 2)
+    json = Oj.dump(obj, mode: :object, indent: 2, ignore_under: true)
     assert(%{{
   "^o":"ObjectJuice::Jeez",
   "x":true,
@@ -799,7 +800,7 @@ class ObjectJuice < Minitest::Test
       @xyz = 123
     end
   end
-  
+
   def test_exception_subclass
     err = nil
     begin

data/test/test_rails.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class RailsJuice < Minitest::Test
+
+  def test_bigdecimal_dump
+    orig = Oj.default_options
+    Oj.default_options = { mode: :rails, bigdecimal_as_decimal: true }
+    bd = BigDecimal('123')
+    json = Oj.dump(bd)
+    Oj.default_options = orig
+
+    assert_equal('0.123e3', json.downcase)
+
+    json = Oj.dump(bd, mode: :rails, bigdecimal_as_decimal: false)
+    assert_equal('"0.123e3"', json.downcase)
+
+    json = Oj.dump(bd, mode: :rails, bigdecimal_as_decimal: true)
+    assert_equal('0.123e3', json.downcase)
+  end
+
+end

data/test/test_strict.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
@@ -379,6 +379,29 @@ class StrictJuice < Minitest::Test
     assert_equal([{ 'x' => 1 }, { 'y' => 2 }], results)
   end
 
+  def test_invalid_decimal_dot_start
+    assert_raises(Oj::ParseError) {
+      Oj.load('.123', mode: :strict)
+    }
+    assert_raises(Oj::ParseError) {
+      Oj.load('-.123', mode: :strict)
+    }
+  end
+
+  def test_invalid_decimal_dot_end
+    json = '123.'
+    assert_raises(Oj::ParseError) {
+      Oj.load(json, mode: :strict)
+    }
+  end
+
+  def test_invalid_decimal_plus
+    json = '+12'
+    assert_raises(Oj::ParseError) {
+      Oj.load(json, mode: :strict)
+    }
+  end
+
   def test_circular_hash
     h = { 'a' => 7 }
     h['b'] = h

data/test/test_various.rb

@@ -96,70 +96,46 @@ class Juice < Minitest::Test
     Oj.default_options = @default_options
   end
 
-=begin
-  # Depending on the order the values may have changed. The set_options sets
-  # should cover the function itself.
-  def test_get_options
-    opts = Oj.default_options()
-    assert_equal({ :indent=>0,
-                   :second_precision=>9,
-                   :circular=>false,
-                   :class_cache=>true,
-                   :auto_define=>false,
-                   :symbol_keys=>false,
-                   :bigdecimal_as_decimal=>true,
-                   :use_to_json=>true,
-                   :nilnil=>false,
-                   :allow_gc=>true,
-                   :quirks_mode=>true,
-                   :allow_invalid_unicode=>false,
-                   :float_precision=>15,
-                   :mode=>:object,
-                   :escape_mode=>:json,
-                   :time_format=>:unix_zone,
-                   :bigdecimal_load=>:auto,
-                   :create_id=>'json_class'}, opts)
-  end
-=end
   def test_set_options
     orig = Oj.default_options()
     alt ={
-      :indent=>" - ",
-      :second_precision=>5,
-      :circular=>true,
-      :class_cache=>false,
-      :auto_define=>true,
-      :symbol_keys=>true,
-      :bigdecimal_as_decimal=>false,
-      :use_to_json=>false,
-      :use_to_hash=>false,
-      :use_as_json=>false,
-      :use_raw_json=>false,
-      :nilnil=>true,
-      :empty_string=>true,
-      :allow_gc=>false,
-      :quirks_mode=>false,
-      :allow_invalid_unicode=>true,
-      :float_precision=>13,
-      :mode=>:strict,
-      :escape_mode=>:ascii,
-      :time_format=>:unix_zone,
-      :bigdecimal_load=>:float,
-      :create_id=>'classy',
-      :create_additions=>true,
-      :space=>'z',
-      :array_nl=>'a',
-      :object_nl=>'o',
-      :space_before=>'b',
-      :nan=>:huge,
-      :hash_class=>Hash,
-      :omit_nil=>false,
-      :allow_nan=>true,
-      :integer_range=>nil,
-      :array_class=>Array,
-      :ignore=>nil,
-      :trace=>true,
-      :safe=>true,
+      indent: " - ",
+      second_precision: 5,
+      circular: true,
+      class_cache: false,
+      auto_define: true,
+      symbol_keys: true,
+      bigdecimal_as_decimal: false,
+      use_to_json: false,
+      use_to_hash: false,
+      use_as_json: false,
+      use_raw_json: false,
+      nilnil: true,
+      empty_string: true,
+      allow_gc: false,
+      quirks_mode: false,
+      allow_invalid_unicode: true,
+      float_precision: 13,
+      mode: :strict,
+      escape_mode: :ascii,
+      time_format: :unix_zone,
+      bigdecimal_load: :float,
+      create_id: 'classy',
+      create_additions: true,
+      space: 'z',
+      array_nl: 'a',
+      object_nl: 'o',
+      space_before: 'b',
+      nan: :huge,
+      hash_class: Hash,
+      omit_nil: false,
+      allow_nan: true,
+      integer_range: nil,
+      array_class: Array,
+      ignore: nil,
+      ignore_under: true,
+      trace: true,
+      safe: true,
     }
     Oj.default_options = alt
     #keys = alt.keys
@@ -425,8 +401,11 @@ class Juice < Minitest::Test
   def test_time_years
     (-2020..2020).each { |year|
       s = "%04d-03-01T15:14:13Z" % [year]
-      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema)
+      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema, second_precision: -1)
       assert_equal(s, json[1..-2])
+
+      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema, second_precision: 3)
+      assert_equal(s[0..-2] + '.000Z', json[1..-2])
     }
   end
 

data/test/tests.rb

@@ -19,6 +19,7 @@ require 'test_saj'
 require 'test_scp'
 require 'test_strict'
 require 'test_various'
+require 'test_rails'
 require 'test_wab'
 require 'test_writer'
 require 'test_integer_range'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.10.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -172,12 +172,21 @@ files:
 - test/activesupport4/decoding_test.rb
 - test/activesupport4/encoding_test.rb
 - test/activesupport4/test_helper.rb
+- test/activesupport5/abstract_unit.rb
 - test/activesupport5/decoding_test.rb
 - test/activesupport5/encoding_test.rb
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
+- test/activesupport6/abstract_unit.rb
+- test/activesupport6/decoding_test.rb
+- test/activesupport6/encoding_test.rb
+- test/activesupport6/encoding_test_cases.rb
+- test/activesupport6/test_common.rb
+- test/activesupport6/test_helper.rb
+- test/activesupport6/time_zone_test_helpers.rb
 - test/bar.rb
+- test/baz.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -234,6 +243,7 @@ files:
 - test/test_integer_range.rb
 - test/test_null.rb
 - test/test_object.rb
+- test/test_rails.rb
 - test/test_saj.rb
 - test/test_scp.rb
 - test/test_strict.rb
@@ -313,6 +323,7 @@ test_files:
 - test/sample_json.rb
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/encoding_test.rb
+- test/activesupport5/abstract_unit.rb
 - test/activesupport5/time_zone_test_helpers.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/decoding_test.rb
@@ -341,8 +352,10 @@ test_files:
 - test/zoo.rb
 - test/activerecord/result_test.rb
 - test/_test_active_mimic.rb
+- test/baz.rb
 - test/tests_mimic_addition.rb
 - test/test_writer.rb
+- test/test_rails.rb
 - test/perf.rb
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_after.rb
@@ -357,3 +370,10 @@ test_files:
 - test/test_gc.rb
 - test/files.rb
 - test/test_various.rb
+- test/activesupport6/encoding_test_cases.rb
+- test/activesupport6/encoding_test.rb
+- test/activesupport6/abstract_unit.rb
+- test/activesupport6/time_zone_test_helpers.rb
+- test/activesupport6/test_helper.rb
+- test/activesupport6/test_common.rb
+- test/activesupport6/decoding_test.rb