oj 3.7.12 → 3.8.0

data/lib/oj/version.rb

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

data/pages/Modes.md

@@ -14,7 +14,7 @@ modes are:
  - `:object`
  - `:custom`
 
-Since modes detemine what the JSON output will look like and alternatively
+Since modes determine what the JSON output will look like and alternatively
 what Oj expects when the `Oj.load()` method is called, mixing the output and
 input mode formats will most likely not behave as intended. If the object mode
 is used for producing JSON then use object mode for reading. The same is true
@@ -117,6 +117,7 @@ information.
 | :object_nl             | String  |         |         |       x |       x |         |       x |         |
 | :omit_nil              | Boolean |       x |       x |       x |       x |       x |       x |         |
 | :quirks_mode           | Boolean |         |         |       6 |         |         |       x |         |
+| :safe                  | String  |         |         |       x |         |         |         |         |
 | :second_precision      | Fixnum  |         |         |         |         |       x |       x |         |
 | :space                 | String  |         |         |       x |       x |         |       x |         |
 | :space_before          | String  |         |         |       x |       x |         |       x |         |
@@ -124,6 +125,7 @@ information.
 | :trace                 | Boolean |       x |       x |       x |       x |       x |       x |       x |
 | :time_format           | Symbol  |         |         |         |         |       x |       x |         |
 | :use_as_json           | Boolean |         |         |         |         |         |       x |         |
+| :use_raw_json          | Boolean |         |         |       x |       x |       x |       x |         |
 | :use_to_hash           | Boolean |         |         |         |         |         |       x |         |
 | :use_to_json           | Boolean |         |         |         |         |         |       x |         |
  --------------------------------------------------------------------------------------------------------
@@ -151,4 +153,3 @@ information.
  6. The quirks mode option is no longer supported in the most recent json
     gem. It is supported by Oj for backward compatibility with older json gem
     versions.
-

data/pages/Options.md

@@ -149,7 +149,7 @@ integer gives better performance.
 
 ### :integer_range [Range]
 
-Dump integers outside range as strings. 
+Dump integers outside range as strings.
 Note: range bounds must be Fixnum.
 
 ### :match_string
@@ -211,6 +211,12 @@ Allow single JSON values instead of documents, default is true (allow). This
 can also be used in :compat mode to be backward compatible with older versions
 of the json gem.
 
+### :safe
+
+The JSON gem includes the complete JSON in parse errors with no limit
+on size. To break from the JSON gem behavior for this case set `:safe`
+to true.
+
 ### :second_precision [Fixnum]
 
 The number of digits after the decimal when dumping the seconds of time.
@@ -254,6 +260,18 @@ The :time_format when dumping.
 Call `as_json()` methods on dump, default is false. The option is ignored in
 the :compat and :rails mode.
 
+
+### :use_raw_json [Boolean]
+
+Call `raw_json()` methods on dump, default is false. The option is
+accepted in the :compat and :rails mode even though it is not
+supported by other JSON gems. It provides a means to optimize dump or
+generate performance. The `raw_json(depth, indent)` method should be
+called only by Oj. It is not intended for any other use. This is mean
+to replace the abused `to_json` methods. Calling `Oj.dump` inside the
+`raw_json` with the object itself when `:use_raw_json` is true will
+result in an infinite loop.
+
 ### :use_to_hash [Boolean]
 
 Call `to_hash()` methods on dump, default is false. The option is ignored in
@@ -263,4 +281,3 @@ the :compat and :rails mode.
 
 Call `to_json()` methods on dump, default is false. The option is ignored in
 the :compat and :rails mode.
-

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,167 @@
 #!/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 'json'
 require 'oj'
 
-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.mimic_JSON
 
-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
+obj = {
+  ab: {
+    cbbb: {
+      tilbeb: [
+        {
+          coob: {
+            uijwts: [
+              {
+                prrrrr: {
+                  yakj: "pvebbx",
+                  lbhqy: {
+                    uhyw: {
+                      uijwts: [
+                        {
+                          jangi: {
+                            ubentg7haineued8atnr8w: {
+                              abc: "uejdncbncnamnasdasdasdasd",
+                              cde: "skfjskdfjskdfjsdkfjsdkfjs"
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              {
+                kdncg: {
+                  lvbnt8b9ounv: {
+                    qk: 9
+                  }
+                }
+              }
+            ],
+            jenfjbhe: {}
+          }
+        }
+      ]
+    }
+  },
+  ijbh: {
+    jsnbrpbnunt: {
+      b88dibalbvp: {
+        mnbvd: "9uhbqlpiev"
+      }
+    },
+    ncnwkl: {
+      ksdfsf: {
+        mjln: "mnklkn"
+      },
+      kbrh: {
+        sdfn83nnalbmgnansdd: {
+          uijwts: {
+            ibha: {
+              uijwts: [
+                {
+                  lnrbf: {
+                    nbvtmqbhap9ebeb7btnnaw: {
+                      ksb: "sdfksdfjsdfsb39242dnasddd",
+                      mnm: "1293dsfnsdmfnsdfsd,fmnsd,"
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          kbrh: {
+            bo8libts: {
+              nag40n: {
+                kyen: "sdfasnc92nsn"
+              },
+              kbrh: {
+                nbwyu26snfcbajsdkj8: {
+                  uijwts: {
+                    mdfnkjsdd: {}
+                  },
+                  kbrh: {
+                    kneahce: {
+                      uijwts: {
+                        kwnb: {
+                          uijwts: [
+                            {
+                              fhfd: {
+                                sfasdnfmasndfamsdnfajsmdf: false
+                              }
+                            }
+                          ],
+                          asdfsdff: [
+                            {
+                              cwdf: {
+                                sddlkfajsdkfjabskdfjalsdkfjansdkfjf: ""
+                              }
+                            },
+                            {
+                              bsdj: {
+                                sdfsjdlfkasy8kljsfsdf83jlkjfals: true
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      kbrh: {
+                        sdfsdfsddfk: {
+                          uijwts: {
+                            sdfsd: {
+                              sdfsadf89mnlrrrqurqwvdnff: {
+                                "kj": 8
+                              }
+                            }
+                          },
+                          kbrh: {
+                            dkdjd: {
+                              dfeteu: {
+                                sdfd: "sdfasdfjlkjslrsdbb"
+                              },
+                              kbrh: {
+                                sdfskjdfldk: {
+                                  buqpen: {
+                                    kjlkj: {
+                                      sdflskdjfalsdkrjalwkjfsrlfjasdf: {
+                                        sd: 0
+                                      }
+                                    }
+                                  },
+                                  kbrh: {
+                                    sdfksljdlfksdfl: {
+                                      sdfsdkfjssd: {
+                                        ksdjf: "sdflsdkfjasdkaufs;ldkfjsdlf",
+                                        sdfsdfsl: [5]
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
 
-100.times do |i|
-  puts i
-  run_test_thread
-end
+#Oj.dump(obj)
+JSON.pretty_generate(obj)
+#JSON.generate(obj)

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