oj 3.8.0 → 3.10.0

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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-11-28 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
@@ -313,6 +322,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,6 +351,7 @@ 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/perf.rb
@@ -357,3 +368,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