oj 3.7.12 → 3.9.0

data/pages/Security.md

@@ -7,7 +7,7 @@ Symbols. The same is true for auto defining classes in all versions of ruby;
 memory will also be exhausted if too many classes are automatically
 defined. Auto defining is a useful feature during development and from trusted
 sources but it allows too many classes to be created in the object load mode and
-auto defined is used with an untrusted source. The `Oj.strict_load()` method
+auto defined is used with an untrusted source. The `Oj.safe_load()` method
 sets and uses the most strict and safest options. It should be used by
 developers who find it difficult to understand the options available in Oj.
 

data/test/bar.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'oj'
+
+#Oj.load_file(ARGV[0], mode: :strict) { |obj|
+#  puts Oj.dump(obj, indent: 2)
+#}
+
+data = open('invalid_unicode.data').read
+
+puts data
+
+puts Oj.dump(data)
+
+Oj.mimic_JSON
+puts Oj.dump(data, escape_mode: :json)
+
+puts Oj.default_options

data/test/foo.rb

@@ -1,33 +1,21 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-$: << '.'
-$: << '../lib'
-$: << '../ext'
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
 
 require 'oj'
+require 'active_support'
+require 'active_support/json'
+#require 'tracer'
 
-f = File.open("foo.json", "w")
-100_000.times do
- obj = { created_at: DateTime.new(2001,2,3,4,5,6) }
- Oj.to_stream(f, obj)
- f.puts
- f.flush
-end
-f.close
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+Oj::Rails.optimize()
 
-def run_test_thread
-  threads = Array.new(3) do
-    Thread.new do 
-      counter = 0
-      File.open("foo.json", "r") { |f| Oj.enum_for(:load, f).lazy.each { counter += 1 } }
-      #File.open("odd_file.jsonl", "r") { |f| Oj.enum_for(:load, f).lazy.each { counter += 1 } }
-      puts counter
-    end
-  end
-  threads.each(&:join)
-end
+#Oj::mimic_JSON
 
-100.times do |i|
-  puts i
-  run_test_thread
-end
+puts JSON.parse('{"a":1}', symbolize_names: true)

data/test/test_custom.rb

@@ -32,6 +32,9 @@ class CustomJuice < Minitest::Test
     def to_json(*args)
       %|{"xx":#{@x},"yy":#{y}}|
     end
+    def raw_json(depth, indent)
+      %|{"xxx":#{@x},"yyy":#{y}}|
+    end
     def as_json(*args)
       {'a' => @x, :b => @y }
     end
@@ -40,6 +43,40 @@ class CustomJuice < Minitest::Test
     end
   end
 
+  class AsJson
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+    def ==(o)
+      self.class == o.class && @x == o.x && @y = o.y
+    end
+    def as_json(*args)
+      {'a' => @x, :b => @y }
+    end
+  end
+
+  class AsRails
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+    def ==(o)
+      self.class == o.class && @x == o.x && @y = o.y
+    end
+    def as_json(*args)
+      a = @x
+      a = a.as_json if a.respond_to?('as_json')
+      b = @y
+      b = b.as_json if b.respond_to?('as_json')
+      {'a' => a, :b => b }
+    end
+  end
+
   def setup
     @default_options = Oj.default_options
     Oj.default_options = { :mode => :custom }
@@ -92,7 +129,7 @@ class CustomJuice < Minitest::Test
     end
     assert(false, "*** expected an exception")
   end
-  
+
   def test_infinity_dump
     assert_equal('null', Oj.dump(1/0.0, :nan => :null))
     assert_equal('3.0e14159265358979323846', Oj.dump(1/0.0, :nan => :huge))
@@ -187,7 +224,7 @@ class CustomJuice < Minitest::Test
                                                         '19' => {
                                                           '20' => {}}}}}}}}}}}}}}}}}}}}}, false)
   end
-  
+
   def test_hash_escaped_key
     json = %{{"a\nb":true,"c\td":false}}
     obj = Oj.load(json)
@@ -232,6 +269,66 @@ class CustomJuice < Minitest::Test
     assert_equal(%|{"b":true,"n":58}|, json)
   end
 
+  def test_object_raw_json
+    obj = Jeez.new(true, 58)
+    json = Oj.dump(obj, :use_to_json => true, :use_as_json => false, :use_raw_json => true, :use_to_hash => false)
+    assert_equal(%|{"xxx":true,"yyy":58}|, json)
+  end
+
+  def test_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.pop()
+    json = Oj.dump(obj, :use_raw_json => true)
+    assert_equal(%|[]|, json)
+  end
+
+  def test_as_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.push_value(3)
+    obj.pop()
+    j = AsJson.new(1, obj)
+
+    json = Oj.dump(j, use_raw_json: true, use_as_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":[3]
+}
+|, json)
+
+    json = Oj.dump(j, use_raw_json: false, use_as_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":{}
+}
+|, json)
+  end
+
+  def test_rails_as_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.push_value(3)
+    obj.pop()
+    j = AsRails.new(1, obj)
+    json = Oj.dump(j, mode: :rails, use_raw_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":{}
+}
+|, json)
+
+    Oj::Rails.optimize
+    json = Oj.dump(j, mode: :rails, use_raw_json: true, indent: 2)
+    Oj::Rails.deoptimize
+    assert_equal(%|{
+  "a":1,
+  "b":[3]
+}
+|, json)
+
+  end
+
   def test_symbol
     json = Oj.dump(:abc)
     assert_equal('"abc"', json)

data/test/test_various.rb

@@ -134,6 +134,7 @@ class Juice < Minitest::Test
       :use_to_json=>false,
       :use_to_hash=>false,
       :use_as_json=>false,
+      :use_raw_json=>false,
       :nilnil=>true,
       :empty_string=>true,
       :allow_gc=>false,
@@ -158,6 +159,7 @@ class Juice < Minitest::Test
       :array_class=>Array,
       :ignore=>nil,
       :trace=>true,
+      :safe=>true,
     }
     Oj.default_options = alt
     #keys = alt.keys

data/test/zoo.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#require 'json'
+
+$: << File.dirname(__FILE__)
+require 'helper'
+require 'oj'
+
+Oj.mimic_JSON
+puts "\u3074"
+
+puts JSON.dump(["\u3074"])
+puts JSON.generate(["\u3074"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.12
+  version: 3.9.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,16 +79,16 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Modes.md
+- pages/Rails.md
+- pages/JsonGem.md
+- pages/Encoding.md
+- pages/WAB.md
+- pages/Custom.md
 - pages/Advanced.md
 - pages/Options.md
-- pages/Custom.md
 - pages/Compatibility.md
-- pages/WAB.md
+- pages/Modes.md
 - pages/Security.md
-- pages/Encoding.md
-- pages/JsonGem.md
-- pages/Rails.md
 files:
 - LICENSE
 - README.md
@@ -177,7 +177,7 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/big.rb
+- test/bar.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -200,7 +200,6 @@ files:
 - 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_fast.rb
@@ -244,6 +243,7 @@ files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
+- test/zoo.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -266,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -278,82 +278,82 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/perf_file.rb
-- test/test_hash.rb
-- test/perf.rb
-- test/test_object.rb
-- test/test_null.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/perf_scp.rb
+- test/foo.rb
 - test/test_integer_range.rb
-- test/test_gc.rb
-- test/sample.rb
-- test/json_gem/json_string_matching_test.rb
+- test/test_strict.rb
+- test/perf_strict.rb
+- test/tests.rb
+- test/perf_saj.rb
+- test/test_compat.rb
+- test/helper.rb
+- test/perf_file.rb
+- test/test_scp.rb
+- test/perf_compat.rb
+- test/json_gem/json_common_interface_test.rb
 - test/json_gem/json_addition_test.rb
-- test/json_gem/test_helper.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/json_generic_object_test.rb
 - test/json_gem/json_generator_test.rb
-- test/json_gem/json_parser_test.rb
+- test/json_gem/test_helper.rb
 - test/json_gem/json_encoding_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/tests_mimic_addition.rb
-- test/test_wab.rb
+- test/json_gem/json_parser_test.rb
+- test/perf_wab.rb
+- test/test_file.rb
+- test/test_object.rb
+- test/sample.rb
+- test/perf_object.rb
+- test/test_hash.rb
+- test/test_custom.rb
+- test/bar.rb
+- test/activesupport4/encoding_test.rb
 - test/activesupport4/test_helper.rb
 - test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/activerecord/result_test.rb
-- test/_test_active.rb
-- test/test_file.rb
+- test/sample_json.rb
 - test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/encoding_test.rb
 - test/activesupport5/time_zone_test_helpers.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test.rb
-- test/tests.rb
-- test/_test_active_mimic.rb
-- test/perf_object.rb
-- test/test_strict.rb
-- test/test_scp.rb
-- test/perf_wab.rb
 - test/test_saj.rb
-- test/mem.rb
-- test/perf_compat.rb
-- test/helper.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_before.rb
-- test/sample_json.rb
-- test/test_debian.rb
-- test/perf_fast.rb
-- test/test_writer.rb
+- test/perf_scp.rb
+- test/test_wab.rb
+- test/test_null.rb
+- test/_test_active.rb
+- test/_test_mimic_rails.rb
 - test/test_fast.rb
-- test/sample/line.rb
+- test/perf_fast.rb
 - test/sample/change.rb
-- test/sample/dir.rb
 - test/sample/text.rb
-- test/sample/layer.rb
-- test/sample/rect.rb
-- test/sample/group.rb
-- test/sample/oval.rb
 - test/sample/doc.rb
-- test/sample/hasprops.rb
 - test/sample/shape.rb
+- test/sample/layer.rb
+- test/sample/group.rb
 - test/sample/file.rb
-- test/files.rb
-- test/big.rb
-- test/perf_saj.rb
-- test/foo.rb
+- test/sample/rect.rb
+- test/sample/hasprops.rb
+- test/sample/line.rb
+- test/sample/dir.rb
+- test/sample/oval.rb
 - test/tests_mimic.rb
-- test/perf_strict.rb
-- test/test_various.rb
-- test/_test_mimic_rails.rb
 - test/perf_simple.rb
+- test/zoo.rb
+- test/activerecord/result_test.rb
+- test/_test_active_mimic.rb
+- test/tests_mimic_addition.rb
+- test/test_writer.rb
+- test/perf.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_redefine.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.rb
+- test/test_debian.rb
+- test/test_gc.rb
+- test/files.rb
+- test/test_various.rb