oj 3.13.13 → 3.13.16

data/test/test_file.rb

@@ -212,6 +212,24 @@ class FileJuice < Minitest::Test
     dump_and_load(DateTime.new(2012, 6, 19), false)
   end
 
+  def test_load_unicode_path
+    json =<<~JSON
+    {
+      "x":true,
+      "y":58,
+      "z": [1,2,3]
+    }
+    JSON
+
+    Tempfile.create('file_test_conceição1.json') do |f|
+      f.write(json)
+      f.close
+
+      objects = Oj.load_file(f.path)
+      assert_equal(Oj.load(json), objects)
+    end
+  end
+
   def dump_and_load(obj, trace=false)
     filename = File.join(File.dirname(__FILE__), 'file_test.json')
     File.open(filename, "w") { |f|

data/test/test_parser_saj.rb

@@ -5,7 +5,7 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-$json = %{{
+$json = %|{
   "array": [
     {
       "num"   : 3,
@@ -18,7 +18,7 @@ $json = %{{
     }
   ],
   "boolean" : true
-}}
+}|
 
 class AllSaj < Oj::Saj
   attr_accessor :calls
@@ -53,6 +53,35 @@ class AllSaj < Oj::Saj
 
 end # AllSaj
 
+class LocSaj
+  attr_accessor :calls
+
+  def initialize()
+    @calls = []
+  end
+
+  def hash_start(key, line, column)
+    @calls << [:hash_start, key, line, column]
+  end
+
+  def hash_end(key, line, column)
+    @calls << [:hash_end, key, line, column]
+  end
+
+  def array_start(key, line, column)
+    @calls << [:array_start, key, line, column]
+  end
+
+  def array_end(key, line, column)
+    @calls << [:array_end, key, line, column]
+  end
+
+  def add_value(value, key, line, column)
+    @calls << [:add_value, value, key, line, column]
+  end
+
+end # LocSaj
+
 class SajTest < Minitest::Test
 
   def test_nil
@@ -242,4 +271,28 @@ class SajTest < Minitest::Test
 		 ], handler.calls)
   end
 
+  def test_loc
+    handler = LocSaj.new()
+    Oj::Parser.saj.handler = handler
+    Oj::Parser.saj.parse($json)
+    assert_equal([[:hash_start, nil, 1, 1],
+                  [:array_start, 'array', 2, 12],
+                  [:hash_start, nil, 3, 5],
+                  [:add_value, 3, 'num', 4, 18],
+                  [:add_value, 'message', 'string', 5, 25],
+                  [:hash_start, 'hash', 6, 17],
+                  [:hash_start, 'h2', 7, 17],
+                  [:array_start, 'a', 8, 17],
+                  [:add_value, 1, nil, 8, 20],
+                  [:add_value, 2, nil, 8, 23],
+                  [:add_value, 3, nil, 8, 26],
+                  [:array_end, 'a', 8, 27],
+                  [:hash_end, 'h2', 9, 9],
+                  [:hash_end, 'hash', 10, 7],
+                  [:hash_end, nil, 11, 5],
+                  [:array_end, 'array', 12, 3],
+                  [:add_value, true, 'boolean', 13, 18],
+                  [:hash_end, nil, 14, 1]], handler.calls)
+  end
+
 end

data/test/test_various.rb

@@ -345,6 +345,12 @@ class Juice < Minitest::Test
     out = Oj.dump hash
     assert_equal(%{{"key":"I \\u003c3 this"}}, out)
   end
+  def test_escapes_slashes_by_default_when_configured_to_do_so
+    hash = {'key' => "I <3 this </script>"}
+    Oj.default_options = {:escape_mode => :slash}
+    out = Oj.dump hash
+    assert_equal(%{{"key":"I <3 this <\\/script>"}}, out)
+  end
   def test_escapes_entities_when_asked_to
     hash = {'key' => "I <3 this"}
     out = Oj.dump(hash, :escape_mode => :xss_safe)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.13
+  version: 3.13.16
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The fastest JSON parser and object serializer.
 email: peter@ohler.com
 executables: []
@@ -200,6 +186,11 @@ files:
 - test/activesupport6/test_common.rb
 - test/activesupport6/test_helper.rb
 - test/activesupport6/time_zone_test_helpers.rb
+- test/activesupport7/abstract_unit.rb
+- test/activesupport7/decoding_test.rb
+- test/activesupport7/encoding_test.rb
+- test/activesupport7/encoding_test_cases.rb
+- test/activesupport7/time_zone_test_helpers.rb
 - test/bar.rb
 - test/baz.rb
 - test/bug.rb
@@ -312,103 +303,4 @@ rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files:
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activerecord/result_test.rb
-- 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/bug.rb
-- test/files.rb
-- test/foo.rb
-- test/helper.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/test_helper.rb
-- test/mem.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_dump.rb
-- test/perf_fast.rb
-- test/perf_file.rb
-- test/perf_object.rb
-- test/perf_once.rb
-- test/perf_parser.rb
-- test/perf_saj.rb
-- test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/perf_wab.rb
-- test/prec.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/shape.rb
-- test/sample/text.rb
-- test/sample.rb
-- test/sample_json.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_generate.rb
-- test/test_hash.rb
-- test/test_integer_range.rb
-- test/test_null.rb
-- test/test_object.rb
-- test/test_parser.rb
-- test/test_parser_saj.rb
-- test/test_parser_usual.rb
-- test/test_rails.rb
-- test/test_saj.rb
-- test/test_scp.rb
-- test/test_strict.rb
-- test/test_various.rb
-- test/test_wab.rb
-- test/test_writer.rb
-- test/tests.rb
-- test/tests_mimic.rb
-- test/tests_mimic_addition.rb
-- test/zoo.rb
+test_files: []